aaa

Signed-off-by: Steve Hipwell <[email protected]>

Author: stevehipwell

.github/workflows/dotcom-acceptance-tests.yaml

@@ -37,18 +37,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
-      - name: Check secrets
-        env:
-          INPUT_ALLOWED_SECRETS: ${{ vars.DOTCOM_ACCEPTANCE_TESTS_ALLOWED_SECRETS || 'DOTCOM_TEST_USER_TOKEN' }}
-          INPUT_SECRETS: ${{ toJSON(secrets) }}
-        run: |
-          set -eou pipefail
+      # - name: Check secrets
+      #   env:
+      #     INPUT_ALLOWED_SECRETS: ${{ vars.DOTCOM_ACCEPTANCE_TESTS_ALLOWED_SECRETS || 'DOTCOM_TEST_USER_TOKEN' }}
+      #     INPUT_SECRETS: ${{ toJSON(secrets) }}
+      #   run: |
+      #     set -eou pipefail
 
-          secret_keys="$(jq --raw-output --compact-output '[. | keys[] | select(test("^(?:(?:TEST)|(?:test))_") | not)] | sort | join(",")' <<<"${INPUT_SECRETS}")"
-          if [[ "${secret_keys}" != "${INPUT_ALLOWED_SECRETS}" ]]; then
-            echo "::error::Too many or too few secrets configured: ${secret_keys}"
-            exit 1
-          fi
+      #     secret_keys="$(jq --raw-output --compact-output '[. | keys[] | select(test("^(?:(?:ACTIONS)|(?:actions)|(?:GITHUB)|(?:github)|(?:TEST)|(?:test))_") | not)] | sort | join(",")' <<<"${INPUT_SECRETS}")"
+      #     if [[ "${secret_keys}" != "${INPUT_ALLOWED_SECRETS}" ]]; then
+      #       echo "::error::Too many or too few secrets configured: ${secret_keys}"
+      #       exit 1
+      #     fi
 
       - name: Check credentials
         id: credentials
@@ -75,14 +75,15 @@ jobs:
         env:
           TF_ACC: "1"
           TF_LOG: INFO
+          GITHUB_TOKEN: ${{ steps.credentials.outputs.token }}
           GITHUB_BASE_URL: https://api.github.com/
           GITHUB_TEST_TYPE: ${{ matrix.mode }}
           GITHUB_OWNER: ${{ (matrix.mode == 'individual' && 'github-terraform-test-user') || (matrix.mode == 'organization' && 'terraformtesting') || '' }}
           GITHUB_ORGANIZATION: ${{ (matrix.mode == 'organization' && 'terraformtesting') || '' }}
           GITHUB_TEST_ORGANIZATION: ${{ (matrix.mode == 'individual' && 'terraformtesting') || '' }}
           GITHUB_TEST_OWNER: ${{ (matrix.mode == 'organization' && 'github-terraform-test-user') || '' }}
           GITHUB_TEST_USER_TOKEN: ${{ steps.credentials.outputs.token }}
-        run: go test -run "^TestAcc*" ./github -v -race -coverprofile=coverage.txt -covermode=atomic -sweep=tf-acc- -timeout 120m -count=1
+        run: go test -run "^TestAcc*" ./github -v -race -coverprofile=coverage.txt -covermode=atomic -timeout 120m -count=1
 
   check:
     name: Check DotCom Acceptance Tests

.github/workflows/ghes-acceptance-tests.yaml

@@ -36,7 +36,7 @@ jobs:
         run: |
           set -eou pipefail
 
-          secret_keys="$(jq --raw-output --compact-output '[. | keys[] | select(test("^(?:(?:TEST)|(?:test))_") | not)] | sort | join(",")' <<<"${INPUT_SECRETS}")"
+          secret_keys="$(jq --raw-output --compact-output '[. | keys[] | select(test("^(?:(?:ACTIONS)|(?:actions)|(?:GITHUB)|(?:github)|(?:TEST)|(?:test))_") | not)] | sort | join(",")' <<<"${INPUT_SECRETS}")"
           if [[ "${secret_keys}" != "${INPUT_ALLOWED_SECRETS}" ]]; then
             echo "::error::Too many or too few secrets configured: ${secret_keys}"
             exit 1
@@ -89,12 +89,13 @@ jobs:
         env:
           TF_ACC: "1"
           TF_LOG: INFO
+          GITHUB_TOKEN: ${{ steps.credentials.outputs.token }}
           GITHUB_BASE_URL: ${{ steps.server.outputs.address }}
           GITHUB_TEST_TYPE: enterprise
           GITHUB_OWNER: terraformtesting
           GITHUB_ORGANIZATION: terraformtesting
           GITHUB_TEST_USER_TOKEN: ${{ steps.credentials.outputs.token }}
-        run: go test -run "^TestAcc*" ./github -v -race -coverprofile=coverage.txt -covermode=atomic -sweep=tf-acc- -timeout 120m -count=1
+        run: go test -run "^TestAcc*" ./github -v -race -coverprofile=coverage.txt -covermode=atomic -timeout 120m -count=1
 
   check:
     name: Check GHES Acceptance Tests

github/config.go

@@ -103,7 +103,7 @@ func (c *Config) NewRESTClient(client *http.Client) (*github.Client, error) {
 
 	hostname := uv3.Hostname()
 	if hostname != DotComHost && !GHECDataResidencyHostMatch.MatchString(hostname) {
-		uv3.Path = path.Join(uv3.Path, "api/v3/")
+		uv3.Path = path.Join(uv3.Path, "api/v3") // fmt.Sprintf("%s/", path.Join(uv3.Path, "api/v3"))
 	}
 
 	v3client, err := github.NewClient(client).WithEnterpriseURLs(uv3.String(), "")

github/sweeper_test.go

@@ -21,10 +21,15 @@ func sharedConfigForRegion() (any, error) {
 		return nil, fmt.Errorf("empty GITHUB_OWNER")
 	}
 
+	baseURL, ok := os.LookupEnv("GITHUB_BASE_URL")
+	if !ok {
+		baseURL = "https://api.github.com/"
+	}
+
 	config := Config{
 		Token:   os.Getenv("GITHUB_TOKEN"),
 		Owner:   os.Getenv("GITHUB_OWNER"),
-		BaseURL: "",
+		BaseURL: baseURL,
 	}
 
 	meta, err := config.Meta()