Merge pull request #31755 from holly-evans/f-aws-sagemaker-model-pack…

…age-name-23968 F/Add model_package_name for aws_sagemaker_model
hashicorp · Jun 5, 2023 · 4c60e5e · 4c60e5e
2 parents 7c0740c + de8b90a
commit 4c60e5e
Show file tree

Hide file tree

Showing 4 changed files with 125 additions and 84 deletions.
diff --git a/.changelog/31755.txt b/.changelog/31755.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_sagemaker_model: Add `container.model_package_name` and `primary_container.model_package_name` arguments
+```
diff --git a/internal/service/sagemaker/model.go b/internal/service/sagemaker/model.go
@@ -59,7 +59,7 @@ func ResourceModel() *schema.Resource {
 						},
 						"image": {
 							Type:         schema.TypeString,
-							Required:     true,
+							Optional:     true,
 							ForceNew:     true,
 							ValidateFunc: validImage,
 						},
@@ -106,6 +106,12 @@ func ResourceModel() *schema.Resource {
 							ForceNew:     true,
 							ValidateFunc: validModelDataURL,
 						},
+						"model_package_name": {
+							Type:         schema.TypeString,
+							Optional:     true,
+							ForceNew:     true,
+							ValidateFunc: verify.ValidARN,
+						},
 					},
 				},
 			},
@@ -164,7 +170,7 @@ func ResourceModel() *schema.Resource {
 						},
 						"image": {
 							Type:         schema.TypeString,
-							Required:     true,
+							Optional:     true,
 							ForceNew:     true,
 							ValidateFunc: validImage,
 						},
@@ -211,6 +217,12 @@ func ResourceModel() *schema.Resource {
 							ForceNew:     true,
 							ValidateFunc: validModelDataURL,
 						},
+						"model_package_name": {
+							Type:         schema.TypeString,
+							Optional:     true,
+							ForceNew:     true,
+							ValidateFunc: verify.ValidARN,
+						},
 					},
 				},
 			},
@@ -404,8 +416,10 @@ func resourceModelDelete(ctx context.Context, d *schema.ResourceData, meta inter
 }
 
 func expandContainer(m map[string]interface{}) *sagemaker.ContainerDefinition {
-	container := sagemaker.ContainerDefinition{
-		Image: aws.String(m["image"].(string)),
+	container := sagemaker.ContainerDefinition{}
+
+	if v, ok := m["image"]; ok && v.(string) != "" {
+		container.Image = aws.String(v.(string))
 	}
 
 	if v, ok := m["mode"]; ok && v.(string) != "" {
@@ -418,6 +432,9 @@ func expandContainer(m map[string]interface{}) *sagemaker.ContainerDefinition {
 	if v, ok := m["model_data_url"]; ok && v.(string) != "" {
 		container.ModelDataUrl = aws.String(v.(string))
 	}
+	if v, ok := m["model_package_name"]; ok && v.(string) != "" {
+		container.ModelPackageName = aws.String(v.(string))
+	}
 	if v, ok := m["environment"].(map[string]interface{}); ok && len(v) > 0 {
 		container.Environment = flex.ExpandStringMap(v)
 	}
@@ -478,7 +495,9 @@ func flattenContainer(container *sagemaker.ContainerDefinition) []interface{} {
 
 	cfg := make(map[string]interface{})
 
-	cfg["image"] = aws.StringValue(container.Image)
+	if container.Image != nil {
+		cfg["image"] = aws.StringValue(container.Image)
+	}
 
 	if container.Mode != nil {
 		cfg["mode"] = aws.StringValue(container.Mode)
@@ -490,6 +509,9 @@ func flattenContainer(container *sagemaker.ContainerDefinition) []interface{} {
 	if container.ModelDataUrl != nil {
 		cfg["model_data_url"] = aws.StringValue(container.ModelDataUrl)
 	}
+	if container.ModelPackageName != nil {
+		cfg["model_package_name"] = aws.StringValue(container.ModelPackageName)
+	}
 	if container.Environment != nil {
 		cfg["environment"] = aws.StringValueMap(container.Environment)
 	}