provider/aws: Add new resource - aws_ecs_task_definition
This commit is contained in:
parent
ae5502b744
commit
87faf855aa
|
@ -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_task_definition": resourceAwsEcsTaskDefinition(),
|
||||||
"aws_eip": resourceAwsEip(),
|
"aws_eip": resourceAwsEip(),
|
||||||
"aws_elasticache_cluster": resourceAwsElasticacheCluster(),
|
"aws_elasticache_cluster": resourceAwsElasticacheCluster(),
|
||||||
"aws_elasticache_security_group": resourceAwsElasticacheSecurityGroup(),
|
"aws_elasticache_security_group": resourceAwsElasticacheSecurityGroup(),
|
||||||
|
|
|
@ -0,0 +1,158 @@
|
||||||
|
package aws
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"crypto/sha1"
|
||||||
|
"encoding/hex"
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
|
||||||
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
|
"github.com/aws/aws-sdk-go/service/ecs"
|
||||||
|
"github.com/hashicorp/terraform/helper/hashcode"
|
||||||
|
"github.com/hashicorp/terraform/helper/schema"
|
||||||
|
)
|
||||||
|
|
||||||
|
func resourceAwsEcsTaskDefinition() *schema.Resource {
|
||||||
|
return &schema.Resource{
|
||||||
|
Create: resourceAwsEcsTaskDefinitionCreate,
|
||||||
|
Read: resourceAwsEcsTaskDefinitionRead,
|
||||||
|
Update: resourceAwsEcsTaskDefinitionUpdate,
|
||||||
|
Delete: resourceAwsEcsTaskDefinitionDelete,
|
||||||
|
|
||||||
|
Schema: map[string]*schema.Schema{
|
||||||
|
"arn": &schema.Schema{
|
||||||
|
Type: schema.TypeString,
|
||||||
|
Computed: true,
|
||||||
|
},
|
||||||
|
|
||||||
|
"family": &schema.Schema{
|
||||||
|
Type: schema.TypeString,
|
||||||
|
Required: true,
|
||||||
|
ForceNew: true,
|
||||||
|
},
|
||||||
|
|
||||||
|
"revision": &schema.Schema{
|
||||||
|
Type: schema.TypeInt,
|
||||||
|
Computed: true,
|
||||||
|
},
|
||||||
|
|
||||||
|
"container_definitions": &schema.Schema{
|
||||||
|
Type: schema.TypeString,
|
||||||
|
Required: true,
|
||||||
|
StateFunc: func(v interface{}) string {
|
||||||
|
hash := sha1.Sum([]byte(v.(string)))
|
||||||
|
return hex.EncodeToString(hash[:])
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
"volume": &schema.Schema{
|
||||||
|
Type: schema.TypeSet,
|
||||||
|
Optional: true,
|
||||||
|
Elem: &schema.Resource{
|
||||||
|
Schema: map[string]*schema.Schema{
|
||||||
|
"name": &schema.Schema{
|
||||||
|
Type: schema.TypeString,
|
||||||
|
Required: true,
|
||||||
|
},
|
||||||
|
|
||||||
|
"host_path": &schema.Schema{
|
||||||
|
Type: schema.TypeString,
|
||||||
|
Required: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Set: resourceAwsEcsTaskDefinitionVolumeHash,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func resourceAwsEcsTaskDefinitionCreate(d *schema.ResourceData, meta interface{}) error {
|
||||||
|
conn := meta.(*AWSClient).ecsconn
|
||||||
|
|
||||||
|
rawDefinitions := d.Get("container_definitions").(string)
|
||||||
|
definitions, err := expandEcsContainerDefinitions(rawDefinitions)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
input := ecs.RegisterTaskDefinitionInput{
|
||||||
|
ContainerDefinitions: definitions,
|
||||||
|
Family: aws.String(d.Get("family").(string)),
|
||||||
|
}
|
||||||
|
|
||||||
|
if v, ok := d.GetOk("volume"); ok {
|
||||||
|
volumes, err := expandEcsVolumes(v.(*schema.Set).List())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
input.Volumes = volumes
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Printf("[DEBUG] Registering ECS task definition: %#v", input)
|
||||||
|
out, err := conn.RegisterTaskDefinition(&input)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
taskDefinition := *out.TaskDefinition
|
||||||
|
|
||||||
|
log.Printf("[DEBUG] ECS task definition registered: %#v (rev. %d)",
|
||||||
|
*taskDefinition.TaskDefinitionARN, *taskDefinition.Revision)
|
||||||
|
|
||||||
|
d.SetId(*taskDefinition.Family)
|
||||||
|
d.Set("arn", *taskDefinition.TaskDefinitionARN)
|
||||||
|
|
||||||
|
return resourceAwsEcsTaskDefinitionRead(d, meta)
|
||||||
|
}
|
||||||
|
|
||||||
|
func resourceAwsEcsTaskDefinitionRead(d *schema.ResourceData, meta interface{}) error {
|
||||||
|
conn := meta.(*AWSClient).ecsconn
|
||||||
|
|
||||||
|
log.Printf("[DEBUG] Reading task definition %s", d.Id())
|
||||||
|
out, err := conn.DescribeTaskDefinition(&ecs.DescribeTaskDefinitionInput{
|
||||||
|
TaskDefinition: aws.String(d.Get("arn").(string)),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
log.Printf("[DEBUG] Received task definition %#v", out)
|
||||||
|
|
||||||
|
taskDefinition := out.TaskDefinition
|
||||||
|
|
||||||
|
d.SetId(*taskDefinition.Family)
|
||||||
|
d.Set("arn", *taskDefinition.TaskDefinitionARN)
|
||||||
|
d.Set("family", *taskDefinition.Family)
|
||||||
|
d.Set("revision", *taskDefinition.Revision)
|
||||||
|
d.Set("container_definitions", taskDefinition.ContainerDefinitions)
|
||||||
|
d.Set("volumes", flattenEcsVolumes(taskDefinition.Volumes))
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func resourceAwsEcsTaskDefinitionUpdate(d *schema.ResourceData, meta interface{}) error {
|
||||||
|
return resourceAwsEcsTaskDefinitionCreate(d, meta)
|
||||||
|
}
|
||||||
|
|
||||||
|
func resourceAwsEcsTaskDefinitionDelete(d *schema.ResourceData, meta interface{}) error {
|
||||||
|
conn := meta.(*AWSClient).ecsconn
|
||||||
|
|
||||||
|
// NOT YET IMPLEMENTED o_O
|
||||||
|
_, err := conn.DeregisterTaskDefinition(&ecs.DeregisterTaskDefinitionInput{
|
||||||
|
TaskDefinition: aws.String(d.Id()),
|
||||||
|
})
|
||||||
|
|
||||||
|
log.Printf("[DEBUG] Deregistering task definition %s returned %#v", d.Id(), err)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func resourceAwsEcsTaskDefinitionVolumeHash(v interface{}) int {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
m := v.(map[string]interface{})
|
||||||
|
buf.WriteString(fmt.Sprintf("%s-", m["name"].(string)))
|
||||||
|
buf.WriteString(fmt.Sprintf("%s-", m["host_path"].(string)))
|
||||||
|
|
||||||
|
return hashcode.String(buf.String())
|
||||||
|
}
|
|
@ -0,0 +1,111 @@
|
||||||
|
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 TestAccAWSEcsTaskDefinition(t *testing.T) {
|
||||||
|
resource.Test(t, resource.TestCase{
|
||||||
|
PreCheck: func() { testAccPreCheck(t) },
|
||||||
|
Providers: testAccProviders,
|
||||||
|
CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy,
|
||||||
|
Steps: []resource.TestStep{
|
||||||
|
resource.TestStep{
|
||||||
|
Config: testAccAWSEcsTaskDefinition,
|
||||||
|
Check: resource.ComposeTestCheckFunc(
|
||||||
|
testAccCheckAWSEcsTaskDefinitionExists("aws_ecs_task_definition.jenkins"),
|
||||||
|
),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func testAccCheckAWSEcsTaskDefinitionDestroy(s *terraform.State) error {
|
||||||
|
conn := testAccProvider.Meta().(*AWSClient).ecsconn
|
||||||
|
|
||||||
|
for _, rs := range s.RootModule().Resources {
|
||||||
|
if rs.Type != "aws_ecs_task_definition" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
out, err := conn.DescribeTaskDefinition(&ecs.DescribeTaskDefinitionInput{
|
||||||
|
TaskDefinition: aws.String(rs.Primary.ID),
|
||||||
|
})
|
||||||
|
|
||||||
|
if err == nil {
|
||||||
|
if out.TaskDefinition != nil {
|
||||||
|
return fmt.Errorf("ECS task definition still exists:\n%#v", *out.TaskDefinition)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func testAccCheckAWSEcsTaskDefinitionExists(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 testAccAWSEcsTaskDefinition = `
|
||||||
|
resource "aws_ecs_task_definition" "jenkins" {
|
||||||
|
family = "jenkins"
|
||||||
|
container_definitions = <<TASK_DEFINITION
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"cpu": 10,
|
||||||
|
"command": ["sleep", "10"],
|
||||||
|
"entryPoint": ["/"],
|
||||||
|
"environment": [
|
||||||
|
{"name": "VARNAME", "value": "VARVAL"}
|
||||||
|
],
|
||||||
|
"essential": true,
|
||||||
|
"image": "jenkins",
|
||||||
|
"links": ["mongodb"],
|
||||||
|
"memory": 128,
|
||||||
|
"name": "jenkins",
|
||||||
|
"portMappings": [
|
||||||
|
{
|
||||||
|
"containerPort": 80,
|
||||||
|
"hostPort": 8080
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"cpu": 10,
|
||||||
|
"command": ["sleep", "10"],
|
||||||
|
"entryPoint": ["/"],
|
||||||
|
"essential": true,
|
||||||
|
"image": "mongodb",
|
||||||
|
"memory": 128,
|
||||||
|
"name": "mongodb",
|
||||||
|
"portMappings": [
|
||||||
|
{
|
||||||
|
"containerPort": 28017,
|
||||||
|
"hostPort": 28017
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
TASK_DEFINITION
|
||||||
|
|
||||||
|
volume {
|
||||||
|
name = "jenkins-home"
|
||||||
|
host_path = "/ecs/jenkins-home"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`
|
|
@ -1,12 +1,15 @@
|
||||||
package aws
|
package aws
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/aws/aws-sdk-go/aws"
|
"github.com/aws/aws-sdk-go/aws"
|
||||||
"github.com/aws/aws-sdk-go/service/ec2"
|
"github.com/aws/aws-sdk-go/service/ec2"
|
||||||
|
"github.com/aws/aws-sdk-go/service/ecs"
|
||||||
"github.com/aws/aws-sdk-go/service/elb"
|
"github.com/aws/aws-sdk-go/service/elb"
|
||||||
"github.com/aws/aws-sdk-go/service/rds"
|
"github.com/aws/aws-sdk-go/service/rds"
|
||||||
"github.com/aws/aws-sdk-go/service/route53"
|
"github.com/aws/aws-sdk-go/service/route53"
|
||||||
|
@ -42,6 +45,42 @@ func expandListeners(configured []interface{}) ([]*elb.Listener, error) {
|
||||||
return listeners, nil
|
return listeners, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Takes the result of flatmap. Expand for an array of listeners and
|
||||||
|
// returns ECS Volume compatible objects
|
||||||
|
func expandEcsVolumes(configured []interface{}) ([]*ecs.Volume, error) {
|
||||||
|
volumes := make([]*ecs.Volume, 0, len(configured))
|
||||||
|
|
||||||
|
// Loop over our configured volumes and create
|
||||||
|
// an array of aws-sdk-go compatible objects
|
||||||
|
for _, lRaw := range configured {
|
||||||
|
data := lRaw.(map[string]interface{})
|
||||||
|
|
||||||
|
l := &ecs.Volume{
|
||||||
|
Name: aws.String(data["name"].(string)),
|
||||||
|
Host: &ecs.HostVolumeProperties{
|
||||||
|
SourcePath: aws.String(data["host_path"].(string)),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
volumes = append(volumes, l)
|
||||||
|
}
|
||||||
|
|
||||||
|
return volumes, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Takes JSON in a string. Decodes JSON into
|
||||||
|
// an array of ecs.ContainerDefinition compatible objects
|
||||||
|
func expandEcsContainerDefinitions(rawDefinitions string) ([]*ecs.ContainerDefinition, error) {
|
||||||
|
var definitions []*ecs.ContainerDefinition
|
||||||
|
|
||||||
|
err := json.Unmarshal([]byte(rawDefinitions), &definitions)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("Error decoding JSON: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return definitions, nil
|
||||||
|
}
|
||||||
|
|
||||||
// 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
|
||||||
|
@ -215,6 +254,44 @@ func flattenListeners(list []*elb.ListenerDescription) []map[string]interface{}
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Flattens an array of Volumes into a []map[string]interface{}
|
||||||
|
func flattenEcsVolumes(list []*ecs.Volume) []map[string]interface{} {
|
||||||
|
result := make([]map[string]interface{}, 0, len(list))
|
||||||
|
for _, volume := range list {
|
||||||
|
l := map[string]interface{}{
|
||||||
|
"name": *volume.Name,
|
||||||
|
"host_path": *volume.Host.SourcePath,
|
||||||
|
}
|
||||||
|
result = append(result, l)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
// Flattens an array of ECS LoadBalancers into a []map[string]interface{}
|
||||||
|
func flattenEcsLoadBalancers(list []*ecs.LoadBalancer) []map[string]interface{} {
|
||||||
|
result := make([]map[string]interface{}, 0, len(list))
|
||||||
|
for _, loadBalancer := range list {
|
||||||
|
l := map[string]interface{}{
|
||||||
|
"elb_name": *loadBalancer.LoadBalancerName,
|
||||||
|
"container_name": *loadBalancer.ContainerName,
|
||||||
|
"container_port": *loadBalancer.ContainerPort,
|
||||||
|
}
|
||||||
|
result = append(result, l)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
// Encodes an array of ecs.ContainerDefinitions into a JSON string
|
||||||
|
func flattenEcsContainerDefinitions(definitions []*ecs.ContainerDefinition) (string, error) {
|
||||||
|
byteArray, err := json.Marshal(definitions)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("Error encoding to JSON: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
n := bytes.Index(byteArray, []byte{0})
|
||||||
|
return string(byteArray[:n]), nil
|
||||||
|
}
|
||||||
|
|
||||||
// Flattens an array of Parameters into a []map[string]interface{}
|
// Flattens an array of Parameters into a []map[string]interface{}
|
||||||
func flattenParameters(list []*rds.Parameter) []map[string]interface{} {
|
func flattenParameters(list []*rds.Parameter) []map[string]interface{} {
|
||||||
result := make([]map[string]interface{}, 0, len(list))
|
result := make([]map[string]interface{}, 0, len(list))
|
||||||
|
|
Loading…
Reference in New Issue