Skip to content

feat: Add resource identity to google_secret_manager_secret_version #18451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vr-ibm wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −8
Open

feat: Add resource identity to google_secret_manager_secret_version #18451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions mmv1/products/secretmanager/SecretVersion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ create_url: '{{secret}}:addVersion'
delete_url: '{{name}}:destroy'
delete_verb: 'POST'
import_format:
- 'projects/{{%project}}/secrets/{{%secret_id}}/versions/{{%version}}'
- 'projects/{{%project}}/secrets/{{%secret}}/versions/{{%version}}'
timeouts:
insert_minutes: 20
update_minutes: 20
Expand All @@ -52,8 +52,6 @@ custom_code:
constants: 'templates/terraform/constants/secret_version.go.tmpl'
# Sweeper skipped as this resource has customized deletion.
exclude_sweeper: true
# exluding resource_identity due to custom_import
exclude_identity_generation: true
deletion_policy_custom_docs: true
samples:
- name: 'secret_version_basic'
Expand Down
17 changes: 12 additions & 5 deletions mmv1/templates/terraform/custom_import/secret_version.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
config := meta.(*transport_tpg.Config)
_ = config

// current import_formats can't import fields with forward slashes in their value
if err := tpgresource.ParseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
return nil, err
name := d.Id()
if err := d.Set("name", name); err != nil {
return nil, fmt.Errorf("Error setting name: %s", err)
}

name := d.Get("name").(string)
secretRegex := regexp.MustCompile("(projects/.+/secrets/.+)/versions/.+$")
versionRegex := regexp.MustCompile("projects/(.+)/secrets/(.+)/versions/(.+)$")

Expand All @@ -28,4 +27,12 @@
return nil, fmt.Errorf("Error setting version: %s", err)
}

if err := tpgresource.SetResourceIdentityAttributes(d, map[string]interface{}{
"project": parts[1],
"secret": parts[2],
"version": parts[3],
}); err != nil {
return nil, err
}

return []*schema.ResourceData{d}, nil
Loading