Merge branch 'main' into feature/copilot-code-review-ruleset

Author: nickfloyd

GNUmakefile

@@ -1,8 +1,29 @@
-TEST?=$$(go list ./... |grep -v 'vendor')
-WEBSITE_REPO=github.com/hashicorp/terraform-website
+SWEEP?=repositories,teams
 PKG_NAME=github
+TEST?=./$(PKG_NAME)/...
+WEBSITE_REPO=github.com/hashicorp/terraform-website
+
+COVERAGEARGS?=-race -coverprofile=coverage.txt -covermode=atomic
+
+# VARIABLE REFERENCE:
+#
+# Test-specific variables:
+#   T=<pattern>       - Test name pattern (e.g., TestAccGithubRepository)
+#   COV=true          - Enable coverage
+#
+#
+# Examples:
+#   make test T=TestMigrate                               # Run only schema migration unit tests
+#   make test COV=true                                    # Run all unit tests with coverage
+#   make testacc T=TestAccGithubRepositories\$$ COV=true  # Run only acceptance tests for a specific Test name with coverage
 
-export TESTARGS=-race -coverprofile=coverage.txt -covermode=atomic
+ifneq ($(origin T), undefined)
+	RUNARGS = -run='$(T)'
+endif
+
+ifneq ($(origin COV), undefined)
+	RUNARGS += $(COVERAGEARGS)
+endif
 
 default: build
 
@@ -26,19 +47,24 @@ lintcheck:
 	golangci-lint run ./...
 
 test:
-	CGO_ENABLED=0 go test ./...
-	# commenting this out for release tooling, please run testacc instead
+	@branch=$$(git rev-parse --abbrev-ref HEAD); \
+	printf "==> Running unit tests on branch: \033[1m%s\033[0m...\n" "🌿 $$branch 🌿"
+	CGO_ENABLED=0 go test $(TEST) \
+		-timeout=30s \
+		-parallel=4 \
+		-v \
+		-skip '^TestAcc' \
+		$(RUNARGS) $(TESTARGS) \
+		-count 1;
 
 testacc:
-	TF_ACC=1 CGO_ENABLED=0 go test -run "^TestAcc*" $(TEST) -v $(TESTARGS) -timeout 120m -count=1
+	@branch=$$(git rev-parse --abbrev-ref HEAD); \
+	printf "==> Running acceptance tests on branch: \033[1m%s\033[0m...\n" "🌿 $$branch 🌿"
+	TF_ACC=1 CGO_ENABLED=0 go test $(TEST) -v -run '^TestAcc' $(RUNARGS) $(TESTARGS) -timeout 120m -count=1
 
-test-compile:
-	@if [ "$(TEST)" = "./..." ]; then \
-		echo "ERROR: Set TEST to a specific package. For example,"; \
-		echo "  make test-compile TEST=./$(PKG_NAME)"; \
-		exit 1; \
-	fi
-	CGO_ENABLED=0 go test -c $(TEST) $(TESTARGS)
+sweep:
+	@echo "WARNING: This will destroy infrastructure. Use only in development accounts."
+	go test $(TEST) -v -sweep=$(SWEEP) $(SWEEPARGS)
 
 website:
 ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
@@ -58,4 +84,4 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 endif
 	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
 
-.PHONY: build test testacc fmt lint lintcheck tools test-compile website website-lint website-test
+.PHONY: build test testacc fmt lint lintcheck tools website website-lint website-test sweep

github/acc_test.go

@@ -25,7 +25,7 @@ const (
 	enterprise   testMode = "enterprise"
 )
 
-const testResourcePrefix = "test-acc-"
+const testResourcePrefix = "tf-acc-test-"
 
 var (
 	orgTestModes     = []testMode{organization, team, enterprise}

github/config.go

@@ -59,7 +59,7 @@ var (
 func RateLimitedHTTPClient(client *http.Client, writeDelay, readDelay, retryDelay time.Duration, parallelRequests bool, retryableErrors map[int]bool, maxRetries int) *http.Client {
 	client.Transport = NewEtagTransport(client.Transport)
 	client.Transport = NewRateLimitTransport(client.Transport, WithWriteDelay(writeDelay), WithReadDelay(readDelay), WithParallelRequests(parallelRequests))
-	client.Transport = logging.NewSubsystemLoggingHTTPTransport("GitHub", client.Transport)
+	client.Transport = logging.NewLoggingHTTPTransport(client.Transport)
 	client.Transport = newPreviewHeaderInjectorTransport(map[string]string{
 		// TODO: remove when Stone Crop preview is moved to general availability in the GraphQL API
 		"Accept": "application/vnd.github.stone-crop-preview+json",

github/data_source_github_actions_environment_public_key_test.go

@@ -11,22 +11,23 @@ import (
 func TestAccGithubActionsEnvironmentPublicKeyDataSource(t *testing.T) {
 	t.Run("queries a repository environment public key without error", func(t *testing.T) {
 		randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
+		repoName := fmt.Sprintf("%srepo-env-pubkey-%s", testResourcePrefix, randomID)
 
 		config := fmt.Sprintf(`
 			resource "github_repository" "test" {
-				name = "tf-acc-test-%[1]s"
+				name = "%[1]s"
 				auto_init = true
 			}
 
 			resource "github_repository_environment" "test" {
 				repository = github_repository.test.name
-				environment = "tf-acc-test-%[1]s"
+				environment = "tf-acc-test-%[2]s"
 			}
 
 			data "github_actions_environment_public_key" "test" {
 				repository = github_repository.test.name
 				environment = github_repository_environment.test.environment
-			}`, randomID)
+			}`, repoName, randomID)
 
 		check := resource.ComposeTestCheckFunc(
 			resource.TestCheckResourceAttrSet(

github/data_source_github_actions_environment_secrets_test.go

@@ -11,10 +11,11 @@ import (
 func TestAccGithubActionsEnvironmentSecretsDataSource(t *testing.T) {
 	t.Run("queries actions secrets from an environment", func(t *testing.T) {
 		randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
+		repoName := fmt.Sprintf("%srepo-env-secrets-%s", testResourcePrefix, randomID)
 
 		config := fmt.Sprintf(`
 			resource "github_repository" "test" {
-				name      = "tf-acc-test-%s"
+				name      = "%s"
 				auto_init = true
 			}
 
@@ -29,7 +30,7 @@ func TestAccGithubActionsEnvironmentSecretsDataSource(t *testing.T) {
 				repository  		= github_repository.test.name
 				plaintext_value = "foo"
 			}
-		`, randomID)
+		`, repoName)
 
 		config2 := config + `
 			data "github_actions_environment_secrets" "test" {
@@ -39,7 +40,7 @@ func TestAccGithubActionsEnvironmentSecretsDataSource(t *testing.T) {
 		`
 
 		check := resource.ComposeTestCheckFunc(
-			resource.TestCheckResourceAttr("data.github_actions_environment_secrets.test", "name", fmt.Sprintf("tf-acc-test-%s", randomID)),
+			resource.TestCheckResourceAttr("data.github_actions_environment_secrets.test", "name", repoName),
 			resource.TestCheckResourceAttr("data.github_actions_environment_secrets.test", "secrets.#", "1"),
 			resource.TestCheckResourceAttr("data.github_actions_environment_secrets.test", "secrets.0.name", "SECRET_1"),
 			resource.TestCheckResourceAttrSet("data.github_actions_environment_secrets.test", "secrets.0.created_at"),

github/data_source_github_actions_environment_variables_test.go

@@ -12,10 +12,11 @@ import (
 func TestAccGithubActionsEnvironmentVariablesDataSource(t *testing.T) {
 	t.Run("queries actions variables from an environment", func(t *testing.T) {
 		randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
+		repoName := fmt.Sprintf("%srepo-env-vars-%s", testResourcePrefix, randomID)
 
 		config := fmt.Sprintf(`
 			resource "github_repository" "test" {
-			  name = "tf-acc-test-%s"
+			  name = "%s"
 			}
 
 			resource "github_repository_environment" "test" {
@@ -29,7 +30,7 @@ func TestAccGithubActionsEnvironmentVariablesDataSource(t *testing.T) {
 			  variable_name    = "test_variable"
 			  value  		   = "foo"
 			}
-			`, randomID)
+			`, repoName)
 
 		config2 := config + `
 			data "github_actions_environment_variables" "test" {

github/data_source_github_actions_organization_secrets_test.go

@@ -27,9 +27,9 @@ func TestAccGithubActionsOrganizationSecretsDataSource(t *testing.T) {
 		`
 
 		check := resource.ComposeTestCheckFunc(
-			resource.TestCheckResourceAttr("data.github_actions_organization_secrets.test", "secrets.#", "1"),
-			resource.TestCheckResourceAttr("data.github_actions_organization_secrets.test", "secrets.0.name", strings.ToUpper(fmt.Sprintf("ORG_SECRET_1_%s", randomID))),
-			resource.TestCheckResourceAttr("data.github_actions_organization_secrets.test", "secrets.0.visibility", "all"),
+			// resource.TestCheckResourceAttr("data.github_actions_organization_secrets.test", "secrets.#", "1"), // There is no feasible way to know how many secrets exist in the Org during test runs. And I couldn't find a "greater than" operator
+			resource.TestCheckTypeSetElemAttr("data.github_actions_organization_secrets.test", "secrets.*.*", strings.ToUpper(fmt.Sprintf("ORG_SECRET_1_%s", randomID))),
+			resource.TestCheckTypeSetElemAttr("data.github_actions_organization_secrets.test", "secrets.*.*", "all"),
 			resource.TestCheckResourceAttrSet("data.github_actions_organization_secrets.test", "secrets.0.created_at"),
 			resource.TestCheckResourceAttrSet("data.github_actions_organization_secrets.test", "secrets.0.updated_at"),
 		)

github/data_source_github_actions_public_key_test.go

@@ -10,18 +10,19 @@ import (
 
 func TestAccGithubActionsPublicKeyDataSource(t *testing.T) {
 	randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
+	repoName := fmt.Sprintf("%srepo-actions-pubkey-%s", testResourcePrefix, randomID)
 
 	t.Run("queries a repository public key without error", func(t *testing.T) {
 		config := fmt.Sprintf(`
 			resource "github_repository" "test" {
-			  name = "tf-acc-test-%[1]s"
+			  name = "%[1]s"
 				auto_init = true
 			}
 
 			data "github_actions_public_key" "test" {
 				repository = github_repository.test.name
 			}
-		`, randomID)
+		`, repoName)
 
 		check := resource.ComposeTestCheckFunc(
 			resource.TestCheckResourceAttrSet(

github/data_source_github_actions_registration_token_test.go

@@ -10,21 +10,22 @@ import (
 
 func TestAccGithubActionsRegistrationTokenDataSource(t *testing.T) {
 	randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
+	repoName := fmt.Sprintf("%srepo-actions-regtoken-%s", testResourcePrefix, randomID)
 
 	t.Run("get a repository registration token without error", func(t *testing.T) {
 		config := fmt.Sprintf(`
 			resource "github_repository" "test" {
-			  name = "tf-acc-test-%[1]s"
+			  name = "%[1]s"
 				auto_init = true
 			}
 
 			data "github_actions_registration_token" "test" {
 				repository = github_repository.test.id
 			}
-		`, randomID)
+		`, repoName)
 
 		check := resource.ComposeTestCheckFunc(
-			resource.TestCheckResourceAttr("data.github_actions_registration_token.test", "repository", fmt.Sprintf("tf-acc-test-%s", randomID)),
+			resource.TestCheckResourceAttr("data.github_actions_registration_token.test", "repository", repoName),
 			resource.TestCheckResourceAttrSet("data.github_actions_registration_token.test", "token"),
 			resource.TestCheckResourceAttrSet("data.github_actions_registration_token.test", "expires_at"),
 		)

github/data_source_github_actions_repository_oidc_subject_claim_customization_template_test.go

@@ -10,11 +10,12 @@ import (
 
 func TestAccGithubActionsRepositoryOIDCSubjectClaimCustomizationTemplateDataSource(t *testing.T) {
 	randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
+	repoName := fmt.Sprintf("%srepo-oidc-%s", testResourcePrefix, randomID)
 
 	t.Run("get an repository oidc subject claim customization template without error", func(t *testing.T) {
 		config := fmt.Sprintf(`
 			resource "github_repository" "test" {
-				name = "tf-acc-test-%s"
+				name = "%s"
 				visibility = "private"
 			}
 
@@ -23,7 +24,7 @@ func TestAccGithubActionsRepositoryOIDCSubjectClaimCustomizationTemplateDataSour
 				use_default = false
 				include_claim_keys = ["repo", "context", "job_workflow_ref"]
 			}
-		`, randomID)
+		`, repoName)
 
 		config2 := config + `
 			data "github_actions_repository_oidc_subject_claim_customization_template" "test" {
@@ -33,15 +34,15 @@ func TestAccGithubActionsRepositoryOIDCSubjectClaimCustomizationTemplateDataSour
 
 		config3 := fmt.Sprintf(`
 			resource "github_repository" "test" {
-				name = "tf-acc-test-%s"
+				name = "%s"
 				visibility = "private"
 			}
 
 			resource "github_actions_repository_oidc_subject_claim_customization_template" "test" {
 				repository = github_repository.test.name
 				use_default = true
 			}
-		`, randomID)
+		`, repoName)
 
 		config4 := config3 + `
 			data "github_actions_repository_oidc_subject_claim_customization_template" "test" {