diff --git a/aws/resource_aws_route_table_association.go b/aws/resource_aws_route_table_association.go index 47c83b0cd02..c63095b0796 100644 --- a/aws/resource_aws_route_table_association.go +++ b/aws/resource_aws_route_table_association.go @@ -115,10 +115,10 @@ func resourceAwsRouteTableAssociationRead(d *schema.ResourceData, meta interface if *a.RouteTableAssociationId == d.Id() { found = true if a.SubnetId != nil { - d.Set("subnet_id", *a.SubnetId) + d.Set("subnet_id", a.SubnetId) } if a.GatewayId != nil { - d.Set("gateway_id", *a.GatewayId) + d.Set("gateway_id", a.GatewayId) } break } diff --git a/aws/resource_aws_security_group_rule.go b/aws/resource_aws_security_group_rule.go index b9d4cdf73e6..fc3cb06c5c9 100644 --- a/aws/resource_aws_security_group_rule.go +++ b/aws/resource_aws_security_group_rule.go @@ -759,9 +759,9 @@ func setFromIPPerm(d *schema.ResourceData, sg *ec2.SecurityGroup, rule *ec2.IpPe s := rule.UserIdGroupPairs[0] if isVPC { - d.Set("source_security_group_id", *s.GroupId) + d.Set("source_security_group_id", s.GroupId) } else { - d.Set("source_security_group_id", *s.GroupName) + d.Set("source_security_group_id", s.GroupName) } } diff --git a/aws/resource_aws_spot_instance_request.go b/aws/resource_aws_spot_instance_request.go index fe31f160fc8..1480136ada0 100644 --- a/aws/resource_aws_spot_instance_request.go +++ b/aws/resource_aws_spot_instance_request.go @@ -264,10 +264,10 @@ func resourceAwsSpotInstanceRequestRead(d *schema.ResourceData, meta interface{} return nil } - d.Set("spot_bid_status", *request.Status.Code) + d.Set("spot_bid_status", request.Status.Code) // Instance ID is not set if the request is still pending if request.InstanceId != nil { - d.Set("spot_instance_id", *request.InstanceId) + d.Set("spot_instance_id", request.InstanceId) // Read the instance data, setting up connection information if err := readInstance(d, meta); err != nil { return fmt.Errorf("Error reading Spot Instance Data: %s", err) diff --git a/aws/resource_aws_vpn_gateway.go b/aws/resource_aws_vpn_gateway.go index a3b6979fab9..4d5d2069c7e 100644 --- a/aws/resource_aws_vpn_gateway.go +++ b/aws/resource_aws_vpn_gateway.go @@ -117,7 +117,7 @@ func resourceAwsVpnGatewayRead(d *schema.ResourceData, meta interface{}) error { // Gateway exists but not attached to the VPC d.Set("vpc_id", "") } else { - d.Set("vpc_id", *vpnAttachment.VpcId) + d.Set("vpc_id", vpnAttachment.VpcId) } if vpnGateway.AvailabilityZone != nil && *vpnGateway.AvailabilityZone != "" { diff --git a/aws/resource_aws_vpn_gateway_attachment.go b/aws/resource_aws_vpn_gateway_attachment.go index 02a188fdd79..e4906ade09e 100644 --- a/aws/resource_aws_vpn_gateway_attachment.go +++ b/aws/resource_aws_vpn_gateway_attachment.go @@ -106,7 +106,7 @@ func resourceAwsVpnGatewayAttachmentRead(d *schema.ResourceData, meta interface{ return nil } - d.Set("vpc_id", *vga.VpcId) + d.Set("vpc_id", vga.VpcId) return nil }