Fix error inconsistent result after apply on argocd_repository_credentials (#243)

Author: onematchfox

argocd/resource_argocd_cluster.go

@@ -265,17 +265,12 @@ func resourceArgoCDClusterUpdate(ctx context.Context, d *schema.ResourceData, me
 	tokenMutexClusters.Unlock()
 
 	if err != nil {
-		if strings.Contains(err.Error(), "NotFound") {
-			d.SetId("")
-			return nil
-		} else {
-			return []diag.Diagnostic{
-				{
-					Severity: diag.Error,
-					Summary:  fmt.Sprintf("something went wrong during cluster update: %s", err),
-					Detail:   err.Error(),
-				},
-			}
+		return []diag.Diagnostic{
+			{
+				Severity: diag.Error,
+				Summary:  fmt.Sprintf("something went wrong during cluster update: %s", err),
+				Detail:   err.Error(),
+			},
 		}
 	}
 	return resourceArgoCDClusterRead(ctx, d, meta)

argocd/resource_argocd_repository.go

@@ -262,11 +262,6 @@ func resourceArgoCDRepositoryUpdate(ctx context.Context, d *schema.ResourceData,
 	tokenMutexConfiguration.Unlock()
 
 	if err != nil {
-		if strings.Contains(err.Error(), "NotFound") {
-			// Repository has already been deleted in an out-of-band fashion
-			d.SetId("")
-			return nil
-		}
 		return []diag.Diagnostic{
 			{
 				Severity: diag.Error,

argocd/resource_argocd_repository_credentials.go

@@ -104,7 +104,7 @@ func resourceArgoCDRepositoryCredentialsRead(ctx context.Context, d *schema.Reso
 			},
 		}
 	}
-	if rcl == nil {
+	if rcl == nil || len(rcl.Items) == 0 {
 		// Repository credentials have already been deleted in an out-of-band fashion
 		d.SetId("")
 		return nil
@@ -155,18 +155,12 @@ func resourceArgoCDRepositoryCredentialsUpdate(ctx context.Context, d *schema.Re
 	tokenMutexConfiguration.Unlock()
 
 	if err != nil {
-		if strings.Contains(err.Error(), "NotFound") {
-			// Repository credentials have already been deleted in an out-of-band fashion
-			d.SetId("")
-			return nil
-		} else {
-			return []diag.Diagnostic{
-				{
-					Severity: diag.Error,
-					Summary:  fmt.Sprintf("credentials for repository %s could not be updated", repoCreds.URL),
-					Detail:   err.Error(),
-				},
-			}
+		return []diag.Diagnostic{
+			{
+				Severity: diag.Error,
+				Summary:  fmt.Sprintf("credentials for repository %s could not be updated", repoCreds.URL),
+				Detail:   err.Error(),
+			},
 		}
 	}
 	d.SetId(r.URL)

argocd/resource_argocd_repository_credentials_test.go

@@ -22,6 +22,11 @@ func TestAccArgoCDRepositoryCredentials(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: testAccArgoCDRepositoryCredentialsSimple(
+					"https://github.com/oboukili/terraform-provider-argocd",
+				),
+			},
+			{
+				Config: testAccArgoCDRepositoryCredentialsSSH(
 					"https://private-git-repository.argocd.svc.cluster.local/project-1.git",
 					"git",
 					sshPrivateKey,
@@ -89,7 +94,15 @@ func TestAccArgoCDRepositoryCredentials_GitHubApp(t *testing.T) {
 	})
 }
 
-func testAccArgoCDRepositoryCredentialsSimple(repoUrl, username, sshPrivateKey string) string {
+func testAccArgoCDRepositoryCredentialsSimple(repoUrl string) string {
+	return fmt.Sprintf(`
+resource "argocd_repository_credentials" "simple" {
+  url             = "%s"
+}
+`, repoUrl)
+}
+
+func testAccArgoCDRepositoryCredentialsSSH(repoUrl, username, sshPrivateKey string) string {
 	return fmt.Sprintf(`
 resource "argocd_repository_credentials" "simple" {
   url             = "%s"

argocd/schema_repository_credentials.go

@@ -10,6 +10,7 @@ func repositoryCredentialsSchema() map[string]*schema.Schema {
 			Type:        schema.TypeString,
 			Description: "URL that these credentials matches to.",
 			Required:    true,
+			ForceNew:    true,
 		},
 		"username": {
 			Type:        schema.TypeString,