-
Notifications
You must be signed in to change notification settings - Fork 9.3k
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 #21041 from DrFaust92/r/sagemaker_studio_lifecycle…
…_config r/sagemaker_studio_lifecycle_config - new resource + usage in domain and user profile
- Loading branch information
Showing
13 changed files
with
689 additions
and
12 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,11 @@ | ||
| ```release-note:new-resource | ||
| aws_sagemaker_studio_lifecycle_config | ||
| ``` | ||
|
|
||
| ```release-note:enhancement | ||
| resource/aws_sagemaker_domain: Add `default_user_settings.jupyter_server_app_settings.lifecycle_config_arns` and `default_user_settings.kernel_gateway_app_settings.lifecycle_config_arns` arguments | ||
| ``` | ||
|
|
||
| ```release-note:enhancement | ||
| resource/aws_user_profile: Add `user_settings.jupyter_server_app_settings.lifecycle_config_arns` and `user_settings.kernel_gateway_app_settings.lifecycle_config_arns` arguments | ||
| ``` |
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,164 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
| "regexp" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/service/sagemaker" | ||
| "github.com/hashicorp/aws-sdk-go-base/tfawserr" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" | ||
| "github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags" | ||
| "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/sagemaker/finder" | ||
| "github.com/terraform-providers/terraform-provider-aws/aws/internal/tfresource" | ||
| ) | ||
|
|
||
| func resourceAwsSagemakerStudioLifecycleConfig() *schema.Resource { | ||
| return &schema.Resource{ | ||
| Create: resourceAwsSagemakerStudioLifecycleConfigCreate, | ||
| Read: resourceAwsSagemakerStudioLifecycleConfigRead, | ||
| Update: resourceAwsSagemakerStudioLifecycleConfigUpdate, | ||
| Delete: resourceAwsSagemakerStudioLifecycleConfigDelete, | ||
| Importer: &schema.ResourceImporter{ | ||
| State: schema.ImportStatePassthrough, | ||
| }, | ||
|
|
||
| Schema: map[string]*schema.Schema{ | ||
| "arn": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "studio_lifecycle_config_app_type": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| ValidateFunc: validation.StringInSlice(sagemaker.StudioLifecycleConfigAppType_Values(), false), | ||
| }, | ||
| "studio_lifecycle_config_content": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| ValidateFunc: validation.StringLenBetween(1, 16384), | ||
| }, | ||
| "studio_lifecycle_config_name": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| ValidateFunc: validation.All( | ||
| validation.StringLenBetween(1, 63), | ||
| validation.StringMatch(regexp.MustCompile(`^[a-zA-Z0-9](-*[a-zA-Z0-9])*$`), "Valid characters are a-z, A-Z, 0-9, and - (hyphen)."), | ||
| ), | ||
| }, | ||
| "tags": tagsSchema(), | ||
| "tags_all": tagsSchemaComputed(), | ||
| }, | ||
|
|
||
| CustomizeDiff: SetTagsDiff, | ||
| } | ||
| } | ||
|
|
||
| func resourceAwsSagemakerStudioLifecycleConfigCreate(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).sagemakerconn | ||
| defaultTagsConfig := meta.(*AWSClient).DefaultTagsConfig | ||
| tags := defaultTagsConfig.MergeTags(keyvaluetags.New(d.Get("tags").(map[string]interface{}))) | ||
|
|
||
| name := d.Get("studio_lifecycle_config_name").(string) | ||
| input := &sagemaker.CreateStudioLifecycleConfigInput{ | ||
| StudioLifecycleConfigName: aws.String(name), | ||
| StudioLifecycleConfigAppType: aws.String(d.Get("studio_lifecycle_config_app_type").(string)), | ||
| StudioLifecycleConfigContent: aws.String(d.Get("studio_lifecycle_config_content").(string)), | ||
| } | ||
|
|
||
| if len(tags) > 0 { | ||
| input.Tags = tags.IgnoreAws().SagemakerTags() | ||
| } | ||
|
|
||
| log.Printf("[DEBUG] Creating SageMaker Studio Lifecycle Config : %s", input) | ||
| _, err := conn.CreateStudioLifecycleConfig(input) | ||
|
|
||
| if err != nil { | ||
| return fmt.Errorf("error creating SageMaker Studio Lifecycle Config (%s): %w", name, err) | ||
| } | ||
|
|
||
| d.SetId(name) | ||
|
|
||
| return resourceAwsSagemakerStudioLifecycleConfigRead(d, meta) | ||
| } | ||
|
|
||
| func resourceAwsSagemakerStudioLifecycleConfigRead(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).sagemakerconn | ||
| defaultTagsConfig := meta.(*AWSClient).DefaultTagsConfig | ||
| ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig | ||
|
|
||
| image, err := finder.StudioLifecycleConfigByName(conn, d.Id()) | ||
|
|
||
| if !d.IsNewResource() && tfresource.NotFound(err) { | ||
| log.Printf("[WARN] SageMaker Studio Lifecycle Config (%s) not found, removing from state", d.Id()) | ||
| d.SetId("") | ||
| return nil | ||
| } | ||
|
|
||
| if err != nil { | ||
| return fmt.Errorf("error reading SageMaker Studio Lifecycle Config (%s): %w", d.Id(), err) | ||
| } | ||
|
|
||
| arn := aws.StringValue(image.StudioLifecycleConfigArn) | ||
| d.Set("studio_lifecycle_config_name", image.StudioLifecycleConfigName) | ||
| d.Set("studio_lifecycle_config_app_type", image.StudioLifecycleConfigAppType) | ||
| d.Set("studio_lifecycle_config_content", image.StudioLifecycleConfigContent) | ||
| d.Set("arn", arn) | ||
|
|
||
| tags, err := keyvaluetags.SagemakerListTags(conn, arn) | ||
|
|
||
| if err != nil { | ||
| return fmt.Errorf("error listing tags for SageMaker Studio Lifecycle Config (%s): %w", d.Id(), err) | ||
| } | ||
|
|
||
| tags = 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 resourceAwsSagemakerStudioLifecycleConfigUpdate(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).sagemakerconn | ||
|
|
||
| if d.HasChange("tags_all") { | ||
| o, n := d.GetChange("tags_all") | ||
|
|
||
| if err := keyvaluetags.SagemakerUpdateTags(conn, d.Get("arn").(string), o, n); err != nil { | ||
| return fmt.Errorf("error updating Studio Lifecycle Config (%s) tags: %w", d.Id(), err) | ||
| } | ||
| } | ||
|
|
||
| return resourceAwsSagemakerStudioLifecycleConfigRead(d, meta) | ||
| } | ||
|
|
||
| func resourceAwsSagemakerStudioLifecycleConfigDelete(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).sagemakerconn | ||
|
|
||
| input := &sagemaker.DeleteStudioLifecycleConfigInput{ | ||
| StudioLifecycleConfigName: aws.String(d.Id()), | ||
| } | ||
|
|
||
| log.Printf("[DEBUG] Deleting SageMaker Studio Lifecycle Config: (%s)", d.Id()) | ||
| if _, err := conn.DeleteStudioLifecycleConfig(input); err != nil { | ||
| if tfawserr.ErrMessageContains(err, sagemaker.ErrCodeResourceNotFound, "does not exist") { | ||
| return nil | ||
| } | ||
|
|
||
| return fmt.Errorf("error deleting SageMaker Studio Lifecycle Config (%s): %w", d.Id(), err) | ||
| } | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.