-
Notifications
You must be signed in to change notification settings - Fork 9.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #19300 from hashicorp/f-servicecat-tag-option
r/servicecatalog_tag_option: New resource
- Loading branch information
Showing
7 changed files
with
587 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ```release-note:new-resource | ||
| aws_servicecatalog_tag_option | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,198 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/service/servicecatalog" | ||
| "github.com/hashicorp/aws-sdk-go-base/tfawserr" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
| iamwaiter "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/iam/waiter" | ||
| "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/servicecatalog/waiter" | ||
| "github.com/terraform-providers/terraform-provider-aws/aws/internal/tfresource" | ||
| ) | ||
|
|
||
| func resourceAwsServiceCatalogTagOption() *schema.Resource { | ||
| return &schema.Resource{ | ||
| Create: resourceAwsServiceCatalogTagOptionCreate, | ||
| Read: resourceAwsServiceCatalogTagOptionRead, | ||
| Update: resourceAwsServiceCatalogTagOptionUpdate, | ||
| Delete: resourceAwsServiceCatalogTagOptionDelete, | ||
| Importer: &schema.ResourceImporter{ | ||
| State: schema.ImportStatePassthrough, | ||
| }, | ||
|
|
||
| Schema: map[string]*schema.Schema{ | ||
| "active": { | ||
| Type: schema.TypeBool, | ||
| Optional: true, | ||
| Default: true, | ||
| }, | ||
| "key": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| }, | ||
| "owner": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "value": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func resourceAwsServiceCatalogTagOptionCreate(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).scconn | ||
|
|
||
| input := &servicecatalog.CreateTagOptionInput{ | ||
| Key: aws.String(d.Get("key").(string)), | ||
| Value: aws.String(d.Get("value").(string)), | ||
| } | ||
|
|
||
| var output *servicecatalog.CreateTagOptionOutput | ||
| err := resource.Retry(iamwaiter.PropagationTimeout, func() *resource.RetryError { | ||
| var err error | ||
|
|
||
| output, err = conn.CreateTagOption(input) | ||
|
|
||
| if tfawserr.ErrMessageContains(err, servicecatalog.ErrCodeInvalidParametersException, "profile does not exist") { | ||
| return resource.RetryableError(err) | ||
| } | ||
|
|
||
| if err != nil { | ||
| return resource.NonRetryableError(err) | ||
| } | ||
|
|
||
| return nil | ||
| }) | ||
|
|
||
| if tfresource.TimedOut(err) { | ||
| output, err = conn.CreateTagOption(input) | ||
| } | ||
|
|
||
| if err != nil { | ||
| return fmt.Errorf("error creating Service Catalog Tag Option: %w", err) | ||
| } | ||
|
|
||
| if output == nil || output.TagOptionDetail == nil { | ||
| return fmt.Errorf("error creating Service Catalog Tag Option: empty response") | ||
| } | ||
|
|
||
| d.SetId(aws.StringValue(output.TagOptionDetail.Id)) | ||
|
|
||
| // Active is not a field of CreateTagOption but is a field of UpdateTagOption. In order to create an | ||
| // inactive Tag Option, you must create an active one and then update it (but calling this resource's | ||
| // Update will error with ErrCodeDuplicateResourceException because Value is unchanged). | ||
| if v, ok := d.GetOk("active"); !ok { | ||
| _, err = conn.UpdateTagOption(&servicecatalog.UpdateTagOptionInput{ | ||
| Id: aws.String(d.Id()), | ||
| Active: aws.Bool(v.(bool)), | ||
| }) | ||
|
|
||
| if err != nil { | ||
| return fmt.Errorf("error creating Service Catalog Tag Option, updating active (%s): %w", d.Id(), err) | ||
| } | ||
| } | ||
|
|
||
| return resourceAwsServiceCatalogTagOptionRead(d, meta) | ||
| } | ||
|
|
||
| func resourceAwsServiceCatalogTagOptionRead(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).scconn | ||
|
|
||
| output, err := waiter.TagOptionReady(conn, d.Id()) | ||
|
|
||
| if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, servicecatalog.ErrCodeResourceNotFoundException) { | ||
| log.Printf("[WARN] Service Catalog Tag Option (%s) not found, removing from state", d.Id()) | ||
| d.SetId("") | ||
| return nil | ||
| } | ||
|
|
||
| if err != nil { | ||
| return fmt.Errorf("error describing Service Catalog Tag Option (%s): %w", d.Id(), err) | ||
| } | ||
|
|
||
| if output == nil { | ||
| return fmt.Errorf("error getting Service Catalog Tag Option (%s): empty response", d.Id()) | ||
| } | ||
|
|
||
| d.Set("active", output.Active) | ||
| d.Set("key", output.Key) | ||
| d.Set("owner", output.Owner) | ||
| d.Set("value", output.Value) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func resourceAwsServiceCatalogTagOptionUpdate(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).scconn | ||
|
|
||
| input := &servicecatalog.UpdateTagOptionInput{ | ||
| Id: aws.String(d.Id()), | ||
| } | ||
|
|
||
| // UpdateTagOption() is very particular about what it receives. Only fields that change should | ||
| // be included or it will throw servicecatalog.ErrCodeDuplicateResourceException, "already exists" | ||
|
|
||
| if d.HasChange("active") { | ||
| input.Active = aws.Bool(d.Get("active").(bool)) | ||
| } | ||
|
|
||
| if d.HasChange("value") { | ||
| input.Value = aws.String(d.Get("value").(string)) | ||
| } | ||
|
|
||
| err := resource.Retry(iamwaiter.PropagationTimeout, func() *resource.RetryError { | ||
| _, err := conn.UpdateTagOption(input) | ||
|
|
||
| if tfawserr.ErrMessageContains(err, servicecatalog.ErrCodeInvalidParametersException, "profile does not exist") { | ||
| return resource.RetryableError(err) | ||
| } | ||
|
|
||
| if err != nil { | ||
| return resource.NonRetryableError(err) | ||
| } | ||
|
|
||
| return nil | ||
| }) | ||
|
|
||
| if tfresource.TimedOut(err) { | ||
| _, err = conn.UpdateTagOption(input) | ||
| } | ||
|
|
||
| if err != nil { | ||
| return fmt.Errorf("error updating Service Catalog Tag Option (%s): %w", d.Id(), err) | ||
| } | ||
|
|
||
| return resourceAwsServiceCatalogTagOptionRead(d, meta) | ||
| } | ||
|
|
||
| func resourceAwsServiceCatalogTagOptionDelete(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).scconn | ||
|
|
||
| input := &servicecatalog.DeleteTagOptionInput{ | ||
| Id: aws.String(d.Id()), | ||
| } | ||
|
|
||
| _, err := conn.DeleteTagOption(input) | ||
|
|
||
| if tfawserr.ErrCodeEquals(err, servicecatalog.ErrCodeResourceNotFoundException) { | ||
| return nil | ||
| } | ||
|
|
||
| if err != nil { | ||
| return fmt.Errorf("error deleting Service Catalog Tag Option (%s): %w", d.Id(), err) | ||
| } | ||
|
|
||
| if err := waiter.TagOptionDeleted(conn, d.Id()); err != nil { | ||
| return fmt.Errorf("error waiting for Service Catalog Tag Option (%s) to be deleted: %w", d.Id(), err) | ||
| } | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.