Skip to content

Commit

Permalink
Fix acc tests (#210)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ekampf
ekampf authored Oct 25, 2022
1 parent 27ed7e8 commit 5b221f5
Show file tree
Hide file tree
Showing 15 changed files with 82 additions and 45 deletions.
2 changes: 1 addition & 1 deletion twingate/datasource_connector_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestAccDatasourceTwingateConnector_basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testDatasourceTwingateConnector(networkName, connectorName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
resource.TestCheckOutput("my_connector", connectorName),
),
},
Expand Down
4 changes: 2 additions & 2 deletions twingate/datasource_connectors_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestAccDatasourceTwingateConnectors_basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testDatasourceTwingateConnectors(networkName1, connectorName, networkName2, connectorName, getTestPrefix()),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testCheckOutputLength("my_connectors", 2),
testCheckOutputAttr("my_connectors", 0, "name", connectorName),
),
Expand Down Expand Up @@ -69,7 +69,7 @@ func TestAccDatasourceTwingateConnectors_emptyResult(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testTwingateConnectorsDoesNotExists(prefix),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testCheckOutputLength("my_connectors_dcs2", 0),
),
},
Expand Down
2 changes: 1 addition & 1 deletion twingate/datasource_group_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func TestAccDatasourceTwingateGroup_basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testDatasourceTwingateGroup(groupName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
resource.TestCheckOutput("my_group_dg1", groupName),
resource.TestCheckOutput("my_group_is_active_dg1", "true"),
resource.TestCheckOutput("my_group_type_dg1", "MANUAL"),
Expand Down
8 changes: 4 additions & 4 deletions twingate/datasource_groups_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestAccDatasourceTwingateGroups_basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testDatasourceTwingateGroups(groupName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
resource.TestCheckResourceAttr(theDatasource, groupsNumber, "2"),
resource.TestCheckResourceAttr(theDatasource, firstGroupName, groupName),
),
Expand Down Expand Up @@ -64,7 +64,7 @@ func TestAccDatasourceTwingateGroups_emptyResult(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testTwingateGroupsDoesNotExists(groupName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
resource.TestCheckResourceAttr("data.twingate_groups.out_dgs2", groupsNumber, "0"),
),
},
Expand Down Expand Up @@ -92,7 +92,7 @@ func TestAccDatasourceTwingateGroupsWithFilters_basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testDatasourceTwingateGroupsWithFilters(groupName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
resource.TestCheckResourceAttr(theDatasource, groupsNumber, "2"),
resource.TestCheckResourceAttr(theDatasource, firstGroupName, groupName),
),
Expand Down Expand Up @@ -189,7 +189,7 @@ func TestAccDatasourceTwingateGroups_withTwoDatasource(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testDatasourceTwingateGroupsWithDatasource(groupName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
resource.TestCheckResourceAttr("data.twingate_groups.two_dgs3", firstGroupName, groupName),
resource.TestCheckResourceAttr("data.twingate_groups.one_dgs3", groupsNumber, "1"),
resource.TestCheckResourceAttr("data.twingate_groups.two_dgs3", groupsNumber, "2"),
Expand Down
4 changes: 2 additions & 2 deletions twingate/datasource_remote_network_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestAccDatasourceTwingateRemoteNetwork_basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testDatasourceTwingateRemoteNetwork(networkName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
resource.TestCheckResourceAttr("data.twingate_remote_network.test_dn1_2", "name", networkName),
),
},
Expand Down Expand Up @@ -59,7 +59,7 @@ func TestAccDatasourceTwingateRemoteNetworkByName_basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testDatasourceTwingateRemoteNetworkByName(networkName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
resource.TestCheckResourceAttr("data.twingate_remote_network.test_dn2_2", "name", networkName),
),
},
Expand Down
2 changes: 1 addition & 1 deletion twingate/datasource_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestAccDatasourceTwingateResource_basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testDatasourceTwingateResource(networkName, resourceName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
resource.TestCheckResourceAttr("data.twingate_resource.out_dr1", "name", resourceName),
),
},
Expand Down
4 changes: 2 additions & 2 deletions twingate/datasource_resources_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func TestAccDatasourceTwingateResources_basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testDatasourceTwingateResources(networkName, resourceName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
resource.TestCheckResourceAttr(theDatasource, resourcesNumber, "2"),
resource.TestCheckResourceAttr(theDatasource, firstResourceName, resourceName),
),
Expand Down Expand Up @@ -97,7 +97,7 @@ func TestAccDatasourceTwingateResources_emptyResult(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testTwingateResourcesDoesNotExists(resourceName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
resource.TestCheckResourceAttr("data.twingate_resources.out_drs2", resourcesNumber, "0"),
),
},
Expand Down
2 changes: 1 addition & 1 deletion twingate/datasource_user_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestAccDatasourceTwingateUser_basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testDatasourceTwingateUser(user.ID),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
resource.TestCheckOutput("my_user_email_du1", user.Email),
),
},
Expand Down
2 changes: 1 addition & 1 deletion twingate/datasource_users_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func TestAccDatasourceTwingateUsers_basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testDatasourceTwingateUsers(),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testCheckResourceAttrNotEqual("data.twingate_users.all", "users.#", "0"),
),
},
Expand Down
12 changes: 6 additions & 6 deletions twingate/resource_connector_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func TestAccRemoteConnectorCreate(t *testing.T) {
Steps: []resource.TestStep{
{
Config: createConnectorC1(remoteNetworkName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateConnectorExists(theResource, "twingate_remote_network.test_c1"),
resource.TestCheckResourceAttrSet(theResource, "name"),
),
Expand Down Expand Up @@ -66,7 +66,7 @@ func TestAccRemoteConnectorWithCustomName(t *testing.T) {
Steps: []resource.TestStep{
{
Config: createConnectorC2(remoteNetworkName, connectorName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateConnectorExists(theResource, "twingate_remote_network.test_c2"),
resource.TestMatchResourceAttr(theResource, "name", regexp.MustCompile(connectorName)),
),
Expand Down Expand Up @@ -143,7 +143,7 @@ func TestAccRemoteConnectorImport(t *testing.T) {
Steps: []resource.TestStep{
{
Config: createConnectorC3(remoteNetworkName, connectorName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateConnectorExists(theResource, "twingate_remote_network.test_c3"),
resource.TestMatchResourceAttr(theResource, "name", testRegexp),
),
Expand Down Expand Up @@ -183,7 +183,7 @@ func TestAccRemoteConnectorNotAllowedToChangeRemoteNetworkId(t *testing.T) {
Steps: []resource.TestStep{
{
Config: createConnectorC4(remoteNetworkName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateConnectorExists(theResource, "twingate_remote_network.test_c4_1"),
),
},
Expand Down Expand Up @@ -230,15 +230,15 @@ func TestAccTwingateConnectorReCreateAfterDeletion(t *testing.T) {
Steps: []resource.TestStep{
{
Config: createConnectorC5(remoteNetworkName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateConnectorExists(theResource, "twingate_remote_network.test_c5"),
deleteTwingateResource(theResource, connectorResourceName),
),
ExpectNonEmptyPlan: true,
},
{
Config: createConnectorC5(remoteNetworkName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateConnectorExists(theResource, "twingate_remote_network.test_c5"),
),
},
Expand Down
2 changes: 1 addition & 1 deletion twingate/resource_connector_tokens_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestAccRemoteConnectorWithTokens(t *testing.T) {
Steps: []resource.TestStep{
{
Config: createConnectorTokensWithKeepers(remoteNetworkName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateConnectorTokensExists(connectorTokensResource),
),
},
Expand Down
10 changes: 5 additions & 5 deletions twingate/resource_group_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ func TestAccTwingateGroupCreateUpdate(t *testing.T) {
Steps: []resource.TestStep{
{
Config: createGroup001(groupNameBefore),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateGroupExists(theResource),
resource.TestCheckResourceAttr(theResource, "name", groupNameBefore),
),
},
{
Config: createGroup001(groupNameAfter),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateGroupExists(theResource),
resource.TestCheckResourceAttr(theResource, "name", groupNameAfter),
),
Expand Down Expand Up @@ -64,7 +64,7 @@ func TestAccTwingateGroupDeleteNonExisting(t *testing.T) {
{
Config: createGroup002(groupNameBefore),
Destroy: true,
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateGroupDoesNotExists("twingate_group.test002"),
),
},
Expand Down Expand Up @@ -141,15 +141,15 @@ func TestAccTwingateGroupReCreateAfterDeletion(t *testing.T) {
Steps: []resource.TestStep{
{
Config: createGroup003(groupName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateGroupExists(theResource),
deleteTwingateResource(theResource, groupResourceName),
),
ExpectNonEmptyPlan: true,
},
{
Config: createGroup003(groupName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateGroupExists(theResource),
),
},
Expand Down
10 changes: 5 additions & 5 deletions twingate/resource_remote_network_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ func TestAccTwingateRemoteNetworkCreateUpdate(t *testing.T) {
Steps: []resource.TestStep{
{
Config: createRemoteNetwork001(remoteNetworkNameBefore),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateRemoteNetworkExists(theResource),
resource.TestCheckResourceAttr(theResource, "name", remoteNetworkNameBefore),
),
},
{
Config: createRemoteNetwork001(remoteNetworkNameAfter),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateRemoteNetworkExists(theResource),
resource.TestCheckResourceAttr(theResource, "name", remoteNetworkNameAfter),
),
Expand Down Expand Up @@ -62,7 +62,7 @@ func TestAccTwingateRemoteNetworkDeleteNonExisting(t *testing.T) {
{
Config: createRemoteNetwork002(remoteNetworkNameBefore),
Destroy: true,
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateRemoteNetworkDoesNotExists("twingate_remote_network.test002"),
),
},
Expand Down Expand Up @@ -141,15 +141,15 @@ func TestAccTwingateRemoteNetworkReCreateAfterDeletion(t *testing.T) {
Steps: []resource.TestStep{
{
Config: createRemoteNetwork003(remoteNetworkName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateRemoteNetworkExists(theResource),
deleteTwingateResource(theResource, remoteNetworkResourceName),
),
ExpectNonEmptyPlan: true,
},
{
Config: createRemoteNetwork003(remoteNetworkName),
Check: resource.ComposeTestCheckFunc(
Check: ComposeTestCheckFunc(
testAccCheckTwingateRemoteNetworkExists(theResource),
),
},
Expand Down
Loading

0 comments on commit 5b221f5

Please sign in to comment.