From 302982c3358329708584f707e92f19b309288b09 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Sun, 28 Aug 2016 19:25:30 +0100 Subject: [PATCH] provider/aws: Remove unsafe ptr dereferencing [A-C]* (#8519) --- .../resource_aws_api_gateway_domain_name.go | 2 +- .../providers/aws/resource_aws_cloudtrail.go | 2 +- .../aws/resource_aws_cloudwatch_log_group.go | 6 +++--- .../aws/resource_aws_codecommit_repository.go | 18 +++++++++--------- .../aws/resource_aws_codedeploy_app.go | 2 +- ...resource_aws_codedeploy_deployment_group.go | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/builtin/providers/aws/resource_aws_api_gateway_domain_name.go b/builtin/providers/aws/resource_aws_api_gateway_domain_name.go index 0d4be86dc..45b54b8cc 100644 --- a/builtin/providers/aws/resource_aws_api_gateway_domain_name.go +++ b/builtin/providers/aws/resource_aws_api_gateway_domain_name.go @@ -76,7 +76,7 @@ func resourceAwsApiGatewayDomainNameCreate(d *schema.ResourceData, meta interfac } d.SetId(*domainName.DomainName) - d.Set("cloudfront_domain_name", *domainName.DistributionDomainName) + d.Set("cloudfront_domain_name", domainName.DistributionDomainName) d.Set("cloudfront_zone_id", cloudFrontRoute53ZoneID) return resourceAwsApiGatewayDomainNameRead(d, meta) diff --git a/builtin/providers/aws/resource_aws_cloudtrail.go b/builtin/providers/aws/resource_aws_cloudtrail.go index c216db804..00a3557ec 100644 --- a/builtin/providers/aws/resource_aws_cloudtrail.go +++ b/builtin/providers/aws/resource_aws_cloudtrail.go @@ -122,7 +122,7 @@ func resourceAwsCloudTrailCreate(d *schema.ResourceData, meta interface{}) error log.Printf("[DEBUG] CloudTrail created: %s", t) - d.Set("arn", *t.TrailARN) + d.Set("arn", t.TrailARN) d.SetId(*t.Name) // AWS CloudTrail sets newly-created trails to false. diff --git a/builtin/providers/aws/resource_aws_cloudwatch_log_group.go b/builtin/providers/aws/resource_aws_cloudwatch_log_group.go index 245c89043..08ffc26a5 100644 --- a/builtin/providers/aws/resource_aws_cloudwatch_log_group.go +++ b/builtin/providers/aws/resource_aws_cloudwatch_log_group.go @@ -76,11 +76,11 @@ func resourceAwsCloudWatchLogGroupRead(d *schema.ResourceData, meta interface{}) log.Printf("[DEBUG] Found Log Group: %#v", *lg) - d.Set("arn", *lg.Arn) - d.Set("name", *lg.LogGroupName) + d.Set("arn", lg.Arn) + d.Set("name", lg.LogGroupName) if lg.RetentionInDays != nil { - d.Set("retention_in_days", *lg.RetentionInDays) + d.Set("retention_in_days", lg.RetentionInDays) } return nil diff --git a/builtin/providers/aws/resource_aws_codecommit_repository.go b/builtin/providers/aws/resource_aws_codecommit_repository.go index 42691a6d8..83d32f42b 100644 --- a/builtin/providers/aws/resource_aws_codecommit_repository.go +++ b/builtin/providers/aws/resource_aws_codecommit_repository.go @@ -93,10 +93,10 @@ func resourceAwsCodeCommitRepositoryCreate(d *schema.ResourceData, meta interfac } d.SetId(d.Get("repository_name").(string)) - d.Set("repository_id", *out.RepositoryMetadata.RepositoryId) - d.Set("arn", *out.RepositoryMetadata.Arn) - d.Set("clone_url_http", *out.RepositoryMetadata.CloneUrlHttp) - d.Set("clone_url_ssh", *out.RepositoryMetadata.CloneUrlSsh) + d.Set("repository_id", out.RepositoryMetadata.RepositoryId) + d.Set("arn", out.RepositoryMetadata.Arn) + d.Set("clone_url_http", out.RepositoryMetadata.CloneUrlHttp) + d.Set("clone_url_ssh", out.RepositoryMetadata.CloneUrlSsh) return resourceAwsCodeCommitRepositoryUpdate(d, meta) } @@ -133,14 +133,14 @@ func resourceAwsCodeCommitRepositoryRead(d *schema.ResourceData, meta interface{ return fmt.Errorf("Error reading CodeCommit Repository: %s", err.Error()) } - d.Set("repository_id", *out.RepositoryMetadata.RepositoryId) - d.Set("arn", *out.RepositoryMetadata.Arn) - d.Set("clone_url_http", *out.RepositoryMetadata.CloneUrlHttp) - d.Set("clone_url_ssh", *out.RepositoryMetadata.CloneUrlSsh) + d.Set("repository_id", out.RepositoryMetadata.RepositoryId) + d.Set("arn", out.RepositoryMetadata.Arn) + d.Set("clone_url_http", out.RepositoryMetadata.CloneUrlHttp) + d.Set("clone_url_ssh", out.RepositoryMetadata.CloneUrlSsh) if _, ok := d.GetOk("default_branch"); ok { if out.RepositoryMetadata.DefaultBranch != nil { - d.Set("default_branch", *out.RepositoryMetadata.DefaultBranch) + d.Set("default_branch", out.RepositoryMetadata.DefaultBranch) } } diff --git a/builtin/providers/aws/resource_aws_codedeploy_app.go b/builtin/providers/aws/resource_aws_codedeploy_app.go index ccf07a82d..706bd7afa 100644 --- a/builtin/providers/aws/resource_aws_codedeploy_app.go +++ b/builtin/providers/aws/resource_aws_codedeploy_app.go @@ -78,7 +78,7 @@ func resourceAwsCodeDeployAppRead(d *schema.ResourceData, meta interface{}) erro } } - d.Set("name", *resp.Application.ApplicationName) + d.Set("name", resp.Application.ApplicationName) return nil } diff --git a/builtin/providers/aws/resource_aws_codedeploy_deployment_group.go b/builtin/providers/aws/resource_aws_codedeploy_deployment_group.go index 72e019311..0ff59564f 100644 --- a/builtin/providers/aws/resource_aws_codedeploy_deployment_group.go +++ b/builtin/providers/aws/resource_aws_codedeploy_deployment_group.go @@ -247,11 +247,11 @@ func resourceAwsCodeDeployDeploymentGroupRead(d *schema.ResourceData, meta inter return err } - d.Set("app_name", *resp.DeploymentGroupInfo.ApplicationName) + d.Set("app_name", resp.DeploymentGroupInfo.ApplicationName) d.Set("autoscaling_groups", resp.DeploymentGroupInfo.AutoScalingGroups) - d.Set("deployment_config_name", *resp.DeploymentGroupInfo.DeploymentConfigName) - d.Set("deployment_group_name", *resp.DeploymentGroupInfo.DeploymentGroupName) - d.Set("service_role_arn", *resp.DeploymentGroupInfo.ServiceRoleArn) + d.Set("deployment_config_name", resp.DeploymentGroupInfo.DeploymentConfigName) + d.Set("deployment_group_name", resp.DeploymentGroupInfo.DeploymentGroupName) + d.Set("service_role_arn", resp.DeploymentGroupInfo.ServiceRoleArn) if err := d.Set("ec2_tag_filter", ec2TagFiltersToMap(resp.DeploymentGroupInfo.Ec2TagFilters)); err != nil { return err }