r/sagemaker_flow_definition

.changelog/20825.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_sagemaker_flow_definition
+```

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

@@ -5,6 +5,7 @@ import (
 	"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"
+	tfsagemaker "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/sagemaker"
 	"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfresource"
 )
 
@@ -16,6 +17,7 @@ func CodeRepositoryByName(conn *sagemaker.SageMaker, name string) (*sagemaker.De
 	}
 
 	output, err := conn.DescribeCodeRepository(input)
+
 	if err != nil {
 		return nil, err
 	}
@@ -35,6 +37,7 @@ func ModelPackageGroupByName(conn *sagemaker.SageMaker, name string) (*sagemaker
 	}
 
 	output, err := conn.DescribeModelPackageGroup(input)
+
 	if err != nil {
 		return nil, err
 	}
@@ -54,6 +57,7 @@ func ImageByName(conn *sagemaker.SageMaker, name string) (*sagemaker.DescribeIma
 	}
 
 	output, err := conn.DescribeImage(input)
+
 	if err != nil {
 		return nil, err
 	}
@@ -73,6 +77,7 @@ func ImageVersionByName(conn *sagemaker.SageMaker, name string) (*sagemaker.Desc
 	}
 
 	output, err := conn.DescribeImageVersion(input)
+
 	if err != nil {
 		return nil, err
 	}
@@ -92,7 +97,8 @@ func DeviceFleetByName(conn *sagemaker.SageMaker, id string) (*sagemaker.Describ
 	}
 
 	output, err := conn.DescribeDeviceFleet(input)
-	if tfawserr.ErrMessageContains(err, "ValidationException", "No devicefleet with name") {
+
+	if tfawserr.ErrMessageContains(err, tfsagemaker.ErrCodeValidationException, "No devicefleet with name") {
 		return nil, &resource.NotFoundError{
 			LastError:   err,
 			LastRequest: input,
@@ -118,6 +124,7 @@ func DomainByName(conn *sagemaker.SageMaker, domainID string) (*sagemaker.Descri
 	}
 
 	output, err := conn.DescribeDomain(input)
+
 	if err != nil {
 		return nil, err
 	}
@@ -163,6 +170,7 @@ func UserProfileByName(conn *sagemaker.SageMaker, domainID, userProfileName stri
 	}
 
 	output, err := conn.DescribeUserProfile(input)
+
 	if err != nil {
 		return nil, err
 	}
@@ -182,6 +190,7 @@ func AppImageConfigByName(conn *sagemaker.SageMaker, appImageConfigID string) (*
 	}
 
 	output, err := conn.DescribeAppImageConfig(input)
+
 	if err != nil {
 		return nil, err
 	}
@@ -204,6 +213,7 @@ func AppByName(conn *sagemaker.SageMaker, domainID, userProfileName, appType, ap
 	}
 
 	output, err := conn.DescribeApp(input)
+
 	if err != nil {
 		return nil, err
 	}
@@ -222,7 +232,7 @@ func WorkforceByName(conn *sagemaker.SageMaker, name string) (*sagemaker.Workfor
 
 	output, err := conn.DescribeWorkforce(input)
 
-	if tfawserr.ErrMessageContains(err, "ValidationException", "No workforce") {
+	if tfawserr.ErrMessageContains(err, tfsagemaker.ErrCodeValidationException, "No workforce") {
 		return nil, &resource.NotFoundError{
 			LastError:   err,
 			LastRequest: input,
@@ -247,7 +257,7 @@ func WorkteamByName(conn *sagemaker.SageMaker, name string) (*sagemaker.Workteam
 
 	output, err := conn.DescribeWorkteam(input)
 
-	if tfawserr.ErrMessageContains(err, "ValidationException", "The work team") {
+	if tfawserr.ErrMessageContains(err, tfsagemaker.ErrCodeValidationException, "The work team") {
 		return nil, &resource.NotFoundError{
 			LastError:   err,
 			LastRequest: input,
@@ -297,7 +307,32 @@ func EndpointConfigByName(conn *sagemaker.SageMaker, name string) (*sagemaker.De
 
 	output, err := conn.DescribeEndpointConfig(input)
 
-	if tfawserr.ErrMessageContains(err, "ValidationException", "Could not find endpoint configuration") {
+	if tfawserr.ErrMessageContains(err, tfsagemaker.ErrCodeValidationException, "Could not find endpoint configuration") {
+		return nil, &resource.NotFoundError{
+			LastError:   err,
+			LastRequest: input,
+		}
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	if output == nil {
+		return nil, tfresource.NewEmptyResultError(input)
+	}
+
+	return output, nil
+}
+
+func FlowDefinitionByName(conn *sagemaker.SageMaker, name string) (*sagemaker.DescribeFlowDefinitionOutput, error) {
+	input := &sagemaker.DescribeFlowDefinitionInput{
+		FlowDefinitionName: aws.String(name),
+	}
+
+	output, err := conn.DescribeFlowDefinition(input)
+
+	if tfawserr.ErrCodeEquals(err, sagemaker.ErrCodeResourceNotFound) {
 		return nil, &resource.NotFoundError{
 			LastError:   err,
 			LastRequest: input,

aws/internal/service/sagemaker/waiter/status.go

@@ -172,6 +172,22 @@ func FeatureGroupStatus(conn *sagemaker.SageMaker, name string) resource.StateRe
 	}
 }
 
+func FlowDefinitionStatus(conn *sagemaker.SageMaker, name string) resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		output, err := finder.FlowDefinitionByName(conn, name)
+
+		if tfresource.NotFound(err) {
+			return nil, "", nil
+		}
+
+		if err != nil {
+			return nil, "", err
+		}
+
+		return output, aws.StringValue(output.FlowDefinitionStatus), nil
+	}
+}
+
 // UserProfileStatus fetches the UserProfile and its Status
 func UserProfileStatus(conn *sagemaker.SageMaker, domainID, userProfileName string) resource.StateRefreshFunc {
 	return func() (interface{}, string, error) {

aws/internal/service/sagemaker/waiter/waiter.go

@@ -28,6 +28,8 @@ const (
 	UserProfileDeletedTimeout         = 10 * time.Minute
 	AppInServiceTimeout               = 10 * time.Minute
 	AppDeletedTimeout                 = 10 * time.Minute
+	FlowDefinitionActiveTimeout       = 2 * time.Minute
+	FlowDefinitionDeletedTimeout      = 2 * time.Minute
 )
 
 // NotebookInstanceInService waits for a NotebookInstance to return InService
@@ -382,3 +384,47 @@ func AppDeleted(conn *sagemaker.SageMaker, domainID, userProfileName, appType, a
 
 	return nil, err
 }
+
+// FlowDefinitionActive waits for a FlowDefinition to return Active
+func FlowDefinitionActive(conn *sagemaker.SageMaker, name string) (*sagemaker.DescribeFlowDefinitionOutput, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{sagemaker.FlowDefinitionStatusInitializing},
+		Target:  []string{sagemaker.FlowDefinitionStatusActive},
+		Refresh: FlowDefinitionStatus(conn, name),
+		Timeout: FlowDefinitionActiveTimeout,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+
+	if output, ok := outputRaw.(*sagemaker.DescribeFlowDefinitionOutput); ok {
+		if status, reason := aws.StringValue(output.FlowDefinitionStatus), aws.StringValue(output.FailureReason); status == sagemaker.FlowDefinitionStatusFailed && reason != "" {
+			tfresource.SetLastError(err, errors.New(reason))
+		}
+
+		return output, err
+	}
+
+	return nil, err
+}
+
+// FlowDefinitionDeleted waits for a FlowDefinition to return Deleted
+func FlowDefinitionDeleted(conn *sagemaker.SageMaker, name string) (*sagemaker.DescribeFlowDefinitionOutput, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{sagemaker.FlowDefinitionStatusDeleting},
+		Target:  []string{},
+		Refresh: FlowDefinitionStatus(conn, name),
+		Timeout: FlowDefinitionDeletedTimeout,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+
+	if output, ok := outputRaw.(*sagemaker.DescribeFlowDefinitionOutput); ok {
+		if status, reason := aws.StringValue(output.FlowDefinitionStatus), aws.StringValue(output.FailureReason); status == sagemaker.FlowDefinitionStatusFailed && reason != "" {
+			tfresource.SetLastError(err, errors.New(reason))
+		}
+
+		return output, err
+	}
+
+	return nil, err
+}

aws/provider.go

@@ -1037,6 +1037,7 @@ func Provider() *schema.Provider {
 			"aws_sagemaker_endpoint":                                  resourceAwsSagemakerEndpoint(),
 			"aws_sagemaker_endpoint_configuration":                    resourceAwsSagemakerEndpointConfiguration(),
 			"aws_sagemaker_feature_group":                             resourceAwsSagemakerFeatureGroup(),
+			"aws_sagemaker_flow_definition":                           resourceAwsSagemakerFlowDefinition(),
 			"aws_sagemaker_image":                                     resourceAwsSagemakerImage(),
 			"aws_sagemaker_image_version":                             resourceAwsSagemakerImageVersion(),
 			"aws_sagemaker_human_task_ui":                             resourceAwsSagemakerHumanTaskUi(),