fix: Fix errors as nil bomb

.github/workflows/ci.yaml

@@ -1,4 +1,4 @@
-name: GitHub Actions CI
+name: CI
 
 on:
   push:
@@ -21,11 +21,11 @@ jobs:
   ci:
     name: Continuous Integration
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     defaults:
       run:
         shell: bash
-    env:
-      GITHUB_TEST_ORGANIZATION: kfcampbell-terraform-provider
     steps:
       - name: Checkout
         uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
@@ -35,7 +35,7 @@ jobs:
           go-version-file: go.mod
           cache: true
       - run: make tools
-      - run: make lint
+      - run: make lintcheck
       - run: make website-lint
       - run: make build
       - run: make test

GNUmakefile

@@ -8,17 +8,18 @@ tools:
 	go install github.com/client9/misspell/cmd/misspell@v0.3.4
 	go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.6.0
 
-build: fmtcheck
+build: lintcheck
 	CGO_ENABLED=0 go build -ldflags="-s -w" ./...
 
 fmt:
 	@echo "==> Fixing source code with golangci-lint..."
 	golangci-lint fmt ./...
 
-fmtcheck:
-	@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
-
 lint:
+	@echo "==> Checking source code against linters and fixing..."
+	golangci-lint run --fix ./...
+
+lintcheck:
 	@echo "==> Checking source code against linters..."
 	golangci-lint run ./...
 
@@ -55,4 +56,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 fmtcheck lint tools test-compile website website-lint website-test
+.PHONY: build test testacc fmt lint lintcheck tools test-compile website website-lint website-test

github/data_source_github_branch.go

@@ -50,9 +50,9 @@ func dataSourceGithubBranchRead(d *schema.ResourceData, meta any) error {
 
 	ref, resp, err := client.Git.GetRef(context.TODO(), orgName, repoName, branchRefName)
 	if err != nil {
-		err := &github.ErrorResponse{}
-		if errors.As(err, &err) {
-			if err.Response.StatusCode == http.StatusNotFound {
+		var ghErr *github.ErrorResponse
+		if errors.As(err, &ghErr) {
+			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[DEBUG] Missing GitHub branch %s/%s (%s)", orgName, repoName, branchRefName)
 				d.SetId("")
 				return nil

github/data_source_github_ref.go

@@ -52,9 +52,9 @@ func dataSourceGithubRefRead(d *schema.ResourceData, meta any) error {
 
 	refData, resp, err := client.Git.GetRef(context.TODO(), owner, repoName, ref)
 	if err != nil {
-		err := &github.ErrorResponse{}
-		if errors.As(err, &err) {
-			if err.Response.StatusCode == http.StatusNotFound {
+		var ghErr *github.ErrorResponse
+		if errors.As(err, &ghErr) {
+			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[DEBUG] Missing GitHub ref %s/%s (%s)", owner, repoName, ref)
 				d.SetId("")
 				return nil

github/data_source_github_repository.go

@@ -361,9 +361,9 @@ func dataSourceGithubRepositoryRead(d *schema.ResourceData, meta any) error {
 
 	repo, _, err := client.Repositories.Get(context.TODO(), owner, repoName)
 	if err != nil {
-		err := &github.ErrorResponse{}
-		if errors.As(err, &err) {
-			if err.Response.StatusCode == http.StatusNotFound {
+		var ghErr *github.ErrorResponse
+		if errors.As(err, &ghErr) {
+			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[DEBUG] Missing GitHub repository %s/%s", owner, repoName)
 				d.SetId("")
 				return nil

github/data_source_github_repository_file.go

@@ -99,9 +99,9 @@ func dataSourceGithubRepositoryFileRead(ctx context.Context, d *schema.ResourceD
 
 	fc, dc, _, err := client.Repositories.GetContents(ctx, owner, repo, file, opts)
 	if err != nil {
-		err := &github.ErrorResponse{}
-		if errors.As(err, &err) {
-			if err.Response.StatusCode == http.StatusNotFound {
+		var ghErr *github.ErrorResponse
+		if errors.As(err, &ghErr) {
+			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[DEBUG] Missing GitHub repository file %s/%s/%s", owner, repo, file)
 				d.SetId("")
 				return nil

github/repository_utils.go

@@ -16,7 +16,7 @@ func checkRepositoryBranchExists(client *github.Client, owner, repo, branch stri
 	ctx := context.WithValue(context.Background(), ctxId, buildTwoPartID(repo, branch))
 	_, _, err := client.Repositories.GetBranch(ctx, owner, repo, branch, 2)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				return fmt.Errorf("branch %s not found in repository %s/%s or repository is not readable", branch, owner, repo)
@@ -130,7 +130,7 @@ func listAutolinks(client *github.Client, owner, repo string) ([]*github.Autolin
 // isArchivedRepositoryError checks if an error is a 403 "repository archived" error.
 // Returns true if the repository is archived.
 func isArchivedRepositoryError(err error) bool {
-	ghErr := &github.ErrorResponse{}
+	var ghErr *github.ErrorResponse
 	if errors.As(err, &ghErr) {
 		if ghErr.Response.StatusCode == http.StatusForbidden {
 			return strings.Contains(strings.ToLower(ghErr.Message), "archived")

github/resource_github_actions_environment_secret.go

@@ -131,7 +131,7 @@ func resourceGithubActionsEnvironmentSecretRead(d *schema.ResourceData, meta any
 
 	repo, _, err := client.Repositories.Get(ctx, owner, repoName)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[INFO] Removing environment secret %s from state because it no longer exists in GitHub",
@@ -145,7 +145,7 @@ func resourceGithubActionsEnvironmentSecretRead(d *schema.ResourceData, meta any
 
 	secret, _, err := client.Actions.GetEnvSecret(ctx, int(repo.GetID()), escapedEnvName, secretName)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[INFO] Removing environment secret %s from state because it no longer exists in GitHub",

github/resource_github_actions_environment_variable.go

@@ -77,7 +77,7 @@ func resourceGithubActionsEnvironmentVariableCreateOrUpdate(d *schema.ResourceDa
 	// Try to create the variable first
 	_, err := client.Actions.CreateEnvVariable(ctx, owner, repoName, escapedEnvName, variable)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) && ghErr.Response.StatusCode == http.StatusConflict {
 			// Variable already exists, try to update instead
 			// If it fails here, we want to return the error otherwise continue
@@ -107,7 +107,7 @@ func resourceGithubActionsEnvironmentVariableRead(d *schema.ResourceData, meta a
 
 	variable, _, err := client.Actions.GetEnvVariable(ctx, owner, repoName, escapedEnvName, name)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[INFO] Removing actions variable %s from state because it no longer exists in GitHub",

github/resource_github_actions_organization_secret.go

@@ -161,7 +161,7 @@ func resourceGithubActionsOrganizationSecretRead(d *schema.ResourceData, meta an
 
 	secret, _, err := client.Actions.GetOrgSecret(ctx, owner, d.Id())
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[INFO] Removing actions secret %s from state because it no longer exists in GitHub",

github/resource_github_actions_organization_variable.go

@@ -156,7 +156,7 @@ func resourceGithubActionsOrganizationVariableRead(d *schema.ResourceData, meta
 
 	variable, _, err := client.Actions.GetOrgVariable(ctx, owner, name)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[INFO] Removing actions variable %s from state because it no longer exists in GitHub",

github/resource_github_actions_runner_group.go

@@ -192,7 +192,7 @@ func resourceGithubActionsRunnerGroupCreate(d *schema.ResourceData, meta any) er
 func getOrganizationRunnerGroup(client *github.Client, ctx context.Context, org string, groupID int64) (*github.RunnerGroup, *github.Response, error) {
 	runnerGroup, resp, err := client.Actions.GetOrganizationRunnerGroup(ctx, org, groupID)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			// ignore error StatusNotModified
 			return runnerGroup, resp, nil
@@ -221,7 +221,7 @@ func resourceGithubActionsRunnerGroupRead(d *schema.ResourceData, meta any) erro
 
 	runnerGroup, resp, err := getOrganizationRunnerGroup(client, ctx, orgName, runnerGroupID)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[INFO] Removing organization runner group %s/%s from state because it no longer exists in GitHub",

github/resource_github_actions_secret.go

@@ -132,7 +132,7 @@ func resourceGithubActionsSecretRead(d *schema.ResourceData, meta any) error {
 
 	secret, _, err := client.Actions.GetRepoSecret(ctx, owner, repoName, secretName)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[INFO] Removing actions secret %s from state because it no longer exists in GitHub",

github/resource_github_actions_variable.go

@@ -104,7 +104,7 @@ func resourceGithubActionsVariableRead(d *schema.ResourceData, meta any) error {
 
 	variable, _, err := client.Actions.GetRepoVariable(ctx, owner, repoName, variableName)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[INFO] Removing actions variable %s from state because it no longer exists in GitHub",

github/resource_github_branch.go

@@ -130,7 +130,7 @@ func resourceGithubBranchRead(d *schema.ResourceData, meta any) error {
 
 	ref, resp, err := client.Git.GetRef(ctx, orgName, repoName, branchRefName)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotModified {
 				return nil

github/resource_github_branch_default.go

@@ -98,7 +98,7 @@ func resourceGithubBranchDefaultRead(d *schema.ResourceData, meta any) error {
 
 	repository, resp, err := client.Repositories.Get(ctx, owner, repoName)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotModified {
 				return nil

github/resource_github_branch_protection_v3.go

@@ -282,7 +282,7 @@ func resourceGithubBranchProtectionV3Read(d *schema.ResourceData, meta any) erro
 	githubProtection, resp, err := client.Repositories.GetBranchProtection(ctx,
 		orgName, repoName, branch)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotModified {
 				if err := requireSignedCommitsRead(d, meta); err != nil {

github/resource_github_codespaces_organization_secret.go

@@ -149,7 +149,7 @@ func resourceGithubCodespacesOrganizationSecretRead(d *schema.ResourceData, meta
 
 	secret, _, err := client.Codespaces.GetOrgSecret(ctx, owner, d.Id())
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[WARN] Removing actions secret %s from state because it no longer exists in GitHub",

github/resource_github_codespaces_secret.go

@@ -119,7 +119,7 @@ func resourceGithubCodespacesSecretRead(d *schema.ResourceData, meta any) error
 
 	secret, _, err := client.Codespaces.GetRepoSecret(ctx, owner, repoName, secretName)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[WARN] Removing actions secret %s from state because it no longer exists in GitHub",

github/resource_github_codespaces_user_secret.go

@@ -133,7 +133,7 @@ func resourceGithubCodespacesUserSecretRead(d *schema.ResourceData, meta any) er
 
 	secret, _, err := client.Codespaces.GetUserSecret(ctx, d.Id())
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[WARN] Removing actions secret %s from state because it no longer exists in GitHub",

github/resource_github_dependabot_organization_secret.go

@@ -149,7 +149,7 @@ func resourceGithubDependabotOrganizationSecretRead(d *schema.ResourceData, meta
 
 	secret, _, err := client.Dependabot.GetOrgSecret(ctx, owner, d.Id())
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[WARN] Removing actions secret %s from state because it no longer exists in GitHub",

github/resource_github_dependabot_secret.go

@@ -120,7 +120,7 @@ func resourceGithubDependabotSecretRead(d *schema.ResourceData, meta any) error
 
 	secret, _, err := client.Dependabot.GetRepoSecret(ctx, owner, repoName, secretName)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[WARN] Removing actions secret %s from state because it no longer exists in GitHub",

github/resource_github_enterprise_actions_runner_group.go

@@ -180,7 +180,7 @@ func resourceGithubActionsEnterpriseRunnerGroupCreate(d *schema.ResourceData, me
 func getEnterpriseRunnerGroup(client *github.Client, ctx context.Context, ent string, groupID int64) (*github.EnterpriseRunnerGroup, *github.Response, error) {
 	enterpriseRunnerGroup, resp, err := client.Enterprise.GetEnterpriseRunnerGroup(ctx, ent, groupID)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			// ignore error StatusNotModified
 			return enterpriseRunnerGroup, resp, nil
@@ -204,7 +204,7 @@ func resourceGithubActionsEnterpriseRunnerGroupRead(d *schema.ResourceData, meta
 
 	enterpriseRunnerGroup, resp, err := getEnterpriseRunnerGroup(client, ctx, enterpriseSlug, runnerGroupID)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[INFO] Removing enterprise runner group %s/%s from state because it no longer exists in GitHub",

github/resource_github_issue.go

@@ -153,7 +153,7 @@ func resourceGithubIssueRead(d *schema.ResourceData, meta any) error {
 	issue, resp, err := client.Issues.Get(ctx,
 		orgName, repoName, number)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotModified {
 				return nil

github/resource_github_issue_label.go

@@ -159,7 +159,7 @@ func resourceGithubIssueLabelRead(d *schema.ResourceData, meta any) error {
 	githubLabel, resp, err := client.Issues.GetLabel(ctx,
 		orgName, repoName, name)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotModified {
 				return nil

github/resource_github_membership.go

@@ -102,7 +102,7 @@ func resourceGithubMembershipRead(d *schema.ResourceData, meta any) error {
 	membership, resp, err := client.Organizations.GetOrgMembership(ctx,
 		username, orgName)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotModified {
 				return nil
@@ -152,7 +152,7 @@ func resourceGithubMembershipDelete(d *schema.ResourceData, meta any) error {
 		var membership *github.Membership
 		membership, _, err = client.Organizations.GetOrgMembership(ctx, username, orgName)
 		if err != nil {
-			ghErr := &github.ErrorResponse{}
+			var ghErr *github.ErrorResponse
 			if errors.As(err, &ghErr) {
 				if ghErr.Response.StatusCode == http.StatusNotFound {
 					log.Printf("[INFO] Not downgrading '%s' membership for '%s' because they are not a member of the org anymore", orgName, username)

github/resource_github_organization_project.go

@@ -95,7 +95,7 @@ func resourceGithubOrganizationProjectRead(d *schema.ResourceData, meta any) err
 
 	project, resp, err := client.Projects.GetProject(ctx, projectID)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotModified {
 				return nil

github/resource_github_organization_role.go

@@ -103,7 +103,7 @@ func resourceGithubOrganizationRoleRead(ctx context.Context, d *schema.ResourceD
 
 	role, _, err := client.Organizations.GetOrgRole(ctx, orgName, roleId)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[WARN] organization role (%s/%d) not found, removing from state", orgName, roleId)

github/resource_github_organization_ruleset.go

@@ -625,7 +625,7 @@ func resourceGithubOrganizationRulesetRead(d *schema.ResourceData, meta any) err
 
 	ruleset, resp, err = client.Organizations.GetOrganizationRuleset(ctx, owner, rulesetID)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotModified {
 				return nil

github/resource_github_organization_webhook.go

@@ -125,7 +125,7 @@ func resourceGithubOrganizationWebhookRead(d *schema.ResourceData, meta any) err
 
 	hook, resp, err := client.Organizations.GetHook(ctx, orgName, hookID)
 	if err != nil {
-		ghErr := &github.ErrorResponse{}
+		var ghErr *github.ErrorResponse
 		if errors.As(err, &ghErr) {
 			if ghErr.Response.StatusCode == http.StatusNotModified {
 				return nil

github/resource_github_project_card.go

@@ -115,9 +115,9 @@ func resourceGithubProjectCardRead(d *schema.ResourceData, meta any) error {
 	log.Printf("[DEBUG] Reading project card: %s", nodeID)
 	card, _, err := client.Projects.GetProjectCard(ctx, int64(cardID))
 	if err != nil {
-		err := &github.ErrorResponse{}
-		if errors.As(err, &err) {
-			if err.Response.StatusCode == http.StatusNotFound {
+		var ghErr *github.ErrorResponse
+		if errors.As(err, &ghErr) {
+			if ghErr.Response.StatusCode == http.StatusNotFound {
 				log.Printf("[INFO] Removing project card %s from state because it no longer exists in GitHub", d.Id())
 				d.SetId("")
 				return nil