diff --git a/.travis.yml b/.travis.yml index f6f44c49f223..b3729bb17f7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,8 @@ install: script: - gas -skip=*/arm/*/models.go -skip=*/management/examples/*.go -skip=*vendor* -skip=*/Gododir/* ./... + - gas -exclude=G101 ./arm/... ./management/examples/... + - gas -exclude=G204 ./Gododir/... - test -z "$(gofmt -s -l $(find ./arm/* -type d -print) | tee /dev/stderr)" - test -z "$(gofmt -s -l -w management | tee /dev/stderr)" - test -z "$(gofmt -s -l -w storage | tee /dev/stderr)" diff --git a/management/examples/example.go b/management/examples/example.go index 3b89a5699542..f5f2fc2d0da3 100644 --- a/management/examples/example.go +++ b/management/examples/example.go @@ -48,13 +48,19 @@ func main() { fmt.Println("Create virtual machine") role := vmutils.NewVMConfiguration(dnsName, vmSize) - vmutils.ConfigureDeploymentFromPlatformImage( + if err := vmutils.ConfigureDeploymentFromPlatformImage( &role, vmImage, fmt.Sprintf("http://%s.blob.core.windows.net/%s/%s.vhd", storageAccount, dnsName, dnsName), - "") - vmutils.ConfigureForLinux(&role, dnsName, userName, userPassword) - vmutils.ConfigureWithPublicSSH(&role) + ""); err != nil { + panic(err) + } + if err := vmutils.ConfigureForLinux(&role, dnsName, userName, userPassword); err != nil { + panic(err) + } + if err := vmutils.ConfigureWithPublicSSH(&role); err != nil { + panic(err) + } fmt.Println("Deploy") operationID, err := virtualmachine.NewClient(client). diff --git a/management/vmutils/extensions.go b/management/vmutils/extensions.go index 90a869275b77..751fd6a6cdbd 100644 --- a/management/vmutils/extensions.go +++ b/management/vmutils/extensions.go @@ -58,7 +58,9 @@ func AddAzureDockerVMExtensionConfiguration(role *vm.Role, dockerPort int, versi return fmt.Errorf(errParamNotSpecified, "role") } - ConfigureWithExternalPort(role, "docker", dockerPort, dockerPort, vm.InputEndpointProtocolTCP) + if err := ConfigureWithExternalPort(role, "docker", dockerPort, dockerPort, vm.InputEndpointProtocolTCP); err != nil { + return err + } publicConfiguration, err := createDockerPublicConfig(dockerPort) if err != nil { diff --git a/storage/blob.go b/storage/blob.go index d952b54d5a31..d9e707c816ce 100644 --- a/storage/blob.go +++ b/storage/blob.go @@ -537,9 +537,7 @@ func (b BlobStorageClient) SetContainerPermissions(container string, containerPe } if resp != nil { - defer func() { - err = resp.body.Close() - }() + defer resp.body.Close() if resp.statusCode != http.StatusOK { return errors.New("Unable to set permissions") @@ -575,9 +573,7 @@ func (b BlobStorageClient) GetContainerPermissions(container string, timeout int // containerAccess. Blob, Container, empty containerAccess := resp.headers.Get(http.CanonicalHeaderKey(ContainerAccessHeader)) - defer func() { - err = resp.body.Close() - }() + defer resp.body.Close() var out AccessPolicy err = xmlUnmarshal(resp.body, &out.SignedIdentifiersList) diff --git a/storage/file.go b/storage/file.go index f679395bde27..716d8c938d24 100644 --- a/storage/file.go +++ b/storage/file.go @@ -250,7 +250,6 @@ func (f FileServiceClient) ListDirsAndFiles(path string, params ListDirsAndFiles if err != nil { return out, err } - defer resp.body.Close() err = xmlUnmarshal(resp.body, &out) return out, err @@ -302,7 +301,6 @@ func (f FileServiceClient) ListShares(params ListSharesParameters) (ShareListRes if err != nil { return out, err } - defer resp.body.Close() err = xmlUnmarshal(resp.body, &out) return out, err @@ -400,7 +398,6 @@ func (f FileServiceClient) modifyRange(path string, bytes io.Reader, fileRange F if err != nil { return err } - defer resp.body.Close() return checkRespCode(resp.statusCode, []int{http.StatusCreated}) } diff --git a/storage/table.go b/storage/table.go index f8caca94ad8d..ef5fdff1da58 100644 --- a/storage/table.go +++ b/storage/table.go @@ -56,7 +56,9 @@ func (c *TableServiceClient) QueryTables() ([]AzureTable, error) { } buf := new(bytes.Buffer) - buf.ReadFrom(resp.body) + if _, err := buf.ReadFrom(resp.body); err != nil { + return nil, err + } var respArray queryTablesResponse if err := json.Unmarshal(buf.Bytes(), &respArray); err != nil { diff --git a/storage/table_entities.go b/storage/table_entities.go index 3bed9c0e67a7..db991407981f 100644 --- a/storage/table_entities.go +++ b/storage/table_entities.go @@ -147,10 +147,7 @@ func (c *TableServiceClient) execTable(table AzureTable, entity TableEntity, spe headers["Content-Length"] = fmt.Sprintf("%d", buf.Len()) - var err error - var resp *odataResponse - - resp, err = c.client.execTable(method, uri, headers, &buf) + resp, err := c.client.execTable(method, uri, headers, &buf) if err != nil { return 0, err @@ -327,8 +324,12 @@ func deserializeEntity(retType reflect.Type, reader io.Reader) ([]TableEntity, e } // Reset PartitionKey and RowKey - tEntries[i].SetPartitionKey(pKey) - tEntries[i].SetRowKey(rKey) + if err := tEntries[i].SetPartitionKey(pKey); err != nil { + return nil, err + } + if err := tEntries[i].SetRowKey(rKey); err != nil { + return nil, err + } } return tEntries, nil