Skip to content

Commit

Permalink
Merge branch 'mudlark-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@bflad
bflad committed Oct 25, 2019
2 parents 54c6724 + 4b29de1 commit fc0e06b
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 58 deletions.
76 changes: 25 additions & 51 deletions aws/resource_aws_cloudhsm2_cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ package aws

import (
"fmt"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"log"
"time"

"github.com/hashicorp/terraform-plugin-sdk/helper/schema"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/cloudhsmv2"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags"
)

func resourceAwsCloudHsm2Cluster() *schema.Resource {
Expand Down Expand Up @@ -212,16 +212,19 @@ func resourceAwsCloudHsm2ClusterCreate(d *schema.ResourceData, meta interface{})
}
}

if err := setTagsAwsCloudHsm2Cluster(cloudhsm2, d); err != nil {
return err
if v := d.Get("tags").(map[string]interface{}); len(v) > 0 {
if err := keyvaluetags.Cloudhsmv2UpdateTags(cloudhsm2, d.Id(), nil, v); err != nil {
return fmt.Errorf("error updating tags: %s", err)
}
}

return resourceAwsCloudHsm2ClusterRead(d, meta)
}

func resourceAwsCloudHsm2ClusterRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).cloudhsmv2conn

cluster, err := describeCloudHsm2Cluster(meta.(*AWSClient).cloudhsmv2conn, d.Id())
cluster, err := describeCloudHsm2Cluster(conn, d.Id())

if cluster == nil {
log.Printf("[WARN] CloudHSMv2 Cluster (%s) not found", d.Id())
Expand Down Expand Up @@ -249,14 +252,27 @@ func resourceAwsCloudHsm2ClusterRead(d *schema.ResourceData, meta interface{}) e
return fmt.Errorf("Error saving Subnet IDs to state for CloudHSMv2 Cluster (%s): %s", d.Id(), err)
}

tags, err := keyvaluetags.Cloudhsmv2ListTags(conn, d.Id())

if err != nil {
return fmt.Errorf("error listing tags for resource (%s): %s", d.Id(), err)
}

if err := d.Set("tags", tags.IgnoreAws().Map()); err != nil {
return fmt.Errorf("error setting tags: %s", err)
}

return nil
}

func resourceAwsCloudHsm2ClusterUpdate(d *schema.ResourceData, meta interface{}) error {
cloudhsm2 := meta.(*AWSClient).cloudhsmv2conn
conn := meta.(*AWSClient).cloudhsmv2conn

if err := setTagsAwsCloudHsm2Cluster(cloudhsm2, d); err != nil {
return err
if d.HasChange("tags") {
o, n := d.GetChange("tags")
if err := keyvaluetags.Cloudhsmv2UpdateTags(conn, d.Id(), o, n); err != nil {
return fmt.Errorf("error updating tags: %s", err)
}
}

return resourceAwsCloudHsm2ClusterRead(d, meta)
Expand Down Expand Up @@ -296,48 +312,6 @@ func resourceAwsCloudHsm2ClusterDelete(d *schema.ResourceData, meta interface{})
return nil
}

func setTagsAwsCloudHsm2Cluster(conn *cloudhsmv2.CloudHSMV2, d *schema.ResourceData) error {
if d.HasChange("tags") {
oraw, nraw := d.GetChange("tags")
create, remove := diffTagsGeneric(oraw.(map[string]interface{}), nraw.(map[string]interface{}))

if len(remove) > 0 {
log.Printf("[DEBUG] Removing tags: %#v", remove)
keys := make([]*string, 0, len(remove))
for k := range remove {
keys = append(keys, aws.String(k))
}

_, err := conn.UntagResource(&cloudhsmv2.UntagResourceInput{
ResourceId: aws.String(d.Id()),
TagKeyList: keys,
})
if err != nil {
return err
}
}
if len(create) > 0 {
log.Printf("[DEBUG] Creating tags: %#v", create)
tagList := make([]*cloudhsmv2.Tag, 0, len(create))
for k, v := range create {
tagList = append(tagList, &cloudhsmv2.Tag{
Key: &k,
Value: v,
})
}
_, err := conn.TagResource(&cloudhsmv2.TagResourceInput{
ResourceId: aws.String(d.Id()),
TagList: tagList,
})
if err != nil {
return err
}
}
}

return nil
}

func readCloudHsm2ClusterCertificates(cluster *cloudhsmv2.Cluster) []map[string]interface{} {
certs := map[string]interface{}{}
if cluster.Certificates != nil {
Expand Down
85 changes: 78 additions & 7 deletions aws/resource_aws_cloudhsm2_cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/cloudhsmv2"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
)
Expand Down Expand Up @@ -85,32 +84,77 @@ func testSweepCloudhsmv2Clusters(region string) error {
}

func TestAccAWSCloudHsm2Cluster_basic(t *testing.T) {
resource.Test(t, resource.TestCase{
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSCloudHsm2ClusterDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSCloudHsm2Cluster(),
Config: testAccAWSCloudHsm2ClusterConfig(),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSCloudHsm2ClusterExists("aws_cloudhsm_v2_cluster.cluster"),
resource.TestCheckResourceAttrSet("aws_cloudhsm_v2_cluster.cluster", "cluster_id"),
resource.TestCheckResourceAttrSet("aws_cloudhsm_v2_cluster.cluster", "vpc_id"),
resource.TestCheckResourceAttrSet("aws_cloudhsm_v2_cluster.cluster", "security_group_id"),
resource.TestCheckResourceAttrSet("aws_cloudhsm_v2_cluster.cluster", "cluster_state"),
resource.TestCheckResourceAttr("aws_cloudhsm_v2_cluster.cluster", "tags.%", "0"),
),
},
{
ResourceName: "aws_cloudhsm_v2_cluster.cluster",
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"cluster_certificates", "tags"},
ImportStateVerifyIgnore: []string{"cluster_certificates"},
},
},
})
}

func testAccAWSCloudHsm2Cluster() string {
func TestAccAWSCloudHsm2Cluster_Tags(t *testing.T) {
resourceName := "aws_cloudhsm_v2_cluster.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSCloudHsm2ClusterDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSCloudHsm2ClusterConfigTags2("key1", "value1", "key2", "value2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSCloudHsm2ClusterExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "tags.%", "2"),
resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"),
resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"cluster_certificates"},
},
{
Config: testAccAWSCloudHsm2ClusterConfigTags1("key1", "value1updated"),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSCloudHsm2ClusterExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"),
),
},
{
Config: testAccAWSCloudHsm2ClusterConfigTags2("key1", "value1updated", "key3", "value3"),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSCloudHsm2ClusterExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "tags.%", "2"),
resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1updated"),
resource.TestCheckResourceAttr(resourceName, "tags.key3", "value3"),
),
},
},
})
}

func testAccAWSCloudHsm2ClusterConfigBase() string {
return fmt.Sprintf(`
variable "subnets" {
default = ["10.0.1.0/24", "10.0.2.0/24"]
Expand Down Expand Up @@ -138,16 +182,43 @@ resource "aws_subnet" "cloudhsm2_test_subnets" {
Name = "tf-acc-aws_cloudhsm_v2_cluster-resource-basic"
}
}
`)
}

func testAccAWSCloudHsm2ClusterConfig() string {
return testAccAWSCloudHsm2ClusterConfigBase() + fmt.Sprintf(`
resource "aws_cloudhsm_v2_cluster" "cluster" {
hsm_type = "hsm1.medium"
subnet_ids = ["${aws_subnet.cloudhsm2_test_subnets.*.id[0]}", "${aws_subnet.cloudhsm2_test_subnets.*.id[1]}"]
}
`)
}

func testAccAWSCloudHsm2ClusterConfigTags1(tagKey1, tagValue1 string) string {
return testAccAWSCloudHsm2ClusterConfigBase() + fmt.Sprintf(`
resource "aws_cloudhsm_v2_cluster" "test" {
hsm_type = "hsm1.medium"
subnet_ids = ["${aws_subnet.cloudhsm2_test_subnets.*.id[0]}", "${aws_subnet.cloudhsm2_test_subnets.*.id[1]}"]
tags = {
%[1]q = %[2]q
}
}
`, tagKey1, tagValue1)
}

func testAccAWSCloudHsm2ClusterConfigTags2(tagKey1, tagValue1, tagKey2, tagValue2 string) string {
return testAccAWSCloudHsm2ClusterConfigBase() + fmt.Sprintf(`
resource "aws_cloudhsm_v2_cluster" "test" {
hsm_type = "hsm1.medium"
subnet_ids = ["${aws_subnet.cloudhsm2_test_subnets.*.id[0]}", "${aws_subnet.cloudhsm2_test_subnets.*.id[1]}"]
tags = {
Name = "tf-acc-aws_cloudhsm_v2_cluster-resource-basic-%d"
%[1]q = %[2]q
%[3]q = %[4]q
}
}
`, acctest.RandInt())
`, tagKey1, tagValue1, tagKey2, tagValue2)
}

func testAccCheckAWSCloudHsm2ClusterDestroy(s *terraform.State) error {
Expand Down

0 comments on commit fc0e06b

Please sign in to comment.