provider/aws: Add new resource - aws_ecs_service
This commit is contained in:
Radek Simko
parent
87faf855aa
commit
ebaa9bde2a
|
|
@ -92,6 +92,7 @@ func Provider() terraform.ResourceProvider {
|
||||||
"aws_db_subnet_group": resourceAwsDbSubnetGroup(),
|
"aws_db_subnet_group": resourceAwsDbSubnetGroup(),
|
||||||
"aws_ebs_volume": resourceAwsEbsVolume(),
|
"aws_ebs_volume": resourceAwsEbsVolume(),
|
||||||
"aws_ecs_cluster": resourceAwsEcsCluster(),
|
"aws_ecs_cluster": resourceAwsEcsCluster(),
|
||||||
|
"aws_ecs_service": resourceAwsEcsService(),
|
||||||
"aws_ecs_task_definition": resourceAwsEcsTaskDefinition(),
|
"aws_ecs_task_definition": resourceAwsEcsTaskDefinition(),
|
||||||
"aws_eip": resourceAwsEip(),
|
"aws_eip": resourceAwsEip(),
|
||||||
"aws_elasticache_cluster": resourceAwsElasticacheCluster(),
|
"aws_elasticache_cluster": resourceAwsElasticacheCluster(),
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,316 @@
|
||||||
|
package aws
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
|
"github.com/aws/aws-sdk-go/service/ecs"
|
||||||
|
"github.com/aws/aws-sdk-go/service/iam"
|
||||||
|
"github.com/hashicorp/terraform/helper/hashcode"
|
||||||
|
"github.com/hashicorp/terraform/helper/resource"
|
||||||
|
"github.com/hashicorp/terraform/helper/schema"
|
||||||
|
)
|
||||||
|
|
||||||
|
var taskDefinitionRE = regexp.MustCompile("^([a-zA-Z0-9_-]+):([0-9]+)$")
|
||||||
|
|
||||||
|
func resourceAwsEcsService() *schema.Resource {
|
||||||
|
return &schema.Resource{
|
||||||
|
Create: resourceAwsEcsServiceCreate,
|
||||||
|
Read: resourceAwsEcsServiceRead,
|
||||||
|
Update: resourceAwsEcsServiceUpdate,
|
||||||
|
Delete: resourceAwsEcsServiceDelete,
|
||||||
|
|
||||||
|
Schema: map[string]*schema.Schema{
|
||||||
|
"name": &schema.Schema{
|
||||||
|
Type: schema.TypeString,
|
||||||
|
Required: true,
|
||||||
|
ForceNew: true,
|
||||||
|
},
|
||||||
|
|
||||||
|
"cluster": &schema.Schema{
|
||||||
|
Type: schema.TypeString,
|
||||||
|
Optional: true,
|
||||||
|
Computed: true,
|
||||||
|
},
|
||||||
|
|
||||||
|
"task_definition": &schema.Schema{
|
||||||
|
Type: schema.TypeString,
|
||||||
|
Required: true,
|
||||||
|
},
|
||||||
|
|
||||||
|
"desired_count": &schema.Schema{
|
||||||
|
Type: schema.TypeInt,
|
||||||
|
Optional: true,
|
||||||
|
},
|
||||||
|
|
||||||
|
"iam_role": &schema.Schema{
|
||||||
|
Type: schema.TypeString,
|
||||||
|
Optional: true,
|
||||||
|
},
|
||||||
|
|
||||||
|
"load_balancer": &schema.Schema{
|
||||||
|
Type: schema.TypeSet,
|
||||||
|
Optional: true,
|
||||||
|
Elem: &schema.Resource{
|
||||||
|
Schema: map[string]*schema.Schema{
|
||||||
|
"elb_name": &schema.Schema{
|
||||||
|
Type: schema.TypeString,
|
||||||
|
Required: true,
|
||||||
|
},
|
||||||
|
|
||||||
|
"container_name": &schema.Schema{
|
||||||
|
Type: schema.TypeString,
|
||||||
|
Required: true,
|
||||||
|
},
|
||||||
|
|
||||||
|
"container_port": &schema.Schema{
|
||||||
|
Type: schema.TypeInt,
|
||||||
|
Required: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Set: resourceAwsEcsLoadBalancerHash,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func resourceAwsEcsServiceCreate(d *schema.ResourceData, meta interface{}) error {
|
||||||
|
conn := meta.(*AWSClient).ecsconn
|
||||||
|
|
||||||
|
input := ecs.CreateServiceInput{
|
||||||
|
ServiceName: aws.String(d.Get("name").(string)),
|
||||||
|
TaskDefinition: aws.String(d.Get("task_definition").(string)),
|
||||||
|
DesiredCount: aws.Long(int64(d.Get("desired_count").(int))),
|
||||||
|
}
|
||||||
|
|
||||||
|
if v, ok := d.GetOk("cluster"); ok {
|
||||||
|
input.Cluster = aws.String(v.(string))
|
||||||
|
}
|
||||||
|
|
||||||
|
loadBalancers := expandEcsLoadBalancers(d.Get("load_balancer").(*schema.Set).List())
|
||||||
|
if len(loadBalancers) > 0 {
|
||||||
|
log.Printf("[DEBUG] Adding ECS load balancers: %#v", loadBalancers)
|
||||||
|
input.LoadBalancers = loadBalancers
|
||||||
|
}
|
||||||
|
if v, ok := d.GetOk("iam_role"); ok {
|
||||||
|
input.Role = aws.String(v.(string))
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Printf("[DEBUG] Creating ECS service: %#v", input)
|
||||||
|
out, err := conn.CreateService(&input)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
service := *out.Service
|
||||||
|
|
||||||
|
log.Printf("[DEBUG] ECS service created: %s", *service.ServiceARN)
|
||||||
|
d.SetId(*service.ServiceARN)
|
||||||
|
d.Set("cluster", *service.ClusterARN)
|
||||||
|
|
||||||
|
return resourceAwsEcsServiceUpdate(d, meta)
|
||||||
|
}
|
||||||
|
|
||||||
|
func resourceAwsEcsServiceRead(d *schema.ResourceData, meta interface{}) error {
|
||||||
|
conn := meta.(*AWSClient).ecsconn
|
||||||
|
|
||||||
|
log.Printf("[DEBUG] Reading ECS service %s", d.Id())
|
||||||
|
input := ecs.DescribeServicesInput{
|
||||||
|
Services: []*string{aws.String(d.Id())},
|
||||||
|
Cluster: aws.String(d.Get("cluster").(string)),
|
||||||
|
}
|
||||||
|
|
||||||
|
out, err := conn.DescribeServices(&input)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
service := out.Services[0]
|
||||||
|
log.Printf("[DEBUG] Received ECS service %#v", service)
|
||||||
|
|
||||||
|
d.SetId(*service.ServiceARN)
|
||||||
|
d.Set("name", *service.ServiceName)
|
||||||
|
|
||||||
|
// Save task definition in the same format
|
||||||
|
if strings.HasPrefix(d.Get("task_definition").(string), "arn:aws:ecs:") {
|
||||||
|
d.Set("task_definition", *service.TaskDefinition)
|
||||||
|
} else {
|
||||||
|
taskDefinition := buildFamilyAndRevisionFromARN(*service.TaskDefinition)
|
||||||
|
d.Set("task_definition", taskDefinition)
|
||||||
|
}
|
||||||
|
|
||||||
|
d.Set("desired_count", *service.DesiredCount)
|
||||||
|
d.Set("cluster", *service.ClusterARN)
|
||||||
|
|
||||||
|
if service.RoleARN != nil {
|
||||||
|
d.Set("iam_role", *service.RoleARN)
|
||||||
|
}
|
||||||
|
|
||||||
|
if service.LoadBalancers != nil {
|
||||||
|
d.Set("load_balancers", flattenEcsLoadBalancers(service.LoadBalancers))
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func resourceAwsEcsServiceUpdate(d *schema.ResourceData, meta interface{}) error {
|
||||||
|
conn := meta.(*AWSClient).ecsconn
|
||||||
|
|
||||||
|
log.Printf("[DEBUG] Updating ECS service %s", d.Id())
|
||||||
|
input := ecs.UpdateServiceInput{
|
||||||
|
Service: aws.String(d.Id()),
|
||||||
|
Cluster: aws.String(d.Get("cluster").(string)),
|
||||||
|
}
|
||||||
|
|
||||||
|
if d.HasChange("desired_count") {
|
||||||
|
_, n := d.GetChange("desired_count")
|
||||||
|
input.DesiredCount = aws.Long(int64(n.(int)))
|
||||||
|
}
|
||||||
|
if d.HasChange("task_definition") {
|
||||||
|
_, n := d.GetChange("task_definition")
|
||||||
|
input.TaskDefinition = aws.String(n.(string))
|
||||||
|
}
|
||||||
|
|
||||||
|
out, err := conn.UpdateService(&input)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
service := out.Service
|
||||||
|
log.Printf("[DEBUG] Updated ECS service %#v", service)
|
||||||
|
|
||||||
|
return resourceAwsEcsServiceRead(d, meta)
|
||||||
|
}
|
||||||
|
|
||||||
|
func resourceAwsEcsServiceDelete(d *schema.ResourceData, meta interface{}) error {
|
||||||
|
conn := meta.(*AWSClient).ecsconn
|
||||||
|
|
||||||
|
// Check if it's not already gone
|
||||||
|
resp, err := conn.DescribeServices(&ecs.DescribeServicesInput{
|
||||||
|
Services: []*string{aws.String(d.Id())},
|
||||||
|
Cluster: aws.String(d.Get("cluster").(string)),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
log.Printf("[DEBUG] ECS service %s is currently %s", d.Id(), *resp.Services[0].Status)
|
||||||
|
|
||||||
|
if *resp.Services[0].Status == "INACTIVE" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Drain the ECS service
|
||||||
|
if *resp.Services[0].Status != "DRAINING" {
|
||||||
|
log.Printf("[DEBUG] Draining ECS service %s", d.Id())
|
||||||
|
_, err = conn.UpdateService(&ecs.UpdateServiceInput{
|
||||||
|
Service: aws.String(d.Id()),
|
||||||
|
Cluster: aws.String(d.Get("cluster").(string)),
|
||||||
|
DesiredCount: aws.Long(int64(0)),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
input := ecs.DeleteServiceInput{
|
||||||
|
Service: aws.String(d.Id()),
|
||||||
|
Cluster: aws.String(d.Get("cluster").(string)),
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Printf("[DEBUG] Deleting ECS service %#v", input)
|
||||||
|
out, err := conn.DeleteService(&input)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wait until it's deleted
|
||||||
|
wait := resource.StateChangeConf{
|
||||||
|
Pending: []string{"DRAINING"},
|
||||||
|
Target: "INACTIVE",
|
||||||
|
Timeout: 5 * time.Minute,
|
||||||
|
MinTimeout: 1 * time.Second,
|
||||||
|
Refresh: func() (interface{}, string, error) {
|
||||||
|
log.Printf("[DEBUG] Checking if ECS service %s is INACTIVE", d.Id())
|
||||||
|
resp, err := conn.DescribeServices(&ecs.DescribeServicesInput{
|
||||||
|
Services: []*string{aws.String(d.Id())},
|
||||||
|
Cluster: aws.String(d.Get("cluster").(string)),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return resp, "FAILED", err
|
||||||
|
}
|
||||||
|
|
||||||
|
return resp, *resp.Services[0].Status, nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = wait.WaitForState()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Printf("[DEBUG] ECS service %s deleted.", *out.Service.ServiceARN)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func resourceAwsEcsLoadBalancerHash(v interface{}) int {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
m := v.(map[string]interface{})
|
||||||
|
buf.WriteString(fmt.Sprintf("%s-", m["elb_name"].(string)))
|
||||||
|
buf.WriteString(fmt.Sprintf("%s-", m["container_name"].(string)))
|
||||||
|
buf.WriteString(fmt.Sprintf("%d-", m["container_port"].(int)))
|
||||||
|
|
||||||
|
return hashcode.String(buf.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildFamilyAndRevisionFromARN(arn string) string {
|
||||||
|
return strings.Split(arn, "/")[1]
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildTaskDefinitionARN(taskDefinition string, meta interface{}) (string, error) {
|
||||||
|
// If it's already an ARN, just return it
|
||||||
|
if strings.HasPrefix(taskDefinition, "arn:aws:ecs:") {
|
||||||
|
return taskDefinition, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse out family & revision
|
||||||
|
family, revision, err := parseTaskDefinition(taskDefinition)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
iamconn := meta.(*AWSClient).iamconn
|
||||||
|
region := meta.(*AWSClient).region
|
||||||
|
|
||||||
|
// An zero value GetUserInput{} defers to the currently logged in user
|
||||||
|
resp, err := iamconn.GetUser(&iam.GetUserInput{})
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("GetUser ERROR: %#v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// arn:aws:iam::0123456789:user/username
|
||||||
|
userARN := *resp.User.ARN
|
||||||
|
accountID := strings.Split(userARN, ":")[4]
|
||||||
|
|
||||||
|
// arn:aws:ecs:us-west-2:01234567890:task-definition/mongodb:3
|
||||||
|
arn := fmt.Sprintf("arn:aws:ecs:%s:%s:task-definition/%s:%s",
|
||||||
|
region, accountID, family, revision)
|
||||||
|
log.Printf("[DEBUG] Built task definition ARN: %s", arn)
|
||||||
|
return arn, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseTaskDefinition(taskDefinition string) (string, string, error) {
|
||||||
|
matches := taskDefinitionRE.FindAllStringSubmatch(taskDefinition, 2)
|
||||||
|
|
||||||
|
if len(matches) == 0 || len(matches[0]) != 3 {
|
||||||
|
return "", "", fmt.Errorf(
|
||||||
|
"Invalid task definition format, family:rev or ARN expected (%#v)",
|
||||||
|
taskDefinition)
|
||||||
|
}
|
||||||
|
|
||||||
|
return matches[0][1], matches[0][2], nil
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,276 @@
|
||||||
|
package aws
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
|
"github.com/aws/aws-sdk-go/service/ecs"
|
||||||
|
"github.com/hashicorp/terraform/helper/resource"
|
||||||
|
"github.com/hashicorp/terraform/terraform"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestParseTaskDefinition(t *testing.T) {
|
||||||
|
cases := map[string]map[string]interface{}{
|
||||||
|
"invalid": map[string]interface{}{
|
||||||
|
"family": "",
|
||||||
|
"revision": "",
|
||||||
|
"isValid": false,
|
||||||
|
},
|
||||||
|
"invalidWithColon:": map[string]interface{}{
|
||||||
|
"family": "",
|
||||||
|
"revision": "",
|
||||||
|
"isValid": false,
|
||||||
|
},
|
||||||
|
"1234": map[string]interface{}{
|
||||||
|
"family": "",
|
||||||
|
"revision": "",
|
||||||
|
"isValid": false,
|
||||||
|
},
|
||||||
|
"invalid:aaa": map[string]interface{}{
|
||||||
|
"family": "",
|
||||||
|
"revision": "",
|
||||||
|
"isValid": false,
|
||||||
|
},
|
||||||
|
"invalid=family:1": map[string]interface{}{
|
||||||
|
"family": "",
|
||||||
|
"revision": "",
|
||||||
|
"isValid": false,
|
||||||
|
},
|
||||||
|
"invalid:name:1": map[string]interface{}{
|
||||||
|
"family": "",
|
||||||
|
"revision": "",
|
||||||
|
"isValid": false,
|
||||||
|
},
|
||||||
|
"valid:1": map[string]interface{}{
|
||||||
|
"family": "valid",
|
||||||
|
"revision": "1",
|
||||||
|
"isValid": true,
|
||||||
|
},
|
||||||
|
"abc12-def:54": map[string]interface{}{
|
||||||
|
"family": "abc12-def",
|
||||||
|
"revision": "54",
|
||||||
|
"isValid": true,
|
||||||
|
},
|
||||||
|
"lorem_ip-sum:123": map[string]interface{}{
|
||||||
|
"family": "lorem_ip-sum",
|
||||||
|
"revision": "123",
|
||||||
|
"isValid": true,
|
||||||
|
},
|
||||||
|
"lorem-ipsum:1": map[string]interface{}{
|
||||||
|
"family": "lorem-ipsum",
|
||||||
|
"revision": "1",
|
||||||
|
"isValid": true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for input, expectedOutput := range cases {
|
||||||
|
family, revision, err := parseTaskDefinition(input)
|
||||||
|
isValid := expectedOutput["isValid"].(bool)
|
||||||
|
if !isValid && err == nil {
|
||||||
|
t.Fatalf("Task definition %s should fail", input)
|
||||||
|
}
|
||||||
|
|
||||||
|
expectedFamily := expectedOutput["family"].(string)
|
||||||
|
if family != expectedFamily {
|
||||||
|
t.Fatalf("Unexpected family (%#v) for task definition %s\n%#v", family, input, err)
|
||||||
|
}
|
||||||
|
expectedRevision := expectedOutput["revision"].(string)
|
||||||
|
if revision != expectedRevision {
|
||||||
|
t.Fatalf("Unexpected revision (%#v) for task definition %s\n%#v", revision, input, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAccAWSEcsServiceWithARN(t *testing.T) {
|
||||||
|
resource.Test(t, resource.TestCase{
|
||||||
|
PreCheck: func() { testAccPreCheck(t) },
|
||||||
|
Providers: testAccProviders,
|
||||||
|
CheckDestroy: testAccCheckAWSEcsServiceDestroy,
|
||||||
|
Steps: []resource.TestStep{
|
||||||
|
resource.TestStep{
|
||||||
|
Config: testAccAWSEcsService,
|
||||||
|
Check: resource.ComposeTestCheckFunc(
|
||||||
|
testAccCheckAWSEcsServiceExists("aws_ecs_service.mongo"),
|
||||||
|
),
|
||||||
|
},
|
||||||
|
|
||||||
|
resource.TestStep{
|
||||||
|
Config: testAccAWSEcsServiceModified,
|
||||||
|
Check: resource.ComposeTestCheckFunc(
|
||||||
|
testAccCheckAWSEcsServiceExists("aws_ecs_service.mongo"),
|
||||||
|
),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAccAWSEcsServiceWithFamilyAndRevision(t *testing.T) {
|
||||||
|
resource.Test(t, resource.TestCase{
|
||||||
|
PreCheck: func() { testAccPreCheck(t) },
|
||||||
|
Providers: testAccProviders,
|
||||||
|
CheckDestroy: testAccCheckAWSEcsServiceDestroy,
|
||||||
|
Steps: []resource.TestStep{
|
||||||
|
resource.TestStep{
|
||||||
|
Config: testAccAWSEcsServiceWithFamilyAndRevision,
|
||||||
|
Check: resource.ComposeTestCheckFunc(
|
||||||
|
testAccCheckAWSEcsServiceExists("aws_ecs_service.jenkins"),
|
||||||
|
),
|
||||||
|
},
|
||||||
|
|
||||||
|
resource.TestStep{
|
||||||
|
Config: testAccAWSEcsServiceWithFamilyAndRevisionModified,
|
||||||
|
Check: resource.ComposeTestCheckFunc(
|
||||||
|
testAccCheckAWSEcsServiceExists("aws_ecs_service.jenkins"),
|
||||||
|
),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func testAccCheckAWSEcsServiceDestroy(s *terraform.State) error {
|
||||||
|
conn := testAccProvider.Meta().(*AWSClient).ecsconn
|
||||||
|
|
||||||
|
for _, rs := range s.RootModule().Resources {
|
||||||
|
if rs.Type != "aws_ecs_service" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
out, err := conn.DescribeServices(&ecs.DescribeServicesInput{
|
||||||
|
Services: []*string{aws.String(rs.Primary.ID)},
|
||||||
|
})
|
||||||
|
|
||||||
|
if err == nil {
|
||||||
|
if len(out.Services) > 0 {
|
||||||
|
return fmt.Errorf("ECS service still exists:\n%#v", out.Services)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func testAccCheckAWSEcsServiceExists(name string) resource.TestCheckFunc {
|
||||||
|
return func(s *terraform.State) error {
|
||||||
|
_, ok := s.RootModule().Resources[name]
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("Not found: %s", name)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var testAccAWSEcsService = `
|
||||||
|
resource "aws_ecs_cluster" "default" {
|
||||||
|
name = "terraformecstest1"
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "aws_ecs_task_definition" "mongo" {
|
||||||
|
family = "mongodb"
|
||||||
|
container_definitions = <<DEFINITION
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"cpu": 128,
|
||||||
|
"essential": true,
|
||||||
|
"image": "mongo:latest",
|
||||||
|
"memory": 128,
|
||||||
|
"name": "mongodb"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
DEFINITION
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "aws_ecs_service" "mongo" {
|
||||||
|
name = "mongodb"
|
||||||
|
cluster = "${aws_ecs_cluster.default.id}"
|
||||||
|
task_definition = "${aws_ecs_task_definition.mongo.arn}"
|
||||||
|
desired_count = 1
|
||||||
|
}
|
||||||
|
`
|
||||||
|
|
||||||
|
var testAccAWSEcsServiceModified = `
|
||||||
|
resource "aws_ecs_cluster" "default" {
|
||||||
|
name = "terraformecstest1"
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "aws_ecs_task_definition" "mongo" {
|
||||||
|
family = "mongodb"
|
||||||
|
container_definitions = <<DEFINITION
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"cpu": 128,
|
||||||
|
"essential": true,
|
||||||
|
"image": "mongo:latest",
|
||||||
|
"memory": 128,
|
||||||
|
"name": "mongodb"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
DEFINITION
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "aws_ecs_service" "mongo" {
|
||||||
|
name = "mongodb"
|
||||||
|
cluster = "${aws_ecs_cluster.default.id}"
|
||||||
|
task_definition = "${aws_ecs_task_definition.mongo.arn}"
|
||||||
|
desired_count = 2
|
||||||
|
}
|
||||||
|
`
|
||||||
|
|
||||||
|
var testAccAWSEcsServiceWithFamilyAndRevision = `
|
||||||
|
resource "aws_ecs_cluster" "default" {
|
||||||
|
name = "terraformecstest2"
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "aws_ecs_task_definition" "jenkins" {
|
||||||
|
family = "jenkins"
|
||||||
|
container_definitions = <<DEFINITION
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"cpu": 128,
|
||||||
|
"essential": true,
|
||||||
|
"image": "jenkins:latest",
|
||||||
|
"memory": 128,
|
||||||
|
"name": "jenkins"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
DEFINITION
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "aws_ecs_service" "jenkins" {
|
||||||
|
name = "jenkins"
|
||||||
|
cluster = "${aws_ecs_cluster.default.id}"
|
||||||
|
task_definition = "${aws_ecs_task_definition.jenkins.family}:${aws_ecs_task_definition.jenkins.revision}"
|
||||||
|
desired_count = 1
|
||||||
|
}
|
||||||
|
`
|
||||||
|
|
||||||
|
var testAccAWSEcsServiceWithFamilyAndRevisionModified = `
|
||||||
|
resource "aws_ecs_cluster" "default" {
|
||||||
|
name = "terraformecstest2"
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "aws_ecs_task_definition" "jenkins" {
|
||||||
|
family = "jenkins"
|
||||||
|
container_definitions = <<DEFINITION
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"cpu": 128,
|
||||||
|
"essential": true,
|
||||||
|
"image": "jenkins:latest",
|
||||||
|
"memory": 128,
|
||||||
|
"name": "jenkins"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
DEFINITION
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "aws_ecs_service" "jenkins" {
|
||||||
|
name = "jenkins"
|
||||||
|
cluster = "${aws_ecs_cluster.default.id}"
|
||||||
|
task_definition = "${aws_ecs_task_definition.jenkins.family}:${aws_ecs_task_definition.jenkins.revision}"
|
||||||
|
desired_count = 1
|
||||||
|
}
|
||||||
|
`
|
||||||
|
|
@ -81,6 +81,28 @@ func expandEcsContainerDefinitions(rawDefinitions string) ([]*ecs.ContainerDefin
|
||||||
return definitions, nil
|
return definitions, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Takes the result of flatmap. Expand for an array of load balancers and
|
||||||
|
// returns ecs.LoadBalancer compatible objects
|
||||||
|
func expandEcsLoadBalancers(configured []interface{}) []*ecs.LoadBalancer {
|
||||||
|
loadBalancers := make([]*ecs.LoadBalancer, 0, len(configured))
|
||||||
|
|
||||||
|
// Loop over our configured load balancers and create
|
||||||
|
// an array of aws-sdk-go compatible objects
|
||||||
|
for _, lRaw := range configured {
|
||||||
|
data := lRaw.(map[string]interface{})
|
||||||
|
|
||||||
|
l := &ecs.LoadBalancer{
|
||||||
|
ContainerName: aws.String(data["container_name"].(string)),
|
||||||
|
ContainerPort: aws.Long(int64(data["container_port"].(int))),
|
||||||
|
LoadBalancerName: aws.String(data["elb_name"].(string)),
|
||||||
|
}
|
||||||
|
|
||||||
|
loadBalancers = append(loadBalancers, l)
|
||||||
|
}
|
||||||
|
|
||||||
|
return loadBalancers
|
||||||
|
}
|
||||||
|
|
||||||
// Takes the result of flatmap.Expand for an array of ingress/egress security
|
// Takes the result of flatmap.Expand for an array of ingress/egress security
|
||||||
// group rules and returns EC2 API compatible objects. This function will error
|
// group rules and returns EC2 API compatible objects. This function will error
|
||||||
// if it finds invalid permissions input, namely a protocol of "-1" with either
|
// if it finds invalid permissions input, namely a protocol of "-1" with either
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue