diff --git a/pkg/cloudprovider/aws/aws.go b/pkg/cloudprovider/aws/aws.go index 538df030cd1..de50abdc8c7 100644 --- a/pkg/cloudprovider/aws/aws.go +++ b/pkg/cloudprovider/aws/aws.go @@ -170,7 +170,7 @@ func (s *goamzEC2) DeleteVolume(volumeId string) (resp *ec2.SimpleResp, err erro func init() { cloudprovider.RegisterCloudProvider("aws", func(config io.Reader) (cloudprovider.Interface, error) { metadata := &goamzMetadata{} - return newAWSCloud(config, getAuth, "", metadata) + return newAWSCloud(config, getAuth, metadata) }) } @@ -219,7 +219,7 @@ func getAvailabilityZone(metadata AWSMetadata) (string, error) { // newAWSCloud creates a new instance of AWSCloud. // authFunc and instanceId are primarily for tests -func newAWSCloud(config io.Reader, authFunc AuthFunc, instanceId string, metadata AWSMetadata) (*AWSCloud, error) { +func newAWSCloud(config io.Reader, authFunc AuthFunc, metadata AWSMetadata) (*AWSCloud, error) { cfg, err := readAWSCloudConfig(config, metadata) if err != nil { return nil, fmt.Errorf("unable to read AWS cloud provider config file: %v", err) diff --git a/pkg/cloudprovider/aws/aws_test.go b/pkg/cloudprovider/aws/aws_test.go index e0749f3924f..2f49c6ffa9f 100644 --- a/pkg/cloudprovider/aws/aws_test.go +++ b/pkg/cloudprovider/aws/aws_test.go @@ -143,8 +143,7 @@ func TestNewAWSCloud(t *testing.T) { for _, test := range tests { t.Logf("Running test case %s", test.name) - selfInstanceId := "self-instance" - c, err := newAWSCloud(test.reader, test.authFunc, selfInstanceId, test.metadata) + c, err := newAWSCloud(test.reader, test.authFunc, test.metadata) if test.expectError { if err == nil { t.Errorf("Should error for case %s", test.name)