diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index d96692adeb..95191d0b6d 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -604,7 +604,7 @@ func (s *awsSdkEC2) DescribeInstances(request *ec2.DescribeInstancesInput) ([]*e response, err := s.ec2.DescribeInstances(request) if err != nil { recordAwsMetric("describe_instance", 0, err) - return nil, fmt.Errorf("error listing AWS instances: %v", err) + return nil, fmt.Errorf("error listing AWS instances: %q", err) } for _, reservation := range response.Reservations { @@ -627,7 +627,7 @@ func (s *awsSdkEC2) DescribeSecurityGroups(request *ec2.DescribeSecurityGroupsIn // Security groups are not paged response, err := s.ec2.DescribeSecurityGroups(request) if err != nil { - return nil, fmt.Errorf("error listing AWS security groups: %v", err) + return nil, fmt.Errorf("error listing AWS security groups: %q", err) } return response.SecurityGroups, nil } @@ -658,7 +658,7 @@ func (s *awsSdkEC2) DescribeVolumes(request *ec2.DescribeVolumesInput) ([]*ec2.V if err != nil { recordAwsMetric("describe_volume", 0, err) - return nil, fmt.Errorf("error listing AWS volumes: %v", err) + return nil, fmt.Errorf("error listing AWS volumes: %q", err) } results = append(results, response.Volumes...) @@ -694,7 +694,7 @@ func (s *awsSdkEC2) DescribeSubnets(request *ec2.DescribeSubnetsInput) ([]*ec2.S // Subnets are not paged response, err := s.ec2.DescribeSubnets(request) if err != nil { - return nil, fmt.Errorf("error listing AWS subnets: %v", err) + return nil, fmt.Errorf("error listing AWS subnets: %q", err) } return response.Subnets, nil } @@ -727,7 +727,7 @@ func (s *awsSdkEC2) DescribeRouteTables(request *ec2.DescribeRouteTablesInput) ( // Not paged response, err := s.ec2.DescribeRouteTables(request) if err != nil { - return nil, fmt.Errorf("error listing AWS route tables: %v", err) + return nil, fmt.Errorf("error listing AWS route tables: %q", err) } return response.RouteTables, nil } @@ -816,7 +816,7 @@ func newAWSCloud(config io.Reader, awsServices Services) (*Cloud, error) { metadata, err := awsServices.Metadata() if err != nil { - return nil, fmt.Errorf("error creating AWS metadata client: %v", err) + return nil, fmt.Errorf("error creating AWS metadata client: %q", err) } cfg, err := readAWSCloudConfig(config, metadata) @@ -963,7 +963,7 @@ func (c *Cloud) NodeAddresses(name types.NodeName) ([]v1.NodeAddress, error) { internalIP, err := c.metadata.GetMetadata("local-ipv4") if err != nil { - return nil, fmt.Errorf("error querying AWS metadata for %q: %v", "local-ipv4", err) + return nil, fmt.Errorf("error querying AWS metadata for %q: %q", "local-ipv4", err) } addresses = append(addresses, v1.NodeAddress{Type: v1.NodeInternalIP, Address: internalIP}) @@ -999,7 +999,7 @@ func (c *Cloud) NodeAddresses(name types.NodeName) ([]v1.NodeAddress, error) { instance, err := c.getInstanceByNodeName(name) if err != nil { - return nil, fmt.Errorf("getInstanceByNodeName failed for %q with %v", name, err) + return nil, fmt.Errorf("getInstanceByNodeName failed for %q with %q", name, err) } return extractNodeAddresses(instance) } @@ -1090,7 +1090,7 @@ func (c *Cloud) InstanceID(nodeName types.NodeName) (string, error) { } inst, err := c.getInstanceByNodeName(nodeName) if err != nil { - return "", fmt.Errorf("getInstanceByNodeName failed for %q with %v", nodeName, err) + return "", fmt.Errorf("getInstanceByNodeName failed for %q with %q", nodeName, err) } return "/" + orEmpty(inst.Placement.AvailabilityZone) + "/" + orEmpty(inst.InstanceId), nil } @@ -1119,7 +1119,7 @@ func (c *Cloud) InstanceType(nodeName types.NodeName) (string, error) { } inst, err := c.getInstanceByNodeName(nodeName) if err != nil { - return "", fmt.Errorf("getInstanceByNodeName failed for %q with %v", nodeName, err) + return "", fmt.Errorf("getInstanceByNodeName failed for %q with %q", nodeName, err) } return aws.StringValue(inst.InstanceType), nil } @@ -1376,7 +1376,7 @@ func (d *awsDisk) describeVolume() (*ec2.Volume, error) { volumes, err := d.ec2.DescribeVolumes(request) if err != nil { - return nil, fmt.Errorf("error querying ec2 for volume %q: %v", volumeID, err) + return nil, fmt.Errorf("error querying ec2 for volume %q: %q", volumeID, err) } if len(volumes) == 0 { return nil, fmt.Errorf("no volumes found for volume %q", volumeID) @@ -1462,7 +1462,7 @@ func (d *awsDisk) deleteVolume() (bool, error) { return false, volume.NewDeletedVolumeInUseError(err.Error()) } } - return false, fmt.Errorf("error deleting EBS volume %q: %v", d.awsID, err) + return false, fmt.Errorf("error deleting EBS volume %q: %q", d.awsID, err) } return true, nil } @@ -1475,7 +1475,7 @@ func (c *Cloud) buildSelfAWSInstance() (*awsInstance, error) { } instanceID, err := c.metadata.GetMetadata("instance-id") if err != nil { - return nil, fmt.Errorf("error fetching instance-id from ec2 metadata service: %v", err) + return nil, fmt.Errorf("error fetching instance-id from ec2 metadata service: %q", err) } // We want to fetch the hostname via the EC2 metadata service @@ -1488,7 +1488,7 @@ func (c *Cloud) buildSelfAWSInstance() (*awsInstance, error) { // have two code paths. instance, err := c.getInstanceByID(instanceID) if err != nil { - return nil, fmt.Errorf("error finding instance %s: %v", instanceID, err) + return nil, fmt.Errorf("error finding instance %s: %q", instanceID, err) } return newAWSInstance(c.ec2, instance), nil } @@ -1517,19 +1517,19 @@ func wrapAttachError(err error, disk *awsDisk, instance string) error { if awsError.Code() == "VolumeInUse" { info, err := disk.describeVolume() if err != nil { - glog.Errorf("Error describing volume %q: %v", disk.awsID, err) + glog.Errorf("Error describing volume %q: %q", disk.awsID, err) } else { for _, a := range info.Attachments { if disk.awsID != awsVolumeID(aws.StringValue(a.VolumeId)) { glog.Warningf("Expected to get attachment info of volume %q but instead got info of %q", disk.awsID, aws.StringValue(a.VolumeId)) } else if aws.StringValue(a.State) == "attached" { - return fmt.Errorf("Error attaching EBS volume %q to instance %q: %v. The volume is currently attached to instance %q", disk.awsID, instance, awsError, aws.StringValue(a.InstanceId)) + return fmt.Errorf("Error attaching EBS volume %q to instance %q: %q. The volume is currently attached to instance %q", disk.awsID, instance, awsError, aws.StringValue(a.InstanceId)) } } } } } - return fmt.Errorf("Error attaching EBS volume %q to instance %q: %v", disk.awsID, instance, err) + return fmt.Errorf("Error attaching EBS volume %q to instance %q: %q", disk.awsID, instance, err) } // AttachDisk implements Volumes.AttachDisk @@ -1541,7 +1541,7 @@ func (c *Cloud) AttachDisk(diskName KubernetesVolumeID, nodeName types.NodeName, awsInstance, info, err := c.getFullInstance(nodeName) if err != nil { - return "", fmt.Errorf("error finding instance %s: %v", nodeName, err) + return "", fmt.Errorf("error finding instance %s: %q", nodeName, err) } if readOnly { @@ -1659,7 +1659,7 @@ func (c *Cloud) DetachDisk(diskName KubernetesVolumeID, nodeName types.NodeName) response, err := c.ec2.DetachVolume(&request) if err != nil { - return "", fmt.Errorf("error detaching EBS volume %q from %q: %v", disk.awsID, awsInstance.awsID, err) + return "", fmt.Errorf("error detaching EBS volume %q from %q: %q", disk.awsID, awsInstance.awsID, err) } if response == nil { return "", errors.New("no response from DetachVolume") @@ -1771,9 +1771,9 @@ func (c *Cloud) CreateDisk(volumeOptions *VolumeOptions) (KubernetesVolumeID, er _, delerr := c.DeleteDisk(volumeName) if delerr != nil { // delete did not succeed, we have a stray volume! - return "", fmt.Errorf("error tagging volume %s, could not delete the volume: %v", volumeName, delerr) + return "", fmt.Errorf("error tagging volume %s, could not delete the volume: %q", volumeName, delerr) } - return "", fmt.Errorf("error tagging volume %s: %v", volumeName, err) + return "", fmt.Errorf("error tagging volume %s: %q", volumeName, err) } return volumeName, nil @@ -1959,7 +1959,7 @@ func (c *Cloud) describeLoadBalancer(name string) (*elb.LoadBalancerDescription, func (c *Cloud) findVPCID() (string, error) { macs, err := c.metadata.GetMetadata("network/interfaces/macs/") if err != nil { - return "", fmt.Errorf("Could not list interfaces of the instance: %v", err) + return "", fmt.Errorf("Could not list interfaces of the instance: %q", err) } // loop over interfaces, first vpc id returned wins @@ -2088,7 +2088,7 @@ func isEqualUserGroupPair(l, r *ec2.UserIdGroupPair, compareGroupUserIDs bool) b func (c *Cloud) setSecurityGroupIngress(securityGroupID string, permissions IPPermissionSet) (bool, error) { group, err := c.findSecurityGroup(securityGroupID) if err != nil { - glog.Warning("Error retrieving security group", err) + glog.Warningf("Error retrieving security group %q", err) return false, err } @@ -2134,7 +2134,7 @@ func (c *Cloud) setSecurityGroupIngress(securityGroupID string, permissions IPPe request.IpPermissions = add.List() _, err = c.ec2.AuthorizeSecurityGroupIngress(request) if err != nil { - return false, fmt.Errorf("error authorizing security group ingress: %v", err) + return false, fmt.Errorf("error authorizing security group ingress: %q", err) } } if remove.Len() != 0 { @@ -2145,7 +2145,7 @@ func (c *Cloud) setSecurityGroupIngress(securityGroupID string, permissions IPPe request.IpPermissions = remove.List() _, err = c.ec2.RevokeSecurityGroupIngress(request) if err != nil { - return false, fmt.Errorf("error revoking security group ingress: %v", err) + return false, fmt.Errorf("error revoking security group ingress: %q", err) } } @@ -2158,7 +2158,7 @@ func (c *Cloud) setSecurityGroupIngress(securityGroupID string, permissions IPPe func (c *Cloud) addSecurityGroupIngress(securityGroupID string, addPermissions []*ec2.IpPermission) (bool, error) { group, err := c.findSecurityGroup(securityGroupID) if err != nil { - glog.Warningf("Error retrieving security group: %v", err) + glog.Warningf("Error retrieving security group: %q", err) return false, err } @@ -2201,8 +2201,8 @@ func (c *Cloud) addSecurityGroupIngress(securityGroupID string, addPermissions [ request.IpPermissions = changes _, err = c.ec2.AuthorizeSecurityGroupIngress(request) if err != nil { - glog.Warning("Error authorizing security group ingress", err) - return false, fmt.Errorf("error authorizing security group ingress: %v", err) + glog.Warning("Error authorizing security group ingress %q", err) + return false, fmt.Errorf("error authorizing security group ingress: %q", err) } return true, nil @@ -2214,7 +2214,7 @@ func (c *Cloud) addSecurityGroupIngress(securityGroupID string, addPermissions [ func (c *Cloud) removeSecurityGroupIngress(securityGroupID string, removePermissions []*ec2.IpPermission) (bool, error) { group, err := c.findSecurityGroup(securityGroupID) if err != nil { - glog.Warningf("Error retrieving security group: %v", err) + glog.Warningf("Error retrieving security group: %q", err) return false, err } @@ -2256,7 +2256,7 @@ func (c *Cloud) removeSecurityGroupIngress(securityGroupID string, removePermiss request.IpPermissions = changes _, err = c.ec2.RevokeSecurityGroupIngress(request) if err != nil { - glog.Warningf("Error revoking security group ingress: %v", err) + glog.Warningf("Error revoking security group ingress: %q", err) return false, err } @@ -2319,7 +2319,7 @@ func (c *Cloud) ensureSecurityGroup(name string, description string) (string, er } } if !ignore { - glog.Error("Error creating security group: ", err) + glog.Errorf("Error creating security group: %q", err) return "", err } time.Sleep(1 * time.Second) @@ -2338,7 +2338,7 @@ func (c *Cloud) ensureSecurityGroup(name string, description string) (string, er // will add the missing tags. We could delete the security // group here, but that doesn't feel like the right thing, as // the caller is likely to retry the create - return "", fmt.Errorf("error tagging security group: %v", err) + return "", fmt.Errorf("error tagging security group: %q", err) } return groupID, nil } @@ -2363,7 +2363,7 @@ func (c *Cloud) findSubnets() ([]*ec2.Subnet, error) { subnets, err := c.ec2.DescribeSubnets(request) if err != nil { - return nil, fmt.Errorf("error describing subnets: %v", err) + return nil, fmt.Errorf("error describing subnets: %q", err) } var matches []*ec2.Subnet @@ -2386,7 +2386,7 @@ func (c *Cloud) findSubnets() ([]*ec2.Subnet, error) { subnets, err = c.ec2.DescribeSubnets(request) if err != nil { - return nil, fmt.Errorf("error describing subnets: %v", err) + return nil, fmt.Errorf("error describing subnets: %q", err) } return subnets, nil @@ -2407,7 +2407,7 @@ func (c *Cloud) findELBSubnets(internalELB bool) ([]string, error) { rRequest.Filters = []*ec2.Filter{vpcIDFilter} rt, err := c.ec2.DescribeRouteTables(rRequest) if err != nil { - return nil, fmt.Errorf("error describe route table: %v", err) + return nil, fmt.Errorf("error describe route table: %q", err) } subnetsByAZ := make(map[string]*ec2.Subnet) @@ -2553,7 +2553,7 @@ func (c *Cloud) buildELBSecurityGroupList(serviceName types.NamespacedName, load sgDescription := fmt.Sprintf("Security group for Kubernetes ELB %s (%v)", loadBalancerName, serviceName) securityGroupID, err = c.ensureSecurityGroup(sgName, sgDescription) if err != nil { - glog.Error("Error creating load balancer security group: ", err) + glog.Errorf("Error creating load balancer security group: %q", err) return nil, err } } @@ -2770,7 +2770,7 @@ func (c *Cloud) EnsureLoadBalancer(clusterName string, apiService *v1.Service, n // Find the subnets that the ELB will live in subnetIDs, err := c.findELBSubnets(internalELB) if err != nil { - glog.Error("Error listing subnets in VPC: ", err) + glog.Errorf("Error listing subnets in VPC: %q", err) return nil, err } @@ -2846,7 +2846,7 @@ func (c *Cloud) EnsureLoadBalancer(clusterName string, apiService *v1.Service, n glog.V(4).Infof("service %v (%v) needs health checks on :%d%s)", apiService.Name, loadBalancerName, healthCheckNodePort, path) err = c.ensureLoadBalancerHealthCheck(loadBalancer, "HTTP", healthCheckNodePort, path) if err != nil { - return nil, fmt.Errorf("Failed to ensure health check for localized service %v on node port %v: %v", loadBalancerName, healthCheckNodePort, err) + return nil, fmt.Errorf("Failed to ensure health check for localized service %v on node port %v: %q", loadBalancerName, healthCheckNodePort, err) } } else { glog.V(4).Infof("service %v does not need custom health checks", apiService.Name) @@ -2868,13 +2868,13 @@ func (c *Cloud) EnsureLoadBalancer(clusterName string, apiService *v1.Service, n err = c.updateInstanceSecurityGroupsForLoadBalancer(loadBalancer, instances) if err != nil { - glog.Warningf("Error opening ingress rules for the load balancer to the instances: %v", err) + glog.Warningf("Error opening ingress rules for the load balancer to the instances: %q", err) return nil, err } err = c.ensureLoadBalancerInstances(orEmpty(loadBalancer.LoadBalancerName), loadBalancer.Instances, instances) if err != nil { - glog.Warningf("Error registering instances with the load balancer: %v", err) + glog.Warningf("Error registering instances with the load balancer: %q", err) return nil, err } @@ -2964,7 +2964,7 @@ func (c *Cloud) getTaggedSecurityGroups() (map[string]*ec2.SecurityGroup, error) request.Filters = c.tagging.addFilters(nil) groups, err := c.ec2.DescribeSecurityGroups(request) if err != nil { - return nil, fmt.Errorf("error querying security groups: %v", err) + return nil, fmt.Errorf("error querying security groups: %q", err) } m := make(map[string]*ec2.SecurityGroup) @@ -3016,7 +3016,7 @@ func (c *Cloud) updateInstanceSecurityGroupsForLoadBalancer(lb *elb.LoadBalancer describeRequest.Filters = c.tagging.addFilters(filters) response, err := c.ec2.DescribeSecurityGroups(describeRequest) if err != nil { - return fmt.Errorf("error querying security groups for ELB: %v", err) + return fmt.Errorf("error querying security groups for ELB: %q", err) } for _, sg := range response { if !c.tagging.hasClusterTag(sg.Tags) { @@ -3028,7 +3028,7 @@ func (c *Cloud) updateInstanceSecurityGroupsForLoadBalancer(lb *elb.LoadBalancer taggedSecurityGroups, err := c.getTaggedSecurityGroups() if err != nil { - return fmt.Errorf("error querying for tagged security groups: %v", err) + return fmt.Errorf("error querying for tagged security groups: %q", err) } // Open the firewall from the load balancer to the instance @@ -3133,7 +3133,7 @@ func (c *Cloud) EnsureLoadBalancerDeleted(clusterName string, service *v1.Servic // De-authorize the load balancer security group from the instances security group err = c.updateInstanceSecurityGroupsForLoadBalancer(lb, nil) if err != nil { - glog.Error("Error deregistering load balancer from instance security groups: ", err) + glog.Errorf("Error deregistering load balancer from instance security groups: %q", err) return err } } @@ -3146,7 +3146,7 @@ func (c *Cloud) EnsureLoadBalancerDeleted(clusterName string, service *v1.Servic _, err = c.elb.DeleteLoadBalancer(request) if err != nil { // TODO: Check if error was because load balancer was concurrently deleted - glog.Error("Error deleting load balancer: ", err) + glog.Errorf("Error deleting load balancer: %q", err) return err } } @@ -3188,7 +3188,7 @@ func (c *Cloud) EnsureLoadBalancerDeleted(clusterName string, service *v1.Servic } } if !ignore { - return fmt.Errorf("error while deleting load balancer security group (%s): %v", securityGroupID, err) + return fmt.Errorf("error while deleting load balancer security group (%s): %q", securityGroupID, err) } } } diff --git a/pkg/cloudprovider/providers/aws/aws_instancegroups.go b/pkg/cloudprovider/providers/aws/aws_instancegroups.go index af3ff541a0..6bf63ae6fe 100644 --- a/pkg/cloudprovider/providers/aws/aws_instancegroups.go +++ b/pkg/cloudprovider/providers/aws/aws_instancegroups.go @@ -37,7 +37,7 @@ func ResizeInstanceGroup(asg ASG, instanceGroupName string, size int) error { MaxSize: aws.Int64(int64(size)), } if _, err := asg.UpdateAutoScalingGroup(request); err != nil { - return fmt.Errorf("error resizing AWS autoscaling group: %v", err) + return fmt.Errorf("error resizing AWS autoscaling group: %q", err) } return nil } @@ -57,7 +57,7 @@ func DescribeInstanceGroup(asg ASG, instanceGroupName string) (InstanceGroupInfo } response, err := asg.DescribeAutoScalingGroups(request) if err != nil { - return nil, fmt.Errorf("error listing AWS autoscaling group (%s): %v", instanceGroupName, err) + return nil, fmt.Errorf("error listing AWS autoscaling group (%s): %q", instanceGroupName, err) } if len(response.AutoScalingGroups) == 0 { diff --git a/pkg/cloudprovider/providers/aws/aws_loadbalancer.go b/pkg/cloudprovider/providers/aws/aws_loadbalancer.go index d08403d578..0a6504ae66 100644 --- a/pkg/cloudprovider/providers/aws/aws_loadbalancer.go +++ b/pkg/cloudprovider/providers/aws/aws_loadbalancer.go @@ -139,7 +139,7 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala glog.V(2).Info("Detaching load balancer from removed subnets") _, err := c.elb.DetachLoadBalancerFromSubnets(request) if err != nil { - return nil, fmt.Errorf("error detaching AWS loadbalancer from subnets: %v", err) + return nil, fmt.Errorf("error detaching AWS loadbalancer from subnets: %q", err) } dirty = true } @@ -151,7 +151,7 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala glog.V(2).Info("Attaching load balancer to added subnets") _, err := c.elb.AttachLoadBalancerToSubnets(request) if err != nil { - return nil, fmt.Errorf("error attaching AWS loadbalancer to subnets: %v", err) + return nil, fmt.Errorf("error attaching AWS loadbalancer to subnets: %q", err) } dirty = true } @@ -170,7 +170,7 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala glog.V(2).Info("Applying updated security groups to load balancer") _, err := c.elb.ApplySecurityGroupsToLoadBalancer(request) if err != nil { - return nil, fmt.Errorf("error applying AWS loadbalancer security groups: %v", err) + return nil, fmt.Errorf("error applying AWS loadbalancer security groups: %q", err) } dirty = true } @@ -230,7 +230,7 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala glog.V(2).Info("Deleting removed load balancer listeners") _, err := c.elb.DeleteLoadBalancerListeners(request) if err != nil { - return nil, fmt.Errorf("error deleting AWS loadbalancer listeners: %v", err) + return nil, fmt.Errorf("error deleting AWS loadbalancer listeners: %q", err) } dirty = true } @@ -242,7 +242,7 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala glog.V(2).Info("Creating added load balancer listeners") _, err := c.elb.CreateLoadBalancerListeners(request) if err != nil { - return nil, fmt.Errorf("error creating AWS loadbalancer listeners: %v", err) + return nil, fmt.Errorf("error creating AWS loadbalancer listeners: %q", err) } dirty = true } @@ -339,7 +339,7 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala modifyAttributesRequest.LoadBalancerAttributes = loadBalancerAttributes _, err = c.elb.ModifyLoadBalancerAttributes(modifyAttributesRequest) if err != nil { - return nil, fmt.Errorf("Unable to update load balancer attributes during attribute sync: %v", err) + return nil, fmt.Errorf("Unable to update load balancer attributes during attribute sync: %q", err) } dirty = true } @@ -411,7 +411,7 @@ func (c *Cloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerDesc _, err := c.elb.ConfigureHealthCheck(request) if err != nil { - return fmt.Errorf("error configuring load-balancer health-check for %q: %v", name, err) + return fmt.Errorf("error configuring load-balancer health-check for %q: %q", name, err) } return nil @@ -486,7 +486,7 @@ func (c *Cloud) createProxyProtocolPolicy(loadBalancerName string) error { glog.V(2).Info("Creating proxy protocol policy on load balancer") _, err := c.elb.CreateLoadBalancerPolicy(request) if err != nil { - return fmt.Errorf("error creating proxy protocol policy on load balancer: %v", err) + return fmt.Errorf("error creating proxy protocol policy on load balancer: %q", err) } return nil @@ -505,7 +505,7 @@ func (c *Cloud) setBackendPolicies(loadBalancerName string, instancePort int64, } _, err := c.elb.SetLoadBalancerPoliciesForBackendServer(request) if err != nil { - return fmt.Errorf("error adjusting AWS loadbalancer backend policies: %v", err) + return fmt.Errorf("error adjusting AWS loadbalancer backend policies: %q", err) } return nil diff --git a/pkg/cloudprovider/providers/aws/aws_routes.go b/pkg/cloudprovider/providers/aws/aws_routes.go index f24220d78f..c2563ace17 100644 --- a/pkg/cloudprovider/providers/aws/aws_routes.go +++ b/pkg/cloudprovider/providers/aws/aws_routes.go @@ -131,7 +131,7 @@ func (c *Cloud) configureInstanceSourceDestCheck(instanceID string, sourceDestCh _, err := c.ec2.ModifyInstanceAttribute(request) if err != nil { - return fmt.Errorf("error configuring source-dest-check on instance %s: %v", instanceID, err) + return fmt.Errorf("error configuring source-dest-check on instance %s: %q", instanceID, err) } return nil } @@ -178,7 +178,7 @@ func (c *Cloud) CreateRoute(clusterName string, nameHint string, route *cloudpro _, err = c.ec2.DeleteRoute(request) if err != nil { - return fmt.Errorf("error deleting blackholed AWS route (%s): %v", aws.StringValue(deleteRoute.DestinationCidrBlock), err) + return fmt.Errorf("error deleting blackholed AWS route (%s): %q", aws.StringValue(deleteRoute.DestinationCidrBlock), err) } } @@ -190,7 +190,7 @@ func (c *Cloud) CreateRoute(clusterName string, nameHint string, route *cloudpro _, err = c.ec2.CreateRoute(request) if err != nil { - return fmt.Errorf("error creating AWS route (%s): %v", route.DestinationCIDR, err) + return fmt.Errorf("error creating AWS route (%s): %q", route.DestinationCIDR, err) } return nil @@ -210,7 +210,7 @@ func (c *Cloud) DeleteRoute(clusterName string, route *cloudprovider.Route) erro _, err = c.ec2.DeleteRoute(request) if err != nil { - return fmt.Errorf("error deleting AWS route (%s): %v", route.DestinationCIDR, err) + return fmt.Errorf("error deleting AWS route (%s): %q", route.DestinationCIDR, err) } return nil diff --git a/pkg/cloudprovider/providers/aws/tags.go b/pkg/cloudprovider/providers/aws/tags.go index ef89d17266..2b0ff8c2c7 100644 --- a/pkg/cloudprovider/providers/aws/tags.go +++ b/pkg/cloudprovider/providers/aws/tags.go @@ -179,7 +179,7 @@ func (c *awsTagging) readRepairClusterTags(client EC2, resourceID string, lifecy } if err := c.createTags(client, resourceID, lifecycle, addTags); err != nil { - return fmt.Errorf("error adding missing tags to resource %q: %v", resourceID, err) + return fmt.Errorf("error adding missing tags to resource %q: %q", resourceID, err) } return nil @@ -222,7 +222,7 @@ func (t *awsTagging) createTags(client EC2, resourceID string, lifecycle Resourc // We could check that the error is retryable, but the error code changes based on what we are tagging // SecurityGroup: InvalidGroup.NotFound - glog.V(2).Infof("Failed to create tags; will retry. Error was %v", err) + glog.V(2).Infof("Failed to create tags; will retry. Error was %q", err) lastErr = err return false, nil })