Skip to content

[bugfix] aws_sagemaker_domain: Fix update failure when app_network_access_type is VpcOnly #45530

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

Open
tabito-hara wants to merge 4 commits into
base: main
Choose a base branch
from
+37 −6
Open

[bugfix] aws_sagemaker_domain: Fix update failure when app_network_access_type is VpcOnly #45530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73a7d7f
VpcId and SubnetIds are always passed to the AWS API when VpcOnly
tabito-hara Dec 10, 2025
795313e
Add a test case where the resource with VpcOnly is updated
tabito-hara Dec 10, 2025
503a4d8
add changelog
tabito-hara Dec 10, 2025
7b25cf5
Refactor acctest
tabito-hara Dec 10, 2025
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
3 changes: 3 additions & 0 deletions .changelog/45530.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_sagemaker_domain: Fix update failure when `app_network_access_type` is `VpcOnly`
```
5 changes: 5 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 @@ -1566,6 +1566,11 @@ func resourceDomainUpdate(ctx context.Context, d *schema.ResourceData, meta any)
input.AppNetworkAccessType = awstypes.AppNetworkAccessType(v.(string))
}

if input.AppNetworkAccessType == awstypes.AppNetworkAccessTypeVpcOnly {
input.VpcId = aws.String(d.Get(names.AttrVPCID).(string))
input.SubnetIds = flex.ExpandStringValueSet(d.Get(names.AttrSubnetIDs).(*schema.Set))
}

if v, ok := d.GetOk("app_security_group_management"); ok && rstudioDomainEnabled(d.Get("domain_settings").([]any)) {
input.AppSecurityGroupManagement = awstypes.AppSecurityGroupManagement(v.(string))
}
Expand Down
35 changes: 29 additions & 6 deletions internal/service/sagemaker/domain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/aws/aws-sdk-go-v2/service/sagemaker"
sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/hashicorp/terraform-plugin-testing/plancheck"
"github.com/hashicorp/terraform-plugin-testing/terraform"
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
"github.com/hashicorp/terraform-provider-aws/internal/conns"
Expand Down Expand Up @@ -271,14 +272,19 @@ func testAccDomain_sharingSettings(t *testing.T) {
CheckDestroy: testAccCheckDomainDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccDomainConfig_sharingSettings(rName),
Config: testAccDomainConfig_sharingSettings(rName, "sharing"),
ConfigPlanChecks: resource.ConfigPlanChecks{
PreApply: []plancheck.PlanCheck{
plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate),
},
},
Check: resource.ComposeTestCheckFunc(
testAccCheckDomainExists(ctx, resourceName, &domain),
resource.TestCheckResourceAttr(resourceName, "default_user_settings.#", "1"),
resource.TestCheckResourceAttr(resourceName, "default_user_settings.0.sharing_settings.#", "1"),
resource.TestCheckResourceAttr(resourceName, "default_user_settings.0.sharing_settings.0.notebook_output_option", "Allowed"),
resource.TestCheckResourceAttrPair(resourceName, "default_user_settings.0.sharing_settings.0.s3_kms_key_id", "aws_kms_key.test", names.AttrKeyID),
resource.TestCheckResourceAttrSet(resourceName, "default_user_settings.0.sharing_settings.0.s3_output_path"),
resource.TestMatchResourceAttr(resourceName, "default_user_settings.0.sharing_settings.0.s3_output_path", regexache.MustCompile(`^s3://tf-acc-.+/sharing$`)),
),
},
{
Expand All @@ -287,6 +293,23 @@ func testAccDomain_sharingSettings(t *testing.T) {
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"retention_policy"},
},
{
Config: testAccDomainConfig_sharingSettings(rName, "sharing-updated"),
ConfigPlanChecks: resource.ConfigPlanChecks{
PreApply: []plancheck.PlanCheck{
plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
},
},
Check: resource.ComposeTestCheckFunc(
testAccCheckDomainExists(ctx, resourceName, &domain),
resource.TestCheckResourceAttr(resourceName, "default_user_settings.#", "1"),
resource.TestCheckResourceAttr(resourceName, "default_user_settings.0.sharing_settings.#", "1"),
resource.TestCheckResourceAttr(resourceName, "default_user_settings.0.sharing_settings.0.notebook_output_option", "Allowed"),
resource.TestCheckResourceAttrPair(resourceName, "default_user_settings.0.sharing_settings.0.s3_kms_key_id", "aws_kms_key.test", names.AttrKeyID),
resource.TestCheckResourceAttrSet(resourceName, "default_user_settings.0.sharing_settings.0.s3_output_path"),
resource.TestMatchResourceAttr(resourceName, "default_user_settings.0.sharing_settings.0.s3_output_path", regexache.MustCompile(`^s3://tf-acc-.+/sharing-updated$`)),
),
},
},
})
}
Expand Down Expand Up @@ -1285,7 +1308,7 @@ func testAccDomain_defaultUserSettingsUpdated(t *testing.T) {
ImportStateVerifyIgnore: []string{"retention_policy"},
},
{
Config: testAccDomainConfig_sharingSettings(rName),
Config: testAccDomainConfig_sharingSettings(rName, "sharing"),
Check: resource.ComposeTestCheckFunc(
testAccCheckDomainExists(ctx, resourceName, &domain),
resource.TestCheckResourceAttr(resourceName, "app_network_access_type", "VpcOnly"),
Expand Down Expand Up @@ -2074,7 +2097,7 @@ resource "aws_sagemaker_domain" "test" {
`, rName, tagKey1, tagValue1, tagKey2, tagValue2))
}

func testAccDomainConfig_sharingSettings(rName string) string {
func testAccDomainConfig_sharingSettings(rName, s3KeyPrefix string) string {
return acctest.ConfigCompose(testAccDomainConfig_base(rName), fmt.Sprintf(`
resource "aws_kms_key" "test" {
description = %[1]q
Expand All @@ -2101,15 +2124,15 @@ resource "aws_sagemaker_domain" "test" {
sharing_settings {
notebook_output_option = "Allowed"
s3_kms_key_id = aws_kms_key.test.key_id
s3_output_path = "s3://${aws_s3_bucket.test.bucket}/sharing"
s3_output_path = "s3://${aws_s3_bucket.test.bucket}/%[2]s"
}
}

retention_policy {
home_efs_file_system = "Delete"
}
}
`, rName))
`, rName, s3KeyPrefix))
}

func testAccDomainConfig_canvasAppSettings(rName string) string {
Expand Down
Loading