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.

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

r/sagemaker_workteam #20122

Merged
merged 14 commits into from
Jul 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/20122.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
aws_sagemaker_workteam
```
60 changes: 60 additions & 0 deletions aws/aws_sagemaker_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package aws

import (
"testing"
)

// Tests are serialized as SagmMaker Domain resources are limited to 1 per account by default.
// SageMaker UserProfile and App depend on the Domain resources and as such are also part of the serialized test suite.
// Sagemaker Workteam tests must also be serialized
func TestAccAWSSagemaker_serial(t *testing.T) {
testCases := map[string]map[string]func(t *testing.T){
"App": {
"basic": testAccAWSSagemakerApp_basic,
"disappears": testAccAWSSagemakerApp_tags,
"tags": testAccAWSSagemakerApp_disappears,
"resourceSpec": testAccAWSSagemakerApp_resourceSpec,
},
"Domain": {
"basic": testAccAWSSagemakerDomain_basic,
"disappears": testAccAWSSagemakerDomain_tags,
"tags": testAccAWSSagemakerDomain_disappears,
"tensorboardAppSettings": testAccAWSSagemakerDomain_tensorboardAppSettings,
"tensorboardAppSettingsWithImage": testAccAWSSagemakerDomain_tensorboardAppSettingsWithImage,
"kernelGatewayAppSettings": testAccAWSSagemakerDomain_kernelGatewayAppSettings,
"kernelGatewayAppSettings_customImage": testAccAWSSagemakerDomain_kernelGatewayAppSettings_customImage,
"jupyterServerAppSettings": testAccAWSSagemakerDomain_jupyterServerAppSettings,
"kms": testAccAWSSagemakerDomain_kms,
"securityGroup": testAccAWSSagemakerDomain_securityGroup,
"sharingSettings": testAccAWSSagemakerDomain_sharingSettings,
},
"UserProfile": {
"basic": testAccAWSSagemakerUserProfile_basic,
"disappears": testAccAWSSagemakerUserProfile_tags,
"tags": testAccAWSSagemakerUserProfile_disappears,
"tensorboardAppSettings": testAccAWSSagemakerUserProfile_tensorboardAppSettings,
"tensorboardAppSettingsWithImage": testAccAWSSagemakerUserProfile_tensorboardAppSettingsWithImage,
"kernelGatewayAppSettings": testAccAWSSagemakerUserProfile_kernelGatewayAppSettings,
"jupyterServerAppSettings": testAccAWSSagemakerUserProfile_jupyterServerAppSettings,
},
"Workteam": {
"disappears": testAccAWSSagemakerWorkteam_disappears,
"CognitoConfig": testAccAWSSagemakerWorkteam_cognitoConfig,
"NotificationConfig": testAccAWSSagemakerWorkteam_notificationConfig,
"OidcConfig": testAccAWSSagemakerWorkteam_oidcConfig,
"Tags": testAccAWSSagemakerWorkteam_tags,
},
}

for group, m := range testCases {
m := m
t.Run(group, func(t *testing.T) {
for name, tc := range m {
tc := tc
t.Run(name, func(t *testing.T) {
tc(t)
})
}
})
}
}
28 changes: 28 additions & 0 deletions aws/internal/service/sagemaker/finder/finder.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,3 +209,31 @@ func WorkforceByName(conn *sagemaker.SageMaker, name string) (*sagemaker.Workfor

return output.Workforce, nil
}

func WorkteamByName(conn *sagemaker.SageMaker, name string) (*sagemaker.Workteam, error) {
input := &sagemaker.DescribeWorkteamInput{
WorkteamName: aws.String(name),
}

output, err := conn.DescribeWorkteam(input)

if tfawserr.ErrMessageContains(err, "ValidationException", "The work team") {
return nil, &resource.NotFoundError{
LastError: err,
LastRequest: input,
}
}

if err != nil {
return nil, err
}

if output == nil || output.Workteam == nil {
return nil, &resource.NotFoundError{
Message: "Empty result",
LastRequest: input,
}
}

return output.Workteam, nil
}
1 change: 1 addition & 0 deletions aws/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,7 @@ func Provider() *schema.Provider {
"aws_sagemaker_notebook_instance": resourceAwsSagemakerNotebookInstance(),
"aws_sagemaker_user_profile": resourceAwsSagemakerUserProfile(),
"aws_sagemaker_workforce": resourceAwsSagemakerWorkforce(),
"aws_sagemaker_workteam": resourceAwsSagemakerWorkteam(),
"aws_schemas_discoverer": resourceAwsSchemasDiscoverer(),
"aws_schemas_registry": resourceAwsSchemasRegistry(),
"aws_schemas_schema": resourceAwsSchemasSchema(),
Expand Down
47 changes: 0 additions & 47 deletions aws/resource_aws_sagemaker_domain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,53 +17,6 @@ import (
"github.com/terraform-providers/terraform-provider-aws/aws/internal/service/sagemaker/finder"
)

// Tests are serialized as SagmMaker Domain resources are limited to 1 per account by default.
// SageMaker UserProfile and App depend on the Domain resources and as such are also part of the serialized test suite.
func TestAccAWSSagemakerDomain_serial(t *testing.T) {
testCases := map[string]map[string]func(t *testing.T){
"Domain": {
"basic": testAccAWSSagemakerDomain_basic,
"disappears": testAccAWSSagemakerDomain_tags,
"tags": testAccAWSSagemakerDomain_disappears,
"tensorboardAppSettings": testAccAWSSagemakerDomain_tensorboardAppSettings,
"tensorboardAppSettingsWithImage": testAccAWSSagemakerDomain_tensorboardAppSettingsWithImage,
"kernelGatewayAppSettings": testAccAWSSagemakerDomain_kernelGatewayAppSettings,
"kernelGatewayAppSettings_customImage": testAccAWSSagemakerDomain_kernelGatewayAppSettings_customImage,
"jupyterServerAppSettings": testAccAWSSagemakerDomain_jupyterServerAppSettings,
"kms": testAccAWSSagemakerDomain_kms,
"securityGroup": testAccAWSSagemakerDomain_securityGroup,
"sharingSettings": testAccAWSSagemakerDomain_sharingSettings,
},
"UserProfile": {
"basic": testAccAWSSagemakerUserProfile_basic,
"disappears": testAccAWSSagemakerUserProfile_tags,
"tags": testAccAWSSagemakerUserProfile_disappears,
"tensorboardAppSettings": testAccAWSSagemakerUserProfile_tensorboardAppSettings,
"tensorboardAppSettingsWithImage": testAccAWSSagemakerUserProfile_tensorboardAppSettingsWithImage,
"kernelGatewayAppSettings": testAccAWSSagemakerUserProfile_kernelGatewayAppSettings,
"jupyterServerAppSettings": testAccAWSSagemakerUserProfile_jupyterServerAppSettings,
},
"App": {
"basic": testAccAWSSagemakerApp_basic,
"disappears": testAccAWSSagemakerApp_tags,
"tags": testAccAWSSagemakerApp_disappears,
"resourceSpec": testAccAWSSagemakerApp_resourceSpec,
},
}

for group, m := range testCases {
m := m
t.Run(group, func(t *testing.T) {
for name, tc := range m {
tc := tc
t.Run(name, func(t *testing.T) {
tc(t)
})
}
})
}
}

func init() {
resource.AddTestSweepers("aws_sagemaker_domain", &resource.Sweeper{
Name: "aws_sagemaker_domain",
Expand Down
1 change: 0 additions & 1 deletion aws/resource_aws_sagemaker_workforce.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ func resourceAwsSagemakerWorkforceRead(d *schema.ResourceData, meta interface{})

if err != nil {
return fmt.Errorf("error reading SageMaker Workforce (%s): %w", d.Id(), err)

}

d.Set("arn", workforce.WorkforceArn)
Expand Down
3 changes: 3 additions & 0 deletions aws/resource_aws_sagemaker_workforce_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ func init() {
resource.AddTestSweepers("aws_sagemaker_workforce", &resource.Sweeper{
Name: "aws_sagemaker_workforce",
F: testSweepSagemakerWorkforces,
Dependencies: []string{
"aws_sagemaker_workteam",
},
})
}

Expand Down
Loading