-
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 #21855 from DrFaust92/r/emr_studio
r/emr studio - new resource
- Loading branch information
Showing
9 changed files
with
775 additions
and
11 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_emr_studio | ||
| ``` |
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
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,274 @@ | ||
| package emr | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/service/emr" | ||
| "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" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" | ||
| "github.com/hashicorp/terraform-provider-aws/internal/conns" | ||
| "github.com/hashicorp/terraform-provider-aws/internal/flex" | ||
| tfiam "github.com/hashicorp/terraform-provider-aws/internal/service/iam" | ||
| tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" | ||
| "github.com/hashicorp/terraform-provider-aws/internal/tfresource" | ||
| "github.com/hashicorp/terraform-provider-aws/internal/verify" | ||
| ) | ||
|
|
||
| func ResourceStudio() *schema.Resource { | ||
| return &schema.Resource{ | ||
| Create: resourceStudioCreate, | ||
| Read: resourceStudioRead, | ||
| Update: resourceStudioUpdate, | ||
| Delete: resourceStudioDelete, | ||
| Importer: &schema.ResourceImporter{ | ||
| State: schema.ImportStatePassthrough, | ||
| }, | ||
|
|
||
| CustomizeDiff: verify.SetTagsDiff, | ||
|
|
||
| Schema: map[string]*schema.Schema{ | ||
| "arn": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "auth_mode": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| ValidateFunc: validation.StringInSlice(emr.AuthMode_Values(), false), | ||
| }, | ||
| "default_s3_location": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| }, | ||
| "description": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| ValidateFunc: validation.StringLenBetween(0, 256), | ||
| }, | ||
| "engine_security_group_id": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| }, | ||
| "idp_auth_url": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| ForceNew: true, | ||
| }, | ||
| "idp_relay_state_parameter_name": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| ForceNew: true, | ||
| }, | ||
| "name": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ValidateFunc: validation.StringLenBetween(1, 256), | ||
| }, | ||
| "service_role": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| ValidateFunc: verify.ValidARN, | ||
| }, | ||
| "subnet_ids": { | ||
| Type: schema.TypeSet, | ||
| MaxItems: 5, | ||
| MinItems: 1, | ||
| Required: true, | ||
| Elem: &schema.Schema{Type: schema.TypeString}, | ||
| }, | ||
| "tags": tftags.TagsSchema(), | ||
| "tags_all": tftags.TagsSchemaComputed(), | ||
| "user_role": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| ForceNew: true, | ||
| ValidateFunc: verify.ValidARN, | ||
| }, | ||
| "url": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "vpc_id": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| }, | ||
| "workspace_security_group_id": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func resourceStudioCreate(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*conns.AWSClient).EMRConn | ||
| defaultTagsConfig := meta.(*conns.AWSClient).DefaultTagsConfig | ||
| tags := defaultTagsConfig.MergeTags(tftags.New(d.Get("tags").(map[string]interface{}))) | ||
|
|
||
| input := &emr.CreateStudioInput{ | ||
| AuthMode: aws.String(d.Get("auth_mode").(string)), | ||
| DefaultS3Location: aws.String(d.Get("default_s3_location").(string)), | ||
| EngineSecurityGroupId: aws.String(d.Get("engine_security_group_id").(string)), | ||
| Name: aws.String(d.Get("name").(string)), | ||
| ServiceRole: aws.String(d.Get("service_role").(string)), | ||
| SubnetIds: flex.ExpandStringSet(d.Get("subnet_ids").(*schema.Set)), | ||
| VpcId: aws.String(d.Get("vpc_id").(string)), | ||
| WorkspaceSecurityGroupId: aws.String(d.Get("workspace_security_group_id").(string)), | ||
| } | ||
|
|
||
| if v, ok := d.GetOk("description"); ok { | ||
| input.Description = aws.String(v.(string)) | ||
| } | ||
|
|
||
| if v, ok := d.GetOk("idp_auth_url"); ok { | ||
| input.IdpAuthUrl = aws.String(v.(string)) | ||
| } | ||
|
|
||
| if v, ok := d.GetOk("idp_relay_state_parameter_name"); ok { | ||
| input.IdpRelayStateParameterName = aws.String(v.(string)) | ||
| } | ||
|
|
||
| if v, ok := d.GetOk("user_role"); ok { | ||
| input.UserRole = aws.String(v.(string)) | ||
| } | ||
|
|
||
| if len(tags) > 0 { | ||
| input.Tags = Tags(tags.IgnoreAWS()) | ||
| } | ||
|
|
||
| var result *emr.CreateStudioOutput | ||
| err := resource.Retry(tfiam.PropagationTimeout, func() *resource.RetryError { | ||
| var err error | ||
| result, err = conn.CreateStudio(input) | ||
| if tfawserr.ErrMessageContains(err, emr.ErrCodeInvalidRequestException, "entity does not have permissions to assume role") { | ||
| return resource.RetryableError(err) | ||
| } | ||
| if tfawserr.ErrMessageContains(err, emr.ErrCodeInvalidRequestException, "Service role does not have permission to access") { | ||
| return resource.RetryableError(err) | ||
| } | ||
| if err != nil { | ||
| return resource.NonRetryableError(err) | ||
| } | ||
| return nil | ||
| }) | ||
| if tfresource.TimedOut(err) { | ||
| result, err = conn.CreateStudio(input) | ||
| } | ||
| if err != nil { | ||
| return fmt.Errorf("error creating EMR Studio: %w", err) | ||
| } | ||
|
|
||
| d.SetId(aws.StringValue(result.StudioId)) | ||
|
|
||
| return resourceStudioRead(d, meta) | ||
| } | ||
|
|
||
| func resourceStudioUpdate(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*conns.AWSClient).EMRConn | ||
|
|
||
| if d.HasChangesExcept("tags", "tags_all") { | ||
| input := &emr.UpdateStudioInput{ | ||
| StudioId: aws.String(d.Id()), | ||
| } | ||
|
|
||
| if d.HasChange("description") { | ||
| input.Description = aws.String(d.Get("description").(string)) | ||
| } | ||
|
|
||
| if d.HasChange("name") { | ||
| input.Name = aws.String(d.Get("name").(string)) | ||
| } | ||
|
|
||
| if d.HasChange("default_s3_location") { | ||
| input.DefaultS3Location = aws.String(d.Get("default_s3_location").(string)) | ||
| } | ||
|
|
||
| if d.HasChange("subnet_ids") { | ||
| input.SubnetIds = flex.ExpandStringSet(d.Get("subnet_ids").(*schema.Set)) | ||
| } | ||
| } | ||
|
|
||
| if d.HasChange("tags_all") { | ||
| o, n := d.GetChange("tags_all") | ||
|
|
||
| if err := UpdateTags(conn, d.Id(), o, n); err != nil { | ||
| return fmt.Errorf("error updating EMR Studio (%s) tags: %w", d.Id(), err) | ||
| } | ||
| } | ||
|
|
||
| return resourceStudioRead(d, meta) | ||
| } | ||
|
|
||
| func resourceStudioRead(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*conns.AWSClient).EMRConn | ||
| defaultTagsConfig := meta.(*conns.AWSClient).DefaultTagsConfig | ||
| ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig | ||
|
|
||
| studio, err := FindStudioByID(conn, d.Id()) | ||
| if !d.IsNewResource() && tfresource.NotFound(err) { | ||
| log.Printf("[WARN] EMR Studio (%s) not found, removing from state", d.Id()) | ||
| d.SetId("") | ||
| return nil | ||
| } | ||
|
|
||
| if err != nil { | ||
| return fmt.Errorf("error reading EMR Studio (%s): %w", d.Id(), err) | ||
| } | ||
|
|
||
| d.Set("arn", studio.StudioArn) | ||
| d.Set("auth_mode", studio.AuthMode) | ||
| d.Set("default_s3_location", studio.DefaultS3Location) | ||
| d.Set("description", studio.Description) | ||
| d.Set("engine_security_group_id", studio.EngineSecurityGroupId) | ||
| d.Set("idp_auth_url", studio.IdpAuthUrl) | ||
| d.Set("idp_relay_state_parameter_name", studio.IdpRelayStateParameterName) | ||
| d.Set("name", studio.Name) | ||
| d.Set("service_role", studio.ServiceRole) | ||
| d.Set("url", studio.Url) | ||
| d.Set("user_role", studio.UserRole) | ||
| d.Set("vpc_id", studio.VpcId) | ||
| d.Set("workspace_security_group_id", studio.WorkspaceSecurityGroupId) | ||
| d.Set("subnet_ids", flex.FlattenStringSet(studio.SubnetIds)) | ||
|
|
||
| tags := KeyValueTags(studio.Tags).IgnoreAWS().IgnoreConfig(ignoreTagsConfig) | ||
|
|
||
| //lintignore:AWSR002 | ||
| if err := d.Set("tags", tags.RemoveDefaultConfig(defaultTagsConfig).Map()); err != nil { | ||
| return fmt.Errorf("error setting tags: %w", err) | ||
| } | ||
|
|
||
| if err := d.Set("tags_all", tags.Map()); err != nil { | ||
| return fmt.Errorf("error setting tags_all: %w", err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func resourceStudioDelete(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*conns.AWSClient).EMRConn | ||
|
|
||
| request := &emr.DeleteStudioInput{ | ||
| StudioId: aws.String(d.Id()), | ||
| } | ||
|
|
||
| log.Printf("[INFO] Deleting EMR Studio: %s", d.Id()) | ||
| _, err := conn.DeleteStudio(request) | ||
|
|
||
| if err != nil { | ||
| if tfawserr.ErrCodeEquals(err, emr.ErrCodeInternalServerException) { | ||
| return nil | ||
| } | ||
| return fmt.Errorf("error deleting EMR Studio (%s): %w", d.Id(), err) | ||
| } | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.