Skip to content

Commit d61d23d

Browse files
Adding Terraform support for Model Armor (#14349) (#10270)
[upstream:1e00d9f1450f013032b569291deb962e491e0406] Signed-off-by: Modular Magician <[email protected]>
1 parent 77a5423 commit d61d23d

14 files changed

+2633
-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+
```

google-beta/fwmodels/provider_model.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ type ProviderModel struct {
154154
MemorystoreCustomEndpoint types.String `tfsdk:"memorystore_custom_endpoint"`
155155
MigrationCenterCustomEndpoint types.String `tfsdk:"migration_center_custom_endpoint"`
156156
MLEngineCustomEndpoint types.String `tfsdk:"ml_engine_custom_endpoint"`
157+
ModelArmorCustomEndpoint types.String `tfsdk:"model_armor_custom_endpoint"`
157158
MonitoringCustomEndpoint types.String `tfsdk:"monitoring_custom_endpoint"`
158159
NetappCustomEndpoint types.String `tfsdk:"netapp_custom_endpoint"`
159160
NetworkConnectivityCustomEndpoint types.String `tfsdk:"network_connectivity_custom_endpoint"`

google-beta/fwprovider/framework_provider.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,12 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
787787
transport_tpg.CustomEndpointValidator(),
788788
},
789789
},
790+
"model_armor_custom_endpoint": &schema.StringAttribute{
791+
Optional: true,
792+
Validators: []validator.String{
793+
transport_tpg.CustomEndpointValidator(),
794+
},
795+
},
790796
"monitoring_custom_endpoint": &schema.StringAttribute{
791797
Optional: true,
792798
Validators: []validator.String{

google-beta/provider/provider.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,11 @@ func Provider() *schema.Provider {
698698
Optional: true,
699699
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
700700
},
701+
"model_armor_custom_endpoint": {
702+
Type: schema.TypeString,
703+
Optional: true,
704+
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
705+
},
701706
"monitoring_custom_endpoint": {
702707
Type: schema.TypeString,
703708
Optional: true,
@@ -1275,6 +1280,7 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
12751280
config.MemorystoreBasePath = d.Get("memorystore_custom_endpoint").(string)
12761281
config.MigrationCenterBasePath = d.Get("migration_center_custom_endpoint").(string)
12771282
config.MLEngineBasePath = d.Get("ml_engine_custom_endpoint").(string)
1283+
config.ModelArmorBasePath = d.Get("model_armor_custom_endpoint").(string)
12781284
config.MonitoringBasePath = d.Get("monitoring_custom_endpoint").(string)
12791285
config.NetappBasePath = d.Get("netapp_custom_endpoint").(string)
12801286
config.NetworkConnectivityBasePath = d.Get("network_connectivity_custom_endpoint").(string)

google-beta/provider/provider_mmv1_resources.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ import (
120120
"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/memorystore"
121121
"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/migrationcenter"
122122
"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/mlengine"
123+
"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/modelarmor"
123124
"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/monitoring"
124125
"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/netapp"
125126
"github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkconnectivity"
@@ -589,9 +590,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
589590
}
590591

591592
// Resources
592-
// Generated resources: 679
593+
// Generated resources: 680
593594
// Generated IAM resources: 339
594-
// Total generated resources: 1018
595+
// Total generated resources: 1019
595596
var generatedResources = map[string]*schema.Resource{
596597
"google_folder_access_approval_settings": accessapproval.ResourceAccessApprovalFolderSettings(),
597598
"google_organization_access_approval_settings": accessapproval.ResourceAccessApprovalOrganizationSettings(),
@@ -1318,6 +1319,7 @@ var generatedResources = map[string]*schema.Resource{
13181319
"google_migration_center_group": migrationcenter.ResourceMigrationCenterGroup(),
13191320
"google_migration_center_preference_set": migrationcenter.ResourceMigrationCenterPreferenceSet(),
13201321
"google_ml_engine_model": mlengine.ResourceMLEngineModel(),
1322+
"google_model_armor_template": modelarmor.ResourceModelArmorTemplate(),
13211323
"google_monitoring_alert_policy": monitoring.ResourceMonitoringAlertPolicy(),
13221324
"google_monitoring_service": monitoring.ResourceMonitoringGenericService(),
13231325
"google_monitoring_group": monitoring.ResourceMonitoringGroup(),
@@ -1887,6 +1889,7 @@ func UseGeneratedProducts() {
18871889
var _ = memorystore.ProductName
18881890
var _ = migrationcenter.ProductName
18891891
var _ = mlengine.ProductName
1892+
var _ = modelarmor.ProductName
18901893
var _ = monitoring.ProductName
18911894
var _ = netapp.ProductName
18921895
var _ = networkconnectivity.ProductName
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)