Merge pull request rancher#270 from KevinJoiner/wrangler-ci

Wrangler CI

.drone.yml

@@ -1,13 +1,52 @@
 ---
 kind: pipeline
+type: docker
 name: fossa
 
 steps:
-- name: fossa
-  image: rancher/drone-fossa:latest
-  settings:
-    api_key:
-      from_secret: FOSSA_API_KEY
-    when:
-      instance:
-        - drone-publish.rancher.io
+  - name: fossa
+    image: rancher/drone-fossa:latest
+    settings:
+      api_key:
+        from_secret: FOSSA_API_KEY
+      when:
+        instance:
+          - drone-publish.rancher.io
+
+---
+kind: pipeline
+type: docker
+name: amd64
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: test
+    image: registry.suse.com/bci/golang:1.19
+    commands:
+      - zypper -n install tar gzip
+      - "curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.51.1;"
+      - ./scripts/ci
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock
+
+---
+kind: pipeline
+type: docker
+name: arm64
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+  - name: test
+    image: registry.suse.com/bci/golang:1.19
+    commands:
+      - ./scripts/ci
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock

pkg/apply/desiredset.go

@@ -39,7 +39,6 @@ type desiredSet struct {
 	noDeleteGVK              map[schema.GroupVersionKind]struct{}
 	setID                    string
 	objs                     *objectset.ObjectSet
-	codeVersion              string
 	owner                    runtime.Object
 	injectors                []injectors.ConfigInjector
 	ratelimitingQps          float32

pkg/apply/desiredset_apply.go

@@ -144,7 +144,7 @@ func (o *desiredSet) debugID() string {
 func (o *desiredSet) collect(objList []runtime.Object) objectset.ObjectByGVK {
 	result := objectset.ObjectByGVK{}
 	for _, obj := range objList {
-		result.Add(obj)
+		_, _ = result.Add(obj)
 	}
 	return result
 }

pkg/apply/desiredset_process_test.go

@@ -7,10 +7,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/dynamic/fake"
 	k8stesting "k8s.io/client-go/testing"
 )
@@ -28,8 +28,10 @@ func Test_multiNamespaceList(t *testing.T) {
 		}},
 		"ns3": {Items: []unstructured.Unstructured{}},
 	}
-
-	baseClient := fake.NewSimpleDynamicClient(runtime.NewScheme())
+	s := runtime.NewScheme()
+	err := appsv1.SchemeBuilder.AddToScheme(s)
+	assert.NoError(t, err, "Failed to build schema.")
+	baseClient := fake.NewSimpleDynamicClient(s)
 	baseClient.PrependReactor("list", "*", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) {
 		if strings.Contains(action.GetNamespace(), "error") {
 			return true, nil, errors.New("simulated failure")
@@ -91,7 +93,7 @@ func Test_multiNamespaceList(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			var calls int
-			err := multiNamespaceList(context.TODO(), tt.args.namespaces, baseClient.Resource(schema.GroupVersionResource{}), labels.NewSelector(), func(obj unstructured.Unstructured) {
+			err := multiNamespaceList(context.TODO(), tt.args.namespaces, baseClient.Resource(appsv1.SchemeGroupVersion.WithResource("deployments")), labels.NewSelector(), func(obj unstructured.Unstructured) {
 				calls += 1
 			})
 

pkg/condition/condition.go

@@ -223,7 +223,6 @@ func getValue(obj interface{}, name ...string) reflect.Value {
 	t := v.Type()
 	if t.Kind() == reflect.Ptr {
 		v = v.Elem()
-		t = v.Type()
 	}
 
 	field := v.FieldByName(name[0])

pkg/controller-gen/args/groupversion_test.go

@@ -9,5 +9,5 @@ import (
 func TestScan(t *testing.T) {
 	cwd, _ := os.Getwd()
 	fmt.Println(cwd)
-	ScanDirectory("./testdata")
+	_, _ = ScanDirectory("./testdata")
 }

pkg/controller-gen/main.go

@@ -3,7 +3,6 @@ package controllergen
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
@@ -46,7 +45,7 @@ func Run(opts cgargs.Options) {
 	genericArgs.InputDirs = parseTypes(customArgs)
 
 	if genericArgs.OutputBase == "./" { //go modules
-		tempDir, err := ioutil.TempDir("", "")
+		tempDir, err := os.MkdirTemp("", "")
 		if err != nil {
 			return
 		}
@@ -123,7 +122,7 @@ func sourcePackagePath(customArgs *cgargs.CustomArgs, pkgName string) string {
 	return pkg
 }
 
-//until k8s code-gen supports gopath
+// until k8s code-gen supports gopath
 func copyGoPathToModules(customArgs *cgargs.CustomArgs) error {
 
 	pathsToCopy := map[string]bool{}
@@ -137,7 +136,7 @@ func copyGoPathToModules(customArgs *cgargs.CustomArgs) error {
 	pkg := sourcePackagePath(customArgs, customArgs.Package)
 	pathsToCopy[pkg] = true
 
-	for pkg, _ := range pathsToCopy {
+	for pkg := range pathsToCopy {
 		if _, err := os.Stat(pkg); os.IsNotExist(err) {
 			continue
 		}

pkg/data/convert/convert.go

@@ -10,6 +10,8 @@ import (
 	"time"
 	"unicode"
 
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
@@ -235,7 +237,8 @@ func EncodeToMap(obj interface{}) (map[string]interface{}, error) {
 func ToJSONKey(str string) string {
 	parts := strings.Split(str, "_")
 	for i := 1; i < len(parts); i++ {
-		parts[i] = strings.Title(parts[i])
+		caser := cases.Title(language.English)
+		parts[i] = caser.String(parts[i])
 	}
 
 	return strings.Join(parts, "")

pkg/generic/factory.go

@@ -103,7 +103,7 @@ func (c *Factory) setControllerFactoryWithLock() error {
 
 func (c *Factory) Sync(ctx context.Context) error {
 	if c.cacheFactory != nil {
-		c.cacheFactory.Start(ctx)
+		_ = c.cacheFactory.Start(ctx)
 		c.cacheFactory.WaitForCacheSync(ctx)
 	}
 	return nil

pkg/git/git.go

@@ -349,7 +349,7 @@ func (g *Git) gitCmd(output io.Writer, args ...string) error {
 
 		cmd.Env = append(cmd.Env, "GIT_SSH_COMMAND="+fmt.Sprintf("ssh -o UserKnownHostsFile=%s", f.Name()))
 	} else {
-		cmd.Env = append(cmd.Env, "GIT_SSH_COMMAND="+fmt.Sprintf("ssh -o StrictHostKeyChecking=accept-new"))
+		cmd.Env = append(cmd.Env, "GIT_SSH_COMMAND="+"ssh -o StrictHostKeyChecking=accept-new")
 	}
 	cmd.Env = append(cmd.Env, "GIT_TERMINAL_PROMPT=0")
 

pkg/kubeconfig/loader.go

@@ -2,7 +2,6 @@ package kubeconfig
 
 import (
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -51,7 +50,7 @@ func GetLoadingRules(kubeConfig string) *clientcmd.ClientConfigLoadingRules {
 
 func canRead(files []string) (result []string) {
 	for _, f := range files {
-		_, err := ioutil.ReadFile(f)
+		_, err := os.ReadFile(f)
 		if err == nil {
 			result = append(result, f)
 		}

pkg/schemas/mappers/move.go

@@ -42,7 +42,7 @@ func (m Move) ModifySchema(s *types.Schema, schemas *types.Schemas) error {
 		return fmt.Errorf("failed to find field %s on schema %s", m.From, s.ID)
 	}
 
-	toSchema, toFieldName, _, ok, err := getField(s, schemas, m.To)
+	toSchema, toFieldName, _, _, err := getField(s, schemas, m.To)
 	if err != nil {
 		return err
 	}

pkg/schemas/reflection.go

@@ -345,9 +345,7 @@ func (s *Schemas) processFieldsMappers(t reflect.Type, fieldName string, schema
 		parts := strings.SplitN(fieldMapper, "=", 2)
 		name = parts[0]
 		if len(parts) == 2 {
-			for _, opt := range strings.Split(parts[1], "|") {
-				opts = append(opts, opt)
-			}
+			opts = append(opts, strings.Split(parts[1], "|")...)
 		}
 
 		factory, ok := s.fieldMappers[name]

pkg/summary/summarized.go

@@ -54,7 +54,6 @@ func (in *SummarizedObjectList) DeepCopyInto(out *SummarizedObjectList) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	return
 }
 
 func (in *SummarizedObjectList) DeepCopy() *SummarizedObjectList {
@@ -78,7 +77,6 @@ func (in *SummarizedObject) DeepCopyInto(out *SummarizedObject) {
 	out.TypeMeta = in.TypeMeta
 	out.ObjectMeta = *in.ObjectMeta.DeepCopy()
 	out.Summary = *in.Summary.DeepCopy()
-	return
 }
 
 func (in *SummarizedObject) DeepCopy() *SummarizedObject {

pkg/webhook/router.go

@@ -42,7 +42,10 @@ func (r *Router) sendError(rw http.ResponseWriter, review *v1.AdmissionReview, e
 
 func writeResponse(rw http.ResponseWriter, review *v1.AdmissionReview) {
 	rw.Header().Set("Content-Type", "application/json")
-	json.NewEncoder(rw).Encode(review)
+	err := json.NewEncoder(rw).Encode(review)
+	if err != nil {
+		logrus.Errorf("Failed to write response: %s", err)
+	}
 }
 
 // ServeHTTP inspects the http.Request and calls the Admit function on all matching handlers.

scripts/ci

@@ -0,0 +1,30 @@
+#! /bin/bash
+set -e
+
+cd $(dirname $0)/..
+PATH=${PATH}:./bin
+echo "Validating"
+
+if ! command -v golangci-lint; then
+    echo Skipping validation: no golangci-lint available
+else
+    echo Running: golangci-lint
+    golangci-lint run
+fi
+
+echo Running: go generate
+go generate ./...
+
+echo Tidying up modules
+go mod tidy
+
+echo Verifying modules
+go mod verify
+
+if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
+    echo "Encountered dirty repo!"
+    exit 1
+fi
+
+echo "Running Test"
+go test ./...