Added Step Function resources (State Machine & Activity)

builtin/providers/aws/import_aws_sfn_activity_test.go

@@ -0,0 +1,30 @@
+package aws
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccAWSSfnActivity_importBasic(t *testing.T) {
+	resourceName := "aws_sfn_activity.foo"
+	rName := acctest.RandString(10)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSSfnActivityDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAWSSfnActivityBasicConfig(rName),
+			},
+
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}

builtin/providers/aws/provider.go

@@ -381,6 +381,8 @@ func Provider() terraform.ResourceProvider {
 			"aws_sns_topic":                                resourceAwsSnsTopic(),
 			"aws_sns_topic_policy":                         resourceAwsSnsTopicPolicy(),
 			"aws_sns_topic_subscription":                   resourceAwsSnsTopicSubscription(),
+			"aws_sfn_activity":                             resourceAwsSfnActivity(),
+			"aws_sfn_state_machine":                        resourceAwsSfnStateMachine(),
 			"aws_subnet":                                   resourceAwsSubnet(),
 			"aws_volume_attachment":                        resourceAwsVolumeAttachment(),
 			"aws_vpc_dhcp_options_association":             resourceAwsVpcDhcpOptionsAssociation(),

builtin/providers/aws/resource_aws_sfn_activity.go

@@ -0,0 +1,97 @@
+package aws
+
+import (
+	"fmt"
+	"log"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/service/sfn"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/helper/schema"
+)
+
+func resourceAwsSfnActivity() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAwsSfnActivityCreate,
+		Read:   resourceAwsSfnActivityRead,
+		Delete: resourceAwsSfnActivityDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validateSfnActivityName,
+			},
+
+			"creation_date": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func resourceAwsSfnActivityCreate(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).sfnconn
+	log.Print("[DEBUG] Creating Step Function Activity")
+
+	params := &sfn.CreateActivityInput{
+		Name: aws.String(d.Get("name").(string)),
+	}
+
+	activity, err := conn.CreateActivity(params)
+	if err != nil {
+		return fmt.Errorf("Error creating Step Function Activity: %s", err)
+	}
+
+	d.SetId(*activity.ActivityArn)
+
+	return resourceAwsSfnActivityRead(d, meta)
+}
+
+func resourceAwsSfnActivityRead(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).sfnconn
+	log.Printf("[DEBUG] Reading Step Function Activity: %s", d.Id())
+
+	sm, err := conn.DescribeActivity(&sfn.DescribeActivityInput{
+		ActivityArn: aws.String(d.Id()),
+	})
+	if err != nil {
+		if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "ActivityDoesNotExist" {
+			d.SetId("")
+			return nil
+		}
+		return err
+	}
+
+	d.Set("name", sm.Name)
+
+	if err := d.Set("creation_date", sm.CreationDate.Format(time.RFC3339)); err != nil {
+		log.Printf("[DEBUG] Error setting creation_date: %s", err)
+	}
+
+	return nil
+}
+
+func resourceAwsSfnActivityDelete(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).sfnconn
+	log.Printf("[DEBUG] Deleting Step Functions Activity: %s", d.Id())
+
+	return resource.Retry(5*time.Minute, func() *resource.RetryError {
+		_, err := conn.DeleteActivity(&sfn.DeleteActivityInput{
+			ActivityArn: aws.String(d.Id()),
+		})
+
+		if err == nil {
+			return nil
+		}
+
+		return resource.NonRetryableError(err)
+	})
+}

builtin/providers/aws/resource_aws_sfn_activity_test.go

@@ -0,0 +1,106 @@
+package aws
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/service/sfn"
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+	"time"
+)
+
+func TestAccAWSSfnActivity_basic(t *testing.T) {
+	name := acctest.RandString(10)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSSfnActivityDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAWSSfnActivityBasicConfig(name),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSSfnActivityExists("aws_sfn_activity.foo"),
+					resource.TestCheckResourceAttr("aws_sfn_activity.foo", "name", name),
+					resource.TestCheckResourceAttrSet("aws_sfn_activity.foo", "creation_date"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckAWSSfnActivityExists(n string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("Not found: %s", n)
+		}
+
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("No Step Function ID set")
+		}
+
+		conn := testAccProvider.Meta().(*AWSClient).sfnconn
+
+		_, err := conn.DescribeActivity(&sfn.DescribeActivityInput{
+			ActivityArn: aws.String(rs.Primary.ID),
+		})
+
+		if err != nil {
+			return err
+		}
+
+		return nil
+	}
+}
+
+func testAccCheckAWSSfnActivityDestroy(s *terraform.State) error {
+	conn := testAccProvider.Meta().(*AWSClient).sfnconn
+
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "aws_sfn_activity" {
+			continue
+		}
+
+		// Retrying as Read after Delete is not always consistent
+		retryErr := resource.Retry(1*time.Minute, func() *resource.RetryError {
+			var err error
+
+			_, err = conn.DescribeActivity(&sfn.DescribeActivityInput{
+				ActivityArn: aws.String(rs.Primary.ID),
+			})
+
+			if err != nil {
+				if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "ActivityDoesNotExist" {
+					return nil
+				}
+
+				return resource.NonRetryableError(err)
+			}
+
+			// If there are no errors, the removal failed
+			// and the object is not yet removed.
+			return resource.RetryableError(fmt.Errorf("Expected AWS Step Function Activity to be destroyed, but was still found, retrying"))
+		})
+
+		if retryErr != nil {
+			return retryErr
+		}
+
+		return nil
+	}
+
+	return fmt.Errorf("Default error in Step Function Test")
+}
+
+func testAccAWSSfnActivityBasicConfig(rName string) string {
+	return fmt.Sprintf(`
+resource "aws_sfn_activity" "foo" {
+  name = "%s"
+}
+`, rName)
+}

builtin/providers/aws/resource_aws_sfn_state_machine.go

@@ -0,0 +1,140 @@
+package aws
+
+import (
+	"log"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/service/sfn"
+	"github.com/hashicorp/errwrap"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/helper/schema"
+)
+
+func resourceAwsSfnStateMachine() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAwsSfnStateMachineCreate,
+		Read:   resourceAwsSfnStateMachineRead,
+		Delete: resourceAwsSfnStateMachineDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"definition": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validateSfnStateMachineDefinition,
+			},
+
+			"name": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validateSfnStateMachineName,
+			},
+
+			"role_arn": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validateArn,
+			},
+
+			"creation_date": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
+			"status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func resourceAwsSfnStateMachineCreate(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).sfnconn
+	log.Print("[DEBUG] Creating Step Function State Machine")
+
+	params := &sfn.CreateStateMachineInput{
+		Definition: aws.String(d.Get("definition").(string)),
+		Name:       aws.String(d.Get("name").(string)),
+		RoleArn:    aws.String(d.Get("role_arn").(string)),
+	}
+
+	var activity *sfn.CreateStateMachineOutput
+
+	err := resource.Retry(5*time.Minute, func() *resource.RetryError {
+		var err error
+		activity, err = conn.CreateStateMachine(params)
+
+		if err != nil {
+			// Note: the instance may be in a deleting mode, hence the retry
+			// when creating the step function. This can happen when we are
+			// updating the resource (since there is no update API call).
+			if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "StateMachineDeleting" {
+				return resource.RetryableError(err)
+			}
+
+			return resource.NonRetryableError(err)
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return errwrap.Wrapf("Error creating Step Function State Machine: {{err}}", err)
+	}
+
+	d.SetId(*activity.StateMachineArn)
+
+	return resourceAwsSfnStateMachineRead(d, meta)
+}
+
+func resourceAwsSfnStateMachineRead(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).sfnconn
+	log.Printf("[DEBUG] Reading Step Function State Machine: %s", d.Id())
+
+	sm, err := conn.DescribeStateMachine(&sfn.DescribeStateMachineInput{
+		StateMachineArn: aws.String(d.Id()),
+	})
+	if err != nil {
+		if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "NotFoundException" {
+			d.SetId("")
+			return nil
+		}
+		return err
+	}
+
+	d.Set("definition", sm.Definition)
+	d.Set("name", sm.Name)
+	d.Set("role_arn", sm.RoleArn)
+	d.Set("status", sm.Status)
+
+	if err := d.Set("creation_date", sm.CreationDate.Format(time.RFC3339)); err != nil {
+		log.Printf("[DEBUG] Error setting creation_date: %s", err)
+	}
+
+	return nil
+}
+
+func resourceAwsSfnStateMachineDelete(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).sfnconn
+	log.Printf("[DEBUG] Deleting Step Function State Machine: %s", d.Id())
+
+	return resource.Retry(5*time.Minute, func() *resource.RetryError {
+		_, err := conn.DeleteStateMachine(&sfn.DeleteStateMachineInput{
+			StateMachineArn: aws.String(d.Id()),
+		})
+
+		if err == nil {
+			return nil
+		}
+
+		return resource.NonRetryableError(err)
+	})
+}