Add Fargate support to Batch compute environments

.changelog/16819.txt

@@ -0,0 +1,11 @@
+```release-note:enhancement
+resource/aws_batch_compute_environment: Additional supported value `FARGATE` and `FARGATE_SPOT` for the `type` argument in the `compute_resources` configuration block
+```
+
+```release-note:enhancement
+resource/aws_batch_compute_environment: The `instance_role`, `instance_type` and `min_vcpus` arguments in the `compute_resources` configuration block are now optional
+```
+
+```release-note:enhancement
+resource/aws_batch_compute_environment: The `security_group_ids` and `subnets` arguments in the `compute_resources` configuration block can now be updated in-place for Fargate compute resources
+```

aws/internal/service/batch/finder/finder.go

@@ -7,29 +7,56 @@ import (
 	tfbatch "github.com/terraform-providers/terraform-provider-aws/aws/internal/service/batch"
 )
 
-func JobDefinitionByARN(conn *batch.Batch, arn string) (*batch.JobDefinition, error) {
-	input := &batch.DescribeJobDefinitionsInput{
-		JobDefinitions: aws.StringSlice([]string{arn}),
+func ComputeEnvironmentDetailByName(conn *batch.Batch, name string) (*batch.ComputeEnvironmentDetail, error) {
+	input := &batch.DescribeComputeEnvironmentsInput{
+		ComputeEnvironments: aws.StringSlice([]string{name}),
+	}
+
+	computeEnvironmentDetail, err := ComputeEnvironmentDetail(conn, input)
+
+	if err != nil {
+		return nil, err
 	}
 
-	return JobDefinition(conn, input)
+	if status := aws.StringValue(computeEnvironmentDetail.Status); status == batch.CEStatusDeleted {
+		return nil, &resource.NotFoundError{
+			Message:     status,
+			LastRequest: input,
+		}
+	}
+
+	return computeEnvironmentDetail, nil
 }
 
-func JobDefinition(conn *batch.Batch, input *batch.DescribeJobDefinitionsInput) (*batch.JobDefinition, error) {
-	output, err := conn.DescribeJobDefinitions(input)
+func ComputeEnvironmentDetail(conn *batch.Batch, input *batch.DescribeComputeEnvironmentsInput) (*batch.ComputeEnvironmentDetail, error) {
+	output, err := conn.DescribeComputeEnvironments(input)
 
 	if err != nil {
 		return nil, err
 	}
 
-	if output == nil || len(output.JobDefinitions) == 0 || output.JobDefinitions[0] == nil {
+	if output == nil || len(output.ComputeEnvironments) == 0 || output.ComputeEnvironments[0] == nil {
 		return nil, &resource.NotFoundError{
 			Message:     "Empty result",
 			LastRequest: input,
 		}
 	}
 
-	jobDefinition := output.JobDefinitions[0]
+	// TODO if len(output.ComputeEnvironments) > 1
+
+	return output.ComputeEnvironments[0], nil
+}
+
+func JobDefinitionByARN(conn *batch.Batch, arn string) (*batch.JobDefinition, error) {
+	input := &batch.DescribeJobDefinitionsInput{
+		JobDefinitions: aws.StringSlice([]string{arn}),
+	}
+
+	jobDefinition, err := JobDefinition(conn, input)
+
+	if err != nil {
+		return nil, err
+	}
 
 	if status := aws.StringValue(jobDefinition.Status); status == tfbatch.JobDefinitionStatusInactive {
 		return nil, &resource.NotFoundError{
@@ -40,3 +67,22 @@ func JobDefinition(conn *batch.Batch, input *batch.DescribeJobDefinitionsInput)
 
 	return jobDefinition, nil
 }
+
+func JobDefinition(conn *batch.Batch, input *batch.DescribeJobDefinitionsInput) (*batch.JobDefinition, error) {
+	output, err := conn.DescribeJobDefinitions(input)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if output == nil || len(output.JobDefinitions) == 0 || output.JobDefinitions[0] == nil {
+		return nil, &resource.NotFoundError{
+			Message:     "Empty result",
+			LastRequest: input,
+		}
+	}
+
+	// TODO if len(output.JobDefinitions) > 1
+
+	return output.JobDefinitions[0], nil
+}

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

@@ -0,0 +1,25 @@
+package waiter
+
+import (
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/batch"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/terraform-providers/terraform-provider-aws/aws/internal/service/batch/finder"
+	"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfresource"
+)
+
+func ComputeEnvironmentStatus(conn *batch.Batch, name string) resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		computeEnvironmentDetail, err := finder.ComputeEnvironmentDetailByName(conn, name)
+
+		if tfresource.NotFound(err) {
+			return nil, "", nil
+		}
+
+		if err != nil {
+			return nil, "", err
+		}
+
+		return computeEnvironmentDetail, aws.StringValue(computeEnvironmentDetail.Status), nil
+	}
+}

aws/internal/service/batch/waiter/waiter.go

@@ -0,0 +1,76 @@
+package waiter
+
+import (
+	"time"
+
+	"github.com/aws/aws-sdk-go/service/batch"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func ComputeEnvironmentCreated(conn *batch.Batch, name string, timeout time.Duration) (*batch.ComputeEnvironmentDetail, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{batch.CEStatusCreating},
+		Target:  []string{batch.CEStatusValid},
+		Refresh: ComputeEnvironmentStatus(conn, name),
+		Timeout: timeout,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+
+	if v, ok := outputRaw.(*batch.ComputeEnvironmentDetail); ok {
+		return v, err
+	}
+
+	return nil, err
+}
+
+func ComputeEnvironmentDeleted(conn *batch.Batch, name string, timeout time.Duration) (*batch.ComputeEnvironmentDetail, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{batch.CEStatusDeleting},
+		Target:  []string{},
+		Refresh: ComputeEnvironmentStatus(conn, name),
+		Timeout: timeout,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+
+	if v, ok := outputRaw.(*batch.ComputeEnvironmentDetail); ok {
+		return v, err
+	}
+
+	return nil, err
+}
+
+func ComputeEnvironmentDisabled(conn *batch.Batch, name string, timeout time.Duration) (*batch.ComputeEnvironmentDetail, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{batch.CEStatusUpdating},
+		Target:  []string{batch.CEStatusValid, batch.CEStatusInvalid},
+		Refresh: ComputeEnvironmentStatus(conn, name),
+		Timeout: timeout,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+
+	if v, ok := outputRaw.(*batch.ComputeEnvironmentDetail); ok {
+		return v, err
+	}
+
+	return nil, err
+}
+
+func ComputeEnvironmentUpdated(conn *batch.Batch, name string, timeout time.Duration) (*batch.ComputeEnvironmentDetail, error) {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{batch.CEStatusUpdating},
+		Target:  []string{batch.CEStatusValid},
+		Refresh: ComputeEnvironmentStatus(conn, name),
+		Timeout: timeout,
+	}
+
+	outputRaw, err := stateConf.WaitForState()
+
+	if v, ok := outputRaw.(*batch.ComputeEnvironmentDetail); ok {
+		return v, err
+	}
+
+	return nil, err
+}