fix: Correct secret drift implementation

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

Author: stevehipwell

github/acc_test.go

@@ -80,15 +80,21 @@ type testAccConfig struct {
 
 var testAccConf *testAccConfig
 
+var testAccProviders map[string]*schema.Provider = map[string]*schema.Provider{
+	"github": Provider(),
+}
+
 // providerFactories are used to instantiate a provider during acceptance testing.
 // The factory function will be invoked for every Terraform CLI command executed
 // to create a provider server to which the CLI can reattach.
-var providerFactories = map[string]func() (*schema.Provider, error){
-	//nolint:unparam
-	"github": func() (*schema.Provider, error) {
-		return Provider(), nil
-	},
-}
+var (
+	providerFactories = map[string]func() (*schema.Provider, error){
+		//nolint:unparam
+		"github": func() (*schema.Provider, error) {
+			return Provider(), nil
+		},
+	}
+)
 
 func TestMain(m *testing.M) {
 	authMode := testMode(os.Getenv("GH_TEST_AUTH_MODE"))

github/data_source_github_actions_environment_secrets.go

@@ -107,11 +107,11 @@ func dataSourceGithubActionsEnvironmentSecretsRead(ctx context.Context, d *schem
 		options.Page = resp.NextPage
 	}
 
-	if id, err := buildID(repoName, escapeIDPart(envName)); err != nil {
+	id, err := buildID(repoName, escapeIDPart(envName))
+	if err != nil {
 		return diag.FromErr(err)
-	} else {
-		d.SetId(id)
 	}
+	d.SetId(id)
 
 	if err := d.Set("secrets", all_secrets); err != nil {
 		return diag.FromErr(err)

github/data_source_github_actions_environment_variables.go

@@ -107,11 +107,11 @@ func dataSourceGithubActionsEnvironmentVariablesRead(ctx context.Context, d *sch
 		options.Page = resp.NextPage
 	}
 
-	if id, err := buildID(repoName, escapeIDPart(envName)); err != nil {
+	id, err := buildID(repoName, escapeIDPart(envName))
+	if err != nil {
 		return diag.FromErr(err)
-	} else {
-		d.SetId(id)
 	}
+	d.SetId(id)
 
 	if err := d.Set("variables", all_variables); err != nil {
 		return diag.FromErr(err)

github/data_source_github_repository_environment_deployment_policies.go

@@ -65,11 +65,11 @@ func dataSourceGithubRepositoryEnvironmentDeploymentPoliciesRead(ctx context.Con
 		results = append(results, policyMap)
 	}
 
-	if id, err := buildID(repoName, escapeIDPart(envName)); err != nil {
+	id, err := buildID(repoName, escapeIDPart(envName))
+	if err != nil {
 		return diag.FromErr(err)
-	} else {
-		d.SetId(id)
 	}
+	d.SetId(id)
 
 	if err = d.Set("policies", results); err != nil {
 		return diag.FromErr(err)

github/provider_test.go

@@ -6,33 +6,9 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-var (
-	testAccProviders         map[string]*schema.Provider
-	testAccProviderFactories func(providers *[]*schema.Provider) map[string]func() (*schema.Provider, error)
-	testAccProvider          *schema.Provider
-)
-
-func init() {
-	testAccProvider = Provider()
-	testAccProviders = map[string]*schema.Provider{
-		"github": testAccProvider,
-	}
-	testAccProviderFactories = func(providers *[]*schema.Provider) map[string]func() (*schema.Provider, error) {
-		return map[string]func() (*schema.Provider, error){
-			//nolint:unparam
-			"github": func() (*schema.Provider, error) {
-				p := Provider()
-				*providers = append(*providers, p)
-				return p, nil
-			},
-		}
-	}
-}
-
 func TestProvider(t *testing.T) {
 	t.Run("runs internal validation without error", func(t *testing.T) {
 		if err := Provider().InternalValidate(); err != nil {