Skip to content

Commit ceee842

Browse files
Adding Terraform support for Model Armor (#14349) (#23432)
[upstream:1e00d9f1450f013032b569291deb962e491e0406] Signed-off-by: Modular Magician <[email protected]>
1 parent 38a99b2 commit ceee842

16 files changed

+2643
-2
lines changed

.changelog/14349.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
`google_model_armor_template`
3+
```

.teamcity/components/inputs/services_beta.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,11 @@ var ServicesListBeta = mapOf(
561561
"displayName" to "Mlengine",
562562
"path" to "./google-beta/services/mlengine"
563563
),
564+
"modelarmor" to mapOf(
565+
"name" to "modelarmor",
566+
"displayName" to "ModelArmor",
567+
"path" to "./google-beta/services/modelarmor"
568+
),
564569
"monitoring" to mapOf(
565570
"name" to "monitoring",
566571
"displayName" to "Monitoring",

.teamcity/components/inputs/services_ga.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,11 @@ var ServicesListGa = mapOf(
556556
"displayName" to "Mlengine",
557557
"path" to "./google/services/mlengine"
558558
),
559+
"modelarmor" to mapOf(
560+
"name" to "modelarmor",
561+
"displayName" to "ModelArmor",
562+
"path" to "./googleservices/modelarmor"
563+
),
559564
"monitoring" to mapOf(
560565
"name" to "monitoring",
561566
"displayName" to "Monitoring",

google/fwmodels/provider_model.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ type ProviderModel struct {
147147
MemorystoreCustomEndpoint types.String `tfsdk:"memorystore_custom_endpoint"`
148148
MigrationCenterCustomEndpoint types.String `tfsdk:"migration_center_custom_endpoint"`
149149
MLEngineCustomEndpoint types.String `tfsdk:"ml_engine_custom_endpoint"`
150+
ModelArmorCustomEndpoint types.String `tfsdk:"model_armor_custom_endpoint"`
150151
MonitoringCustomEndpoint types.String `tfsdk:"monitoring_custom_endpoint"`
151152
NetappCustomEndpoint types.String `tfsdk:"netapp_custom_endpoint"`
152153
NetworkConnectivityCustomEndpoint types.String `tfsdk:"network_connectivity_custom_endpoint"`

google/fwprovider/framework_provider.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,12 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
744744
transport_tpg.CustomEndpointValidator(),
745745
},
746746
},
747+
"model_armor_custom_endpoint": &schema.StringAttribute{
748+
Optional: true,
749+
Validators: []validator.String{
750+
transport_tpg.CustomEndpointValidator(),
751+
},
752+
},
747753
"monitoring_custom_endpoint": &schema.StringAttribute{
748754
Optional: true,
749755
Validators: []validator.String{

google/provider/provider.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,11 @@ func Provider() *schema.Provider {
663663
Optional: true,
664664
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
665665
},
666+
"model_armor_custom_endpoint": {
667+
Type: schema.TypeString,
668+
Optional: true,
669+
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
670+
},
666671
"monitoring_custom_endpoint": {
667672
Type: schema.TypeString,
668673
Optional: true,
@@ -1202,6 +1207,7 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
12021207
config.MemorystoreBasePath = d.Get("memorystore_custom_endpoint").(string)
12031208
config.MigrationCenterBasePath = d.Get("migration_center_custom_endpoint").(string)
12041209
config.MLEngineBasePath = d.Get("ml_engine_custom_endpoint").(string)
1210+
config.ModelArmorBasePath = d.Get("model_armor_custom_endpoint").(string)
12051211
config.MonitoringBasePath = d.Get("monitoring_custom_endpoint").(string)
12061212
config.NetappBasePath = d.Get("netapp_custom_endpoint").(string)
12071213
config.NetworkConnectivityBasePath = d.Get("network_connectivity_custom_endpoint").(string)

google/provider/provider_mmv1_resources.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ import (
113113
"github.com/hashicorp/terraform-provider-google/google/services/memorystore"
114114
"github.com/hashicorp/terraform-provider-google/google/services/migrationcenter"
115115
"github.com/hashicorp/terraform-provider-google/google/services/mlengine"
116+
"github.com/hashicorp/terraform-provider-google/google/services/modelarmor"
116117
"github.com/hashicorp/terraform-provider-google/google/services/monitoring"
117118
"github.com/hashicorp/terraform-provider-google/google/services/netapp"
118119
"github.com/hashicorp/terraform-provider-google/google/services/networkconnectivity"
@@ -542,9 +543,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
542543
}
543544

544545
// Resources
545-
// Generated resources: 624
546+
// Generated resources: 625
546547
// Generated IAM resources: 309
547-
// Total generated resources: 933
548+
// Total generated resources: 934
548549
var generatedResources = map[string]*schema.Resource{
549550
"google_folder_access_approval_settings": accessapproval.ResourceAccessApprovalFolderSettings(),
550551
"google_organization_access_approval_settings": accessapproval.ResourceAccessApprovalOrganizationSettings(),
@@ -1205,6 +1206,7 @@ var generatedResources = map[string]*schema.Resource{
12051206
"google_migration_center_group": migrationcenter.ResourceMigrationCenterGroup(),
12061207
"google_migration_center_preference_set": migrationcenter.ResourceMigrationCenterPreferenceSet(),
12071208
"google_ml_engine_model": mlengine.ResourceMLEngineModel(),
1209+
"google_model_armor_template": modelarmor.ResourceModelArmorTemplate(),
12081210
"google_monitoring_alert_policy": monitoring.ResourceMonitoringAlertPolicy(),
12091211
"google_monitoring_service": monitoring.ResourceMonitoringGenericService(),
12101212
"google_monitoring_group": monitoring.ResourceMonitoringGroup(),
@@ -1712,6 +1714,7 @@ func UseGeneratedProducts() {
17121714
var _ = memorystore.ProductName
17131715
var _ = migrationcenter.ProductName
17141716
var _ = mlengine.ProductName
1717+
var _ = modelarmor.ProductName
17151718
var _ = monitoring.ProductName
17161719
var _ = netapp.ProductName
17171720
var _ = networkconnectivity.ProductName

google/services/modelarmor/product.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Copyright (c) HashiCorp, Inc.
2+
// SPDX-License-Identifier: MPL-2.0
3+
4+
// ----------------------------------------------------------------------------
5+
//
6+
// *** AUTO GENERATED CODE *** Type: MMv1 ***
7+
//
8+
// ----------------------------------------------------------------------------
9+
//
10+
// This file is automatically generated by Magic Modules and manual
11+
// changes will be clobbered when the file is regenerated.
12+
//
13+
// Please read more about how to change this file in
14+
// .github/CONTRIBUTING.md.
15+
//
16+
// ----------------------------------------------------------------------------
17+
18+
// Package modelarmor contains resources, datasources, etc. for the model armor service.
19+
package modelarmor
20+
21+
const ProductName = "modelarmor"

0 commit comments

Comments
 (0)