additional removals

hashicorp · Apr 1, 2021 · a2759b8 · a2759b8
1 parent f0075a2
commit a2759b8
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 28 deletions.
diff --git a/aws/cloudfront_cache_policy_structure.go b/aws/cloudfront_cache_policy_structure.go
@@ -224,10 +224,10 @@ func setParametersConfig(parametersConfig *cloudfront.ParametersInCacheKeyAndFor
 }
 
 func setCloudFrontCachePolicy(d *schema.ResourceData, cachePolicy *cloudfront.CachePolicyConfig) {
-	d.Set("comment", aws.StringValue(cachePolicy.Comment))
-	d.Set("default_ttl", aws.Int64Value(cachePolicy.DefaultTTL))
-	d.Set("max_ttl", aws.Int64Value(cachePolicy.MaxTTL))
-	d.Set("min_ttl", aws.Int64Value(cachePolicy.MinTTL))
-	d.Set("name", aws.StringValue(cachePolicy.Name))
+	d.Set("comment", cachePolicy.Comment)
+	d.Set("default_ttl", cachePolicy.DefaultTTL)
+	d.Set("max_ttl", cachePolicy.MaxTTL)
+	d.Set("min_ttl", cachePolicy.MinTTL)
+	d.Set("name", cachePolicy.Name)
 	d.Set("parameters_in_cache_key_and_forwarded_to_origin", setParametersConfig(cachePolicy.ParametersInCacheKeyAndForwardedToOrigin))
 }
diff --git a/aws/resource_aws_acmpca_certificate.go b/aws/resource_aws_acmpca_certificate.go
@@ -185,8 +185,8 @@ func resourceAwsAcmpcaCertificateRead(d *schema.ResourceData, meta interface{})
 	}
 
 	d.Set("arn", d.Id())
-	d.Set("certificate", aws.StringValue(certificateOutput.Certificate))
-	d.Set("certificate_chain", aws.StringValue(certificateOutput.CertificateChain))
+	d.Set("certificate", certificateOutput.Certificate)
+	d.Set("certificate_chain", certificateOutput.CertificateChain)
 
 	return nil
 }

diff --git a/aws/resource_aws_acmpca_certificate_authority_certificate.go b/aws/resource_aws_acmpca_certificate_authority_certificate.go
@@ -82,8 +82,8 @@ func resourceAwsAcmpcaCertificateAuthorityCertificateRead(d *schema.ResourceData
 	}
 
 	d.Set("certificate_authority_arn", d.Id())
-	d.Set("certificate", aws.StringValue(output.Certificate))
-	d.Set("certificate_chain", aws.StringValue(output.CertificateChain))
+	d.Set("certificate", output.Certificate)
+	d.Set("certificate_chain", output.CertificateChain)
 
 	return nil
 }
diff --git a/aws/resource_aws_cloudfront_cache_policy.go b/aws/resource_aws_cloudfront_cache_policy.go
@@ -189,7 +189,7 @@ func resourceAwsCloudFrontCachePolicyRead(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	d.Set("etag", aws.StringValue(resp.ETag))
+	d.Set("etag", resp.ETag)
 
 	setCloudFrontCachePolicy(d, resp.CachePolicy.CachePolicyConfig)
 

diff --git a/aws/resource_aws_cloudfront_origin_request_policy.go b/aws/resource_aws_cloudfront_origin_request_policy.go
@@ -162,11 +162,11 @@ func resourceAwsCloudFrontOriginRequestPolicyRead(d *schema.ResourceData, meta i
 		return fmt.Errorf("error reading CloudFront Origin Request Policy (%s): empty response", d.Id())
 	}
 
-	d.Set("etag", aws.StringValue(resp.ETag))
+	d.Set("etag", resp.ETag)
 
 	originRequestPolicy := resp.OriginRequestPolicy.OriginRequestPolicyConfig
-	d.Set("comment", aws.StringValue(originRequestPolicy.Comment))
-	d.Set("name", aws.StringValue(originRequestPolicy.Name))
+	d.Set("comment", originRequestPolicy.Comment)
+	d.Set("name", originRequestPolicy.Name)
 	d.Set("cookies_config", flattenCloudFrontOriginRequestPolicyCookiesConfig(originRequestPolicy.CookiesConfig))
 	d.Set("headers_config", flattenCloudFrontOriginRequestPolicyHeadersConfig(originRequestPolicy.HeadersConfig))
 	d.Set("query_strings_config", flattenCloudFrontOriginRequestPolicyQueryStringsConfig(originRequestPolicy.QueryStringsConfig))

diff --git a/aws/resource_aws_cloudfront_realtime_log_config.go b/aws/resource_aws_cloudfront_realtime_log_config.go
@@ -142,7 +142,7 @@ func resourceAwsCloudFrontRealtimeLogConfigRead(d *schema.ResourceData, meta int
 		return fmt.Errorf("error setting fields: %w", err)
 	}
 	d.Set("name", logConfig.Name)
-	d.Set("sampling_rate", int(aws.Int64Value(logConfig.SamplingRate)))
+	d.Set("sampling_rate", logConfig.SamplingRate)
 
 	return nil
 }

diff --git a/aws/resource_aws_cloudwatch_query_definition.go b/aws/resource_aws_cloudwatch_query_definition.go
@@ -64,7 +64,7 @@ func resourceAwsCloudWatchQueryDefinitionCreate(ctx context.Context, d *schema.R
 	}
 
 	d.SetId(aws.StringValue(r.QueryDefinitionId))
-	d.Set("query_definition_id", aws.StringValue(r.QueryDefinitionId)) // TODO: is this needed?
+	d.Set("query_definition_id", r.QueryDefinitionId) // TODO: is this needed?
 
 	return resourceAwsCloudWatchQueryDefinitionRead(ctx, d, meta)
 }
@@ -98,9 +98,9 @@ func resourceAwsCloudWatchQueryDefinitionRead(ctx context.Context, d *schema.Res
 		return nil
 	}
 
-	d.Set("name", aws.StringValue(result.Name))
-	d.Set("query_string", aws.StringValue(result.QueryString))
-	d.Set("query_definition_id", aws.StringValue(result.QueryDefinitionId))
+	d.Set("name", result.Name)
+	d.Set("query_string", result.QueryString)
+	d.Set("query_definition_id", result.QueryDefinitionId)
 	if err := d.Set("log_group_names", aws.StringValueSlice(result.LogGroupNames)); err != nil {
 		return diag.FromErr(fmt.Errorf("error setting log_group_names: %w", err))
 	}

diff --git a/aws/resource_aws_fms_policy.go b/aws/resource_aws_fms_policy.go
@@ -198,22 +198,22 @@ func resourceAwsFmsPolicyRead(d *schema.ResourceData, meta interface{}) error {
 }
 
 func resourceAwsFmsPolicyFlattenPolicy(d *schema.ResourceData, resp *fms.GetPolicyOutput) error {
-	d.Set("arn", aws.StringValue(resp.PolicyArn))
+	d.Set("arn", resp.PolicyArn)
 
-	d.Set("name", aws.StringValue(resp.Policy.PolicyName))
-	d.Set("exclude_resource_tags", aws.BoolValue(resp.Policy.ExcludeResourceTags))
+	d.Set("name", resp.Policy.PolicyName)
+	d.Set("exclude_resource_tags", resp.Policy.ExcludeResourceTags)
 	if err := d.Set("exclude_map", flattenFMSPolicyMap(resp.Policy.ExcludeMap)); err != nil {
 		return err
 	}
 	if err := d.Set("include_map", flattenFMSPolicyMap(resp.Policy.IncludeMap)); err != nil {
 		return err
 	}
-	d.Set("remediation_enabled", aws.BoolValue(resp.Policy.RemediationEnabled))
+	d.Set("remediation_enabled", resp.Policy.RemediationEnabled)
 	if err := d.Set("resource_type_list", resp.Policy.ResourceTypeList); err != nil {
 		return err
 	}
-	d.Set("resource_type", aws.StringValue(resp.Policy.ResourceType))
-	d.Set("policy_update_token", aws.StringValue(resp.Policy.PolicyUpdateToken))
+	d.Set("resource_type", resp.Policy.ResourceType)
+	d.Set("policy_update_token", resp.Policy.PolicyUpdateToken)
 	if err := d.Set("resource_tags", flattenFMSResourceTags(resp.Policy.ResourceTags)); err != nil {
 		return err
 	}

diff --git a/aws/resource_aws_lb_target_group.go b/aws/resource_aws_lb_target_group.go
@@ -736,7 +736,7 @@ func flattenAwsLbTargetGroupResource(d *schema.ResourceData, meta interface{}, t
 			if err != nil {
 				return fmt.Errorf("error converting preserve_client_ip.enabled to bool: %s", aws.StringValue(attr.Value))
 			}
-			d.Set("preserve_client_ip", aws.StringValue(attr.Value))
+			d.Set("preserve_client_ip", attr.Value)
 		}
 	}
 

diff --git a/aws/resource_aws_lightsail_instance.go b/aws/resource_aws_lightsail_instance.go
@@ -218,7 +218,7 @@ func resourceAwsLightsailInstanceRead(d *schema.ResourceData, meta interface{})
 
 	// Deprecated: AWS Go SDK v1.36.25 removed Ipv6Address field
 	if len(i.Ipv6Addresses) > 0 {
-		d.Set("ipv6_address", aws.StringValue(i.Ipv6Addresses[0]))
+		d.Set("ipv6_address", i.Ipv6Addresses[0])
 	}
 
 	d.Set("ipv6_addresses", aws.StringValueSlice(i.Ipv6Addresses))

diff --git a/aws/resource_aws_msk_cluster.go b/aws/resource_aws_msk_cluster.go
@@ -456,7 +456,7 @@ func resourceAwsMskClusterRead(d *schema.ResourceData, meta interface{}) error {
 
 	cluster := out.ClusterInfo
 
-	d.Set("arn", aws.StringValue(cluster.ClusterArn))
+	d.Set("arn", cluster.ClusterArn)
 	d.Set("bootstrap_brokers", sortMskClusterEndpoints(aws.StringValue(brokerOut.BootstrapBrokerString)))
 	d.Set("bootstrap_brokers_sasl_scram", sortMskClusterEndpoints(aws.StringValue(brokerOut.BootstrapBrokerStringSaslScram)))
 	d.Set("bootstrap_brokers_tls", sortMskClusterEndpoints(aws.StringValue(brokerOut.BootstrapBrokerStringTls)))

diff --git a/aws/resource_aws_ssm_patch_group.go b/aws/resource_aws_ssm_patch_group.go
@@ -93,7 +93,7 @@ func resourceAwsSsmPatchGroupRead(d *schema.ResourceData, meta interface{}) erro
 	}
 
 	d.Set("baseline_id", groupBaselineId)
-	d.Set("patch_group", aws.StringValue(group.PatchGroup))
+	d.Set("patch_group", group.PatchGroup)
 
 	return nil