r/mwaa_environment - new resource

aws/internal/keyvaluetags/generators/servicetags/main.go

@@ -132,6 +132,7 @@ var mapServiceNames = []string{
 	"medialive",
 	"mediapackage",
 	"mq",
+	"mwaa",
 	"opsworks",
 	"qldb",
 	"pinpoint",

aws/internal/keyvaluetags/generators/updatetags/main.go

@@ -94,6 +94,7 @@ var serviceNames = []string{
 	"mediapackage",
 	"mediastore",
 	"mq",
+	"mwaa",
 	"neptune",
 	"networkfirewall",
 	"networkmanager",

aws/internal/keyvaluetags/service_generation_customizations.go

@@ -84,6 +84,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/mediapackage"
 	"github.com/aws/aws-sdk-go/service/mediastore"
 	"github.com/aws/aws-sdk-go/service/mq"
+	"github.com/aws/aws-sdk-go/service/mwaa"
 	"github.com/aws/aws-sdk-go/service/neptune"
 	"github.com/aws/aws-sdk-go/service/networkfirewall"
 	"github.com/aws/aws-sdk-go/service/networkmanager"
@@ -283,6 +284,8 @@ func ServiceClientType(serviceName string) string {
 		funcType = reflect.TypeOf(mediastore.New)
 	case "mq":
 		funcType = reflect.TypeOf(mq.New)
+	case "mwaa":
+		funcType = reflect.TypeOf(mwaa.New)
 	case "neptune":
 		funcType = reflect.TypeOf(neptune.New)
 	case "networkfirewall":
@@ -409,6 +412,8 @@ func ServiceListTagsFunction(serviceName string) string {
 		return "ListTags"
 	case "mq":
 		return "ListTags"
+	case "mwaa":
+		return "ListTags"
 	case "opsworks":
 		return "ListTags"
 	case "redshift":

aws/internal/service/mwaa/finder/finder.go

@@ -0,0 +1,25 @@
+package finder
+
+import (
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/mwaa"
+)
+
+// EnvironmentByName returns the MWAA Environment corresponding to the specified Name.
+// Returns nil if no environment is found.
+func EnvironmentByName(conn *mwaa.MWAA, name string) (*mwaa.Environment, error) {
+	input := &mwaa.GetEnvironmentInput{
+		Name: aws.String(name),
+	}
+
+	output, err := conn.GetEnvironment(input)
+	if err != nil {
+		return nil, err
+	}
+
+	if output == nil {
+		return nil, nil
+	}
+
+	return output.Environment, nil
+}

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

@@ -0,0 +1,35 @@
+package waiter
+
+import (
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/mwaa"
+	"github.com/hashicorp/aws-sdk-go-base/tfawserr"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/terraform-providers/terraform-provider-aws/aws/internal/service/mwaa/finder"
+)
+
+const (
+	environmentStatusNotFound = "NotFound"
+	environmentStatusUnknown  = "Unknown"
+)
+
+// EnvironmentStatus fetches the Environment and its Status
+func EnvironmentStatus(conn *mwaa.MWAA, name string) resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		environment, err := finder.EnvironmentByName(conn, name)
+
+		if tfawserr.ErrCodeEquals(err, mwaa.ErrCodeResourceNotFoundException) {
+			return nil, environmentStatusNotFound, nil
+		}
+
+		if err != nil {
+			return nil, environmentStatusUnknown, err
+		}
+
+		if environment == nil {
+			return nil, environmentStatusNotFound, nil
+		}
+
+		return environment, aws.StringValue(environment.Status), nil
+	}
+}

aws/internal/service/mwaa/waiter/waiter.go

@@ -0,0 +1,82 @@
+package waiter
+
+import (
+	"time"
+
+	"github.com/aws/aws-sdk-go/service/mwaa"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+const (
+	// Maximum amount of time to wait for an environment creation
+	EnvironmentCreatedTimeout = 90 * time.Minute
+	// Amount of delay to check an environment status
+	EnvironmentCreatedDelay = 1 * time.Minute
+
+	// Maximum amount of time to wait for an environment update
+	EnvironmentUpdatedTimeout = 90 * time.Minute
+	// Amount of delay to check an environment status
+	EnvironmentUpdatedDelay = 1 * time.Minute
+
+	// Maximum amount of time to wait for an environment deletion
+	EnvironmentDeletedTimeout = 90 * time.Minute
+	// Amount of delay to check an environment status
+	EnvironmentDeletedDelay = 1 * time.Minute
+)
+
+// EnvironmentCreated waits for a Environment to return AVAILABLE
+func EnvironmentCreated(conn *mwaa.MWAA, name string) (*mwaa.Environment, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{mwaa.EnvironmentStatusCreating},
+		Target:  []string{mwaa.EnvironmentStatusAvailable},
+		Refresh: EnvironmentStatus(conn, name),
+		Timeout: EnvironmentCreatedTimeout,
+		Delay:   EnvironmentCreatedDelay,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+
+	if v, ok := outputRaw.(*mwaa.Environment); ok {
+		return v, err
+	}
+
+	return nil, err
+}
+
+// EnvironmentUpdated waits for a Environment to return AVAILABLE
+func EnvironmentUpdated(conn *mwaa.MWAA, name string) (*mwaa.Environment, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{mwaa.EnvironmentStatusUpdating},
+		Target:  []string{mwaa.EnvironmentStatusAvailable},
+		Refresh: EnvironmentStatus(conn, name),
+		Timeout: EnvironmentUpdatedTimeout,
+		Delay:   EnvironmentUpdatedDelay,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+
+	if v, ok := outputRaw.(*mwaa.Environment); ok {
+		return v, err
+	}
+
+	return nil, err
+}
+
+// EnvironmentDeleted waits for a Environment to be deleted
+func EnvironmentDeleted(conn *mwaa.MWAA, name string) (*mwaa.Environment, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{mwaa.EnvironmentStatusDeleting},
+		Target:  []string{},
+		Refresh: EnvironmentStatus(conn, name),
+		Timeout: EnvironmentDeletedTimeout,
+		Delay:   EnvironmentDeletedDelay,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+
+	if v, ok := outputRaw.(*mwaa.Environment); ok {
+		return v, err
+	}
+
+	return nil, err
+}

aws/provider.go

@@ -786,6 +786,7 @@ func Provider() *schema.Provider {
 			"aws_msk_cluster":                                         resourceAwsMskCluster(),
 			"aws_msk_configuration":                                   resourceAwsMskConfiguration(),
 			"aws_msk_scram_secret_association":                        resourceAwsMskScramSecretAssociation(),
+			"aws_mwaa_environment":                                    resourceAwsMwaaEnvironment(),
 			"aws_nat_gateway":                                         resourceAwsNatGateway(),
 			"aws_network_acl":                                         resourceAwsNetworkAcl(),
 			"aws_default_network_acl":                                 resourceAwsDefaultNetworkAcl(),