From 34a24f28db04ec1ec22e574c82e89240e0ce5e10 Mon Sep 17 00:00:00 2001 From: Luke Reed Date: Mon, 27 Sep 2021 14:31:38 -0400 Subject: [PATCH] Update to go 1.17 and update goreleaser and make snapshot builds (#192) --- .circleci/config.yml | 37 +++++++++++++++++------------- docs/contributing/guide.md | 2 +- go.mod | 47 +++++++++++++++++++++++++++++++++++++- go.sum | 1 - 4 files changed, 68 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 18c868b..797b6a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,17 +6,9 @@ orbs: executors: golang-exec: docker: - - image: circleci/golang:1.13-stretch + - image: circleci/golang:1.17-stretch references: - install_goreleaser: &install_goreleaser - run: - name: Install GoReleaser - command: | - curl -fsSLo goreleaser.deb https://github.com/goreleaser/goreleaser/releases/download/v0.155.0/goreleaser_amd64.deb - echo "a69c2c0a924d808df408f70f49c68998eca172ec goreleaser.deb" | sha1sum -c - sudo dpkg -i goreleaser.deb - rm goreleaser.deb e2e_config: &e2e_config command_runner_image: quay.io/reactiveops/ci-images:v11-stretch executor: golang-exec @@ -35,26 +27,31 @@ references: jobs: test: working_directory: /go/src/github.com/fairwindsops/rbac-lookup - docker: - - image: circleci/golang:1.13 + - image: circleci/golang:1.17 environment: GO111MODULE: "on" steps: - checkout - run: go mod download && go mod verify - run: go test -v ./... -coverprofile=coverage.txt -covermode=atomic - + snapshot: + working_directory: /go/src/github.com/fairwindsops/rbac-lookup + docker: + - image: goreleaser/goreleaser:v0.174.2 + steps: + - checkout + - run: goreleaser --snapshot + - store_artifacts: + path: dist + destination: snapshot release: working_directory: /go/src/github.com/fairwindsops/rbac-lookup docker: - - image: circleci/golang:1.13 - environment: - GO111MODULE: "on" + - image: goreleaser/goreleaser:v0.174.2 steps: - checkout - run: go mod download && go mod verify - - *install_goreleaser - run: goreleaser publish_docs: docker: @@ -89,6 +86,14 @@ workflows: filters: branches: only: /.*/ + - snapshot: + requires: + - test + filters: + branches: + only: /.*/ + tags: + ignore: /.*/ - rok8s-scripts/kubernetes_e2e_tests: name: e2e test kube 1.16 kind_node_image: "kindest/node:v1.16.15@sha256:a89c771f7de234e6547d43695c7ab047809ffc71a0c3b65aa54eda051c45ed20" diff --git a/docs/contributing/guide.md b/docs/contributing/guide.md index 6fc4313..9008b6a 100644 --- a/docs/contributing/guide.md +++ b/docs/contributing/guide.md @@ -21,7 +21,7 @@ We label issues with the ["good first issue" tag](https://github.com/FairwindsOp ### Prerequisites -* A properly configured Golang environment with Go 1.13 or higher +* A properly configured Golang environment with Go 1.17 or higher * Access to a cluster via a properly configured KUBECONFIG ### Installation diff --git a/go.mod b/go.mod index 95218ca..65bcf90 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fairwindsops/rbac-lookup -go 1.13 +go 1.17 require ( github.com/spf13/cobra v0.0.7 @@ -12,3 +12,48 @@ require ( k8s.io/apimachinery v0.20.4 k8s.io/client-go v0.20.4 ) + +require ( + cloud.google.com/go v0.94.1 // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/Azure/go-autorest/autorest v0.11.1 // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.5 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/logger v0.2.0 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/evanphx/json-patch v4.9.0+incompatible // indirect + github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect + github.com/go-logr/logr v0.2.0 // indirect + github.com/gogo/protobuf v1.3.1 // indirect + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/googleapis/gax-go/v2 v2.1.0 // indirect + github.com/googleapis/gnostic v0.4.1 // indirect + github.com/imdario/mergo v0.3.5 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/json-iterator/go v1.1.10 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + go.opencensus.io v0.23.0 // indirect + golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect + golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365 // indirect + golang.org/x/text v0.3.6 // indirect + golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83 // indirect + google.golang.org/grpc v1.40.0 // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.2.8 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect + k8s.io/klog/v2 v2.4.0 // indirect + k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // indirect + k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect +) diff --git a/go.sum b/go.sum index d4ae28d..b23b67b 100644 --- a/go.sum +++ b/go.sum @@ -110,7 +110,6 @@ github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=