Colab: Use location instead of region for Colab resources in base_url (#13470) (#9714)

[upstream:661431af1b097de795ac8672a79273c513f47d00]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

Diff for: .changelog/13470.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+colab: fixed an issue where `google_colab_*` resources incorrectly required a provider-level region matching the resource location
+```

Diff for: google-beta/services/colab/resource_colab_notebook_execution_sweeper.go

@@ -117,7 +117,7 @@ func listAndActionColabNotebookExecution(action sweeper.ResourceAction) error {
 		}
 
 		// Prepare list URL
-		listTemplate := strings.Split("https://{{region}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/notebookExecutionJobs", "?")[0]
+		listTemplate := strings.Split("https://{{location}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/notebookExecutionJobs", "?")[0]
 		listUrl, err := tpgresource.ReplaceVars(mockConfig, config, listTemplate)
 		if err != nil {
 			log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
@@ -198,7 +198,7 @@ func deleteResourceColabNotebookExecution(config *transport_tpg.Config, d *tpgre
 		return nil
 	}
 
-	deleteTemplate := "https://{{region}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/notebookExecutionJobs/{{notebook_execution_job_id}}"
+	deleteTemplate := "https://{{location}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/notebookExecutionJobs/{{notebook_execution_job_id}}"
 
 	url, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
 	if err != nil {

Diff for: google-beta/services/colab/resource_colab_runtime_sweeper.go

@@ -117,7 +117,7 @@ func listAndActionColabRuntime(action sweeper.ResourceAction) error {
 		}
 
 		// Prepare list URL
-		listTemplate := strings.Split("https://{{region}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/notebookRuntimes", "?")[0]
+		listTemplate := strings.Split("https://{{location}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/notebookRuntimes", "?")[0]
 		listUrl, err := tpgresource.ReplaceVars(mockConfig, config, listTemplate)
 		if err != nil {
 			log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
@@ -195,7 +195,7 @@ func deleteResourceColabRuntime(config *transport_tpg.Config, d *tpgresource.Res
 		return nil
 	}
 
-	deleteTemplate := "https://{{region}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/notebookRuntimes/{{name}}"
+	deleteTemplate := "https://{{location}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/notebookRuntimes/{{name}}"
 
 	url, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
 	if err != nil {

Diff for: google-beta/services/colab/resource_colab_runtime_template_sweeper.go

@@ -117,7 +117,7 @@ func listAndActionColabRuntimeTemplate(action sweeper.ResourceAction) error {
 		}
 
 		// Prepare list URL
-		listTemplate := strings.Split("https://{{region}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/notebookRuntimeTemplates", "?")[0]
+		listTemplate := strings.Split("https://{{location}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/notebookRuntimeTemplates", "?")[0]
 		listUrl, err := tpgresource.ReplaceVars(mockConfig, config, listTemplate)
 		if err != nil {
 			log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
@@ -195,7 +195,7 @@ func deleteResourceColabRuntimeTemplate(config *transport_tpg.Config, d *tpgreso
 		return nil
 	}
 
-	deleteTemplate := "https://{{region}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/notebookRuntimeTemplates/{{name}}"
+	deleteTemplate := "https://{{location}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/notebookRuntimeTemplates/{{name}}"
 
 	url, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
 	if err != nil {

Diff for: google-beta/services/colab/resource_colab_schedule_sweeper.go

@@ -117,7 +117,7 @@ func listAndActionColabSchedule(action sweeper.ResourceAction) error {
 		}
 
 		// Prepare list URL
-		listTemplate := strings.Split("https://{{region}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/schedules", "?")[0]
+		listTemplate := strings.Split("https://{{location}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/schedules", "?")[0]
 		listUrl, err := tpgresource.ReplaceVars(mockConfig, config, listTemplate)
 		if err != nil {
 			log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
@@ -194,7 +194,7 @@ func deleteResourceColabSchedule(config *transport_tpg.Config, d *tpgresource.Re
 		return nil
 	}
 
-	deleteTemplate := "https://{{region}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/schedules/{{name}}"
+	deleteTemplate := "https://{{location}}-aiplatform.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/schedules/{{name}}"
 
 	url, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
 	if err != nil {

Diff for: google-beta/transport/config.go

@@ -622,7 +622,7 @@ var DefaultBasePaths = map[string]string{
 	CloudRunV2BasePathKey:               "https://run.googleapis.com/v2/",
 	CloudSchedulerBasePathKey:           "https://cloudscheduler.googleapis.com/v1/",
 	CloudTasksBasePathKey:               "https://cloudtasks.googleapis.com/v2/",
-	ColabBasePathKey:                    "https://{{region}}-aiplatform.googleapis.com/v1beta1/",
+	ColabBasePathKey:                    "https://{{location}}-aiplatform.googleapis.com/v1beta1/",
 	ComposerBasePathKey:                 "https://composer.googleapis.com/v1beta1/",
 	ComputeBasePathKey:                  "https://compute.googleapis.com/compute/beta/",
 	ContainerAnalysisBasePathKey:        "https://containeranalysis.googleapis.com/v1beta1/",