Merge pull request #404 from rajathagasthya/go-1.13

k8s-ci-robot · web-flow · commit 2ba5d4baa906 · 2020-02-25T17:02:26.000-08:00
⚠ Bump to go 1.13
diff --git a/.travis.yml b/.travis.yml
@@ -5,16 +5,15 @@ os:
   - osx
 
 go:
-- "1.12"
+- "1.13"
 
 git:
   depth: 3
 
 go_import_path: sigs.k8s.io/controller-tools
 
 install:
-- go get -u github.com/golang/dep/cmd/dep
-- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.17.1
+- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.23.6
 
 script:
 - GO111MODULE=on TRACE=1 ./test.sh
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/controller-tools
 
-go 1.12
+go 1.13
 
 require (
 	github.com/fatih/color v1.7.0
diff --git a/go.sum b/go.sum
@@ -132,8 +132,6 @@ github.com/go-openapi/validate v0.19.2 h1:ky5l57HjyVRrsJfd2+Ro5Z9PjGuKbsmftwyMtk
 github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
 github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gobuffalo/flect v0.1.5 h1:xpKq9ap8MbYfhuPCF0dBH854Gp9CxZjr/IocxELFflo=
-github.com/gobuffalo/flect v0.1.5/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80=
 github.com/gobuffalo/flect v0.2.0 h1:EWCvMGGxOjsgwlWaP+f4+Hh6yrrte7JeFL2S6b+0hdM=
 github.com/gobuffalo/flect v0.2.0/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -400,6 +398,7 @@ golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgw
 golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72 h1:bw9doJza/SFBEweII/rHQh338oozWyiFsBRHtrflcws=
 golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
diff --git a/pkg/crd/conv.go b/pkg/crd/conv.go
@@ -35,7 +35,7 @@ func AsVersion(original apiext.CustomResourceDefinition, gv schema.GroupVersion)
 	// questionable decision.
 	intVer, err := conversionScheme.ConvertToVersion(&original, apiextinternal.SchemeGroupVersion)
 	if err != nil {
-		return nil, fmt.Errorf("unable to convert to internal CRD version: %v", err)
+		return nil, fmt.Errorf("unable to convert to internal CRD version: %w", err)
 	}
 
 	return conversionScheme.ConvertToVersion(intVer, gv)
diff --git a/pkg/crd/testdata/go.mod b/pkg/crd/testdata/go.mod
@@ -1,6 +1,6 @@
 module testdata.kubebuilder.io/cronjob
 
-go 1.12
+go 1.13
 
 require (
 	k8s.io/api v0.0.0-20190615205754-1d1b8b084b30
diff --git a/pkg/deepcopy/testdata/go.mod b/pkg/deepcopy/testdata/go.mod
@@ -1,6 +1,6 @@
 module testdata.kubebuilder.io/cronjob
 
-go 1.12
+go 1.13
 
 require (
 	k8s.io/api v0.0.0-20190722141453-b90922c02518
diff --git a/pkg/genall/options.go b/pkg/genall/options.go
@@ -128,7 +128,7 @@ func protoFromOptions(optionsRegistry *markers.Registry, options []string) (prot
 
 		val, err := defn.Parse(rawOpt)
 		if err != nil {
-			return protoRuntime{}, fmt.Errorf("unable to parse option %q: %v", rawOpt[1:], err)
+			return protoRuntime{}, fmt.Errorf("unable to parse option %q: %w", rawOpt[1:], err)
 		}
 
 		switch val := val.(type) {
diff --git a/pkg/markers/parse.go b/pkg/markers/parse.go
@@ -588,7 +588,7 @@ func ArgumentFromType(rawType reflect.Type) (Argument, error) {
 		arg.Type = SliceType
 		itemType, err := ArgumentFromType(rawType.Elem())
 		if err != nil {
-			return Argument{}, fmt.Errorf("bad slice item type: %v", err)
+			return Argument{}, fmt.Errorf("bad slice item type: %w", err)
 		}
 		arg.ItemType = &itemType
 	case reflect.Map:
@@ -598,7 +598,7 @@ func ArgumentFromType(rawType reflect.Type) (Argument, error) {
 		}
 		itemType, err := ArgumentFromType(rawType.Elem())
 		if err != nil {
-			return Argument{}, fmt.Errorf("bad slice item type: %v", err)
+			return Argument{}, fmt.Errorf("bad slice item type: %w", err)
 		}
 		arg.ItemType = &itemType
 	default:
@@ -720,7 +720,7 @@ func (d *Definition) loadFields() error {
 
 		argType, err := ArgumentFromType(field.Type)
 		if err != nil {
-			return fmt.Errorf("unable to extract type information for field %q: %v", field.Name, err)
+			return fmt.Errorf("unable to extract type information for field %q: %w", field.Name, err)
 		}
 
 		if argType.Type == RawType {
diff --git a/pkg/schemapatcher/gen.go b/pkg/schemapatcher/gen.go
@@ -170,11 +170,11 @@ func (g Generator) Generate(ctx *genall.GenerationContext) (result error) {
 
 		if allSame {
 			if err := existingSet.setGlobalSchema(); err != nil {
-				return fmt.Errorf("failed to set global firstSchema for %s: %v", existingSet.GroupKind, err)
+				return fmt.Errorf("failed to set global firstSchema for %s: %w", existingSet.GroupKind, err)
 			}
 		} else {
 			if err := existingSet.setVersionedSchemata(); err != nil {
-				return fmt.Errorf("failed to set versioned schemas for %s: %v", existingSet.GroupKind, err)
+				return fmt.Errorf("failed to set versioned schemas for %s: %w", existingSet.GroupKind, err)
 			}
 		}
 	}
@@ -278,7 +278,7 @@ func (e *partialCRD) setGlobalSchema(newSchema apiext.JSONSchemaProps) error {
 	}
 	schema, err := legacySchema(newSchema)
 	if err != nil {
-		return fmt.Errorf("failed to convert schema to legacy form: %v", err)
+		return fmt.Errorf("failed to convert schema to legacy form: %w", err)
 	}
 	schemaNodeTree, err := yamlop.ToYAML(schema)
 	if err != nil {
@@ -300,7 +300,7 @@ func (e *partialCRD) setGlobalSchema(newSchema apiext.JSONSchemaProps) error {
 	}
 	for i, verNode := range versions.Content {
 		if err := yamlop.DeleteNode(verNode, "schema"); err != nil {
-			return fmt.Errorf("spec.versions[%d]: %v", i, err)
+			return fmt.Errorf("spec.versions[%d]: %w", i, err)
 		}
 	}
 
@@ -363,26 +363,26 @@ func (e *partialCRD) setVersionedSchemata(newSchemata map[string]apiext.JSONSche
 		newSchema, found := newSchemata[name]
 		if !found {
 			if err := yamlop.DeleteNode(verNode, "schema"); err != nil {
-				return fmt.Errorf("spec.versions[%d]: %v", i, err)
+				return fmt.Errorf("spec.versions[%d]: %w", i, err)
 			}
 		} else {
 			// TODO(directxman12): if this gets to be more than 2 versions, use polymorphism to clean this up
 			var verSchema interface{} = newSchema
 			if e.CRDVersion == legacyAPIExtVersion {
 				verSchema, err = legacySchema(newSchema)
 				if err != nil {
-					return fmt.Errorf("failed to convert schema to legacy form: %v", err)
+					return fmt.Errorf("failed to convert schema to legacy form: %w", err)
 				}
 			}
 
 			schemaNodeTree, err := yamlop.ToYAML(verSchema)
 			if err != nil {
-				return fmt.Errorf("failed to convert schema to YAML: %v", err)
+				return fmt.Errorf("failed to convert schema to YAML: %w", err)
 			}
 			schemaNodeTree = schemaNodeTree.Content[0] // get rid of the document node
 			yamlop.SetStyle(schemaNodeTree, 0)         // clear the style so it defaults to an auto-chosen one
 			if err := yamlop.SetNode(verNode, *schemaNodeTree, "schema", "openAPIV3Schema"); err != nil {
-				return fmt.Errorf("spec.versions[%d]: %v", i, err)
+				return fmt.Errorf("spec.versions[%d]: %w", i, err)
 			}
 		}
 	}
diff --git a/pkg/schemapatcher/internal/yaml/convert.go b/pkg/schemapatcher/internal/yaml/convert.go
@@ -33,12 +33,12 @@ func ToYAML(rawObj interface{}) (*yaml.Node, error) {
 
 	rawJSON, err := json.Marshal(rawObj)
 	if err != nil {
-		return nil, fmt.Errorf("failed to marshal object: %v", err)
+		return nil, fmt.Errorf("failed to marshal object: %w", err)
 	}
 
 	var out yaml.Node
 	if err := yaml.Unmarshal(rawJSON, &out); err != nil {
-		return nil, fmt.Errorf("unable to unmarshal marshalled object: %v", err)
+		return nil, fmt.Errorf("unable to unmarshal marshalled object: %w", err)
 	}
 	return &out, nil
 }
diff --git a/pkg/schemapatcher/internal/yaml/nested.go b/pkg/schemapatcher/internal/yaml/nested.go
@@ -58,7 +58,7 @@ func asCloseAsPossible(root *yaml.Node, path ...string) (*yaml.Node, []string, e
 
 		nextNode, err := ValueInMapping(currNode, path[0])
 		if err != nil {
-			return nil, nil, fmt.Errorf("unable to get next node in path %v: %v", path, err)
+			return nil, nil, fmt.Errorf("unable to get next node in path %v: %w", path, err)
 		}
 
 		if nextNode == nil {
diff --git a/pkg/schemapatcher/testdata/go.mod b/pkg/schemapatcher/testdata/go.mod
@@ -1,5 +1,5 @@
 module testdata.kubebuilder.io/inplaceschema
 
-go 1.12
+go 1.13
 
 require k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func AsVersion(original apiext.CustomResourceDefinition, gv schema.GroupVersion)`
`35`	`35`	`// questionable decision.`
`36`	`36`	`intVer, err := conversionScheme.ConvertToVersion(&original, apiextinternal.SchemeGroupVersion)`
`37`	`37`	`if err != nil {`
`38`		`- return nil, fmt.Errorf("unable to convert to internal CRD version: %v", err)`
	`38`	`+ return nil, fmt.Errorf("unable to convert to internal CRD version: %w", err)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`return conversionScheme.ConvertToVersion(intVer, gv)`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ func protoFromOptions(optionsRegistry *markers.Registry, options []string) (prot`
`128`	`128`
`129`	`129`	`val, err := defn.Parse(rawOpt)`
`130`	`130`	`if err != nil {`
`131`		`- return protoRuntime{}, fmt.Errorf("unable to parse option %q: %v", rawOpt[1:], err)`
	`131`	`+ return protoRuntime{}, fmt.Errorf("unable to parse option %q: %w", rawOpt[1:], err)`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`switch val := val.(type) {`
Original file line number	Diff line number	Diff line change
`@@ -588,7 +588,7 @@ func ArgumentFromType(rawType reflect.Type) (Argument, error) {`
`588`	`588`	`arg.Type = SliceType`
`589`	`589`	`itemType, err := ArgumentFromType(rawType.Elem())`
`590`	`590`	`if err != nil {`
`591`		`- return Argument{}, fmt.Errorf("bad slice item type: %v", err)`
	`591`	`+ return Argument{}, fmt.Errorf("bad slice item type: %w", err)`
`592`	`592`	`}`
`593`	`593`	`arg.ItemType = &itemType`
`594`	`594`	`case reflect.Map:`
`@@ -598,7 +598,7 @@ func ArgumentFromType(rawType reflect.Type) (Argument, error) {`
`598`	`598`	`}`
`599`	`599`	`itemType, err := ArgumentFromType(rawType.Elem())`
`600`	`600`	`if err != nil {`
`601`		`- return Argument{}, fmt.Errorf("bad slice item type: %v", err)`
	`601`	`+ return Argument{}, fmt.Errorf("bad slice item type: %w", err)`
`602`	`602`	`}`
`603`	`603`	`arg.ItemType = &itemType`
`604`	`604`	`default:`
`@@ -720,7 +720,7 @@ func (d *Definition) loadFields() error {`
`720`	`720`
`721`	`721`	`argType, err := ArgumentFromType(field.Type)`
`722`	`722`	`if err != nil {`
`723`		`- return fmt.Errorf("unable to extract type information for field %q: %v", field.Name, err)`
	`723`	`+ return fmt.Errorf("unable to extract type information for field %q: %w", field.Name, err)`
`724`	`724`	`}`
`725`	`725`
`726`	`726`	`if argType.Type == RawType {`
Original file line number	Diff line number	Diff line change
`@@ -170,11 +170,11 @@ func (g Generator) Generate(ctx *genall.GenerationContext) (result error) {`
`170`	`170`
`171`	`171`	`if allSame {`
`172`	`172`	`if err := existingSet.setGlobalSchema(); err != nil {`
`173`		`- return fmt.Errorf("failed to set global firstSchema for %s: %v", existingSet.GroupKind, err)`
	`173`	`+ return fmt.Errorf("failed to set global firstSchema for %s: %w", existingSet.GroupKind, err)`
`174`	`174`	`}`
`175`	`175`	`} else {`
`176`	`176`	`if err := existingSet.setVersionedSchemata(); err != nil {`
`177`		`- return fmt.Errorf("failed to set versioned schemas for %s: %v", existingSet.GroupKind, err)`
	`177`	`+ return fmt.Errorf("failed to set versioned schemas for %s: %w", existingSet.GroupKind, err)`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`	`}`
`@@ -278,7 +278,7 @@ func (e *partialCRD) setGlobalSchema(newSchema apiext.JSONSchemaProps) error {`
`278`	`278`	`}`
`279`	`279`	`schema, err := legacySchema(newSchema)`
`280`	`280`	`if err != nil {`
`281`		`- return fmt.Errorf("failed to convert schema to legacy form: %v", err)`
	`281`	`+ return fmt.Errorf("failed to convert schema to legacy form: %w", err)`
`282`	`282`	`}`
`283`	`283`	`schemaNodeTree, err := yamlop.ToYAML(schema)`
`284`	`284`	`if err != nil {`
`@@ -300,7 +300,7 @@ func (e *partialCRD) setGlobalSchema(newSchema apiext.JSONSchemaProps) error {`
`300`	`300`	`}`
`301`	`301`	`for i, verNode := range versions.Content {`
`302`	`302`	`if err := yamlop.DeleteNode(verNode, "schema"); err != nil {`
`303`		`- return fmt.Errorf("spec.versions[%d]: %v", i, err)`
	`303`	`+ return fmt.Errorf("spec.versions[%d]: %w", i, err)`
`304`	`304`	`}`
`305`	`305`	`}`
`306`	`306`
`@@ -363,26 +363,26 @@ func (e *partialCRD) setVersionedSchemata(newSchemata map[string]apiext.JSONSche`
`363`	`363`	`newSchema, found := newSchemata[name]`
`364`	`364`	`if !found {`
`365`	`365`	`if err := yamlop.DeleteNode(verNode, "schema"); err != nil {`
`366`		`- return fmt.Errorf("spec.versions[%d]: %v", i, err)`
	`366`	`+ return fmt.Errorf("spec.versions[%d]: %w", i, err)`
`367`	`367`	`}`
`368`	`368`	`} else {`
`369`	`369`	`// TODO(directxman12): if this gets to be more than 2 versions, use polymorphism to clean this up`
`370`	`370`	`var verSchema interface{} = newSchema`
`371`	`371`	`if e.CRDVersion == legacyAPIExtVersion {`
`372`	`372`	`verSchema, err = legacySchema(newSchema)`
`373`	`373`	`if err != nil {`
`374`		`- return fmt.Errorf("failed to convert schema to legacy form: %v", err)`
	`374`	`+ return fmt.Errorf("failed to convert schema to legacy form: %w", err)`
`375`	`375`	`}`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`schemaNodeTree, err := yamlop.ToYAML(verSchema)`
`379`	`379`	`if err != nil {`
`380`		`- return fmt.Errorf("failed to convert schema to YAML: %v", err)`
	`380`	`+ return fmt.Errorf("failed to convert schema to YAML: %w", err)`
`381`	`381`	`}`
`382`	`382`	`schemaNodeTree = schemaNodeTree.Content[0] // get rid of the document node`
`383`	`383`	`yamlop.SetStyle(schemaNodeTree, 0) // clear the style so it defaults to an auto-chosen one`
`384`	`384`	`if err := yamlop.SetNode(verNode, *schemaNodeTree, "schema", "openAPIV3Schema"); err != nil {`
`385`		`- return fmt.Errorf("spec.versions[%d]: %v", i, err)`
	`385`	`+ return fmt.Errorf("spec.versions[%d]: %w", i, err)`
`386`	`386`	`}`
`387`	`387`	`}`
`388`	`388`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,12 @@ func ToYAML(rawObj interface{}) (*yaml.Node, error) {`
`33`	`33`
`34`	`34`	`rawJSON, err := json.Marshal(rawObj)`
`35`	`35`	`if err != nil {`
`36`		`- return nil, fmt.Errorf("failed to marshal object: %v", err)`
	`36`	`+ return nil, fmt.Errorf("failed to marshal object: %w", err)`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`var out yaml.Node`
`40`	`40`	`if err := yaml.Unmarshal(rawJSON, &out); err != nil {`
`41`		`- return nil, fmt.Errorf("unable to unmarshal marshalled object: %v", err)`
	`41`	`+ return nil, fmt.Errorf("unable to unmarshal marshalled object: %w", err)`
`42`	`42`	`}`
`43`	`43`	`return &out, nil`
`44`	`44`	`}`