-
Notifications
You must be signed in to change notification settings - Fork 9.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
New Resource: aws_iot_thing #3521
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "log" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/service/iot" | ||
| "github.com/hashicorp/terraform/helper/schema" | ||
| "github.com/hashicorp/terraform/helper/validation" | ||
| ) | ||
|
|
||
| func resourceAwsIotThing() *schema.Resource { | ||
| return &schema.Resource{ | ||
| Create: resourceAwsIotThingCreate, | ||
| Read: resourceAwsIotThingRead, | ||
| Update: resourceAwsIotThingUpdate, | ||
| Delete: resourceAwsIotThingDelete, | ||
|
|
||
| Importer: &schema.ResourceImporter{ | ||
| State: schema.ImportStatePassthrough, | ||
| }, | ||
|
|
||
| Schema: map[string]*schema.Schema{ | ||
| "name": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| ValidateFunc: validation.StringLenBetween(1, 128), | ||
| }, | ||
| "attributes": { | ||
| Type: schema.TypeMap, | ||
| Optional: true, | ||
| }, | ||
| "thing_type_name": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| ValidateFunc: validation.StringLenBetween(1, 128), | ||
| }, | ||
| "default_client_id": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "version": { | ||
| Type: schema.TypeInt, | ||
| Computed: true, | ||
| }, | ||
| "arn": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func resourceAwsIotThingCreate(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).iotconn | ||
|
|
||
| params := &iot.CreateThingInput{ | ||
| ThingName: aws.String(d.Get("name").(string)), | ||
| } | ||
|
|
||
| if v, ok := d.GetOk("thing_type_name"); ok { | ||
| params.ThingTypeName = aws.String(v.(string)) | ||
| } | ||
| if v, ok := d.GetOk("attributes"); ok { | ||
| params.AttributePayload = &iot.AttributePayload{ | ||
| Attributes: stringMapToPointers(v.(map[string]interface{})), | ||
| } | ||
| } | ||
|
|
||
| log.Printf("[DEBUG] Creating IoT Thing: %s", params) | ||
| out, err := conn.CreateThing(params) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| d.SetId(*out.ThingName) | ||
|
|
||
| return resourceAwsIotThingRead(d, meta) | ||
| } | ||
|
|
||
| func resourceAwsIotThingRead(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).iotconn | ||
|
|
||
| params := &iot.DescribeThingInput{ | ||
| ThingName: aws.String(d.Id()), | ||
| } | ||
| log.Printf("[DEBUG] Reading IoT Thing: %s", params) | ||
| out, err := conn.DescribeThing(params) | ||
|
|
||
| if err != nil { | ||
| if isAWSErr(err, iot.ErrCodeResourceNotFoundException, "") { | ||
| log.Printf("[WARN] IoT Thing %q not found, removing from state", d.Id()) | ||
| d.SetId("") | ||
| } | ||
| return err | ||
| } | ||
|
|
||
| log.Printf("[DEBUG] Received IoT Thing: %s", out) | ||
|
|
||
| d.Set("arn", out.ThingArn) | ||
| d.Set("name", out.ThingName) | ||
| d.Set("attributes", aws.StringValueMap(out.Attributes)) | ||
| d.Set("default_client_id", out.DefaultClientId) | ||
| d.Set("thing_type_name", out.ThingTypeName) | ||
| d.Set("version", out.Version) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func resourceAwsIotThingUpdate(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).iotconn | ||
|
|
||
| params := &iot.UpdateThingInput{ | ||
| ThingName: aws.String(d.Get("name").(string)), | ||
| } | ||
| if d.HasChange("thing_type_name") { | ||
| if v, ok := d.GetOk("thing_type_name"); ok { | ||
| params.ThingTypeName = aws.String(v.(string)) | ||
| } else { | ||
| params.RemoveThingType = aws.Bool(true) | ||
| } | ||
| } | ||
| if d.HasChange("attributes") { | ||
| attributes := map[string]*string{} | ||
|
|
||
| if v, ok := d.GetOk("attributes"); ok { | ||
| if m, ok := v.(map[string]interface{}); ok { | ||
| attributes = stringMapToPointers(m) | ||
| } | ||
| } | ||
| params.AttributePayload = &iot.AttributePayload{ | ||
| Attributes: attributes, | ||
| } | ||
| } | ||
|
|
||
| _, err := conn.UpdateThing(params) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return resourceAwsIotThingRead(d, meta) | ||
| } | ||
|
|
||
| func resourceAwsIotThingDelete(d *schema.ResourceData, meta interface{}) error { | ||
| conn := meta.(*AWSClient).iotconn | ||
|
|
||
| params := &iot.DeleteThingInput{ | ||
| ThingName: aws.String(d.Id()), | ||
| } | ||
| log.Printf("[DEBUG] Deleting IoT Thing: %s", params) | ||
|
|
||
| _, err := conn.DeleteThing(params) | ||
| if err != nil { | ||
| if isAWSErr(err, iot.ErrCodeResourceNotFoundException, "") { | ||
| return nil | ||
| } | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,195 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/service/iot" | ||
| "github.com/hashicorp/terraform/helper/acctest" | ||
| "github.com/hashicorp/terraform/helper/resource" | ||
| "github.com/hashicorp/terraform/terraform" | ||
| ) | ||
|
|
||
| func TestAccAWSIotThing_basic(t *testing.T) { | ||
| var thing iot.DescribeThingOutput | ||
| rString := acctest.RandString(8) | ||
| thingName := fmt.Sprintf("tf_acc_thing_%s", rString) | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testAccCheckAWSIotThingDestroy, | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: testAccAWSIotThingConfig_basic(thingName), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckIotThingExists("aws_iot_thing.test", &thing), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "name", thingName), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "attributes.%", "0"), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "thing_type_name", ""), | ||
| resource.TestCheckResourceAttrSet("aws_iot_thing.test", "arn"), | ||
| resource.TestCheckResourceAttrSet("aws_iot_thing.test", "default_client_id"), | ||
| resource.TestCheckResourceAttrSet("aws_iot_thing.test", "version"), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccAWSIotThing_full(t *testing.T) { | ||
| var thing iot.DescribeThingOutput | ||
| rString := acctest.RandString(8) | ||
| thingName := fmt.Sprintf("tf_acc_thing_%s", rString) | ||
| typeName := fmt.Sprintf("tf_acc_type_%s", rString) | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testAccCheckAWSIotThingDestroy, | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: testAccAWSIotThingConfig_full(thingName, typeName, "42"), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckIotThingExists("aws_iot_thing.test", &thing), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "name", thingName), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "thing_type_name", typeName), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "attributes.%", "3"), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "attributes.One", "11111"), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "attributes.Two", "TwoTwo"), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "attributes.Answer", "42"), | ||
| resource.TestCheckResourceAttrSet("aws_iot_thing.test", "arn"), | ||
| resource.TestCheckResourceAttrSet("aws_iot_thing.test", "default_client_id"), | ||
| resource.TestCheckResourceAttrSet("aws_iot_thing.test", "version"), | ||
| ), | ||
| }, | ||
| { // Update attribute | ||
| Config: testAccAWSIotThingConfig_full(thingName, typeName, "differentOne"), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckIotThingExists("aws_iot_thing.test", &thing), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "name", thingName), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "thing_type_name", typeName), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "attributes.%", "3"), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "attributes.One", "11111"), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "attributes.Two", "TwoTwo"), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "attributes.Answer", "differentOne"), | ||
| resource.TestCheckResourceAttrSet("aws_iot_thing.test", "arn"), | ||
| resource.TestCheckResourceAttrSet("aws_iot_thing.test", "default_client_id"), | ||
| resource.TestCheckResourceAttrSet("aws_iot_thing.test", "version"), | ||
| ), | ||
| }, | ||
| { // Remove thing type association | ||
| Config: testAccAWSIotThingConfig_basic(thingName), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckIotThingExists("aws_iot_thing.test", &thing), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "name", thingName), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "attributes.%", "0"), | ||
| resource.TestCheckResourceAttr("aws_iot_thing.test", "thing_type_name", ""), | ||
| resource.TestCheckResourceAttrSet("aws_iot_thing.test", "arn"), | ||
| resource.TestCheckResourceAttrSet("aws_iot_thing.test", "default_client_id"), | ||
| resource.TestCheckResourceAttrSet("aws_iot_thing.test", "version"), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccAWSIotThing_importBasic(t *testing.T) { | ||
| resourceName := "aws_iot_thing.test" | ||
| rString := acctest.RandString(8) | ||
| thingName := fmt.Sprintf("tf_acc_thing_%s", rString) | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testAccCheckAWSIotThingTypeDestroy, | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: testAccAWSIotThingConfig_basic(thingName), | ||
| }, | ||
| { | ||
| ResourceName: resourceName, | ||
| ImportState: true, | ||
| ImportStateVerify: true, | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func testAccCheckIotThingExists(n string, thing *iot.DescribeThingOutput) 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 IoT Thing ID is set") | ||
| } | ||
|
|
||
| conn := testAccProvider.Meta().(*AWSClient).iotconn | ||
| params := &iot.DescribeThingInput{ | ||
| ThingName: aws.String(rs.Primary.ID), | ||
| } | ||
| resp, err := conn.DescribeThing(params) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| *thing = *resp | ||
|
|
||
| return nil | ||
| } | ||
| } | ||
|
|
||
| func testAccCheckAWSIotThingDestroy(s *terraform.State) error { | ||
| conn := testAccProvider.Meta().(*AWSClient).iotconn | ||
|
|
||
| for _, rs := range s.RootModule().Resources { | ||
| if rs.Type != "aws_iot_thing" { | ||
| continue | ||
| } | ||
|
|
||
| params := &iot.DescribeThingInput{ | ||
| ThingName: aws.String(rs.Primary.ID), | ||
| } | ||
|
|
||
| _, err := conn.DescribeThing(params) | ||
| if err != nil { | ||
| if isAWSErr(err, iot.ErrCodeResourceNotFoundException, "") { | ||
| return nil | ||
| } | ||
| return err | ||
| } | ||
| return fmt.Errorf("Expected IoT Thing to be destroyed, %s found", rs.Primary.ID) | ||
|
|
||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func testAccAWSIotThingConfig_basic(thingName string) string { | ||
| return fmt.Sprintf(` | ||
| resource "aws_iot_thing" "test" { | ||
| name = "%s" | ||
| } | ||
| `, thingName) | ||
| } | ||
|
|
||
| func testAccAWSIotThingConfig_full(thingName, typeName, answer string) string { | ||
| return fmt.Sprintf(` | ||
| resource "aws_iot_thing" "test" { | ||
| name = "%s" | ||
| attributes { | ||
| One = "11111" | ||
| Two = "TwoTwo" | ||
| Answer = "%s" | ||
| } | ||
| thing_type_name = "${aws_iot_thing_type.test.name}" | ||
| } | ||
|
|
||
| resource "aws_iot_thing_type" "test" { | ||
| name = "%s" | ||
| } | ||
| `, thingName, answer, typeName) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Aw shucks - just missing a
return errin here, otherwise we print out the wrong message below