Fix: improve acc tests (Twingate#596)

Co-authored-by: Bob Lee <[email protected]>
vmanilo · Nov 4, 2024 · 6940d82 · 6940d82
1 parent 041be8b
commit 6940d82
Show file tree

Hide file tree

Showing 25 changed files with 1,791 additions and 1,741 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -120,14 +120,13 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     if: "!github.event.pull_request.head.repo.fork"
-    timeout-minutes: 15
     strategy:
-      max-parallel: 2
+      max-parallel: 3
       fail-fast: false
       matrix:
         terraform:
           - '1.8.*'
-          - '1.9.*'
+#          - '1.9.*'
           - 'latest'
     steps:
 
@@ -161,6 +160,7 @@ jobs:
         TWINGATE_API_TOKEN: ${{ secrets.TWINGATE_API_TOKEN }}
         TEST_UNIQUE_VALUE: ${{ github.run_id }}-${{ github.run_number }}-${{ matrix.terraform }}
       run: |
+        terraform version
         make testacc
 
     - name: Send coverage
@@ -175,13 +175,13 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     if: "!github.event.pull_request.head.repo.fork"
-    timeout-minutes: 15
     strategy:
-      max-parallel: 2
+      max-parallel: 3
       fail-fast: false
       matrix:
         tofu:
           - '1.6.*'
+          - '1.7.*'
           - 'latest'
 
     steps:
@@ -224,7 +224,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: "!github.event.pull_request.head.repo.fork"
+    if: '!github.event.pull_request.head.repo.fork && always()'
     needs: [tests-acceptance, tests-acceptance-opentofu]
     runs-on: ubuntu-latest
     timeout-minutes: 15

diff --git a/.github/workflows/smoketests.yml b/.github/workflows/smoketests.yml
@@ -40,14 +40,13 @@ jobs:
     name: Matrix Acceptance Tests
     needs: build
     runs-on: ubuntu-latest
-    timeout-minutes: 15
     strategy:
-      max-parallel: 2
+      max-parallel: 3
       fail-fast: false
       matrix:
         terraform:
           - '1.8.*'
-          - '1.9.*'
+#          - '1.9.*'
           - 'latest'
     steps:
     - name: Check out code into the Go module directory
@@ -94,6 +93,7 @@ jobs:
         TWINGATE_API_TOKEN: ${{ secrets.TWINGATE_API_TOKEN }}
         TEST_UNIQUE_VALUE: ${{ github.run_id }}-${{ github.run_number }}-${{ matrix.terraform }}
       run: |
+        terraform version
         make testacc
 
     - name: Report Status
@@ -112,14 +112,13 @@ jobs:
     name: OpenTofu Matrix Acceptance Tests
     needs: build
     runs-on: ubuntu-latest
-    if: "!github.event.pull_request.head.repo.fork"
-    timeout-minutes: 15
     strategy:
-      max-parallel: 2
+      max-parallel: 3
       fail-fast: false
       matrix:
         tofu:
           - '1.6.*'
+          - '1.7.*'
           - 'latest'
 
     steps:
@@ -162,7 +161,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: always()
+    if: '!github.event.pull_request.head.repo.fork && always()'
     needs: [tests-acceptance, tests-acceptance-opentofu]
     runs-on: ubuntu-latest
     timeout-minutes: 15

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -10,7 +10,7 @@ mkdir -p "${TEST_RESULTS}"
 
 echo PACKAGE_NAME: "$PACKAGE_NAME"
 echo "Running tests:"
-go run gotest.tools/gotestsum --rerun-fails --packages "${PACKAGE_NAME}" --format standard-quiet --junitfile "${TEST_RESULTS}"/test-results.xml -- -coverpkg="${PACKAGE_NAME}" -coverprofile="${TEST_RESULTS}"/coverage.out.tmp "${PACKAGE_NAME}"
+go run gotest.tools/gotestsum --rerun-fails=5 --packages "${PACKAGE_NAME}" --format standard-quiet --junitfile "${TEST_RESULTS}"/test-results.xml -- -coverpkg="${PACKAGE_NAME}" -coverprofile="${TEST_RESULTS}"/coverage.out.tmp "${PACKAGE_NAME}"
 echo
 
 echo "Generating coverage report (removing generated **/api/gen/** and *.pb.go files)"

diff --git a/twingate/internal/test/acctests/datasource/connector_test.go b/twingate/internal/test/acctests/datasource/connector_test.go
@@ -13,24 +13,24 @@ import (
 )
 
 func TestAccDatasourceTwingateConnector_basic(t *testing.T) {
-	t.Run("Test Twingate Datasource : Acc Connector Basic", func(t *testing.T) {
-		networkName := test.RandomName()
-		connectorName := test.RandomConnectorName()
-
-		resource.Test(t, resource.TestCase{
-			ProtoV6ProviderFactories: acctests.ProviderFactories,
-			PreCheck:                 func() { acctests.PreCheck(t) },
-			CheckDestroy:             acctests.CheckTwingateConnectorDestroy,
-			Steps: []resource.TestStep{
-				{
-					Config: testDatasourceTwingateConnector(networkName, connectorName),
-					Check: acctests.ComposeTestCheckFunc(
-						resource.TestCheckOutput("my_connector", connectorName),
-						resource.TestCheckOutput("my_connector_notification_status", "true"),
-					),
-				},
+	t.Parallel()
+
+	networkName := test.RandomName()
+	connectorName := test.RandomConnectorName()
+
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acctests.ProviderFactories,
+		PreCheck:                 func() { acctests.PreCheck(t) },
+		CheckDestroy:             acctests.CheckTwingateConnectorDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testDatasourceTwingateConnector(networkName, connectorName),
+				Check: acctests.ComposeTestCheckFunc(
+					resource.TestCheckOutput("my_connector", connectorName),
+					resource.TestCheckOutput("my_connector_notification_status", "true"),
+				),
 			},
-		})
+		},
 	})
 }
 
@@ -59,21 +59,21 @@ func testDatasourceTwingateConnector(remoteNetworkName, connectorName string) st
 }
 
 func TestAccDatasourceTwingateConnector_negative(t *testing.T) {
-	t.Run("Test Twingate Datasource : Acc Connector - does not exists", func(t *testing.T) {
-		connectorID := base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("Connector:%d", acctest.RandInt())))
+	t.Parallel()
 
-		resource.Test(t, resource.TestCase{
-			ProtoV6ProviderFactories: acctests.ProviderFactories,
-			PreCheck: func() {
-				acctests.PreCheck(t)
-			},
-			Steps: []resource.TestStep{
-				{
-					Config:      testTwingateConnectorDoesNotExists(connectorID),
-					ExpectError: regexp.MustCompile("failed to read connector with id"),
-				},
+	connectorID := base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("Connector:%d", acctest.RandInt())))
+
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acctests.ProviderFactories,
+		PreCheck: func() {
+			acctests.PreCheck(t)
+		},
+		Steps: []resource.TestStep{
+			{
+				Config:      testTwingateConnectorDoesNotExists(connectorID),
+				ExpectError: regexp.MustCompile("failed to read connector with id"),
 			},
-		})
+		},
 	})
 }
 
@@ -90,20 +90,20 @@ func testTwingateConnectorDoesNotExists(id string) string {
 }
 
 func TestAccDatasourceTwingateConnector_invalidID(t *testing.T) {
-	t.Run("Test Twingate Datasource : Acc Connector - failed parse ID", func(t *testing.T) {
-		connectorID := acctest.RandString(10)
+	t.Parallel()
 
-		resource.Test(t, resource.TestCase{
-			ProtoV6ProviderFactories: acctests.ProviderFactories,
-			PreCheck: func() {
-				acctests.PreCheck(t)
-			},
-			Steps: []resource.TestStep{
-				{
-					Config:      testTwingateConnectorDoesNotExists(connectorID),
-					ExpectError: regexp.MustCompile("failed to read connector with id"),
-				},
+	connectorID := acctest.RandString(10)
+
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: acctests.ProviderFactories,
+		PreCheck: func() {
+			acctests.PreCheck(t)
+		},
+		Steps: []resource.TestStep{
+			{
+				Config:      testTwingateConnectorDoesNotExists(connectorID),
+				ExpectError: regexp.MustCompile("failed to read connector with id"),
 			},
-		})
+		},
 	})
 }
diff --git a/twingate/internal/test/acctests/datasource/connectors_test.go b/twingate/internal/test/acctests/datasource/connectors_test.go
@@ -19,7 +19,7 @@ var (
 )
 
 func TestAccDatasourceTwingateConnectors_basic(t *testing.T) {
-	acctests.SetPageLimit(1)
+	t.Parallel()
 
 	networkName1 := test.RandomName()
 	networkName2 := test.RandomName()
@@ -69,6 +69,7 @@ func testDatasourceTwingateConnectors(networkName1, connectorName1, networkName2
 }
 
 func TestAccDatasourceTwingateConnectors_emptyResult(t *testing.T) {
+	t.Parallel()
 	prefix := acctest.RandString(10)
 
 	resource.Test(t, resource.TestCase{
@@ -153,48 +154,6 @@ func testCheckOutputAttr(name string, index int, attr string, expected interface
 	}
 }
 
-func testCheckOutputNestedLen(name string, index int, attr string, length int) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		ms := s.RootModule()
-
-		res, ok := ms.Outputs[name]
-		if !ok || res == nil || res.Value == nil {
-			return fmt.Errorf("output '%s' not found", name)
-		}
-
-		list, ok := res.Value.([]interface{})
-		if !ok {
-			return fmt.Errorf("output '%s' is not a list", name)
-		}
-
-		if index >= len(list) {
-			return fmt.Errorf("index out of bounds, actual length %d", len(list))
-		}
-
-		item := list[index]
-		obj, ok := item.(map[string]interface{})
-		if !ok {
-			return fmt.Errorf("expected map, actual is %T", item)
-		}
-
-		actual, ok := obj[attr]
-		if !ok {
-			return fmt.Errorf("attribute '%s' not found", attr)
-		}
-
-		attrList, ok := actual.([]interface{})
-		if !ok {
-			return fmt.Errorf("output '%s' is not a list", attr)
-		}
-
-		if len(attrList) != length {
-			return fmt.Errorf("expected length %d, got %d", length, len(attrList))
-		}
-
-		return nil
-	}
-}
-
 func TestAccDatasourceTwingateConnectorsFilterByName(t *testing.T) {
 	t.Parallel()
 

diff --git a/twingate/internal/test/acctests/datasource/dns-filtering-profile_test.go b/twingate/internal/test/acctests/datasource/dns-filtering-profile_test.go
@@ -11,6 +11,8 @@ import (
 )
 
 func TestAccDatasourceTwingateDNSFilteringProfile_basic(t *testing.T) {
+	t.Parallel()
+
 	testName := "t" + acctest.RandString(6)
 	profileName := test.RandomName()