Prefered the use of validateArnIfSet instead of validateArn for kms_k…

…ey attributes
hashicorp · Dec 19, 2016 · c02105a · c02105a
1 parent b136b59
commit c02105a
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 14 deletions.
diff --git a/builtin/providers/aws/resource_aws_ami_copy.go b/builtin/providers/aws/resource_aws_ami_copy.go
@@ -32,10 +32,11 @@ func resourceAwsAmiCopy() *schema.Resource {
 	}
 
 	resourceSchema["kms_key_id"] = &schema.Schema{
-		Type:     schema.TypeString,
-		Optional: true,
-		Computed: true,
-		ForceNew: true,
+		Type:         schema.TypeString,
+		Optional:     true,
+		Computed:     true,
+		ForceNew:     true,
+		ValidateFunc: validateArnIfSet,
 	}
 
 	return &schema.Resource{

diff --git a/builtin/providers/aws/resource_aws_cloudtrail.go b/builtin/providers/aws/resource_aws_cloudtrail.go
@@ -68,7 +68,7 @@ func resourceAwsCloudTrail() *schema.Resource {
 			"kms_key_id": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				ValidateFunc: validateArn,
+				ValidateFunc: validateArnIfSet,
 			},
 			"home_region": {
 				Type:     schema.TypeString,

diff --git a/builtin/providers/aws/resource_aws_db_instance.go b/builtin/providers/aws/resource_aws_db_instance.go
@@ -309,7 +309,7 @@ func resourceAwsDbInstance() *schema.Resource {
 				Optional:     true,
 				Computed:     true,
 				ForceNew:     true,
-				ValidateFunc: validateArn,
+				ValidateFunc: validateArnIfSet,
 			},
 
 			"tags": tagsSchema(),

diff --git a/builtin/providers/aws/resource_aws_ebs_volume.go b/builtin/providers/aws/resource_aws_ebs_volume.go
@@ -47,7 +47,7 @@ func resourceAwsEbsVolume() *schema.Resource {
 				Optional:     true,
 				Computed:     true,
 				ForceNew:     true,
-				ValidateFunc: validateArn,
+				ValidateFunc: validateArnIfSet,
 			},
 			"size": {
 				Type:     schema.TypeInt,

diff --git a/builtin/providers/aws/resource_aws_elastic_transcoder_pipeline.go b/builtin/providers/aws/resource_aws_elastic_transcoder_pipeline.go
@@ -28,7 +28,7 @@ func resourceAwsElasticTranscoderPipeline() *schema.Resource {
 			"aws_kms_key_arn": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				ValidateFunc: validateArn,
+				ValidateFunc: validateArnIfSet,
 			},
 
 			// ContentConfig also requires ThumbnailConfig

diff --git a/builtin/providers/aws/resource_aws_kinesis_firehose_delivery_stream.go b/builtin/providers/aws/resource_aws_kinesis_firehose_delivery_stream.go
@@ -152,7 +152,7 @@ func resourceAwsKinesisFirehoseDeliveryStream() *schema.Resource {
 						"kms_key_arn": {
 							Type:         schema.TypeString,
 							Optional:     true,
-							ValidateFunc: validateArn,
+							ValidateFunc: validateArnIfSet,
 						},
 
 						"role_arn": {

diff --git a/builtin/providers/aws/resource_aws_lambda_function.go b/builtin/providers/aws/resource_aws_lambda_function.go
@@ -158,7 +158,7 @@ func resourceAwsLambdaFunction() *schema.Resource {
 			"kms_key_arn": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				ValidateFunc: validateArn,
+				ValidateFunc: validateArnIfSet,
 			},
 		},
 	}

diff --git a/builtin/providers/aws/resource_aws_rds_cluster.go b/builtin/providers/aws/resource_aws_rds_cluster.go
@@ -196,7 +196,7 @@ func resourceAwsRDSCluster() *schema.Resource {
 				Optional:     true,
 				Computed:     true,
 				ForceNew:     true,
-				ValidateFunc: validateArn,
+				ValidateFunc: validateArnIfSet,
 			},
 
 			"tags": tagsSchema(),

diff --git a/builtin/providers/aws/resource_aws_redshift_cluster.go b/builtin/providers/aws/resource_aws_redshift_cluster.go
@@ -170,7 +170,7 @@ func resourceAwsRedshiftCluster() *schema.Resource {
 				Optional:     true,
 				Computed:     true,
 				ForceNew:     true,
-				ValidateFunc: validateArn,
+				ValidateFunc: validateArnIfSet,
 			},
 
 			"elastic_ip": {

diff --git a/builtin/providers/aws/resource_aws_s3_bucket_object.go b/builtin/providers/aws/resource_aws_s3_bucket_object.go
@@ -92,7 +92,7 @@ func resourceAwsS3BucketObject() *schema.Resource {
 			"kms_key_id": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				ValidateFunc: validateArn,
+				ValidateFunc: validateArnIfSet,
 			},
 
 			"etag": {

diff --git a/builtin/providers/aws/resource_aws_ses_receipt_rule.go b/builtin/providers/aws/resource_aws_ses_receipt_rule.go
@@ -211,7 +211,7 @@ func resourceAwsSesReceiptRule() *schema.Resource {
 						"kms_key_arn": {
 							Type:         schema.TypeString,
 							Optional:     true,
-							ValidateFunc: validateArn,
+							ValidateFunc: validateArnIfSet,
 						},
 
 						"object_key_prefix": {