Add support for multiple formats for pubsub refs in source repo (#3339) (#1938)

* Add support for multiple formats for pubsub refs in source repo (a TypeMap's key_value).

* Add docs

* Return string

* Handle err, assert type

* Assert more types

* Use empty strings, not nils

* Update overrides/terraform/property_override.rb

* Pull utils function to source_repo_utils, make regex constant

* fmt

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

Author: modular-magician

.changelog/3339.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+sourcerepo: allowed `google_sourcerepo_repo` `pubsub_configs.topic` to accept short topic names in addition to full references.
+```

google-beta/pubsub_utils.go

@@ -5,6 +5,8 @@ import (
 	"regexp"
 )
 
+const PubsubTopicRegex = "projects\\/.*\\/topics\\/.*"
+
 func getComputedSubscriptionName(project, subscription string) string {
 	match, _ := regexp.MatchString("projects\\/.*\\/subscriptions\\/.*", subscription)
 	if match {
@@ -14,7 +16,7 @@ func getComputedSubscriptionName(project, subscription string) string {
 }
 
 func getComputedTopicName(project, topic string) string {
-	match, _ := regexp.MatchString("projects\\/.*\\/topics\\/.*", topic)
+	match, _ := regexp.MatchString(PubsubTopicRegex, topic)
 	if match {
 		return topic
 	}

google-beta/resource_app_engine_flexible_app_version.go

@@ -2630,7 +2630,11 @@ func expandAppEngineFlexibleAppVersionDeploymentFiles(v interface{}, d Terraform
 		}
 		transformed["sourceUrl"] = transformedSourceUrl
 
-		m[original["name"].(string)] = transformed
+		transformedName, err := expandString(original["name"], d, config)
+		if err != nil {
+			return nil, err
+		}
+		m[transformedName] = transformed
 	}
 	return m, nil
 }

google-beta/resource_app_engine_standard_app_version.go

@@ -1154,7 +1154,11 @@ func expandAppEngineStandardAppVersionDeploymentFiles(v interface{}, d Terraform
 		}
 		transformed["sourceUrl"] = transformedSourceUrl
 
-		m[original["name"].(string)] = transformed
+		transformedName, err := expandString(original["name"], d, config)
+		if err != nil {
+			return nil, err
+		}
+		m[transformedName] = transformed
 	}
 	return m, nil
 }

google-beta/resource_binary_authorization_policy.go

@@ -574,7 +574,11 @@ func expandBinaryAuthorizationPolicyClusterAdmissionRules(v interface{}, d Terra
 		}
 		transformed["enforcementMode"] = transformedEnforcementMode
 
-		m[original["cluster"].(string)] = transformed
+		transformedCluster, err := expandString(original["cluster"], d, config)
+		if err != nil {
+			return nil, err
+		}
+		m[transformedCluster] = transformed
 	}
 	return m, nil
 }

google-beta/resource_source_repo_repository.go

@@ -359,7 +359,11 @@ func expandSourceRepoRepositoryPubsubConfigs(v interface{}, d TerraformResourceD
 		}
 		transformed["serviceAccountEmail"] = transformedServiceAccountEmail
 
-		m[original["topic"].(string)] = transformed
+		transformedTopic, err := expandSourceRepoRepositoryPubsubConfigsTopic(original["topic"], d, config)
+		if err != nil {
+			return nil, err
+		}
+		m[transformedTopic] = transformed
 	}
 	return m, nil
 }

google-beta/source_repo_utils.go

@@ -0,0 +1,22 @@
+package google
+
+import "regexp"
+
+func expandSourceRepoRepositoryPubsubConfigsTopic(v interface{}, d TerraformResourceData, config *Config) (string, error) {
+	// short-circuit if the topic is a full uri so we don't need to getProject
+	ok, err := regexp.MatchString(PubsubTopicRegex, v.(string))
+	if err != nil {
+		return "", err
+	}
+
+	if ok {
+		return v.(string), nil
+	}
+
+	project, err := getProject(d, config)
+	if err != nil {
+		return "", err
+	}
+
+	return getComputedTopicName(project, v.(string)), err
+}

google-beta/utils.go

@@ -418,3 +418,7 @@ func stringInSlice(arr []string, str string) bool {
 func migrateStateNoop(v int, is *terraform.InstanceState, meta interface{}) (*terraform.InstanceState, error) {
 	return is, nil
 }
+
+func expandString(v interface{}, d TerraformResourceData, config *Config) (string, error) {
+	return v.(string), nil
+}