Add PF container start and remove to testing, and fix env var in test…

… environment.
pingidentity · Aug 9, 2024 · f9dee56 · f9dee56
1 parent d526920
commit f9dee56
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/code-analysis-lint-test.yaml b/.github/workflows/code-analysis-lint-test.yaml
@@ -134,14 +134,15 @@ jobs:
       PINGCTL_LOG_LEVEL: ${{ vars.PINGCTL_LOG_LEVEL }}
       PINGCTL_LOG_PATH: ${{ vars.PINGCTL_LOG_PATH }}
       PINGCTL_PINGONE_PROVIDER_VERSION: ${{ vars.PINGCTL_PINGONE_PROVIDER_VERSION }}
-      PINGCTL_PINGFEDERATE_ADMIN_API_PATH: ${{ vars.PINGCTL_PINGFEDERATE_ADMIN_API_PATH }}
-      PINGCTL_PINGFEDERATE_CLIENT_ID: ${{ vars.PINGCTL_PINGFEDERATE_CLIENT_ID }}
-      PINGCTL_PINGFEDERATE_CLIENT_SECRET: ${{ vars.PINGCTL_PINGFEDERATE_CLIENT_SECRET }}
-      PINGCTL_PINGFEDERATE_HTTPS_HOST: ${{ vars.PINGCTL_PINGFEDERATE_HTTPS_HOST }}
-      PINGCTL_PINGFEDERATE_PASSWORD: ${{ vars.PINGCTL_PINGFEDERATE_PASSWORD }}
-      PINGCTL_PINGFEDERATE_SCOPES: ${{ vars.PINGCTL_PINGFEDERATE_SCOPES }}
-      PINGCTL_PINGFEDERATE_TOKEN_URL: ${{ vars.PINGCTL_PINGFEDERATE_TOKEN_URL }}
-      PINGCTL_PINGFEDERATE_USERNAME: ${{ vars.PINGCTL_PINGFEDERATE_USERNAME }}
+      PINGCTL_PINGFEDERATE_ADMIN_API_PATH: ${{ secrets.PINGCTL_PINGFEDERATE_ADMIN_API_PATH }}
+      PINGCTL_PINGFEDERATE_CLIENT_ID: ${{ secrets.PINGCTL_PINGFEDERATE_CLIENT_ID }}
+      PINGCTL_PINGFEDERATE_CLIENT_SECRET: ${{ secrets.PINGCTL_PINGFEDERATE_CLIENT_SECRET }}
+      PINGCTL_PINGFEDERATE_HTTPS_HOST: ${{ secrets.PINGCTL_PINGFEDERATE_HTTPS_HOST }}
+      PINGCTL_PINGFEDERATE_PASSWORD: ${{ secrets.PINGCTL_PINGFEDERATE_PASSWORD }}
+      PINGCTL_PINGFEDERATE_SCOPES: ${{ secrets.PINGCTL_PINGFEDERATE_SCOPES }}
+      PINGCTL_PINGFEDERATE_TOKEN_URL: ${{ secrets.PINGCTL_PINGFEDERATE_TOKEN_URL }}
+      PINGCTL_PINGFEDERATE_USERNAME: ${{ secrets.PINGCTL_PINGFEDERATE_USERNAME }}
+      PINGCTL_PINGFEDERATE_PROVIDER_VERSION: ${{ vars.PINGCTL_PINGFEDERATE_PROVIDER_VERSION }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5

diff --git a/Makefile b/Makefile
@@ -14,9 +14,11 @@ fmt:
 vet:
 	go vet ./...
 
-test:
+go-test:
 	go test -parallel=4 -count=1 ./...
 
+test: starttestcontainer go-test removetestcontainer
+
 devchecknotest: install importfmtlint fmt vet golangcilint
 
 devcheck: devchecknotest spincontainer test removetestcontainer

diff --git a/internal/connector/pingfederate/pingfederate_connector_test.go b/internal/connector/pingfederate/pingfederate_connector_test.go
@@ -23,7 +23,7 @@ func TestPingFederateTerraformPlan(t *testing.T) {
 			name:     "PingFederateAuthenticationApiApplication",
 			resource: resources.AuthenticationApiApplication(PingFederateClientInfo),
 			ignoredErrors: []string{
-				"Error: Invalid Attribute Value",
+				"Error: Invalid Attribute Value", // TODO - Remove with PDI-1925 fix
 			},
 		},
 	}