From e826c8eaeb12fb30df500469679d53cafc67ad59 Mon Sep 17 00:00:00 2001
From: Stephen Lewis <stephenrlewis@google.com>
Date: Thu, 18 Mar 2021 09:44:08 -0700
Subject: [PATCH] Made project CAI conversion prefer project number if
 available

---
 mmv1/third_party/validator/project.go | 31 ++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/mmv1/third_party/validator/project.go b/mmv1/third_party/validator/project.go
index 00c613906457..847bdf316252 100644
--- a/mmv1/third_party/validator/project.go
+++ b/mmv1/third_party/validator/project.go
@@ -9,9 +9,15 @@ import (
 )
 
 func GetProjectCaiObject(d TerraformResourceData, config *Config) ([]Asset, error) {
-	// NOTE: asset.name should use the project number, but we use project_id b/c
-	// the number is computed server-side.
-	name, err := assetName(d, config, "//cloudresourcemanager.googleapis.com/projects/{{project_id_or_project}}")
+	// use project number if it's available; otherwise, fill in project id so that we
+	// keep the CAI assets apart for different uncreated projects.
+	var linkTmpl string
+	if _, ok := d.GetOk("number"); ok {
+		linkTmpl = "//cloudresourcemanager.googleapis.com/projects/{{number}}"
+	} else {
+		linkTmpl = "//cloudresourcemanager.googleapis.com/projects/{{project_id_or_project}}"
+	}
+	name, err := assetName(d, config, linkTmpl)
 	if err != nil {
 		return []Asset{}, err
 	}
@@ -76,7 +82,15 @@ func getParentResourceId(d TerraformResourceData, p *cloudresourcemanager.Projec
 }
 
 func GetProjectBillingInfoCaiObject(d TerraformResourceData, config *Config) ([]Asset, error) {
-	name, err := assetName(d, config, "//cloudbilling.googleapis.com/projects/{{project_id_or_project}}/billingInfo")
+	// use project number if it's available; otherwise, fill in project id so that we
+	// keep the CAI assets apart for different uncreated projects.
+	var linkTmpl string
+	if _, ok := d.GetOk("number"); ok {
+		linkTmpl = "//cloudbilling.googleapis.com/projects/{{number}}/billingInfo"
+	} else {
+		linkTmpl = "//cloudbilling.googleapis.com/projects/{{project_id_or_project}}/billingInfo"
+	}
+	name, err := assetName(d, config, linkTmpl)
 	if err != nil {
 		return []Asset{}, err
 	}
@@ -103,9 +117,16 @@ func GetProjectBillingInfoApiObject(d TerraformResourceData, config *Config) (ma
 		return nil, ErrNoConversion
 	}
 
+	var name string
+	if number, ok := d.GetOk("number"); ok {
+		name = fmt.Sprintf("projects/%s/billingInfo", number)
+	} else {
+		name = fmt.Sprintf("projects/%s/billingInfo", d.Get("project_id"))
+	}
+
 	ba := &cloudbilling.ProjectBillingInfo{
 		BillingAccountName: fmt.Sprintf("billingAccounts/%s", d.Get("billing_account")),
-		Name:               fmt.Sprintf("projects/%s/billingInfo", d.Get("project_id")),
+		Name:               name,
 		ProjectId:          d.Get("project_id").(string),
 	}