Update CodeRepositoryIndex and RepositoryGroup 409 error handling

GoogleCloudPlatform · Nov 15, 2024 · 6fbcd65 · 6fbcd65
1 parent be8cc8c
commit 6fbcd65
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 154 deletions.
diff --git a/mmv1/products/cloudaicompanion/CodeRepositoryIndex.yaml b/mmv1/products/cloudaicompanion/CodeRepositoryIndex.yaml
@@ -51,7 +51,6 @@ async:
     message: message
   include_project: false
 custom_code:
-  custom_create: templates/terraform/custom_create/code_repository_index.go.tmpl
   custom_update: templates/terraform/custom_update/code_repository_index.go.tmpl
 parameters:
   - name: location

diff --git a/mmv1/templates/terraform/custom_create/code_repository_index.go.tmpl b/mmv1/templates/terraform/custom_create/code_repository_index.go.tmpl
diff --git a/mmv1/templates/terraform/custom_create/repository_group.go.tmpl b/mmv1/templates/terraform/custom_create/repository_group.go.tmpl
@@ -51,8 +51,16 @@ for {
 	})
 	if err != nil {
 		if transport_tpg.IsGoogleApiErrorWithCode(err, 409) {
-			log.Printf("[DEBUG] Waiting for enqueued operation to finish before creating RepositoryGroup: %#v", obj)
-			time.Sleep(3 * time.Minute)
+			errMsg := fmt.Sprintf("%s", errMsg)
+			if strings.Contains(errMsg, "unable to queue the operation") {
+				log.Printf("[DEBUG] Waiting for enqueued operation to finish before creating RepositoryGroup: %#v", obj)
+				time.Sleep(10 * time.Second)
+			} else if strings.Contains(errMsg, "parent resource not in ready state") {
+				log.Printf("[DEBUG] Waiting for parent resource to become active before creating RepositoryGroup: %#v", obj)
+				time.Sleep(1 * time.Minute)
+			} else {
+				return fmt.Errorf("Error creating RepositoryGroup %q: %s", d.Id(), err)
+			}
 		} else {
 			return fmt.Errorf("Error creating RepositoryGroup: %s", err)
 		}

diff --git a/mmv1/templates/terraform/custom_update/code_repository_index.go.tmpl b/mmv1/templates/terraform/custom_update/code_repository_index.go.tmpl
@@ -52,10 +52,15 @@ for {
 	})
 	if err != nil {
 		if transport_tpg.IsGoogleApiErrorWithCode(err, 409) {
-			log.Printf("[DEBUG] Waiting for enqueued operation to finish before updating CodeRepositoryIndex: %#v", obj)
-			time.Sleep(3 * time.Minute)
+			errMsg := fmt.Sprintf("%s", errMsg)
+			if strings.Contains(errMsg, "parent resource not in ready state") {
+				log.Printf("[DEBUG] Waiting for parent resource to become active before updating CodeRepositoryIndex: %#v", obj)
+				time.Sleep(1 * time.Minute)
+			} else {
+				return fmt.Errorf("Error updating CodeRepositoryIndex %q: %s", d.Id(), err)
+			}
 		} else {
-			return fmt.Errorf("Error updating CodeRepositoryIndex: %s", err)
+			return fmt.Errorf("Error updating CodeRepositoryIndex %q: %s", d.Id(), err)
 		}
 	} else {
 		break

diff --git a/mmv1/templates/terraform/custom_update/repository_group.go.tmpl b/mmv1/templates/terraform/custom_update/repository_group.go.tmpl
@@ -52,10 +52,18 @@ for {
 	})
 	if err != nil {
 		if transport_tpg.IsGoogleApiErrorWithCode(err, 409) {
-			log.Printf("[DEBUG] Waiting for enqueued operation to finish before updating RepositoryGroup %q: %#v", d.Id(), obj)
-			time.Sleep(3 * time.Minute)
+			errMsg := fmt.Sprintf("%s", errMsg)
+			if strings.Contains(errMsg, "unable to queue the operation") {
+				log.Printf("[DEBUG] Waiting for enqueued operation to finish before updating RepositoryGroup: %#v", obj)
+				time.Sleep(10 * time.Second)
+			} else if strings.Contains(errMsg, "parent resource not in ready state") {
+				log.Printf("[DEBUG] Waiting for parent resource to become active before updating RepositoryGroup: %#v", obj)
+				time.Sleep(1 * time.Minute)
+			} else {
+				return fmt.Errorf("Error updating RepositoryGroup %q: %s", d.Id(), err)
+			}
 		} else {
-			return fmt.Errorf("Error updating RepositoryGroup: %s", err)
+			return fmt.Errorf("Error updating RepositoryGroup %q: %s", d.Id(), err)
 		}
 	} else {
 		break

diff --git a/mmv1/third_party/terraform/acctest/bootstrap_test_utils.go.tmpl b/mmv1/third_party/terraform/acctest/bootstrap_test_utils.go.tmpl
@@ -1626,10 +1626,18 @@ func SetupProjectsAndGetAccessToken(org, billing, pid, service string, config *t
 				})
 				if err != nil {
 					if transport_tpg.IsGoogleApiErrorWithCode(err, 409) {
-						log.Printf("[DEBUG] Waiting for enqueued operation to finish")
-						time.Sleep(3 * time.Minute)
+						errMsg := fmt.Sprintf("%s", errMsg)
+						if strings.Contains(errMsg, "unable to queue the operation") {
+							log.Printf("[DEBUG] Waiting for enqueued operation to finish before creating RepositoryGroup: %#v", obj)
+							time.Sleep(10 * time.Second)
+						} else if strings.Contains(errMsg, "parent resource not in ready state") {
+							log.Printf("[DEBUG] Waiting for parent resource to become active before creating RepositoryGroup: %#v", obj)
+							time.Sleep(1 * time.Minute)
+						} else {
+							return t.Fatalf("Error creating RepositoryGroup: %s", err)
+						}
 					} else {
-						t.Fatalf("Error creating code repository index %q: %s", codeRepositoryIndexId, err)
+						t.Fatalf("Error creating repository group %q: %s", repositoryGroupId, err)
 					}
 				} else {
 					break
@@ -1700,27 +1708,18 @@ func SetupProjectsAndGetAccessToken(org, billing, pid, service string, config *t
 			}
 
 			headers := make(http.Header)
-			for {
-				_, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-					Config:    config,
-					Method:    "POST",
-					Project:   config.Project,
-					RawURL:    postURL,
-					UserAgent: config.UserAgent,
-					Body:      obj,
-					Timeout:   90 * time.Minute,
-					Headers:   headers,
-				})
-				if err != nil {
-					if transport_tpg.IsGoogleApiErrorWithCode(err, 409) {
-						log.Printf("[DEBUG] Waiting for enqueued operation to finish")
-						time.Sleep(3 * time.Minute)
-					} else {
-						t.Fatalf("Error creating code repository index %q: %s", codeRepositoryIndexId, err)
-					}
-				} else {
-					break
-				}
+			_, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+				Config:    config,
+				Method:    "POST",
+				Project:   config.Project,
+				RawURL:    postURL,
+				UserAgent: config.UserAgent,
+				Body:      obj,
+				Timeout:   90 * time.Minute,
+				Headers:   headers,
+			})
+			if err != nil {
+				t.Fatalf("Error creating code repository index %q: %s", codeRepositoryIndexId, err)
 			}
 
 			_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{