Skip to content

Commit

Permalink
Add Secure Source Manager product and Instance resource (#9415) (#16637)
Browse files Browse the repository at this point in the history
* Add ssm product and instance.yaml

* Add instance id parameter and keep name as output property

* move to beta

* Add createTime, updateTime, state fields

* Add basic instance test

* Remove blank lines

* Add one blank line back

* Move back to GA provider

* Fix iam policy

* move iam definition up

* Add iam roles

* Add iam tests

* Add test to examples

* Remove iam policy, adjust context and variable names

* Revert "Remove iam policy, adjust context and variable names"

This reverts commit 8e99a3997af8d96ebe58dc15e6d614ff5f245ae2.

* remove iam policy, use ctx var for instance id

* Use format with random suffix

* Slight change import_format for iam, remove provider explicit

* Fix instance_id in generated iam test

* Remove iam test

* Remove reference to the iam test

* edit to test again

* add iam conditions to test

* Update import format

* remove iam condition test

* revert import format

* Fix links

* Remove update fields from resource, remove enum values for output field, add iam_conditions_request_type

* Add back values:

* Add new line

* add unknown value back

* Remove iam_conditions_request_type
[upstream:e06981ab153016b6c49db1fd134685fc09d9a71b]

Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician authored Nov 30, 2023
1 parent 5e1c8e2 commit a38e7d5
Show file tree
Hide file tree
Showing 18 changed files with 1,630 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .changelog/9415.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
`google_secure_source_manager_instance`
```
5 changes: 5 additions & 0 deletions .teamcity/components/generated/services.kt
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,11 @@ var services = mapOf(
"displayName" to "Secretmanager",
"path" to "./google/services/secretmanager"
),
"securesourcemanager" to mapOf(
"name" to "securesourcemanager",
"displayName" to "Securesourcemanager",
"path" to "./google/services/securesourcemanager"
),
"securitycenter" to mapOf(
"name" to "securitycenter",
"displayName" to "Securitycenter",
Expand Down
1 change: 1 addition & 0 deletions google/fwmodels/provider_model.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ type ProviderModel struct {
RedisCustomEndpoint types.String `tfsdk:"redis_custom_endpoint"`
ResourceManagerCustomEndpoint types.String `tfsdk:"resource_manager_custom_endpoint"`
SecretManagerCustomEndpoint types.String `tfsdk:"secret_manager_custom_endpoint"`
SecureSourceManagerCustomEndpoint types.String `tfsdk:"secure_source_manager_custom_endpoint"`
SecurityCenterCustomEndpoint types.String `tfsdk:"security_center_custom_endpoint"`
ServiceManagementCustomEndpoint types.String `tfsdk:"service_management_custom_endpoint"`
ServiceUsageCustomEndpoint types.String `tfsdk:"service_usage_custom_endpoint"`
Expand Down
6 changes: 6 additions & 0 deletions google/fwprovider/framework_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,12 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
transport_tpg.CustomEndpointValidator(),
},
},
"secure_source_manager_custom_endpoint": &schema.StringAttribute{
Optional: true,
Validators: []validator.String{
transport_tpg.CustomEndpointValidator(),
},
},
"security_center_custom_endpoint": &schema.StringAttribute{
Optional: true,
Validators: []validator.String{
Expand Down
10 changes: 10 additions & 0 deletions google/fwtransport/framework_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ type FrameworkProviderConfig struct {
RedisBasePath string
ResourceManagerBasePath string
SecretManagerBasePath string
SecureSourceManagerBasePath string
SecurityCenterBasePath string
ServiceManagementBasePath string
ServiceUsageBasePath string
Expand Down Expand Up @@ -283,6 +284,7 @@ func (p *FrameworkProviderConfig) LoadAndValidateFramework(ctx context.Context,
p.RedisBasePath = data.RedisCustomEndpoint.ValueString()
p.ResourceManagerBasePath = data.ResourceManagerCustomEndpoint.ValueString()
p.SecretManagerBasePath = data.SecretManagerCustomEndpoint.ValueString()
p.SecureSourceManagerBasePath = data.SecureSourceManagerCustomEndpoint.ValueString()
p.SecurityCenterBasePath = data.SecurityCenterCustomEndpoint.ValueString()
p.ServiceManagementBasePath = data.ServiceManagementCustomEndpoint.ValueString()
p.ServiceUsageBasePath = data.ServiceUsageCustomEndpoint.ValueString()
Expand Down Expand Up @@ -1137,6 +1139,14 @@ func (p *FrameworkProviderConfig) HandleDefaults(ctx context.Context, data *fwmo
data.SecretManagerCustomEndpoint = types.StringValue(customEndpoint.(string))
}
}
if data.SecureSourceManagerCustomEndpoint.IsNull() {
customEndpoint := transport_tpg.MultiEnvDefault([]string{
"GOOGLE_SECURE_SOURCE_MANAGER_CUSTOM_ENDPOINT",
}, transport_tpg.DefaultBasePaths[transport_tpg.SecureSourceManagerBasePathKey])
if customEndpoint != nil {
data.SecureSourceManagerCustomEndpoint = types.StringValue(customEndpoint.(string))
}
}
if data.SecurityCenterCustomEndpoint.IsNull() {
customEndpoint := transport_tpg.MultiEnvDefault([]string{
"GOOGLE_SECURITY_CENTER_CUSTOM_ENDPOINT",
Expand Down
6 changes: 6 additions & 0 deletions google/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,11 @@ func Provider() *schema.Provider {
Optional: true,
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
},
"secure_source_manager_custom_endpoint": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
},
"security_center_custom_endpoint": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -944,6 +949,7 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
config.RedisBasePath = d.Get("redis_custom_endpoint").(string)
config.ResourceManagerBasePath = d.Get("resource_manager_custom_endpoint").(string)
config.SecretManagerBasePath = d.Get("secret_manager_custom_endpoint").(string)
config.SecureSourceManagerBasePath = d.Get("secure_source_manager_custom_endpoint").(string)
config.SecurityCenterBasePath = d.Get("security_center_custom_endpoint").(string)
config.ServiceManagementBasePath = d.Get("service_management_custom_endpoint").(string)
config.ServiceUsageBasePath = d.Get("service_usage_custom_endpoint").(string)
Expand Down
12 changes: 9 additions & 3 deletions google/provider/provider_mmv1_resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ import (
"github.com/hashicorp/terraform-provider-google/google/services/redis"
"github.com/hashicorp/terraform-provider-google/google/services/resourcemanager"
"github.com/hashicorp/terraform-provider-google/google/services/secretmanager"
"github.com/hashicorp/terraform-provider-google/google/services/securesourcemanager"
"github.com/hashicorp/terraform-provider-google/google/services/securitycenter"
"github.com/hashicorp/terraform-provider-google/google/services/servicemanagement"
"github.com/hashicorp/terraform-provider-google/google/services/sourcerepo"
Expand Down Expand Up @@ -324,6 +325,7 @@ var generatedIAMDatasources = map[string]*schema.Resource{
"google_pubsub_schema_iam_policy": tpgiamresource.DataSourceIamPolicy(pubsub.PubsubSchemaIamSchema, pubsub.PubsubSchemaIamUpdaterProducer),
"google_pubsub_topic_iam_policy": tpgiamresource.DataSourceIamPolicy(pubsub.PubsubTopicIamSchema, pubsub.PubsubTopicIamUpdaterProducer),
"google_secret_manager_secret_iam_policy": tpgiamresource.DataSourceIamPolicy(secretmanager.SecretManagerSecretIamSchema, secretmanager.SecretManagerSecretIamUpdaterProducer),
"google_secure_source_manager_instance_iam_policy": tpgiamresource.DataSourceIamPolicy(securesourcemanager.SecureSourceManagerInstanceIamSchema, securesourcemanager.SecureSourceManagerInstanceIamUpdaterProducer),
"google_scc_source_iam_policy": tpgiamresource.DataSourceIamPolicy(securitycenter.SecurityCenterSourceIamSchema, securitycenter.SecurityCenterSourceIamUpdaterProducer),
"google_endpoints_service_iam_policy": tpgiamresource.DataSourceIamPolicy(servicemanagement.ServiceManagementServiceIamSchema, servicemanagement.ServiceManagementServiceIamUpdaterProducer),
"google_endpoints_service_consumers_iam_policy": tpgiamresource.DataSourceIamPolicy(servicemanagement.ServiceManagementServiceConsumersIamSchema, servicemanagement.ServiceManagementServiceConsumersIamUpdaterProducer),
Expand Down Expand Up @@ -359,9 +361,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
}

// Resources
// Generated resources: 344
// Generated IAM resources: 213
// Total generated resources: 557
// Generated resources: 345
// Generated IAM resources: 216
// Total generated resources: 561
var generatedResources = map[string]*schema.Resource{
"google_folder_access_approval_settings": accessapproval.ResourceAccessApprovalFolderSettings(),
"google_organization_access_approval_settings": accessapproval.ResourceAccessApprovalOrganizationSettings(),
Expand Down Expand Up @@ -847,6 +849,10 @@ var generatedResources = map[string]*schema.Resource{
"google_secret_manager_secret_iam_member": tpgiamresource.ResourceIamMember(secretmanager.SecretManagerSecretIamSchema, secretmanager.SecretManagerSecretIamUpdaterProducer, secretmanager.SecretManagerSecretIdParseFunc),
"google_secret_manager_secret_iam_policy": tpgiamresource.ResourceIamPolicy(secretmanager.SecretManagerSecretIamSchema, secretmanager.SecretManagerSecretIamUpdaterProducer, secretmanager.SecretManagerSecretIdParseFunc),
"google_secret_manager_secret_version": secretmanager.ResourceSecretManagerSecretVersion(),
"google_secure_source_manager_instance": securesourcemanager.ResourceSecureSourceManagerInstance(),
"google_secure_source_manager_instance_iam_binding": tpgiamresource.ResourceIamBinding(securesourcemanager.SecureSourceManagerInstanceIamSchema, securesourcemanager.SecureSourceManagerInstanceIamUpdaterProducer, securesourcemanager.SecureSourceManagerInstanceIdParseFunc),
"google_secure_source_manager_instance_iam_member": tpgiamresource.ResourceIamMember(securesourcemanager.SecureSourceManagerInstanceIamSchema, securesourcemanager.SecureSourceManagerInstanceIamUpdaterProducer, securesourcemanager.SecureSourceManagerInstanceIdParseFunc),
"google_secure_source_manager_instance_iam_policy": tpgiamresource.ResourceIamPolicy(securesourcemanager.SecureSourceManagerInstanceIamSchema, securesourcemanager.SecureSourceManagerInstanceIamUpdaterProducer, securesourcemanager.SecureSourceManagerInstanceIdParseFunc),
"google_scc_folder_custom_module": securitycenter.ResourceSecurityCenterFolderCustomModule(),
"google_scc_mute_config": securitycenter.ResourceSecurityCenterMuteConfig(),
"google_scc_notification_config": securitycenter.ResourceSecurityCenterNotificationConfig(),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,245 @@
// 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 securesourcemanager

import (
"fmt"

"github.com/hashicorp/errwrap"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"google.golang.org/api/cloudresourcemanager/v1"

"github.com/hashicorp/terraform-provider-google/google/tpgiamresource"
"github.com/hashicorp/terraform-provider-google/google/tpgresource"
transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
)

var SecureSourceManagerInstanceIamSchema = map[string]*schema.Schema{
"project": {
Type: schema.TypeString,
Computed: true,
Optional: true,
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Computed: true,
Optional: true,
ForceNew: true,
},
"instance_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
DiffSuppressFunc: tpgresource.CompareSelfLinkOrResourceName,
},
}

type SecureSourceManagerInstanceIamUpdater struct {
project string
location string
instanceId string
d tpgresource.TerraformResourceData
Config *transport_tpg.Config
}

func SecureSourceManagerInstanceIamUpdaterProducer(d tpgresource.TerraformResourceData, config *transport_tpg.Config) (tpgiamresource.ResourceIamUpdater, error) {
values := make(map[string]string)

project, _ := tpgresource.GetProject(d, config)
if project != "" {
if err := d.Set("project", project); err != nil {
return nil, fmt.Errorf("Error setting project: %s", err)
}
}
values["project"] = project
location, _ := tpgresource.GetLocation(d, config)
if location != "" {
if err := d.Set("location", location); err != nil {
return nil, fmt.Errorf("Error setting location: %s", err)
}
}
values["location"] = location
if v, ok := d.GetOk("instance_id"); ok {
values["instance_id"] = v.(string)
}

// We may have gotten either a long or short name, so attempt to parse long name if possible
m, err := tpgresource.GetImportIdQualifiers([]string{"projects/(?P<project>[^/]+)/locations/(?P<location>[^/]+)/instances/(?P<instance_id>[^/]+)", "(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<instance_id>[^/]+)", "(?P<location>[^/]+)/(?P<instance_id>[^/]+)", "(?P<instance_id>[^/]+)"}, d, config, d.Get("instance_id").(string))
if err != nil {
return nil, err
}

for k, v := range m {
values[k] = v
}

u := &SecureSourceManagerInstanceIamUpdater{
project: values["project"],
location: values["location"],
instanceId: values["instance_id"],
d: d,
Config: config,
}

if err := d.Set("project", u.project); err != nil {
return nil, fmt.Errorf("Error setting project: %s", err)
}
if err := d.Set("location", u.location); err != nil {
return nil, fmt.Errorf("Error setting location: %s", err)
}
if err := d.Set("instance_id", u.GetResourceId()); err != nil {
return nil, fmt.Errorf("Error setting instance_id: %s", err)
}

return u, nil
}

func SecureSourceManagerInstanceIdParseFunc(d *schema.ResourceData, config *transport_tpg.Config) error {
values := make(map[string]string)

project, _ := tpgresource.GetProject(d, config)
if project != "" {
values["project"] = project
}

location, _ := tpgresource.GetLocation(d, config)
if location != "" {
values["location"] = location
}

m, err := tpgresource.GetImportIdQualifiers([]string{"projects/(?P<project>[^/]+)/locations/(?P<location>[^/]+)/instances/(?P<instance_id>[^/]+)", "(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<instance_id>[^/]+)", "(?P<location>[^/]+)/(?P<instance_id>[^/]+)", "(?P<instance_id>[^/]+)"}, d, config, d.Id())
if err != nil {
return err
}

for k, v := range m {
values[k] = v
}

u := &SecureSourceManagerInstanceIamUpdater{
project: values["project"],
location: values["location"],
instanceId: values["instance_id"],
d: d,
Config: config,
}
if err := d.Set("instance_id", u.GetResourceId()); err != nil {
return fmt.Errorf("Error setting instance_id: %s", err)
}
d.SetId(u.GetResourceId())
return nil
}

func (u *SecureSourceManagerInstanceIamUpdater) GetResourceIamPolicy() (*cloudresourcemanager.Policy, error) {
url, err := u.qualifyInstanceUrl("getIamPolicy")
if err != nil {
return nil, err
}

project, err := tpgresource.GetProject(u.d, u.Config)
if err != nil {
return nil, err
}
var obj map[string]interface{}

userAgent, err := tpgresource.GenerateUserAgentString(u.d, u.Config.UserAgent)
if err != nil {
return nil, err
}

policy, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: u.Config,
Method: "GET",
Project: project,
RawURL: url,
UserAgent: userAgent,
Body: obj,
})
if err != nil {
return nil, errwrap.Wrapf(fmt.Sprintf("Error retrieving IAM policy for %s: {{err}}", u.DescribeResource()), err)
}

out := &cloudresourcemanager.Policy{}
err = tpgresource.Convert(policy, out)
if err != nil {
return nil, errwrap.Wrapf("Cannot convert a policy to a resource manager policy: {{err}}", err)
}

return out, nil
}

func (u *SecureSourceManagerInstanceIamUpdater) SetResourceIamPolicy(policy *cloudresourcemanager.Policy) error {
json, err := tpgresource.ConvertToMap(policy)
if err != nil {
return err
}

obj := make(map[string]interface{})
obj["policy"] = json

url, err := u.qualifyInstanceUrl("setIamPolicy")
if err != nil {
return err
}
project, err := tpgresource.GetProject(u.d, u.Config)
if err != nil {
return err
}

userAgent, err := tpgresource.GenerateUserAgentString(u.d, u.Config.UserAgent)
if err != nil {
return err
}

_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: u.Config,
Method: "POST",
Project: project,
RawURL: url,
UserAgent: userAgent,
Body: obj,
Timeout: u.d.Timeout(schema.TimeoutCreate),
})
if err != nil {
return errwrap.Wrapf(fmt.Sprintf("Error setting IAM policy for %s: {{err}}", u.DescribeResource()), err)
}

return nil
}

func (u *SecureSourceManagerInstanceIamUpdater) qualifyInstanceUrl(methodIdentifier string) (string, error) {
urlTemplate := fmt.Sprintf("{{SecureSourceManagerBasePath}}%s:%s", fmt.Sprintf("projects/%s/locations/%s/instances/%s", u.project, u.location, u.instanceId), methodIdentifier)
url, err := tpgresource.ReplaceVars(u.d, u.Config, urlTemplate)
if err != nil {
return "", err
}
return url, nil
}

func (u *SecureSourceManagerInstanceIamUpdater) GetResourceId() string {
return fmt.Sprintf("projects/%s/locations/%s/instances/%s", u.project, u.location, u.instanceId)
}

func (u *SecureSourceManagerInstanceIamUpdater) GetMutexKey() string {
return fmt.Sprintf("iam-securesourcemanager-instance-%s", u.GetResourceId())
}

func (u *SecureSourceManagerInstanceIamUpdater) DescribeResource() string {
return fmt.Sprintf("securesourcemanager instance %q", u.GetResourceId())
}
Loading

0 comments on commit a38e7d5

Please sign in to comment.