switched to the v1beta API for modelarmor and add google_model_armor_floorsetting Resource (#14457) (#10359)

[upstream:c01b20fec6deb05853282bf9254f5c8ded815b55]

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

Author: modular-magician

.changelog/14457.txt

@@ -0,0 +1,8 @@
+```release-note:new-resource
+`google_model_armor_floorsetting`
+```
+
+
+```release-note:enhancement
+modelarmor: switched to the v1beta API for `google_model_armor_*` resources
+```

google-beta/fwmodels/provider_model.go

@@ -155,6 +155,7 @@ type ProviderModel struct {
 	MigrationCenterCustomEndpoint          types.String `tfsdk:"migration_center_custom_endpoint"`
 	MLEngineCustomEndpoint                 types.String `tfsdk:"ml_engine_custom_endpoint"`
 	ModelArmorCustomEndpoint               types.String `tfsdk:"model_armor_custom_endpoint"`
+	ModelArmorGlobalCustomEndpoint         types.String `tfsdk:"model_armor_global_custom_endpoint"`
 	MonitoringCustomEndpoint               types.String `tfsdk:"monitoring_custom_endpoint"`
 	NetappCustomEndpoint                   types.String `tfsdk:"netapp_custom_endpoint"`
 	NetworkConnectivityCustomEndpoint      types.String `tfsdk:"network_connectivity_custom_endpoint"`

google-beta/fwprovider/framework_provider.go

@@ -793,6 +793,12 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
 					transport_tpg.CustomEndpointValidator(),
 				},
 			},
+			"model_armor_global_custom_endpoint": &schema.StringAttribute{
+				Optional: true,
+				Validators: []validator.String{
+					transport_tpg.CustomEndpointValidator(),
+				},
+			},
 			"monitoring_custom_endpoint": &schema.StringAttribute{
 				Optional: true,
 				Validators: []validator.String{

google-beta/provider/provider.go

@@ -703,6 +703,11 @@ func Provider() *schema.Provider {
 				Optional:     true,
 				ValidateFunc: transport_tpg.ValidateCustomEndpoint,
 			},
+			"model_armor_global_custom_endpoint": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: transport_tpg.ValidateCustomEndpoint,
+			},
 			"monitoring_custom_endpoint": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -1281,6 +1286,7 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
 	config.MigrationCenterBasePath = d.Get("migration_center_custom_endpoint").(string)
 	config.MLEngineBasePath = d.Get("ml_engine_custom_endpoint").(string)
 	config.ModelArmorBasePath = d.Get("model_armor_custom_endpoint").(string)
+	config.ModelArmorGlobalBasePath = d.Get("model_armor_global_custom_endpoint").(string)
 	config.MonitoringBasePath = d.Get("monitoring_custom_endpoint").(string)
 	config.NetappBasePath = d.Get("netapp_custom_endpoint").(string)
 	config.NetworkConnectivityBasePath = d.Get("network_connectivity_custom_endpoint").(string)

google-beta/provider/provider_mmv1_resources.go

@@ -121,6 +121,7 @@ import (
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/migrationcenter"
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/mlengine"
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/modelarmor"
+	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/modelarmorglobal"
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/monitoring"
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/netapp"
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkconnectivity"
@@ -594,9 +595,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
 }
 
 // Resources
-// Generated resources: 685
+// Generated resources: 686
 // Generated IAM resources: 339
-// Total generated resources: 1024
+// Total generated resources: 1025
 var generatedResources = map[string]*schema.Resource{
 	"google_folder_access_approval_settings":                                     accessapproval.ResourceAccessApprovalFolderSettings(),
 	"google_organization_access_approval_settings":                               accessapproval.ResourceAccessApprovalOrganizationSettings(),
@@ -1329,6 +1330,7 @@ var generatedResources = map[string]*schema.Resource{
 	"google_migration_center_preference_set":                                     migrationcenter.ResourceMigrationCenterPreferenceSet(),
 	"google_ml_engine_model":                                                     mlengine.ResourceMLEngineModel(),
 	"google_model_armor_template":                                                modelarmor.ResourceModelArmorTemplate(),
+	"google_model_armor_floorsetting":                                            modelarmorglobal.ResourceModelArmorGlobalFloorsetting(),
 	"google_monitoring_alert_policy":                                             monitoring.ResourceMonitoringAlertPolicy(),
 	"google_monitoring_service":                                                  monitoring.ResourceMonitoringGenericService(),
 	"google_monitoring_group":                                                    monitoring.ResourceMonitoringGroup(),
@@ -1899,6 +1901,7 @@ func UseGeneratedProducts() {
 	var _ = migrationcenter.ProductName
 	var _ = mlengine.ProductName
 	var _ = modelarmor.ProductName
+	var _ = modelarmorglobal.ProductName
 	var _ = monitoring.ProductName
 	var _ = netapp.ProductName
 	var _ = networkconnectivity.ProductName

google-beta/services/modelarmor/resource_model_armor_template_generated_meta.yaml

@@ -2,7 +2,7 @@ resource: 'google_model_armor_template'
 generation_type: 'mmv1'
 source_file: 'products/modelarmor/Template.yaml'
 api_service_name: 'modelarmor.googleapis.com'
-api_version: 'v1'
+api_version: 'v1beta'
 api_resource_type_kind: 'Template'
 autogen_status: true
 fields:

google-beta/services/modelarmor/resource_model_armor_template_sweeper.go

@@ -117,7 +117,7 @@ func listAndActionModelArmorTemplate(action sweeper.ResourceAction) error {
 		}
 
 		// Prepare list URL
-		listTemplate := strings.Split("https://modelarmor.{{location}}.rep.googleapis.com/v1/projects/{{project}}/locations/{{location}}/templates", "?")[0]
+		listTemplate := strings.Split("https://modelarmor.{{location}}.rep.googleapis.com/v1beta/projects/{{project}}/locations/{{location}}/templates", "?")[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 deleteResourceModelArmorTemplate(config *transport_tpg.Config, d *tpgresour
 		return nil
 	}
 
-	deleteTemplate := "https://modelarmor.{{location}}.rep.googleapis.com/v1/projects/{{project}}/locations/{{location}}/templates/{{template_id}}"
+	deleteTemplate := "https://modelarmor.{{location}}.rep.googleapis.com/v1beta/projects/{{project}}/locations/{{location}}/templates/{{template_id}}"
 
 	url, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
 	if err != nil {

google-beta/services/modelarmor/resource_model_armor_template_test.go

@@ -17,31 +17,15 @@
 package modelarmor_test
 
 import (
-	"bytes"
 	"fmt"
 	"testing"
-	"text/template"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest"
 )
 
-// Helper function to expand a template
-func expandTemplate(tmplStr string, data map[string]interface{}) (string, error) {
-	tmpl, err := template.New("config").Parse(tmplStr)
-	if err != nil {
-		return "", err
-	}
-	var buf bytes.Buffer
-	err = tmpl.Execute(&buf, data)
-	if err != nil {
-		return "", err
-	}
-	return buf.String(), nil
-}
-
 func TestAccModelArmorTemplate_basic(t *testing.T) {
 	t.Parallel()
 
@@ -58,13 +42,7 @@ func TestAccModelArmorTemplate_basic(t *testing.T) {
 		CheckDestroy:             testAccCheckModelArmorTemplateDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: func() string {
-					cfg, err := testAccModelArmorTemplate_basic_config(basicContext)
-					if err != nil {
-						t.Fatalf("Failed to expand basic config template: %v", err)
-					}
-					return cfg
-				}(),
+				Config: testAccModelArmorTemplate_basic_config(basicContext),
 			},
 			{
 				ResourceName:      "google_model_armor_template.template-basic",
@@ -75,19 +53,18 @@ func TestAccModelArmorTemplate_basic(t *testing.T) {
 	})
 }
 
-func testAccModelArmorTemplate_basic_config(context map[string]interface{}) (string, error) {
-	const basic_template = `
+func testAccModelArmorTemplate_basic_config(context map[string]interface{}) string {
+	return acctest.Nprintf(`
 resource "google_model_armor_template" "template-basic" {
-  location    = "{{.location}}"
-  template_id = "{{.templateId}}"
+  location    = "%{location}"
+  template_id = "%{templateId}"
   filter_config {
   
   }
   template_metadata {
   
   }
-}`
-	return expandTemplate(basic_template, context)
+}`, context)
 }
 
 func TestAccModelArmorTemplate_update(t *testing.T) {
@@ -96,6 +73,7 @@ func TestAccModelArmorTemplate_update(t *testing.T) {
 	templateId := fmt.Sprintf("modelarmor-test-update-%s", acctest.RandString(t, 5))
 
 	context := map[string]interface{}{
+		"location":   "us-central1",
 		"templateId": templateId,
 	}
 
@@ -134,7 +112,7 @@ func TestAccModelArmorTemplate_update(t *testing.T) {
 func testAccModelArmorTemplate_initial(context map[string]interface{}) string {
 	return acctest.Nprintf(`
       resource "google_model_armor_template" "test-resource" {
-        location    = "us-central1"
+        location    = "%{location}"
         template_id = "%{templateId}"
         labels = {
             "test-label" = "env-testing-initial"

google-beta/services/modelarmorglobal/product.go

@@ -0,0 +1,21 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+// ----------------------------------------------------------------------------
+//
+//     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
+//
+// ----------------------------------------------------------------------------
+//
+//     This file is automatically generated by Magic Modules and manual
+//     changes will be clobbered when the file is regenerated.
+//
+//     Please read more about how to change this file in
+//     .github/CONTRIBUTING.md.
+//
+// ----------------------------------------------------------------------------
+
+// Package modelarmorglobal contains resources, datasources, etc. for the model armor service.
+package modelarmorglobal
+
+const ProductName = "modelarmorglobal"