Simplify archived repo handling

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

Author: deiga

github/resource_github_repository_vulnerability_alerts.go

@@ -2,13 +2,8 @@ package github
 
 import (
 	"context"
-	"errors"
-	"fmt"
-	"net/http"
 	"strconv"
-	"strings"
 
-	"github.com/google/go-github/v83/github"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -63,21 +58,24 @@ func resourceGithubRepositoryVulnerabilityAlertsCreate(ctx context.Context, d *s
 	repoName := d.Get("repository").(string)
 
 	vulnerabilityAlertsEnabled := d.Get("enabled").(bool)
+	repo, _, err := client.Repositories.Get(ctx, owner, repoName)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+	if repo.GetArchived() {
+		return diag.Errorf("cannot enable vulnerability alerts on archived repository %s/%s", owner, repoName)
+	}
 	if vulnerabilityAlertsEnabled {
-		resp, err := client.Repositories.EnableVulnerabilityAlerts(ctx, owner, repoName)
+		_, err := client.Repositories.EnableVulnerabilityAlerts(ctx, owner, repoName)
 		if err != nil {
-			return diag.FromErr(handleVulnerabilityAlertsErrorOnArchivedRepository(err, resp, repoName))
+			return diag.FromErr(err)
 		}
 	} else {
-		resp, err := client.Repositories.DisableVulnerabilityAlerts(ctx, owner, repoName)
+		_, err := client.Repositories.DisableVulnerabilityAlerts(ctx, owner, repoName)
 		if err != nil {
-			return diag.FromErr(handleVulnerabilityAlertsErrorOnArchivedRepository(err, resp, repoName))
+			return diag.FromErr(err)
 		}
 	}
-	repo, _, err := client.Repositories.Get(ctx, owner, repoName)
-	if err != nil {
-		return diag.FromErr(err)
-	}
 
 	d.SetId(strconv.Itoa(int(repo.GetID())))
 
@@ -168,14 +166,3 @@ func resourceGithubRepositoryVulnerabilityAlertsImport(ctx context.Context, d *s
 	}
 	return []*schema.ResourceData{d}, nil
 }
-
-func handleVulnerabilityAlertsErrorOnArchivedRepository(err error, resp *github.Response, repoName string) error {
-	var ghErr *github.ErrorResponse
-	if errors.As(err, &ghErr) {
-		// Error response when trying to enable vulnerability alerts on an archived repository. "422 Failed to change dependabot alerts status"
-		if resp.StatusCode == http.StatusUnprocessableEntity && strings.Contains(strings.ToLower(ghErr.Message), "failed to change dependabot alerts status") {
-			return fmt.Errorf("failed to change vulnerability alerts for repository %s. The repository is most likely archived: %s", repoName, ghErr.Message)
-		}
-	}
-	return err
-}

github/resource_github_repository_vulnerability_alerts_test.go

@@ -280,7 +280,7 @@ func TestAccGithubRepositoryVulnerabilityAlerts(t *testing.T) {
 				},
 				{
 					Config:      fmt.Sprintf(repoConfig, repoName, true, alertsBlock),
-					ExpectError: regexp.MustCompile(`repository is most likely archived`),
+					ExpectError: regexp.MustCompile(`cannot enable vulnerability alerts on archived repository`),
 				},
 			},
 		})