Merge pull request #17221 from DrFaust92/r/sagemaker_app_image_config

r/sagemaker_app_image_config - new resource

.changelog/17221.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+aws_sagemaker_app_image_config
+```
+
+```release-note:bug
+resource/aws_sagemaker_code_repository: fix doc name
+```

aws/internal/service/sagemaker/finder/finder.go

@@ -119,3 +119,22 @@ func UserProfileByName(conn *sagemaker.SageMaker, domainID, userProfileName stri
 
 	return output, nil
 }
+
+// AppImageConfigByName returns the App Image Config corresponding to the specified App Image Config ID.
+// Returns nil if no App Image Cofnig is found.
+func AppImageConfigByName(conn *sagemaker.SageMaker, appImageConfigID string) (*sagemaker.DescribeAppImageConfigOutput, error) {
+	input := &sagemaker.DescribeAppImageConfigInput{
+		AppImageConfigName: aws.String(appImageConfigID),
+	}
+
+	output, err := conn.DescribeAppImageConfig(input)
+	if err != nil {
+		return nil, err
+	}
+
+	if output == nil {
+		return nil, nil
+	}
+
+	return output, nil
+}

aws/provider.go

@@ -879,6 +879,7 @@ func Provider() *schema.Provider {
 			"aws_route_table":                                         resourceAwsRouteTable(),
 			"aws_default_route_table":                                 resourceAwsDefaultRouteTable(),
 			"aws_route_table_association":                             resourceAwsRouteTableAssociation(),
+			"aws_sagemaker_app_image_config":                          resourceAwsSagemakerAppImageConfig(),
 			"aws_sagemaker_code_repository":                           resourceAwsSagemakerCodeRepository(),
 			"aws_sagemaker_domain":                                    resourceAwsSagemakerDomain(),
 			"aws_sagemaker_endpoint":                                  resourceAwsSagemakerEndpoint(),

aws/resource_aws_sagemaker_app_image_config.go

@@ -0,0 +1,305 @@
+package aws
+
+import (
+	"fmt"
+	"log"
+	"regexp"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/sagemaker"
+	"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/service/sagemaker/finder"
+)
+
+func resourceAwsSagemakerAppImageConfig() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAwsSagemakerAppImageConfigCreate,
+		Read:   resourceAwsSagemakerAppImageConfigRead,
+		Update: resourceAwsSagemakerAppImageConfigUpdate,
+		Delete: resourceAwsSagemakerAppImageConfigDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"arn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"app_image_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)."),
+				),
+			},
+			"kernel_gateway_image_config": {
+				Type:     schema.TypeList,
+				Optional: true,
+				MaxItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"file_system_config": {
+							Type:     schema.TypeList,
+							Optional: true,
+							MaxItems: 1,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"default_gid": {
+										Type:         schema.TypeInt,
+										Optional:     true,
+										Default:      100,
+										ValidateFunc: validation.IntInSlice([]int{0, 100}),
+									},
+									"default_uid": {
+										Type:         schema.TypeInt,
+										Optional:     true,
+										Default:      1000,
+										ValidateFunc: validation.IntInSlice([]int{0, 1000}),
+									},
+									"mount_path": {
+										Type:     schema.TypeString,
+										Optional: true,
+										Default:  "/home/sagemaker-user",
+										ValidateFunc: validation.All(
+											validation.StringLenBetween(1, 1024),
+											validation.StringMatch(regexp.MustCompile(`^\/.*`), "Must start with `/`."),
+										),
+									},
+								},
+							},
+						},
+						"kernel_spec": {
+							Type:     schema.TypeList,
+							Required: true,
+							MaxItems: 1,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"display_name": {
+										Type:         schema.TypeString,
+										Optional:     true,
+										ValidateFunc: validation.StringLenBetween(1, 1024),
+									},
+									"name": {
+										Type:         schema.TypeString,
+										Required:     true,
+										ValidateFunc: validation.StringLenBetween(1, 1024),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func resourceAwsSagemakerAppImageConfigCreate(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).sagemakerconn
+
+	name := d.Get("app_image_config_name").(string)
+	input := &sagemaker.CreateAppImageConfigInput{
+		AppImageConfigName: aws.String(name),
+	}
+
+	if v, ok := d.GetOk("kernel_gateway_image_config"); ok && len(v.([]interface{})) > 0 {
+		input.KernelGatewayImageConfig = expandSagemakerAppImageConfigKernelGatewayImageConfig(v.([]interface{}))
+	}
+
+	_, err := conn.CreateAppImageConfig(input)
+	if err != nil {
+		return fmt.Errorf("error creating SageMaker App Image Config %s: %w", name, err)
+	}
+
+	d.SetId(name)
+
+	return resourceAwsSagemakerAppImageConfigRead(d, meta)
+}
+
+func resourceAwsSagemakerAppImageConfigRead(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).sagemakerconn
+
+	image, err := finder.AppImageConfigByName(conn, d.Id())
+	if err != nil {
+		if isAWSErr(err, sagemaker.ErrCodeResourceNotFound, "does not exist") {
+			d.SetId("")
+			log.Printf("[WARN] Unable to find SageMaker App Image Config (%s); removing from state", d.Id())
+			return nil
+		}
+		return fmt.Errorf("error reading SageMaker App Image Config (%s): %w", d.Id(), err)
+
+	}
+
+	arn := aws.StringValue(image.AppImageConfigArn)
+	d.Set("app_image_config_name", image.AppImageConfigName)
+	d.Set("arn", arn)
+
+	if err := d.Set("kernel_gateway_image_config", flattenSagemakerAppImageConfigKernelGatewayImageConfig(image.KernelGatewayImageConfig)); err != nil {
+		return fmt.Errorf("error setting kernel_gateway_image_config: %w", err)
+	}
+
+	return nil
+}
+
+func resourceAwsSagemakerAppImageConfigUpdate(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).sagemakerconn
+
+	if d.HasChange("kernel_gateway_image_config") {
+
+		input := &sagemaker.UpdateAppImageConfigInput{
+			AppImageConfigName: aws.String(d.Id()),
+		}
+
+		if v, ok := d.GetOk("kernel_gateway_image_config"); ok && len(v.([]interface{})) > 0 {
+			input.KernelGatewayImageConfig = expandSagemakerAppImageConfigKernelGatewayImageConfig(v.([]interface{}))
+		}
+
+		log.Printf("[DEBUG] Sagemaker App Image Config update config: %#v", *input)
+		_, err := conn.UpdateAppImageConfig(input)
+		if err != nil {
+			return fmt.Errorf("error updating SageMaker App Image Config: %w", err)
+		}
+
+	}
+
+	return resourceAwsSagemakerAppImageConfigRead(d, meta)
+}
+
+func resourceAwsSagemakerAppImageConfigDelete(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).sagemakerconn
+
+	input := &sagemaker.DeleteAppImageConfigInput{
+		AppImageConfigName: aws.String(d.Id()),
+	}
+
+	if _, err := conn.DeleteAppImageConfig(input); err != nil {
+		if isAWSErr(err, sagemaker.ErrCodeResourceNotFound, "does not exist") {
+			return nil
+		}
+		return fmt.Errorf("error deleting SageMaker App Image Config (%s): %w", d.Id(), err)
+	}
+
+	return nil
+}
+
+func expandSagemakerAppImageConfigKernelGatewayImageConfig(l []interface{}) *sagemaker.KernelGatewayImageConfig {
+	if len(l) == 0 || l[0] == nil {
+		return nil
+	}
+
+	m := l[0].(map[string]interface{})
+
+	config := &sagemaker.KernelGatewayImageConfig{}
+
+	if v, ok := m["kernel_spec"].([]interface{}); ok && len(v) > 0 {
+		config.KernelSpecs = expandSagemakerAppImageConfigKernelGatewayImageConfigKernelSpecs(v)
+	}
+
+	if v, ok := m["file_system_config"].([]interface{}); ok && len(v) > 0 {
+		config.FileSystemConfig = expandSagemakerAppImageConfigKernelGatewayImageConfigFileSystemConfig(v)
+	}
+
+	return config
+}
+
+func expandSagemakerAppImageConfigKernelGatewayImageConfigFileSystemConfig(l []interface{}) *sagemaker.FileSystemConfig {
+	if len(l) == 0 || l[0] == nil {
+		return nil
+	}
+
+	m := l[0].(map[string]interface{})
+
+	config := &sagemaker.FileSystemConfig{
+		DefaultGid: aws.Int64(int64(m["default_gid"].(int))),
+		DefaultUid: aws.Int64(int64(m["default_uid"].(int))),
+		MountPath:  aws.String(m["mount_path"].(string)),
+	}
+
+	return config
+}
+
+func expandSagemakerAppImageConfigKernelGatewayImageConfigKernelSpecs(tfList []interface{}) []*sagemaker.KernelSpec {
+	if len(tfList) == 0 {
+		return nil
+	}
+
+	var kernelSpecs []*sagemaker.KernelSpec
+
+	for _, tfMapRaw := range tfList {
+		tfMap, ok := tfMapRaw.(map[string]interface{})
+
+		if !ok {
+			continue
+		}
+
+		kernelSpec := &sagemaker.KernelSpec{
+			Name: aws.String(tfMap["name"].(string)),
+		}
+
+		if v, ok := tfMap["display_name"].(string); ok && v != "" {
+			kernelSpec.DisplayName = aws.String(v)
+		}
+
+		if kernelSpec == nil {
+			continue
+		}
+
+		kernelSpecs = append(kernelSpecs, kernelSpec)
+	}
+
+	return kernelSpecs
+}
+
+func flattenSagemakerAppImageConfigKernelGatewayImageConfig(config *sagemaker.KernelGatewayImageConfig) []map[string]interface{} {
+	if config == nil {
+		return []map[string]interface{}{}
+	}
+
+	m := map[string]interface{}{}
+
+	if config.KernelSpecs != nil {
+		m["kernel_spec"] = flattenSagemakerAppImageConfigKernelGatewayImageConfigKernelSpecs(config.KernelSpecs)
+	}
+
+	if config.FileSystemConfig != nil {
+		m["file_system_config"] = flattenSagemakerAppImageConfigKernelGatewayImageConfigFileSystemConfig(config.FileSystemConfig)
+	}
+
+	return []map[string]interface{}{m}
+}
+
+func flattenSagemakerAppImageConfigKernelGatewayImageConfigFileSystemConfig(config *sagemaker.FileSystemConfig) []map[string]interface{} {
+	if config == nil {
+		return []map[string]interface{}{}
+	}
+
+	m := map[string]interface{}{
+		"mount_path":  aws.StringValue(config.MountPath),
+		"default_gid": aws.Int64Value(config.DefaultGid),
+		"default_uid": aws.Int64Value(config.DefaultUid),
+	}
+
+	return []map[string]interface{}{m}
+}
+
+func flattenSagemakerAppImageConfigKernelGatewayImageConfigKernelSpecs(kernelSpecs []*sagemaker.KernelSpec) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(kernelSpecs))
+
+	for _, raw := range kernelSpecs {
+		kernelSpec := make(map[string]interface{})
+
+		kernelSpec["name"] = aws.StringValue(raw.Name)
+
+		if raw.DisplayName != nil {
+			kernelSpec["display_name"] = aws.StringValue(raw.DisplayName)
+		}
+
+		res = append(res, kernelSpec)
+	}
+
+	return res
+}