From 609673689f9dc9d7a33f4830b6d6d89f974553ca Mon Sep 17 00:00:00 2001 From: kuroseets Date: Sat, 5 Dec 2020 10:11:54 +0900 Subject: [PATCH 1/2] change from the one that created the ssm params arn to the one that is passed --- aws/data_source_aws_ssm_parameter.go | 12 +----------- aws/resource_aws_ssm_parameter.go | 11 +---------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/aws/data_source_aws_ssm_parameter.go b/aws/data_source_aws_ssm_parameter.go index c76575ef5ac9..fa0c999d62f5 100644 --- a/aws/data_source_aws_ssm_parameter.go +++ b/aws/data_source_aws_ssm_parameter.go @@ -3,10 +3,8 @@ package aws import ( "fmt" "log" - "strings" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/arn" "github.com/aws/aws-sdk-go/service/ssm" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) @@ -64,15 +62,7 @@ func dataAwsSsmParameterRead(d *schema.ResourceData, meta interface{}) error { param := resp.Parameter d.SetId(*param.Name) - - arn := arn.ARN{ - Partition: meta.(*AWSClient).partition, - Region: meta.(*AWSClient).region, - Service: "ssm", - AccountID: meta.(*AWSClient).accountid, - Resource: fmt.Sprintf("parameter/%s", strings.TrimPrefix(d.Id(), "/")), - } - d.Set("arn", arn.String()) + d.Set("arn", param.ARN) d.Set("name", param.Name) d.Set("type", param.Type) d.Set("value", param.Value) diff --git a/aws/resource_aws_ssm_parameter.go b/aws/resource_aws_ssm_parameter.go index d577a47bddeb..6e768879ad89 100644 --- a/aws/resource_aws_ssm_parameter.go +++ b/aws/resource_aws_ssm_parameter.go @@ -4,11 +4,9 @@ import ( "context" "fmt" "log" - "strings" "time" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/arn" "github.com/aws/aws-sdk-go/service/ssm" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" @@ -197,14 +195,7 @@ func resourceAwsSsmParameterRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error setting tags: %s", err) } - arn := arn.ARN{ - Partition: meta.(*AWSClient).partition, - Region: meta.(*AWSClient).region, - Service: "ssm", - AccountID: meta.(*AWSClient).accountid, - Resource: fmt.Sprintf("parameter/%s", strings.TrimPrefix(d.Id(), "/")), - } - d.Set("arn", arn.String()) + d.Set("arn", param.ARN) return nil } From e0266224a45b6acad6c33156f88ca85dcfcd0347 Mon Sep 17 00:00:00 2001 From: kuroseets Date: Sun, 6 Dec 2020 19:56:55 +0900 Subject: [PATCH 2/2] fmt fix --- aws/resource_aws_ssm_parameter.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/resource_aws_ssm_parameter.go b/aws/resource_aws_ssm_parameter.go index 6e768879ad89..b085eee40804 100644 --- a/aws/resource_aws_ssm_parameter.go +++ b/aws/resource_aws_ssm_parameter.go @@ -195,7 +195,7 @@ func resourceAwsSsmParameterRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("error setting tags: %s", err) } - d.Set("arn", param.ARN) + d.Set("arn", param.ARN) return nil }