From 211c7f858503123f8a12351cd0fff085952f34fd Mon Sep 17 00:00:00 2001 From: Joel Hendrix Date: Thu, 25 Jul 2019 06:48:44 -0700 Subject: [PATCH] Cherry-pick Azure devops changes (#5336) * add azure devops pipeline * Fixes to devops CI (#5239) * Fixes to devops CI Add devops badge to README Fix lint and vet steps * limit linter to subset of repo fix golint errors * more linter fixes * more linter fixes * add remaining tests * include combined output when running git commands * enable dotglob so hidden dirs are moved --- README.md | 2 + azure-pipelines.yml | 58 ++++++++++++++++++ storage/file.go | 4 ++ tools/apidiff/cmd/packages.go | 6 +- tools/apidiff/delta/delta_test.go | 74 +++++++++++------------ tools/apidiff/exports/package_test.go | 10 +-- tools/deprecate/cmd/package.go | 2 +- tools/profileBuilder/model/latest.go | 4 +- tools/profileBuilder/model/latest_test.go | 30 ++++----- tools/profileBuilder/model/paths_test.go | 32 +++++----- tools/versioner/cmd/root_test.go | 8 +-- 11 files changed, 147 insertions(+), 83 deletions(-) create mode 100644 azure-pipelines.yml diff --git a/README.md b/README.md index 1a226af8b224..a07c02f357a3 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ [![Build Status](https://travis-ci.org/Azure/azure-sdk-for-go.svg?branch=master)](https://travis-ci.org/Azure/azure-sdk-for-go) +[![Build Status](https://dev.azure.com/azure-sdk/public/_apis/build/status/go/Azure.azure-sdk-for-go?branchName=latest)](https://dev.azure.com/azure-sdk/public/_build/latest?definitionId=640&branchName=latest) + [![Go Report Card](https://goreportcard.com/badge/github.com/Azure/azure-sdk-for-go)](https://goreportcard.com/report/github.com/Azure/azure-sdk-for-go) azure-sdk-for-go provides Go packages for managing and using Azure services. diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 000000000000..d254313e0985 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,58 @@ +pool: + vmImage: 'Ubuntu 16.04' + +variables: + GOROOT: '/usr/local/go1.12' + GOPATH: '$(system.defaultWorkingDirectory)/work' + sdkPath: '$(GOPATH)/src/github.com/$(build.repository.name)' + IGNORE_BREAKING_CHANGES: true + +steps: +- script: | + set -e + mkdir -p '$(GOPATH)/bin' + mkdir -p '$(sdkPath)' + shopt -s dotglob extglob + mv !(work) '$(sdkPath)' + echo '##vso[task.prependpath]$(GOROOT)/bin' + echo '##vso[task.prependpath]$(GOPATH)/bin' + displayName: 'Create Go Workspace' +- script: | + set -e + curl -sSL https://raw.githubusercontent.com/golang/dep/master/install.sh | sh + dep ensure -v + go get -u golang.org/x/lint/golint + workingDirectory: '$(sdkPath)' + displayName: 'Install Dependencies' +- script: go vet $(go list ./... | grep -v vendor) + workingDirectory: '$(sdkPath)' + displayName: 'Vet' +- script: go build -v $(go list ./... | grep -v vendor) + workingDirectory: '$(sdkPath)' + displayName: 'Build' +- script: go test $(dirname $(find . -path ./vendor -prune -o -name '*_test.go' -print) | sort -u) + workingDirectory: '$(sdkPath)' + displayName: 'Run Tests' +- script: go run ./tools/apidiff/main.go packages ./services FETCH_HEAD~1 FETCH_HEAD --copyrepo --breakingchanges || $IGNORE_BREAKING_CHANGES + workingDirectory: '$(sdkPath)' + displayName: 'Display Breaking Changes' +- script: go run ./tools/pkgchk/main.go ./services --exceptions ./tools/pkgchk/exceptions.txt + workingDirectory: '$(sdkPath)' + displayName: 'Verify Package Directory' +- script: grep -L -r --include *.go --exclude-dir vendor -P "Copyright (\d{4}|\(c\)) Microsoft" ./ | tee >&2 + workingDirectory: '$(sdkPath)' + displayName: 'Copyright Header Check' + failOnStderr: true + condition: succeededOrFailed() +- script: gofmt -s -l -w $(find . -path ./vendor -prune -o -name '*.go' -print) >&2 + workingDirectory: '$(sdkPath)' + displayName: 'Format Check' + failOnStderr: true + condition: succeededOrFailed() +- script: | + golint ./storage/... >&2 + golint ./tools/... >&2 + workingDirectory: '$(sdkPath)' + displayName: 'Linter Check' + failOnStderr: true + condition: succeededOrFailed() diff --git a/storage/file.go b/storage/file.go index 06bbe4ba08cb..6a480b12a802 100644 --- a/storage/file.go +++ b/storage/file.go @@ -29,7 +29,11 @@ const fourMB = uint64(4194304) const oneTB = uint64(1099511627776) // Export maximum range and file sizes + +// MaxRangeSize defines the maximum size in bytes for a file range. const MaxRangeSize = fourMB + +// MaxFileSize defines the maximum size in bytes for a file. const MaxFileSize = oneTB // File represents a file on a share. diff --git a/tools/apidiff/cmd/packages.go b/tools/apidiff/cmd/packages.go index 8db1b443ca8f..cb86098b758f 100644 --- a/tools/apidiff/cmd/packages.go +++ b/tools/apidiff/cmd/packages.go @@ -191,7 +191,7 @@ type CommitPkgsReport struct { CommitsReports map[string]pkgsReport `json:"deltas"` } -// returns true if the report contains no data +// IsEmpty returns true if the report contains no data. func (c CommitPkgsReport) IsEmpty() bool { for _, r := range c.CommitsReports { if !r.isEmpty() { @@ -201,7 +201,7 @@ func (c CommitPkgsReport) IsEmpty() bool { return true } -// returns true if the report contains breaking changes +// HasBreakingChanges returns true if the report contains breaking changes. func (c CommitPkgsReport) HasBreakingChanges() bool { for _, r := range c.CommitsReports { if r.hasBreakingChanges() { @@ -211,7 +211,7 @@ func (c CommitPkgsReport) HasBreakingChanges() bool { return false } -// returns true if the package contains additive changes +// HasAdditiveChanges returns true if the package contains additive changes. func (c CommitPkgsReport) HasAdditiveChanges() bool { for _, r := range c.CommitsReports { if r.hasAdditiveChanges() { diff --git a/tools/apidiff/delta/delta_test.go b/tools/apidiff/delta/delta_test.go index f486b5706958..3d36d34c52a3 100644 --- a/tools/apidiff/delta/delta_test.go +++ b/tools/apidiff/delta/delta_test.go @@ -46,10 +46,10 @@ func Test_GetAddedExports(t *testing.T) { } cAdded := map[string]exports.Const{ - "Blue": exports.Const{Type: "Color", Value: "Blue"}, - "Green": exports.Const{Type: "Color", Value: "Green"}, - "Red": exports.Const{Type: "Color", Value: "Red"}, - "Holiday": exports.Const{Type: "DayOfWeek", Value: "Holiday"}, + "Blue": {Type: "Color", Value: "Blue"}, + "Green": {Type: "Color", Value: "Green"}, + "Red": {Type: "Color", Value: "Red"}, + "Holiday": {Type: "DayOfWeek", Value: "Holiday"}, } for k, v := range cAdded { @@ -72,12 +72,12 @@ func Test_GetAddedExports(t *testing.T) { } fAdded := map[string]exports.Func{ - "DoNothing2": exports.Func{}, - "Client.ExportData": exports.Func{Params: strPtr("context.Context,string,string,ExportRDBParameters"), Returns: strPtr("ExportDataFuture,error")}, - "Client.ExportDataPreparer": exports.Func{Params: strPtr("context.Context,string,string,ExportRDBParameters"), Returns: strPtr("*http.Request,error")}, - "Client.ExportDataSender": exports.Func{Params: strPtr("*http.Request"), Returns: strPtr("ExportDataFuture,error")}, - "Client.ExportDataResponder": exports.Func{Params: strPtr("*http.Response"), Returns: strPtr("autorest.Response,error")}, - "ExportDataFuture.Result": exports.Func{Params: strPtr("Client"), Returns: strPtr("autorest.Response,error")}, + "DoNothing2": {}, + "Client.ExportData": {Params: strPtr("context.Context,string,string,ExportRDBParameters"), Returns: strPtr("ExportDataFuture,error")}, + "Client.ExportDataPreparer": {Params: strPtr("context.Context,string,string,ExportRDBParameters"), Returns: strPtr("*http.Request,error")}, + "Client.ExportDataSender": {Params: strPtr("*http.Request"), Returns: strPtr("ExportDataFuture,error")}, + "Client.ExportDataResponder": {Params: strPtr("*http.Response"), Returns: strPtr("autorest.Response,error")}, + "ExportDataFuture.Result": {Params: strPtr("Client"), Returns: strPtr("autorest.Response,error")}, } for k, v := range fAdded { @@ -100,12 +100,12 @@ func Test_GetAddedExports(t *testing.T) { } iAdded := map[string]exports.Interface{ - "NewInterface": exports.Interface{Methods: map[string]exports.Func{ - "One": exports.Func{Params: strPtr("int")}, - "Two": exports.Func{Returns: strPtr("error")}, + "NewInterface": {Methods: map[string]exports.Func{ + "One": {Params: strPtr("int")}, + "Two": {Returns: strPtr("error")}, }}, - "SomeInterface": exports.Interface{Methods: map[string]exports.Func{ - "NewMethod": exports.Func{Params: strPtr("string"), Returns: strPtr("bool,error")}, + "SomeInterface": {Methods: map[string]exports.Func{ + "NewMethod": {Params: strPtr("string"), Returns: strPtr("bool,error")}, }}, } @@ -129,23 +129,23 @@ func Test_GetAddedExports(t *testing.T) { } sAdded := map[string]exports.Struct{ - "ExportDataFuture": exports.Struct{ + "ExportDataFuture": { AnonymousFields: []string{"azure.Future"}, Fields: map[string]string{"NewField": "string"}, }, - "ExportRDBParameters": exports.Struct{ + "ExportRDBParameters": { Fields: map[string]string{ "Format": "*string", "Prefix": "*string", "Container": "*string", }, }, - "CreateProperties": exports.Struct{ + "CreateProperties": { Fields: map[string]string{ "NewField": "*float64", }, }, - "DeleteFuture": exports.Struct{ + "DeleteFuture": { Fields: map[string]string{ "NewField": "string", }, @@ -174,10 +174,10 @@ func Test_GetAddedStructFields(t *testing.T) { } added := map[string]exports.Struct{ - "CreateProperties": exports.Struct{ + "CreateProperties": { Fields: map[string]string{"NewField": "*float64"}, }, - "DeleteFuture": exports.Struct{ + "DeleteFuture": { Fields: map[string]string{"NewField": "string"}, }, } @@ -197,9 +197,9 @@ func Test_GetAddedInterfaceMethods(t *testing.T) { } added := map[string]exports.Interface{ - "SomeInterface": exports.Interface{ + "SomeInterface": { Methods: map[string]exports.Func{ - "NewMethod": exports.Func{Params: strPtr("string"), Returns: strPtr("bool,error")}, + "NewMethod": {Params: strPtr("string"), Returns: strPtr("bool,error")}, }, }, } @@ -268,23 +268,23 @@ func Test_GetFuncSigChanges(t *testing.T) { } changed := map[string]delta.FuncSig{ - "DoNothing": delta.FuncSig{ + "DoNothing": { Params: &delta.Signature{From: delta.None, To: "string"}, }, - "DoNothingWithParam": delta.FuncSig{ + "DoNothingWithParam": { Params: &delta.Signature{From: "int", To: delta.None}, }, - "Client.List": delta.FuncSig{ + "Client.List": { Params: &delta.Signature{From: "context.Context", To: "context.Context,string"}, Returns: &delta.Signature{From: "ListResultPage,error", To: "ListResult,error"}, }, - "Client.ListPreparer": delta.FuncSig{ + "Client.ListPreparer": { Params: &delta.Signature{From: "context.Context", To: "context.Context,string"}, }, - "Client.Delete": delta.FuncSig{ + "Client.Delete": { Params: &delta.Signature{From: "context.Context,string,string", To: "context.Context,string"}, }, - "Client.DeletePreparer": delta.FuncSig{ + "Client.DeletePreparer": { Params: &delta.Signature{From: "context.Context,string,string", To: "context.Context,string"}, }, } @@ -313,10 +313,10 @@ func Test_GetInterfaceMethodSigChanges(t *testing.T) { } changed := map[string]delta.InterfaceDef{ - "SomeInterface": delta.InterfaceDef{ + "SomeInterface": { MethodSigs: map[string]delta.FuncSig{ - "One": delta.FuncSig{Params: &delta.Signature{From: delta.None, To: "string"}}, - "Two": delta.FuncSig{Params: &delta.Signature{From: "bool", To: "bool,int"}}, + "One": {Params: &delta.Signature{From: delta.None, To: "string"}}, + "Two": {Params: &delta.Signature{From: "bool", To: "bool,int"}}, }, }, } @@ -345,15 +345,15 @@ func Test_GetStructFieldChanges(t *testing.T) { } changed := map[string]delta.StructDef{ - "CreateProperties": delta.StructDef{ + "CreateProperties": { Fields: map[string]delta.Signature{ - "SubnetID": delta.Signature{From: "*string", To: "*int"}, - "RedisConfiguration": delta.Signature{From: "map[string]*string", To: "interface{}"}, + "SubnetID": {From: "*string", To: "*int"}, + "RedisConfiguration": {From: "map[string]*string", To: "interface{}"}, }, }, - "ListResult": delta.StructDef{ + "ListResult": { Fields: map[string]delta.Signature{ - "NextLink": delta.Signature{From: "*string", To: "string"}, + "NextLink": {From: "*string", To: "string"}, }, }, } diff --git a/tools/apidiff/exports/package_test.go b/tools/apidiff/exports/package_test.go index 8183a0cbb2e7..a7226ee040ac 100644 --- a/tools/apidiff/exports/package_test.go +++ b/tools/apidiff/exports/package_test.go @@ -104,23 +104,23 @@ func Test_Interfaces(t *testing.T) { }{ {"SomeInterface", exports.Interface{ Methods: map[string]exports.Func{ - "One": exports.Func{ + "One": { Params: nil, Returns: nil, }, - "Two": exports.Func{ + "Two": { Params: strPtr("bool"), Returns: nil, }, - "Three": exports.Func{ + "Three": { Params: nil, Returns: strPtr("string"), }, - "Four": exports.Func{ + "Four": { Params: strPtr("int"), Returns: strPtr("error"), }, - "Five": exports.Func{ + "Five": { Params: strPtr("int,bool"), Returns: strPtr("int,error"), }, diff --git a/tools/deprecate/cmd/package.go b/tools/deprecate/cmd/package.go index 8b8b55227d4a..014cec2c348a 100644 --- a/tools/deprecate/cmd/package.go +++ b/tools/deprecate/cmd/package.go @@ -104,7 +104,7 @@ func addDeprecationComment(cg *ast.CommentGroup, message string) { } // create a new comment and add it to the beginning of the comment group nd := []*ast.Comment{ - &ast.Comment{ + { Text: fmt.Sprintf("// Deprecated: %s", message), Slash: cg.Pos() - 1, }, diff --git a/tools/profileBuilder/model/latest.go b/tools/profileBuilder/model/latest.go index 1eba7a372590..2c64e001c13e 100644 --- a/tools/profileBuilder/model/latest.go +++ b/tools/profileBuilder/model/latest.go @@ -163,7 +163,7 @@ var versionLE = func() func(string, string) (bool, error) { // inconsistencies in the directory structure (e.g. v1, 6.2, v1.0 etc). given this we must always check // the API version strategry first as the semver strategy can match an API version yielding incorrect results. wellKnownStrategies := []strategyTuple{ - strategyTuple{ + { match: regexp.MustCompile(`^(?P\d{4})-(?P\d{2})-(?P\d{2})(?:[\.\-](?P.+))?$`), handler: func(leftMatch, rightMatch []string) (bool, error) { var err error @@ -197,7 +197,7 @@ var versionLE = func() func(string, string) (bool, error) { return true, nil }, }, - strategyTuple{ + { match: regexp.MustCompile(`(?P\d+)(?:\.(?P\d+)(?:\.(?P\d+))?-?(?P.*))?`), handler: func(leftMatch, rightMatch []string) (bool, error) { for i := 1; i <= 3; i++ { diff --git a/tools/profileBuilder/model/latest_test.go b/tools/profileBuilder/model/latest_test.go index b193f7ce4b1d..f07117b58615 100644 --- a/tools/profileBuilder/model/latest_test.go +++ b/tools/profileBuilder/model/latest_test.go @@ -69,23 +69,23 @@ func TestLatestTrackerAPIVer(t *testing.T) { result int } tests := []tc{ - tc{ + { input: "/work/src/github.com/Azure/azure-sdk-for-go/services/abc/2019-01-01/abc", result: 1, }, - tc{ + { input: "/work/src/github.com/Azure/azure-sdk-for-go/services/abc/2018-05-11/abc", result: -1, }, - tc{ + { input: "/work/src/github.com/Azure/azure-sdk-for-go/services/abc/2019-07-13/abc", result: 0, }, - tc{ + { input: "/work/src/github.com/Azure/azure-sdk-for-go/services/def/2015-03-01/def", result: 1, }, - tc{ + { input: "/work/src/github.com/Azure/azure-sdk-for-go/services/def/2017-10-01/def", result: 0, }, @@ -123,43 +123,43 @@ func TestLatestTrackerModVer(t *testing.T) { result int } tests := []tc{ - tc{ + { input: "/work/src/github.com/Azure/azure-sdk-for-go/services/abc/2019-01-01/abc", result: 1, }, - tc{ + { input: "/work/src/github.com/Azure/azure-sdk-for-go/services/abc/2018-05-11/abc", result: -1, }, - tc{ + { input: "/work/src/github.com/Azure/azure-sdk-for-go/services/abc/2019-01-01/abc/v2", result: 0, }, - tc{ + { input: "/work/src/github.com/Azure/azure-sdk-for-go/services/abc/2019-07-13/abc", result: 0, }, - tc{ + { input: "/work/src/github.com/Azure/azure-sdk-for-go/services/abc/2019-07-13/abc/v2", result: 0, }, - tc{ + { input: "/work/src/github.com/Azure/azure-sdk-for-go/services/def/2015-03-01/def", result: 1, }, - tc{ + { input: "/work/src/github.com/Azure/azure-sdk-for-go/services/def/2017-10-01/def", result: 0, }, - tc{ + { input: "/work/src/github.com/Azure/azure-sdk-for-go/services/def/2015-03-01/def/v2", result: -1, }, - tc{ + { input: "/work/src/github.com/Azure/azure-sdk-for-go/services/def/2017-10-01/def/v2", result: 0, }, - tc{ + { input: "/work/src/github.com/Azure/azure-sdk-for-go/services/def/2017-10-01/def/v3", result: 0, }, diff --git a/tools/profileBuilder/model/paths_test.go b/tools/profileBuilder/model/paths_test.go index 03dfbb84faf7..2950bbd47529 100644 --- a/tools/profileBuilder/model/paths_test.go +++ b/tools/profileBuilder/model/paths_test.go @@ -29,7 +29,7 @@ func TestDeconstructPath(t *testing.T) { pi PathInfo } testcases := []testcase{ - testcase{ + { name: "arm1", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "storage", "mgmt", "2016-01-01", "storage"), pi: PathInfo{ @@ -39,7 +39,7 @@ func TestDeconstructPath(t *testing.T) { Group: "storage", }, }, - testcase{ + { name: "arm2", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "datalake", "analytics", "mgmt", "2016-11-01", "account"), pi: PathInfo{ @@ -49,7 +49,7 @@ func TestDeconstructPath(t *testing.T) { Group: "account", }, }, - testcase{ + { name: "arm3", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "datalake", "analytics", "mgmt", "2016-11-01", "account", "v2"), pi: PathInfo{ @@ -60,7 +60,7 @@ func TestDeconstructPath(t *testing.T) { ModVer: "v2", }, }, - testcase{ + { name: "arm4", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "datalake", "analytics", "mgmt", "2016-11-01", "account", "v2", "accountapi"), pi: PathInfo{ @@ -72,7 +72,7 @@ func TestDeconstructPath(t *testing.T) { APIPkg: "accountapi", }, }, - testcase{ + { name: "arm5", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "storage", "mgmt", "2016-01-01", "storage", "v10"), pi: PathInfo{ @@ -83,7 +83,7 @@ func TestDeconstructPath(t *testing.T) { ModVer: "v10", }, }, - testcase{ + { name: "arm6", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "storage", "mgmt", "2016-01-01", "storage", "v10", "storageapi"), pi: PathInfo{ @@ -95,7 +95,7 @@ func TestDeconstructPath(t *testing.T) { APIPkg: "storageapi", }, }, - testcase{ + { name: "arm7", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "storage", "mgmt", "2016-01-01", "storage", "storageapi"), pi: PathInfo{ @@ -106,7 +106,7 @@ func TestDeconstructPath(t *testing.T) { APIPkg: "storageapi", }, }, - testcase{ + { name: "arm8", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "datalake", "analytics", "mgmt", "2016-11-01", "account", "accountapi"), pi: PathInfo{ @@ -117,7 +117,7 @@ func TestDeconstructPath(t *testing.T) { APIPkg: "accountapi", }, }, - testcase{ + { name: "dataplane1", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "cognitiveservices", "v2.0", "luis", "authoring"), pi: PathInfo{ @@ -127,7 +127,7 @@ func TestDeconstructPath(t *testing.T) { Group: filepath.Join("luis", "authoring"), }, }, - testcase{ + { name: "dataplane2", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "datalake", "analytics", "2016-11-01", "job"), pi: PathInfo{ @@ -137,7 +137,7 @@ func TestDeconstructPath(t *testing.T) { Group: "job", }, }, - testcase{ + { name: "dataplane3", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "appinsights", "v1", "insights"), pi: PathInfo{ @@ -147,7 +147,7 @@ func TestDeconstructPath(t *testing.T) { Group: "insights", }, }, - testcase{ + { name: "dataplane4", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "cognitiveservices", "v2.0", "luis", "authoring", "v2"), pi: PathInfo{ @@ -158,7 +158,7 @@ func TestDeconstructPath(t *testing.T) { ModVer: "v2", }, }, - testcase{ + { name: "dataplane5", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "cognitiveservices", "v2.0", "luis", "authoring", "v2", "authoringapi"), pi: PathInfo{ @@ -170,7 +170,7 @@ func TestDeconstructPath(t *testing.T) { APIPkg: "authoringapi", }, }, - testcase{ + { name: "dataplane6", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "appinsights", "v1", "insights", "v4"), pi: PathInfo{ @@ -181,7 +181,7 @@ func TestDeconstructPath(t *testing.T) { ModVer: "v4", }, }, - testcase{ + { name: "dataplane7", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "appinsights", "v1", "insights", "insightsapi"), pi: PathInfo{ @@ -192,7 +192,7 @@ func TestDeconstructPath(t *testing.T) { APIPkg: "insightsapi", }, }, - testcase{ + { name: "dataplane8", path: filepath.Join("work", "src", "github.com", "Azure", "azure-sdk-for-go", "services", "appinsights", "v1", "insights", "v4", "insightsapi"), pi: PathInfo{ diff --git a/tools/versioner/cmd/root_test.go b/tools/versioner/cmd/root_test.go index 4bef43e1b426..5be1d7cae459 100644 --- a/tools/versioner/cmd/root_test.go +++ b/tools/versioner/cmd/root_test.go @@ -277,14 +277,14 @@ func Test_updateGoModVerB(t *testing.T) { func cleanTestData() { cmd := exec.Command("git", "clean", "-xdf", "../../testdata") - err := cmd.Run() + output, err := cmd.CombinedOutput() if err != nil { - panic(err) + panic(string(output)) } cmd = exec.Command("git", "checkout", "--", "../../testdata") - err = cmd.Run() + output, err = cmd.CombinedOutput() if err != nil { - panic(err) + panic(string(output)) } }