GoogleCloudPlatform
diff --git a/‎.ci/magician/cmd/test_terraform_vcr.go‎
Lines changed: 0 additions & 1 deletion b/‎.ci/magician/cmd/test_terraform_vcr.go‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎mmv1/api/resource.go‎
Lines changed: 3 additions & 0 deletions b/‎mmv1/api/resource.go‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎mmv1/api/type.go‎
Lines changed: 48 additions & 0 deletions b/‎mmv1/api/type.go‎
Lines changed: 48 additions & 0 deletions
diff --git a/‎mmv1/products/datafusion/Instance.yaml‎
Lines changed: 1 addition & 0 deletions b/‎mmv1/products/datafusion/Instance.yaml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎mmv1/provider/template_data.go‎
Lines changed: 9 additions & 0 deletions b/‎mmv1/provider/template_data.go‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎mmv1/provider/terraform.go‎
Lines changed: 7 additions & 2 deletions b/‎mmv1/provider/terraform.go‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎mmv1/templates/terraform/pre_update/fw_datafusion_instance_update.go.tmpl‎
Lines changed: 35 additions & 0 deletions b/‎mmv1/templates/terraform/pre_update/fw_datafusion_instance_update.go.tmpl‎
Lines changed: 35 additions & 0 deletions
@@ -237,7 +237,6 @@ func execTestTerraformVCR(prNumber, mmCommitSha, buildID, projectID, buildStep,
 	}
 
 	notRunBeta, notRunGa := notRunTests(tpgRepo.UnifiedZeroDiff, tpgbRepo.UnifiedZeroDiff, replayingResult)
-
 	postReplayData := postReplay{
 		RunFullVCR:       runFullVCR,
 		AffectedServices: sort.StringSlice(servicesArr),
 
@@ -308,6 +308,9 @@ type Resource struct {
 	// control if a resource is continuously generated from public OpenAPI docs
 	AutogenStatus string `yaml:"autogen_status"`
 
+	// If true, this resource generates with the new plugin framework resource template
+	FrameworkResource bool `yaml:"plugin_framework,omitempty"`
+
 	// The three groups of []*Type fields are expected to be strictly ordered within a yaml file
 	// in the sequence of Virtual Fields -> Parameters -> Properties
 
 
@@ -551,6 +551,15 @@ func (t Type) ResourceType() string {
 	return path[len(path)-1]
 }
 
+func (t Type) FWResourceType() string {
+	r := t.ResourceRef()
+	if r == nil {
+		return ""
+	}
+	path := strings.Split(r.BaseUrl, "/")
+	return path[len(path)-1]
+}
+
 // TODO rewrite: validation
 // func (t *Type) check_default_value_property() {
 // return if @default_value.nil?
@@ -821,6 +830,45 @@ func (t Type) TFType(s string) string {
 	return "schema.TypeString"
 }
 
+func (t Type) GetFWType() string {
+	switch t.Type {
+	case "Boolean":
+		return "Bool"
+	case "Double":
+		return "Float64"
+	case "Integer":
+		return "Int64"
+	case "String":
+		return "String"
+	case "Time":
+		return "String"
+	case "Enum":
+		return "String"
+	case "ResourceRef":
+		return "String"
+	case "NestedObject":
+		return "Nested"
+	case "Array":
+		return "List"
+	case "KeyValuePairs":
+		return "Map"
+	case "KeyValueLabels":
+		return "Map"
+	case "KeyValueTerraformLabels":
+		return "Map"
+	case "KeyValueEffectiveLabels":
+		return "Map"
+	case "KeyValueAnnotations":
+		return "Map"
+	case "Map":
+		return "Map"
+	case "Fingerprint":
+		return "String"
+	}
+
+	return "String"
+}
+
 // TODO rewrite: validation
 // // Represents an enum, and store is valid values
 // class Enum < Primitive
 
@@ -13,6 +13,7 @@
 
 ---
 name: 'Instance'
+# plugin_framework: true
 description: |
   Represents a Data Fusion instance.
 references:
 
@@ -85,6 +85,15 @@ func (td *TemplateData) GenerateResourceFile(filePath string, resource api.Resou
 	td.GenerateFile(filePath, templatePath, resource, true, templates...)
 }
 
+func (td *TemplateData) GenerateFWResourceFile(filePath string, resource api.Resource) {
+	templatePath := "templates/terraform/resource_fw.go.tmpl"
+	templates := []string{
+		templatePath,
+		"templates/terraform/schema_property_fw.go.tmpl",
+	}
+	td.GenerateFile(filePath, templatePath, resource, true, templates...)
+}
+
 func (td *TemplateData) GenerateMetadataFile(filePath string, resource api.Resource) {
 	templatePath := "templates/terraform/metadata.yaml.tmpl"
 	templates := []string{
 
@@ -128,8 +128,13 @@ func (t *Terraform) GenerateResource(object api.Resource, templateData TemplateD
 		if err := os.MkdirAll(targetFolder, os.ModePerm); err != nil {
 			log.Println(fmt.Errorf("error creating parent directory %v: %v", targetFolder, err))
 		}
-		targetFilePath := path.Join(targetFolder, fmt.Sprintf("resource_%s.go", t.ResourceGoFilename(object)))
-		templateData.GenerateResourceFile(targetFilePath, object)
+		if object.FrameworkResource {
+			targetFilePath := path.Join(targetFolder, fmt.Sprintf("resource_fw_%s.go", t.ResourceGoFilename(object)))
+			templateData.GenerateFWResourceFile(targetFilePath, object)
+		} else {
+			targetFilePath := path.Join(targetFolder, fmt.Sprintf("resource_%s.go", t.ResourceGoFilename(object)))
+			templateData.GenerateResourceFile(targetFilePath, object)
+		}
 	}
 
 	if generateDocs {
 
@@ -0,0 +1,35 @@
+{{/*
+	The license inside this block applies to this file
+	Copyright 2024 Google Inc.
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/ -}}
+updateMask := []string{}
+
+if !plan.EnableStackdriverLogging.Equal(state.EnableStackdriverLogging) {
+	updateMask = append(updateMask, "enableStackdriverLogging")
+}
+
+if !plan.EnableStackdriverMonitoring.Equal(state.EnableStackdriverMonitoring) {
+	updateMask = append(updateMask, "enableStackdriverMonitoring")
+}
+
+if !plan.EnableRbac.Equal(state.EnableRbac) {
+	updateMask = append(updateMask, "enableRbac")
+}
+
+
+// updateMask is a URL parameter but not present in the schema, so ReplaceVars
+// won't set it
+
+url, err := transport_tpg.AddQueryParams(url, map[string]string{"updateMask": strings.Join(updateMask, ",")})
+if err != nil {
+  resp.Diagnostics.AddError("Error, failure building update mask query parameters in {{ $.Name -}}", err.Error())
+  return
+}
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,6 @@ func execTestTerraformVCR(prNumber, mmCommitSha, buildID, projectID, buildStep,`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`notRunBeta, notRunGa := notRunTests(tpgRepo.UnifiedZeroDiff, tpgbRepo.UnifiedZeroDiff, replayingResult)`
`240`		`-`
`241`	`240`	`postReplayData := postReplay{`
`242`	`241`	`RunFullVCR: runFullVCR,`
`243`	`242`	`AffectedServices: sort.StringSlice(servicesArr),`