Merge pull request #38567 from deepakbshetty/f-aws_sagemaker_user_pro…

…file-studio_web_portal_settings

r/aws_sagemaker_user_profile: add studio_web_portal_settings

.changelog/38567.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_sagemaker_user_profile: Add `user_settings.studio_web_portal_settings` configuration block
+```

internal/service/sagemaker/domain.go

@@ -1379,6 +1379,10 @@ func expandUserSettings(l []interface{}) *awstypes.UserSettings {
 		config.RStudioServerProAppSettings = expandRStudioServerProAppSettings(v)
 	}
 
+	if v, ok := m["studio_web_portal_settings"].([]interface{}); ok && len(v) > 0 {
+		config.StudioWebPortalSettings = expandStudioWebPortalSettings(v)
+	}
+
 	return config
 }
 
@@ -1839,6 +1843,26 @@ func expandDomainCustomImages(l []interface{}) []awstypes.CustomImage {
 	return images
 }
 
+func expandStudioWebPortalSettings(l []interface{}) *awstypes.StudioWebPortalSettings {
+	if len(l) == 0 || l[0] == nil {
+		return nil
+	}
+
+	m := l[0].(map[string]interface{})
+
+	config := &awstypes.StudioWebPortalSettings{}
+
+	if v, ok := m["hidden_app_types"].(*schema.Set); ok && v.Len() > 0 {
+		config.HiddenAppTypes = flex.ExpandStringyValueSet[awstypes.AppType](v)
+	}
+
+	if v, ok := m["hidden_ml_tools"].(*schema.Set); ok && v.Len() > 0 {
+		config.HiddenMlTools = flex.ExpandStringyValueSet[awstypes.MlTools](v)
+	}
+
+	return config
+}
+
 func flattenUserSettings(config *awstypes.UserSettings) []map[string]interface{} {
 	if config == nil {
 		return []map[string]interface{}{}
@@ -1908,6 +1932,10 @@ func flattenUserSettings(config *awstypes.UserSettings) []map[string]interface{}
 		m["r_studio_server_pro_app_settings"] = flattenRStudioServerProAppSettings(config.RStudioServerProAppSettings)
 	}
 
+	if config.StudioWebPortalSettings != nil {
+		m["studio_web_portal_settings"] = flattenStudioWebPortalSettings(config.StudioWebPortalSettings)
+	}
+
 	return []map[string]interface{}{m}
 }
 
@@ -2508,3 +2536,21 @@ func flattenEFSFileSystemConfig(apiObject awstypes.EFSFileSystemConfig) []map[st
 
 	return []map[string]interface{}{tfMap}
 }
+
+func flattenStudioWebPortalSettings(config *awstypes.StudioWebPortalSettings) []map[string]interface{} {
+	if config == nil {
+		return []map[string]interface{}{}
+	}
+
+	m := map[string]interface{}{}
+
+	if config.HiddenAppTypes != nil {
+		m["hidden_app_types"] = flex.FlattenStringyValueSet[awstypes.AppType](config.HiddenAppTypes)
+	}
+
+	if config.HiddenMlTools != nil {
+		m["hidden_ml_tools"] = flex.FlattenStringyValueSet[awstypes.MlTools](config.HiddenMlTools)
+	}
+
+	return []map[string]interface{}{m}
+}

internal/service/sagemaker/sagemaker_test.go

@@ -106,6 +106,8 @@ func TestAccSageMaker_serial(t *testing.T) {
 			"kernelGatewayAppSettings_imageConfig":     testAccUserProfile_kernelGatewayAppSettings_imageconfig,
 			"codeEditorAppSettings_customImage":        testAccUserProfile_codeEditorAppSettings_customImage,
 			"jupyterServerAppSettings":                 testAccUserProfile_jupyterServerAppSettings,
+			"studioWebPortalSettings_hiddenAppTypes":   testAccUserProfile_studioWebPortalSettings_hiddenAppTypes,
+			"studioWebPortalSettings_hiddenMlTools":    testAccUserProfile_studioWebPortalSettings_hiddenMlTools,
 		},
 		"Workforce": {
 			acctest.CtDisappears: testAccWorkforce_disappears,

internal/service/sagemaker/status.go

@@ -123,22 +123,6 @@ func statusFlowDefinition(ctx context.Context, conn *sagemaker.Client, name stri
 	}
 }
 
-func statusUserProfile(ctx context.Context, conn *sagemaker.Client, domainID, userProfileName string) retry.StateRefreshFunc {
-	return func() (interface{}, string, error) {
-		output, err := findUserProfileByName(ctx, conn, domainID, userProfileName)
-
-		if tfresource.NotFound(err) {
-			return nil, "", nil
-		}
-
-		if err != nil {
-			return nil, "", err
-		}
-
-		return output, string(output.Status), nil
-	}
-}
-
 func statusApp(ctx context.Context, conn *sagemaker.Client, domainID, userProfileOrSpaceName, appType, appName string) retry.StateRefreshFunc {
 	return func() (interface{}, string, error) {
 		output, err := findAppByName(ctx, conn, domainID, userProfileOrSpaceName, appType, appName)