Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

r/aws_sagemaker_domain: add arguments to DefaultResourceSpec #21508

Merged
merged 13 commits into from
Jan 3, 2022
Merged

r/aws_sagemaker_domain: add arguments to DefaultResourceSpec #21508

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d9a0b11
r/aws_sagemaker_domain: add arguments to DefaultResourceSpec
philof Oct 26, 2021
4e6e17c
r/aws_sagemaker_domain: add test for sagemaker_image_version_arn to D…
philof Nov 2, 2021
5a98754
r/aws_sagemaker_user_profile: add attributes to DefaultResourceSpec
philof Nov 2, 2021
30c4c3e
r/aws_sagemaker_user_profile: terrafmt
philof Nov 3, 2021
e28aeda
r/aws_sagemaker_user_profile: providerlint
philof Nov 3, 2021
e9dd9e9
r/aws_sagemaker_user_profile: golangci-lint
philof Nov 3, 2021
ba6ab7b
Update docs & Add CHANGELOG entry
philof Nov 8, 2021
dbe2180
r/aws_sagemaker_app: add attributes to ResourceSpec
philof Nov 11, 2021
4f64033
r/aws_sagemaker_app: providerlint
philof Nov 11, 2021
aa17f68
r/aws_sagemaker_app: golangci-lint
philof Nov 12, 2021
a150bb5
r/aws_sagemaker_domain: fix typo in attributes
philof Nov 15, 2021
dbaed13
r/aws_sagemaker_domain: fix markdown-lint
philof Nov 15, 2021
5d3a1a0
Update 21508.txt
ewbankkit Jan 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions internal/service/sagemaker/domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,21 @@ func ResourceDomain() *schema.Resource {
Optional: true,
ValidateFunc: validation.StringInSlice(sagemaker.AppInstanceType_Values(), false),
},
"lifecycle_config_arn": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: verify.ValidARN,
},
"sagemaker_image_arn": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: verify.ValidARN,
},
"sagemaker_image_version_arn": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: verify.ValidARN,
},
},
},
},
Expand All @@ -162,11 +172,21 @@ func ResourceDomain() *schema.Resource {
Optional: true,
ValidateFunc: validation.StringInSlice(sagemaker.AppInstanceType_Values(), false),
},
"lifecycle_config_arn": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: verify.ValidARN,
},
"sagemaker_image_arn": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: verify.ValidARN,
},
"sagemaker_image_version_arn": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: verify.ValidARN,
},
},
},
},
Expand Down Expand Up @@ -199,11 +219,21 @@ func ResourceDomain() *schema.Resource {
Optional: true,
ValidateFunc: validation.StringInSlice(sagemaker.AppInstanceType_Values(), false),
},
"lifecycle_config_arn": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: verify.ValidARN,
},
"sagemaker_image_arn": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: verify.ValidARN,
},
"sagemaker_image_version_arn": {
philof marked this conversation as resolved.
Show resolved Hide resolved
Type: schema.TypeString,
Optional: true,
ValidateFunc: verify.ValidARN,
},
},
},
},
Expand Down Expand Up @@ -556,10 +586,18 @@ func expandSagemakerDomainDefaultResourceSpec(l []interface{}) *sagemaker.Resour
config.InstanceType = aws.String(v)
}

if v, ok := m["lifecycle_config_arn"].(string); ok && v != "" {
config.LifecycleConfigArn = aws.String(v)
}

if v, ok := m["sagemaker_image_arn"].(string); ok && v != "" {
config.SageMakerImageArn = aws.String(v)
}

if v, ok := m["sagemaker_image_version_arn"].(string); ok && v != "" {
config.SageMakerImageVersionArn = aws.String(v)
}

return config
}

Expand Down Expand Up @@ -651,10 +689,18 @@ func flattenSagemakerDomainDefaultResourceSpec(config *sagemaker.ResourceSpec) [
m["instance_type"] = aws.StringValue(config.InstanceType)
}

if config.LifecycleConfigArn != nil {
m["lifcycle_config_arn"] = aws.StringValue(config.LifecycleConfigArn)
}

if config.SageMakerImageArn != nil {
m["sagemaker_image_arn"] = aws.StringValue(config.SageMakerImageArn)
}

if config.SageMakerImageVersionArn != nil {
m["sagemaker_image_version_arn"] = aws.StringValue(config.SageMakerImageVersionArn)
}

return []map[string]interface{}{m}
}

Expand Down
2 changes: 2 additions & 0 deletions internal/service/sagemaker/domain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ func testAccDomain_kernelGatewayAppSettings_lifecycleConfig(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "default_user_settings.0.kernel_gateway_app_settings.0.lifecycle_config_arns.#", "1"),
resource.TestCheckResourceAttr(resourceName, "default_user_settings.0.kernel_gateway_app_settings.0.default_resource_spec.#", "1"),
resource.TestCheckResourceAttr(resourceName, "default_user_settings.0.kernel_gateway_app_settings.0.default_resource_spec.0.instance_type", "ml.t3.micro"),
resource.TestCheckResourceAttrPair(resourceName, "default_user_settings.0.kernel_gateway_app_settings.0.default_resource_spec.0.lifecycle_config_arn", "aws_sagemaker_studio_lifecycle_config.test", "arn"),
),
},
{
Expand Down Expand Up @@ -822,6 +823,7 @@ resource "aws_sagemaker_domain" "test" {
kernel_gateway_app_settings {
default_resource_spec {
instance_type = "ml.t3.micro"
lifecycle_config_arn = aws_sagemaker_studio_lifecycle_config.test.arn
}

lifecycle_config_arns = [aws_sagemaker_studio_lifecycle_config.test.arn]
Expand Down