Merge pull request #20065 from DrFaust92/r/sagemaker_workforce

r/sagemaker_workforce - new resource

.changelog/20065.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+aws_sagemaker_workforce
+```
+
+```release-note:enhancement
+resource/aws_cognito_user_pool_client: Set `callback_urls` and `logout_urls` as computed.
+```

aws/internal/service/sagemaker/finder/finder.go

@@ -3,6 +3,8 @@ package finder
 import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/sagemaker"
+	"github.com/hashicorp/aws-sdk-go-base/tfawserr"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
 // CodeRepositoryByName returns the code repository corresponding to the specified name.
@@ -179,3 +181,31 @@ func AppByName(conn *sagemaker.SageMaker, domainID, userProfileName, appType, ap
 
 	return output, nil
 }
+
+func WorkforceByName(conn *sagemaker.SageMaker, name string) (*sagemaker.Workforce, error) {
+	input := &sagemaker.DescribeWorkforceInput{
+		WorkforceName: aws.String(name),
+	}
+
+	output, err := conn.DescribeWorkforce(input)
+
+	if tfawserr.ErrMessageContains(err, "ValidationException", "No workforce") {
+		return nil, &resource.NotFoundError{
+			LastError:   err,
+			LastRequest: input,
+		}
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	if output == nil || output.Workforce == nil {
+		return nil, &resource.NotFoundError{
+			Message:     "Empty result",
+			LastRequest: input,
+		}
+	}
+
+	return output.Workforce, nil
+}

aws/provider.go

@@ -1013,6 +1013,7 @@ func Provider() *schema.Provider {
 			"aws_sagemaker_notebook_instance_lifecycle_configuration": resourceAwsSagemakerNotebookInstanceLifeCycleConfiguration(),
 			"aws_sagemaker_notebook_instance":                         resourceAwsSagemakerNotebookInstance(),
 			"aws_sagemaker_user_profile":                              resourceAwsSagemakerUserProfile(),
+			"aws_sagemaker_workforce":                                 resourceAwsSagemakerWorkforce(),
 			"aws_schemas_discoverer":                                  resourceAwsSchemasDiscoverer(),
 			"aws_schemas_registry":                                    resourceAwsSchemasRegistry(),
 			"aws_schemas_schema":                                      resourceAwsSchemasSchema(),

aws/resource_aws_cognito_user_pool_client.go

@@ -97,6 +97,7 @@ func resourceAwsCognitoUserPoolClient() *schema.Resource {
 			"callback_urls": {
 				Type:     schema.TypeSet,
 				Optional: true,
+				Computed: true,
 				MaxItems: 100,
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
@@ -147,6 +148,7 @@ func resourceAwsCognitoUserPoolClient() *schema.Resource {
 			"logout_urls": {
 				Type:     schema.TypeSet,
 				Optional: true,
+				Computed: true,
 				MaxItems: 100,
 				Elem: &schema.Schema{
 					Type: schema.TypeString,