Skip to content
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

Jump to bottom

corrections in google_composer_user_workloads_secret #7390

Merged
merged 1 commit into from
May 20, 2024
Merged

corrections in google_composer_user_workloads_secret #7390

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
20 changes: 10 additions & 10 deletions google-beta/services/composer/resource_composer_user_workloads_secret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ func ResourceComposerUserWorkloadsSecret() *schema.Resource {
},

Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(120 * time.Minute),
Update: schema.DefaultTimeout(120 * time.Minute),
Delete: schema.DefaultTimeout(30 * time.Minute),
Create: schema.DefaultTimeout(time.Minute),
Update: schema.DefaultTimeout(time.Minute),
Delete: schema.DefaultTimeout(time.Minute),
},

CustomizeDiff: customdiff.All(
Expand All @@ -43,7 +43,7 @@ func ResourceComposerUserWorkloadsSecret() *schema.Resource {
Required: true,
ForceNew: true,
ValidateFunc: verify.ValidateGCEName,
Description: `Name of the environment.`,
Description: `Name of the secret.`,
},
"region": {
Type: schema.TypeString,
Expand Down Expand Up @@ -201,7 +201,7 @@ func resourceComposerUserWorkloadsSecretDelete(d *schema.ResourceData, meta inte

func resourceComposerUserWorkloadsSecretImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
config := meta.(*transport_tpg.Config)
if err := tpgresource.ParseImportId([]string{"projects/(?P<project>[^/]+)/locations/(?P<region>[^/]+)/environments/(?P<environment>[^/]+)/userWorkloadsSecrets/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<environment>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {
if err := tpgresource.ParseImportId([]string{"projects/(?P<project>[^/]+)/locations/(?P<region>[^/]+)/environments/(?P<environment>[^/]+)/userWorkloadsSecrets/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<environment>[^/]+)/(?P<name>[^/]+)", "(?P<environment>[^/]+)/(?P<name>[^/]+)"}, d, config); err != nil {
return nil, err
}

Expand Down Expand Up @@ -230,7 +230,7 @@ func resourceComposerUserWorkloadsSecretImport(d *schema.ResourceData, meta inte
return []*schema.ResourceData{d}, nil
}

func resourceComposerUserWorkloadsSecretName(d *schema.ResourceData, config *transport_tpg.Config) (*UserWorkloadsSecretsName, error) {
func resourceComposerUserWorkloadsSecretName(d *schema.ResourceData, config *transport_tpg.Config) (*UserWorkloadsSecretName, error) {
project, err := tpgresource.GetProject(d, config)
if err != nil {
return nil, err
Expand All @@ -241,25 +241,25 @@ func resourceComposerUserWorkloadsSecretName(d *schema.ResourceData, config *tra
return nil, err
}

return &UserWorkloadsSecretsName{
return &UserWorkloadsSecretName{
Project: project,
Region: region,
Environment: d.Get("environment").(string),
Secret: d.Get("name").(string),
}, nil
}

type UserWorkloadsSecretsName struct {
type UserWorkloadsSecretName struct {
Project string
Region string
Environment string
Secret string
}

func (n *UserWorkloadsSecretsName) ResourceName() string {
func (n *UserWorkloadsSecretName) ResourceName() string {
return fmt.Sprintf("projects/%s/locations/%s/environments/%s/userWorkloadsSecrets/%s", n.Project, n.Region, n.Environment, n.Secret)
}

func (n *UserWorkloadsSecretsName) ParentName() string {
func (n *UserWorkloadsSecretName) ParentName() string {
return fmt.Sprintf("projects/%s/locations/%s/environments/%s", n.Project, n.Region, n.Environment)
}
6 changes: 4 additions & 2 deletions google-beta/services/composer/resource_composer_user_workloads_secret_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestAccComposerUserWorkloadsSecret_basic(t *testing.T) {
acctest.VcrTest(t, resource.TestCase{
PreCheck: func() { acctest.AccTestPreCheck(t) },
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
// CheckDestroy: testAccComposerUserWorkloadsSecretDestroy(t),
CheckDestroy: testAccComposerEnvironmentDestroyProducer(t),
Steps: []resource.TestStep{
{
Config: testAccComposerUserWorkloadsSecret_basic(envName, secretName, envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv()),
Expand All @@ -52,6 +52,7 @@ func TestAccComposerUserWorkloadsSecret_update(t *testing.T) {
acctest.VcrTest(t, resource.TestCase{
PreCheck: func() { acctest.AccTestPreCheck(t) },
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
CheckDestroy: testAccComposerEnvironmentDestroyProducer(t),
Steps: []resource.TestStep{
{
Config: testAccComposerUserWorkloadsSecret_basic(envName, secretName, envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv()),
Expand All @@ -77,6 +78,7 @@ func TestAccComposerUserWorkloadsSecret_delete(t *testing.T) {
acctest.VcrTest(t, resource.TestCase{
PreCheck: func() { acctest.AccTestPreCheck(t) },
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
CheckDestroy: testAccComposerEnvironmentDestroyProducer(t),
Steps: []resource.TestStep{
{
Config: testAccComposerUserWorkloadsSecret_basic(envName, secretName, envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv()),
Expand Down Expand Up @@ -161,7 +163,7 @@ func testAccComposerUserWorkloadsSecretDestroyed(t *testing.T) func(s *terraform
if len(idTokens) != 8 {
return fmt.Errorf("Invalid ID %q, expected format projects/{project}/regions/{region}/environments/{environment}/userWorkloadsSecrets/{name}", rs.Primary.ID)
}
secretName := &composer.UserWorkloadsSecretsName{
secretName := &composer.UserWorkloadsSecretName{
Project: idTokens[1],
Region: idTokens[3],
Environment: idTokens[5],
Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/composer_user_workloads_secret.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Secret can be imported using any of these accepted formats:

* `projects/{{project}}/locations/{{region}}/environments/{{environment}}/userWorkloadsSecrets/{{name}}`
* `{{project}}/{{region}}/{{environment}}/{{name}}`
* `{{name}}`
* `{{environment}}/{{name}}`

In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import User Workloads Secret using one of the formats above. For example:

Expand All @@ -99,5 +99,5 @@ When using the [`terraform import` command](https://developer.hashicorp.com/terr
```
$ terraform import google_composer_user_workloads_secret.example projects/{{project}}/locations/{{region}}/environments/{{environment}}/userWorkloadsSecrets/{{name}}
$ terraform import google_composer_user_workloads_secret.example {{project}}/{{region}}/{{environment}}/{{name}}
$ terraform import google_composer_user_workloads_secret.example {{name}}
$ terraform import google_composer_user_workloads_secret.example {{environment}}/{{name}}
```