fix: Correct secret drift implementation (#3069)

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

Author: stevehipwell

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)