diff --git a/.goreleaser.yml b/.goreleaser.yml index ab5fa4a..3dbb8d1 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -4,23 +4,19 @@ env: before: hooks: - go mod download - builds: - id: jx-project # Path to main.go file or main package. # Default is `.`. main: ./cmd/main.go - # Binary name. # Can be a path (e.g. `bin/app`) to wrap the binary in a directory. # Default is the name of the project directory. binary: jx-project - # Custom ldflags templates. # Default is `-s -w -X main.version={{.Version}} -X main.commit={{.ShortCommit}} -X main.date={{.Date}} -X main.builtBy=goreleaser`. ldflags: - -X "{{.Env.ROOTPACKAGE}}/pkg/cmd/version.Version={{.Env.VERSION}}" -X "{{.Env.ROOTPACKAGE}}/pkg/cmd/version.Revision={{.Env.REV}}" -X "{{.Env.ROOTPACKAGE}}/pkg/cmd/version.Branch={{.Env.BRANCH}}" -X "{{.Env.ROOTPACKAGE}}/pkg/cmd/version.BuildDate={{.Env.BUILDDATE}}" -X "{{.Env.ROOTPACKAGE}}/pkg/cmd/version.GoVersion={{.Env.GOVERSION}}" - # GOOS list to build for. # For more info refer to: https://golang.org/doc/install/source#environment # Defaults are darwin and linux. @@ -28,46 +24,40 @@ builds: - windows - darwin - linux - # GOARCH to build for. # For more info refer to: https://golang.org/doc/install/source#environment # Defaults are 386 and amd64. goarch: - amd64 - - arm - arm64 - + ignore: + - goos: windows + goarch: arm64 archives: - name_template: "jx-project-{{ .Os }}-{{ .Arch }}" format_overrides: - goos: windows format: zip - checksum: # You can change the name of the checksums file. # Default is `jx-project_{{ .Version }}_checksums.txt`. name_template: "jx-project-checksums.txt" - # Algorithm to be used. # Accepted options are sha256, sha512, sha1, crc32, md5, sha224 and sha384. # Default is sha256. algorithm: sha256 - changelog: - # set it to true if you wish to skip the changelog generation - skip: true - + disable: true release: # If set to true, will not auto-publish the release. # Default is false. draft: false - # If set to auto, will mark the release as not ready for production # in case there is an indicator for this in the tag e.g. v1.0.0-rc1 # If set to true, will mark the release as not ready for production. # Default is false. prerelease: false - # You can change the name of the GitHub release. # Default is `{{.Tag}}` name_template: "{{.Env.VERSION}}" +version: "2" diff --git a/Makefile b/Makefile index da0cfc6..c2804f0 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ ORG := jenkins-x-plugins ORG_REPO := $(ORG)/$(NAME) RELEASE_ORG_REPO := $(ORG_REPO) ROOT_PACKAGE := github.com/$(ORG_REPO) -GO_VERSION := 1.19 +GO_VERSION := 1.23 GO_DEPENDENCIES := $(call rwildcard,pkg/,*.go) $(call rwildcard,cmd/j,*.go) BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2> /dev/null || echo 'unknown') diff --git a/go.mod b/go.mod index 23dea94..c71f6fd 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ module github.com/jenkins-x-plugins/jx-project -go 1.19 +go 1.23.0 require ( - github.com/AlecAivazis/survey/v2 v2.3.4 + github.com/AlecAivazis/survey/v2 v2.3.7 github.com/Azure/draft v0.15.0 github.com/alexflint/go-filemutex v0.0.0-20171028004239-d358565f3c3f github.com/blang/semver v3.5.1+incompatible @@ -12,150 +12,144 @@ require ( github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect github.com/denormal/go-gitignore v0.0.0-20180713143441-75ce8f3e513c github.com/jbrukh/bayesian v0.0.0-20200318221351-d726b684ca4a // indirect - github.com/jenkins-x-plugins/jx-gitops v0.7.33 - github.com/jenkins-x-plugins/jx-promote v0.4.1 - github.com/jenkins-x/go-scm v1.11.18 - github.com/jenkins-x/jx-api/v4 v4.6.1 - github.com/jenkins-x/jx-helpers/v3 v3.4.12 - github.com/jenkins-x/jx-logging/v3 v3.0.12 - github.com/jenkins-x/lighthouse-client v0.0.580 + github.com/jenkins-x/go-scm v1.14.43 + github.com/jenkins-x/jx-api/v4 v4.7.6 + github.com/jenkins-x/jx-helpers/v3 v3.9.0 + github.com/jenkins-x/jx-logging/v3 v3.0.17 + github.com/jenkins-x/lighthouse-client v0.0.1286 github.com/pkg/errors v0.9.1 - github.com/spf13/cobra v1.6.1 + github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.8.1 - github.com/tektoncd/pipeline v0.29.0 - helm.sh/helm/v3 v3.11.1 - k8s.io/api v0.26.0 - k8s.io/apimachinery v0.26.0 - k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible - knative.dev/pkg v0.0.0-20210827184538-2bd91f75571c - sigs.k8s.io/yaml v1.3.0 + github.com/stretchr/testify v1.9.0 + github.com/tektoncd/pipeline v0.41.0 + helm.sh/helm/v3 v3.15.3 + k8s.io/api v0.31.3 + k8s.io/apimachinery v0.31.3 + k8s.io/client-go v0.31.3 + knative.dev/pkg v0.0.0-20231023150739-56bfe0dd9626 + sigs.k8s.io/yaml v1.4.0 ) require ( - cloud.google.com/go/compute v1.19.1 // indirect - cloud.google.com/go/compute/metadata v0.2.3 // indirect - code.gitea.io/sdk/gitea v0.14.0 // indirect + github.com/jenkins-x-plugins/jx-gitops v0.23.11 + github.com/jenkins-x-plugins/jx-promote v0.6.11 +) + +require ( + code.gitea.io/sdk/gitea v0.16.0 // indirect contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect contrib.go.opencensus.io/exporter/prometheus v0.4.0 // indirect + dario.cat/mergo v1.0.1 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect - github.com/Azure/go-autorest/autorest v0.11.27 // indirect - github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect - github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect - github.com/Azure/go-autorest/logger v0.2.1 // indirect - github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect - github.com/Masterminds/semver/v3 v3.2.0 // indirect + github.com/Masterminds/semver/v3 v3.3.0 // indirect github.com/alecthomas/jsonschema v0.0.0-20200530073317-71f438968921 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blendle/zapdriver v1.3.1 // indirect - github.com/bluekeyes/go-gitdiff v0.4.0 // indirect + github.com/bluekeyes/go-gitdiff v0.8.0 // indirect github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/cyphar/filepath-securejoin v0.2.3 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/emicklei/go-restful v2.16.0+incompatible // indirect - github.com/evanphx/json-patch v5.6.0+incompatible // indirect - github.com/evanphx/json-patch/v5 v5.5.0 // indirect - github.com/fatih/color v1.13.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/cyphar/filepath-securejoin v0.3.4 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/davidmz/go-pageant v1.0.2 // indirect + github.com/emicklei/go-restful/v3 v3.12.1 // indirect + github.com/evanphx/json-patch/v5 v5.6.0 // indirect + github.com/fatih/color v1.17.0 // indirect + github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect - github.com/go-errors/errors v1.0.1 // indirect - github.com/go-kit/log v0.2.0 // indirect + github.com/go-errors/errors v1.5.1 // indirect + github.com/go-fed/httpsig v1.1.0 // indirect + github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect + github.com/go-git/go-billy/v5 v5.5.0 // indirect + github.com/go-git/go-git/v5 v5.12.0 // indirect + github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect - github.com/go-logr/logr v1.2.3 // indirect - github.com/go-openapi/jsonpointer v0.19.5 // indirect - github.com/go-openapi/jsonreference v0.20.0 // indirect - github.com/go-openapi/spec v0.20.2 // indirect - github.com/go-openapi/swag v0.19.15 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/jsonreference v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/go-stack/stack v1.8.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-jwt/jwt/v4 v4.2.0 // indirect - github.com/golang/glog v1.1.0 // indirect + github.com/golang/glog v1.2.1 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.3 // indirect - github.com/google/go-cmp v0.5.9 // indirect - github.com/google/go-containerregistry v0.6.0 // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/google/go-containerregistry v0.17.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.3.0 // indirect - github.com/googleapis/gnostic v0.5.5 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/gorilla/securecookie v1.1.1 // indirect - github.com/gorilla/sessions v1.2.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect - github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/gorilla/sessions v1.2.1 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/hashicorp/go-version v1.3.0 // indirect - github.com/hashicorp/golang-lru v0.5.4 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect - github.com/imdario/mergo v0.3.13 // indirect - github.com/inconshreveable/mousetrap v1.0.1 // indirect - github.com/jenkins-x/jx-kube-client/v3 v3.0.4 // indirect - github.com/jenkins-x/logrus-stackdriver-formatter v0.2.4 // indirect + github.com/imdario/mergo v0.3.16 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jenkins-x/jx-kube-client/v3 v3.0.8 // indirect + github.com/jenkins-x/logrus-stackdriver-formatter v0.2.7 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/mailru/easyjson v0.7.7 // indirect - github.com/mattn/go-colorable v0.1.12 // indirect - github.com/mattn/go-isatty v0.0.14 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.14.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.37.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/pjbgf/sha1cd v0.3.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/prometheus/statsd_exporter v0.21.0 // indirect github.com/rawlingsj/jsonschema v0.0.0-20210511142122-a9c2cfdb7dcf // indirect - github.com/rickar/props v0.0.0-20170718221555-0b06aeb2f037 // indirect github.com/russross/blackfriday v1.6.0 // indirect github.com/shurcooL/githubv4 v0.0.0-20191102174205-af46314aec7b // indirect github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect - github.com/sirupsen/logrus v1.9.0 // indirect - github.com/src-d/gcfg v1.4.0 // indirect - github.com/stretchr/objx v0.5.0 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect + github.com/stretchr/objx v0.5.2 // indirect github.com/vrischmann/envconfig v1.3.0 // indirect + github.com/x448/float16 v0.8.4 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect go.opencensus.io v0.24.0 // indirect - go.uber.org/atomic v1.9.0 // indirect - go.uber.org/multierr v1.7.0 // indirect - go.uber.org/zap v1.19.1 // indirect - golang.org/x/crypto v0.5.0 // indirect - golang.org/x/net v0.9.0 // indirect - golang.org/x/oauth2 v0.7.0 // indirect - golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.7.0 // indirect - golang.org/x/term v0.7.0 // indirect - golang.org/x/text v0.9.0 // indirect - golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect - gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect - google.golang.org/api v0.114.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect - google.golang.org/grpc v1.56.3 // indirect - google.golang.org/protobuf v1.30.0 // indirect + go.uber.org/atomic v1.11.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.27.0 // indirect + golang.org/x/crypto v0.31.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/oauth2 v0.21.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/term v0.27.0 // indirect + golang.org/x/text v0.21.0 // indirect + golang.org/x/time v0.5.0 // indirect + gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect + google.golang.org/api v0.185.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/grpc v1.65.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 // indirect - gopkg.in/src-d/go-git.v4 v4.13.1 // indirect gopkg.in/validator.v2 v2.0.0-20200605151824-2b28d334fa05 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.26.0 // indirect - k8s.io/klog/v2 v2.80.1 // indirect - k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect - k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect - sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect -) - -replace ( - k8s.io/api => k8s.io/api v0.21.5 - k8s.io/apimachinery => k8s.io/apimachinery v0.21.5 - k8s.io/client-go => k8s.io/client-go v0.21.5 - k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20210113233702-8566a335510f + k8s.io/apiextensions-apiserver v0.30.2 // indirect + k8s.io/klog/v2 v2.130.1 // indirect + k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect + k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) diff --git a/go.sum b/go.sum index db38b0a..129392b 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -7,7 +6,6 @@ cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxK cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= @@ -15,25 +13,14 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v1.19.1 h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY= -cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE= -cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= -cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -43,88 +30,31 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -code.gitea.io/sdk/gitea v0.14.0 h1:m4J352I3p9+bmJUfS+g0odeQzBY/5OXP91Gv6D4fnJ0= -code.gitea.io/sdk/gitea v0.14.0/go.mod h1:89WiyOX1KEcvjP66sRHdu0RafojGo60bT9UqW17VbWs= +code.gitea.io/sdk/gitea v0.16.0 h1:gAfssETO1Hv9QbE+/nhWu7EjoFQYKt6kPoyDytQgw00= +code.gitea.io/sdk/gitea v0.16.0/go.mod h1:ndkDk99BnfiUCCYEUhpNzi0lpmApXlwRFqClBlOlEBg= contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d h1:LblfooH1lKOpp1hIhukktmSAxFkqMPFk9KR6iZ0MJNI= contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d/go.mod h1:IshRmMJBhDfFj5Y67nVhMYTTIze91RUeT73ipWKs/GY= contrib.go.opencensus.io/exporter/prometheus v0.4.0 h1:0QfIkj9z/iVZgK31D9H9ohjjIDApI2GOPScCKwxedbs= contrib.go.opencensus.io/exporter/prometheus v0.4.0/go.mod h1:o7cosnyfuPVK0tB8q0QmaQNhGnptITnPQB+z1+qeFB0= -contrib.go.opencensus.io/exporter/zipkin v0.1.2/go.mod h1:mP5xM3rrgOjpn79MM8fZbj3gsxcuytSqtH0dxSWW1RE= +dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= +dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/AlecAivazis/survey/v2 v2.3.4 h1:pchTU9rsLUSvWEl2Aq9Pv3k0IE2fkqtGxazskAMd9Ng= -github.com/AlecAivazis/survey/v2 v2.3.4/go.mod h1:hrV6Y/kQCLhIZXGcriDCUBtB3wnN7156gMXJ3+b23xM= -github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v43.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ= +github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo= github.com/Azure/draft v0.15.0 h1:9GVmAwNxusaU1FIsoIBFWYT9ivnHwOYD2Q6O5cJjl7E= github.com/Azure/draft v0.15.0/go.mod h1:zz7LXil5dfY7p0jR0+BFjSwYz8aIigRjYR4GQwaNGE0= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= -github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A= -github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= -github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= -github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= -github.com/Azure/go-autorest/autorest/adal v0.9.20 h1:gJ3E98kMpFB1MFqQCvA1yFab8vthOeD4VlFRQULxahg= -github.com/Azure/go-autorest/autorest/adal v0.9.20/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= -github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= -github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= -github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw= -github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= -github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= -github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= -github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8= -github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= -github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= -github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= -github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317/go.mod h1:DF8FZRxMHMGv/vP2lQP6h+dYzzjpuRn24VeRiYn3qjQ= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= -github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g= -github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= -github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= -github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= -github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= -github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= -github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= -github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= -github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= -github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= -github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8= -github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg= -github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00= -github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600= -github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU= -github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= -github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= +github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0= +github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s= github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= -github.com/alecthomas/jsonschema v0.0.0-20180308105923-f2c93856175a/go.mod h1:qpebaTNSsyUn5rPSJMsfqEtDw71TTggXM6stUDI16HA= +github.com/TV4/logrus-stackdriver-formatter v0.1.0 h1:nFea8RiX7ecTnWPM+9FIqwZYJdcGo58CHMGIVdYzMXg= +github.com/TV4/logrus-stackdriver-formatter v0.1.0/go.mod h1:wwS7hOiBvP6SBD0UXCa767+VhHkaXrfX0MzUojYcN0Q= github.com/alecthomas/jsonschema v0.0.0-20200530073317-71f438968921 h1:T3+cD5fYvuH36h7EZq+TDpm+d8a6FSD4pQsbmuGGQ8o= github.com/alecthomas/jsonschema v0.0.0-20200530073317-71f438968921/go.mod h1:/n6+1/DWPltRLWL/VKyUxg6tzsl5kHUCcraimt4vr60= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -132,332 +62,113 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= github.com/alexflint/go-filemutex v0.0.0-20171028004239-d358565f3c3f h1:tbgFqBK8r77y+mT2RKkQ8ukhk/uvPtPZvr3a3166YNw= github.com/alexflint/go-filemutex v0.0.0-20171028004239-d358565f3c3f/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= -github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= -github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/blendle/zapdriver v1.3.1 h1:C3dydBOWYRiOk+B8X9IVZ5IOe+7cl+tGOexN4QqHfpE= github.com/blendle/zapdriver v1.3.1/go.mod h1:mdXfREi6u5MArG4j9fewC+FGnXaBR+T4Ox4J2u4eHCc= -github.com/bluekeyes/go-gitdiff v0.4.0 h1:Q3qUnQ5cv27vG6ywUTiSQUobRYRcQIBs8KVGKojLg9I= -github.com/bluekeyes/go-gitdiff v0.4.0/go.mod h1:QpfYYO1E0fTVHVZAZKiRjtSGY9823iCdvGXBcEzHGbM= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= -github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q= -github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= -github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= -github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= -github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= -github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= -github.com/c2h5oh/datasize v0.0.0-20171227191756-4eba002a5eae/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= +github.com/bluekeyes/go-gitdiff v0.8.0 h1:Nn1wfw3/XeKoc3lWk+2bEXGUHIx36kj80FM1gVcBk+o= +github.com/bluekeyes/go-gitdiff v0.8.0/go.mod h1:WWAk1Mc6EgWarCrPFO+xeYlujPu98VuLW3Tu+B/85AE= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg= -github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc= -github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= -github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudevents/sdk-go/v2 v2.5.0 h1:Ts6aLHbBUJfcNcZ4ouAfJ4+Np7SE1Yf2w4ADKRCd7Fo= -github.com/cloudevents/sdk-go/v2 v2.5.0/go.mod h1:nlXhgFkf0uTopxmRXalyMwS2LG70cRGPrxzmjJgSG0U= +github.com/cloudevents/sdk-go/v2 v2.12.0 h1:p1k+ysVOZtNiXfijnwB3WqZNA3y2cGOiKQygWkUHCEI= +github.com/cloudevents/sdk-go/v2 v2.12.0/go.mod h1:xDmKfzNjM8gBvjaF8ijFjM1VYOVUEeUfapHMUX1T5To= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= -github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= -github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= -github.com/containerd/aufs v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= -github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod h1:jg2QkJcsabfHugurUvvPhS3E08Oxiuh5W/g1ybB4e0E= -github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= -github.com/containerd/btrfs v1.0.0/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= -github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod h1:X9rLEHIqSf/wfK8NsPqxJmeZgW4pcfzdXITDrUSJ6uI= -github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= -github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod h1:pA0z1pT8KYB3TCXK/ocprsh7MAkoW8bZVzPdih9snmM= -github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= -github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= -github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= -github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= -github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= -github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= -github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= -github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= -github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= -github.com/containerd/containerd v1.2.10/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ= -github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU= -github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI= -github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s= -github.com/containerd/containerd v1.5.2/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g= -github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo= -github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y= -github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ= -github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= -github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= -github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= -github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= -github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= -github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= -github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= -github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU= -github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk= -github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= -github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= -github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g= -github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= -github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= -github.com/containerd/imgcrypt v1.0.1/go.mod h1:mdd8cEPW7TPgNG4FpuP3sGBiQ7Yi/zak9TYCG3juvb0= -github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod h1:6TNsg0ctmizkrOgXRNQjAPFWpMYRWuiB6dSF4Pfa5SA= -github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod h1:5AZJNI6sLHJljKuI9IHnw1pWqo/F0nGDOuR9zgTs7ow= -github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJrXQb0Dpc4ms= -github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c= -github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= -github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= -github.com/containerd/stargz-snapshotter/estargz v0.6.4/go.mod h1:83VWDqHnurTKliEB0YvWMiCfLDwv4Cjj1X9Vk98GJZw= -github.com/containerd/stargz-snapshotter/estargz v0.7.0/go.mod h1:83VWDqHnurTKliEB0YvWMiCfLDwv4Cjj1X9Vk98GJZw= -github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= -github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= -github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8= -github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= -github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= -github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= -github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk= -github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= -github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= -github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod h1:8IgZOBdv8fAgXddBT4dBXJPtxyRsejFIpXoklgxgEjw= -github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod h1:A9zfAbMlQwE+/is6hi0Xw8ktpL+6glmqZYtevJgaB8Y= -github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= -github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= -github.com/containerd/zfs v1.0.0/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= -github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM= -github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8= -github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc= -github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4= -github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= -github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= -github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= -github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI= github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= -github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= -github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= -github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= -github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= -github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= -github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= -github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= +github.com/cyphar/filepath-securejoin v0.3.4 h1:VBWugsJh2ZxJmLFSM06/0qzQyiQX2Qs0ViKrUAcqdZ8= +github.com/cyphar/filepath-securejoin v0.3.4/go.mod h1:8s/MCNJREmFK0H02MF6Ihv1nakJe4L/w3WZLHNkvlYM= github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ= github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davidmz/go-pageant v1.0.2 h1:bPblRCh5jGU+Uptpz6LgMZGD5hJoOt7otgT454WvHn0= +github.com/davidmz/go-pageant v1.0.2/go.mod h1:P2EDDnMqIwG5Rrp05dTRITj9z2zpGcD9efWSkTNKLIE= github.com/denormal/go-gitignore v0.0.0-20180713143441-75ce8f3e513c h1:HRga01jvlL5GrcRjRARcMLkOmIXrPit1hpR9f3BtXvg= github.com/denormal/go-gitignore v0.0.0-20180713143441-75ce8f3e513c/go.mod h1:C/+sI4IFnEpCn6VQ3GIPEp+FrQnQw+YQP3+n+GdGq7o= -github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-gk v0.0.0-20140819190930-201884a44051/go.mod h1:qm+vckxRlDt0aOla0RYJJVeqHZlWfOm2UIxHaqPB46E= -github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654/go.mod h1:qm+vckxRlDt0aOla0RYJJVeqHZlWfOm2UIxHaqPB46E= -github.com/dgryski/go-lttb v0.0.0-20180810165845-318fcdf10a77/go.mod h1:Va5MyIzkU0rAM92tn3hb3Anb7oz7KcnixF49+2wOMe4= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= -github.com/docker/cli v20.10.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v20.10.8+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= -github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.8+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= -github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= -github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= -github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI= -github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= -github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.15.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.16.0+incompatible h1:rgqiKNjTnFQA6kkhFe16D8epTksy9HQ1MyrbDXSdYhM= -github.com/emicklei/go-restful v2.16.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= -github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= +github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= +github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= -github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= -github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch/v5 v5.5.0 h1:bAmFiUJ+o0o2B4OiTFeE3MqCOtyo+jjPP9iZ0VRxYUc= -github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= -github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= -github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls= +github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= +github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= +github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= +github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= +github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew= github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= -github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= -github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk= +github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= +github.com/go-fed/httpsig v1.1.0 h1:9M+hb0jkEICD8/cAiNqEB66R87tTINszBRTjwjQzWcI= +github.com/go-fed/httpsig v1.1.0/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= +github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= +github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= +github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys= +github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw= -github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= -github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= -github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= -github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= -github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= -github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= -github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= -github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= -github.com/go-openapi/spec v0.20.2 h1:pFPUZsiIbZ20kLUcuCGeuQWG735fPMxW7wHF9BWlnQU= -github.com/go-openapi/spec v0.20.2/go.mod h1:RW6Xcbs6LOyWLU/mXGdzn2Qc+3aj+ASfI7rvSZh1Vls= -github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.13/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM= -github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= +github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= -github.com/gobuffalo/flect v0.2.3/go.mod h1:vmkQwuZYhN5Pc4ljYQZzP+1sq+NEkK+lh20jmEmX3jc= -github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= -github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= -github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= -github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= -github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= -github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU= -github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= -github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= -github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/glog v1.2.1 h1:OptwRhECazUx5ix5TTWC3EZhsZEHWcYWY4FQHTIubm4= +github.com/golang/glog v1.2.1/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -470,7 +181,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -485,25 +195,12 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/gonum/blas v0.0.0-20181208220705-f22b278b28ac/go.mod h1:P32wAyui1PQ58Oce/KYkOqQv8cVw1zAapXOl+dRFGbc= -github.com/gonum/diff v0.0.0-20181124234638-500114f11e71/go.mod h1:22dM4PLscQl+Nzf64qNBurVJvfyvZELT0iRW2l/NN70= -github.com/gonum/floats v0.0.0-20181209220543-c233463c7e82/go.mod h1:PxC8OnwL11+aosOB5+iEPoV3picfs8tUpkVd0pDo+Kg= -github.com/gonum/integrate v0.0.0-20181209220457-a422b5c0fdf2/go.mod h1:pDgmNM6seYpwvPos3q+zxlXMsbve6mOIPucUnUOrI7Y= -github.com/gonum/internal v0.0.0-20181124074243-f884aa714029/go.mod h1:Pu4dmpkhSyOzRwuXkOgAvijx4o+4YMUJJo9OvPYMkks= -github.com/gonum/lapack v0.0.0-20181123203213-e4cdc5a0bff9/go.mod h1:XA3DeT6rxh2EAE789SSiSJNqxPaC0aE9J8NTOI0Jo/A= -github.com/gonum/mathext v0.0.0-20181121095525-8a4bf007ea55/go.mod h1:fmo8aiSEWkJeiGXUJf+sPvuDgEFgqIoZSs843ePKrGg= -github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9/go.mod h1:0EXg4mc1CNP0HCqCz+K4ts155PXIlUywf0wqN+GfPZw= -github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b/go.mod h1:Z4GIJBJO3Wa4gD4vbwQxXXZ+WHmW6E9ixmNrwvs0iZs= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= +github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= +github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -511,30 +208,19 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-containerregistry v0.5.2-0.20210609162550-f0ce2270b3b4/go.mod h1:R5WRYyTdQqTchlBhX4q+WICGh8HQIL5wDFoFZv7Jq6Q= -github.com/google/go-containerregistry v0.6.0 h1:niQ+8XD//kKgArIFwDVBXsWVWbde16LPdHMyNwSC8h4= -github.com/google/go-containerregistry v0.6.0/go.mod h1:euCCtNbZ6tKqi1E72vwDj2xZcN5ttKpZLfa/wSo5iLw= -github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20210918223331-0e8b581974dd/go.mod h1:j3IqhBG3Ox1NXmmhbWU4UmiHVAf2dUgB7le1Ch7JZQ0= -github.com/google/go-github/v27 v27.0.6/go.mod h1:/0Gr8pJ55COkmv+S/yPKCczSkUPIM/LnFyubufRNIS0= -github.com/google/go-licenses v0.0.0-20200602185517-f29a4c695c3d/go.mod h1:g1VOUGKZYIqe8lDq2mL7plhAWXqrEaGUs7eIjthN1sk= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-containerregistry v0.17.0 h1:5p+zYs/R4VGHkhyvgWurWrpJ2hW4Vv9fQI+GzdcwXLk= +github.com/google/go-containerregistry v0.17.0/go.mod h1:u0qB2l7mvtWVR5kNcbFIhFY1hLbf8eeGapA+vbFDCtQ= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/licenseclassifier v0.0.0-20190926221455-842c0d70d702/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M= -github.com/google/mako v0.0.0-20190821191249-122f8dcef9e3/go.mod h1:YzLcVlL+NqWnmUEPuhS1LxDDwGO9WNbVlEXaF4IH35g= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -542,231 +228,114 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM= +github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= -github.com/googleapis/gnostic v0.5.3/go.mod h1:TRWw1s4gxBGjSe301Dai3c7wXJAZy57+/6tawkOvqHQ= -github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw= -github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= -github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= -github.com/gorilla/sessions v1.2.0 h1:S7P+1Hm5V/AT9cjEcUD5uDaQSX0OE577aCXgoaKpYbQ= -github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= -github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI= +github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 h1:lLT7ZLSzGLI08vc9cpd+tYmNWjdKDqyr/2L+f6U12Fk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= github.com/h2non/gock v1.0.9 h1:17gCehSo8ZOgEsFKpQgqHiR7VLyjxdAG3lkhVvO9QZU= +github.com/h2non/gock v1.0.9/go.mod h1:CZMcB0Lg5IWnr9bF79pPMg9WeV6WumxQiUJ1UvdO1iE= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go-version v1.3.0 h1:McDWVJIU/y+u1BRV06dPaLfLCaT7fUTJLp5r04x7iNw= -github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/go-version v1.5.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= +github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog= github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 h1:i462o439ZjprVSFSZLZxcsoAe592sZB1rci2Z8j4wdk= github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= -github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/influxdata/tdigest v0.0.0-20180711151920-a7d76c6f093a/go.mod h1:9GkyshztGufsdPQWjH+ifgnIr3xNUL5syI70g2dzU1o= -github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= -github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= -github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= +github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jbrukh/bayesian v0.0.0-20200318221351-d726b684ca4a h1:gbdjhSslIoRRiSSLCP3kKuLmqAJGmhnPVhIyf6Dbw34= github.com/jbrukh/bayesian v0.0.0-20200318221351-d726b684ca4a/go.mod h1:SELxwZQq/mPnfPCR2mchLmT4TQaPJvYtLcCtDWSM7vM= -github.com/jenkins-x-plugins/jx-gitops v0.7.33 h1:Z1chmzuTexIznDwvrV9ZlRmSlIqiW+QaYOC1GUQvsOU= -github.com/jenkins-x-plugins/jx-gitops v0.7.33/go.mod h1:HMb3U6TCeZg7RO8APOp6AwX8qgXLyoo0oCvPywWZ6B8= -github.com/jenkins-x-plugins/jx-promote v0.4.1 h1:Cl+9NEcZ/vO6azC7U+jJ8bK+uRCFOzbqkzOp1w6lHoo= -github.com/jenkins-x-plugins/jx-promote v0.4.1/go.mod h1:/3yMsvEza+wxdK7/sHEnM5L/EoQiVQFsO/M8zfcQgvc= -github.com/jenkins-x/go-scm v1.10.10/go.mod h1:z7xTO9/VzqW3xEbEMH2z5cpOGrZ8+nOHOWfU1ngFGxs= -github.com/jenkins-x/go-scm v1.11.18 h1:AxtemjmNA1/9G6JiCPW0M44KMovOTkIoc69dXD7sB88= -github.com/jenkins-x/go-scm v1.11.18/go.mod h1:FsA0UOK1U89XnXSwC97kJ20+8tfJPP9s8zUn5AXu/3Q= -github.com/jenkins-x/jx-api/v4 v4.6.1 h1:E86DW66wLxjbxzvbu4ys4jeCRClb4szbtFVmkB9kvTw= -github.com/jenkins-x/jx-api/v4 v4.6.1/go.mod h1:1ZPMGLTfWeDz4CoB+QBScVQM+AjS780osJ4W6mHJWlk= -github.com/jenkins-x/jx-helpers/v3 v3.4.12 h1:Avx1/KxyFxIhvpOr7J6Dn0WvcZmsm1i7ZFXmRd/WhZc= -github.com/jenkins-x/jx-helpers/v3 v3.4.12/go.mod h1:/2n7uMXbbLp1V9fG1fnf7ngdu3vGQFSMYnglY4oKx7c= -github.com/jenkins-x/jx-kube-client/v3 v3.0.4 h1:/MbqKke3q9/JYrXCHCyqDXiyD0ybnouK7fIfCPCJ/Ck= -github.com/jenkins-x/jx-kube-client/v3 v3.0.4/go.mod h1:suKBiBs7DKHzOEyhcsr5QhFs/Wcm0agLFMoYlIf3bPA= -github.com/jenkins-x/jx-logging/v3 v3.0.12 h1:iHcYnGexYkGp0Wvh2q0TWUZqTnDGtuGhVwimSFm15/M= -github.com/jenkins-x/jx-logging/v3 v3.0.12/go.mod h1:IL7YsL8KK0vA79mwcIdC0dS6sLxorZlIlsCdCh167fw= -github.com/jenkins-x/lighthouse-client v0.0.580 h1:F+1C/nI9GHcgApTtFWeRAVmffpu+xFRqLx82ijEMusg= -github.com/jenkins-x/lighthouse-client v0.0.580/go.mod h1:SKxKKVeqJwvwg+IL6lvT1W6HhjaPwPgMWsga/HS0cTU= -github.com/jenkins-x/logrus-stackdriver-formatter v0.2.4 h1:K/MNPWnRGvQU3MEJFjwtHcoJi5KkRXjZumOI/eXlhg4= -github.com/jenkins-x/logrus-stackdriver-formatter v0.2.4/go.mod h1:qstXS0wrjYchh67ofWufoyAqLQIf9kW++MkIdxgH1dE= +github.com/jenkins-x-plugins/jx-gitops v0.23.11 h1:qhLUuZvPosWqL0wg4yUVKDAdcTqOCae2dZRk6iMyLYc= +github.com/jenkins-x-plugins/jx-gitops v0.23.11/go.mod h1:47MZvC74MXfudouBDZRe8GpZXg7neVuL2W2D1cH1aXE= +github.com/jenkins-x-plugins/jx-promote v0.6.11 h1:1psfVDXdm6hQ40/pB0svSvvPxB2KQepnxPLqEB9aitc= +github.com/jenkins-x-plugins/jx-promote v0.6.11/go.mod h1:K818frWgYYeuO/Njzf3DWQOJiy3/2YGo7lw5jyRY40U= +github.com/jenkins-x/go-scm v1.14.43 h1:hhFivDj28dVEDzcI6S07z6hZRK1speL8P1A3SWuF9i0= +github.com/jenkins-x/go-scm v1.14.43/go.mod h1:Rkk6rQeOzDDIvQRcwiFzTkBHPX1/fOVmSlxE9sqSJWM= +github.com/jenkins-x/jx-api/v4 v4.7.6 h1:+SJwYn/uF7CwbC5cD399zLjcM+VEgJMS89QL8ixa0WY= +github.com/jenkins-x/jx-api/v4 v4.7.6/go.mod h1:qBBQ+CUsclk9O8vV0dksPpyKgS0wXe7O/3Tzm9xxRiA= +github.com/jenkins-x/jx-helpers/v3 v3.9.0 h1:j0VIOqZLdxJKMhb0UfVbOrcvK0UoNBLYseyxpi4N/IY= +github.com/jenkins-x/jx-helpers/v3 v3.9.0/go.mod h1:EnF19OEjrUi+ykI0xyc9Y9aquEPZtP+mEtHzhJHJ+3E= +github.com/jenkins-x/jx-kube-client/v3 v3.0.8 h1:AzXuXCdv4DQf8wqR5c1UL0uXVu6KrAjdPtPb6wrG0Hs= +github.com/jenkins-x/jx-kube-client/v3 v3.0.8/go.mod h1:ELgPjZhMqYiCKml4L16GREF6bkC890KRKfpNCz+aIgE= +github.com/jenkins-x/jx-logging/v3 v3.0.17 h1:0qpgKfpxl4uks6vZZV5LCGCOOD3axgMxoK3m6X74kpQ= +github.com/jenkins-x/jx-logging/v3 v3.0.17/go.mod h1:vUW4EJxE8TowVsFhcwcpKag189ZS5J25a3kyMPq1mYM= +github.com/jenkins-x/lighthouse-client v0.0.1286 h1:canmnlXhc1b5UtxGNi9Scg3S05bM+9WUJ1pQoRc1ZRc= +github.com/jenkins-x/lighthouse-client v0.0.1286/go.mod h1:e/FBvB0TyvxFTJ80vpWXlPRdNfiYQVnXDQksO5Wtb3c= +github.com/jenkins-x/logrus-stackdriver-formatter v0.2.7 h1:waTRYQoVXfRZXs1SVGgk8hcHdlBZOP8rJJLYg33up6k= +github.com/jenkins-x/logrus-stackdriver-formatter v0.2.7/go.mod h1:4xQdtL7MXIiluYFTF1cP7c0IZdLv5UMJv3h1ttgH72w= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8= github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= -github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= -github.com/klauspost/compress v1.13.0/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= -github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= -github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.17/go.mod h1:WgzbA6oji13JREwiNsRDNfl7jYdPnmz+VEuLrA+/48M= -github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= -github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= -github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= -github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= -github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= -github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= -github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= -github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -774,335 +343,144 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= -github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= -github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.1 h1:jMU0WaQrP0a/YAEq8eJmJKjBoMs+pClEr1vDMlM/Do4= -github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA= -github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= -github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= +github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= -github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= -github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= -github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= -github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= -github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= -github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= -github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= -github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= -github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= +github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= -github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= -github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= -github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/prometheus/statsd_exporter v0.21.0 h1:hA05Q5RFeIjgwKIYEdFd59xu5Wwaznf33yKI+pyX6T8= github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rawlingsj/jsonschema v0.0.0-20210511142122-a9c2cfdb7dcf h1:YPl5D1RlBkDDxJBodNwBtzBnqDQobrDJcs/2x3Grfts= github.com/rawlingsj/jsonschema v0.0.0-20210511142122-a9c2cfdb7dcf/go.mod h1:8LFgdjjkhuo3+T0/kprWPWGqh2+v8QC4hLyjNK6j15s= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rickar/props v0.0.0-20170718221555-0b06aeb2f037 h1:HFsTO5S+nnw/Xs9lRYF+UUJvH8wMSRMRal321W0hfdY= -github.com/rickar/props v0.0.0-20170718221555-0b06aeb2f037/go.mod h1:F1p8BNM4IXv2UcptwSp8HJOapKurodd/PYu1D6Gtn9Y= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= -github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww= github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/shurcooL/githubv4 v0.0.0-20190718010115-4ba037080260/go.mod h1:hAF0iLZy4td2EX+/8Tw+4nodhlMrwN3HupfaXj3zkGo= github.com/shurcooL/githubv4 v0.0.0-20191102174205-af46314aec7b h1:Cocq9/ZZxCoiybhygOR7hX4E3/PkV8eNbd1AEcUvaHM= github.com/shurcooL/githubv4 v0.0.0-20191102174205-af46314aec7b/go.mod h1:hAF0iLZy4td2EX+/8Tw+4nodhlMrwN3HupfaXj3zkGo= github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f h1:tygelZueB1EtXkPI6mQ4o9DQ0+FKW41hTbunoXZCTqk= github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f/go.mod h1:AuYgA5Kyo4c7HfUmvRGs/6rGlMMV/6B1bVnB9JxJEEg= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= -github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= -github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= -github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= -github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= -github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= -github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= -github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= -github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25/go.mod h1:lbP8tGiBjZ5YWIc2fzuRpTaz0b/53vT6PEs3QuAWzuU= -github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= -github.com/tektoncd/pipeline v0.29.0 h1:d6EOBqqSulk1nw2CkORw8aegFx3ad4Wwsr2YPA0aH3g= -github.com/tektoncd/pipeline v0.29.0/go.mod h1:aPxBLtRAcvu6TAg5juhMwChQTi9lja+KDTi3yXgNi0E= -github.com/tektoncd/plumbing v0.0.0-20211012143332-c7cc43d9bc0c/go.mod h1:b9esRuV1absBvaPzKkjYdKXjC5Tgs8/vh1sz++RiTdc= -github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tsenart/go-tsz v0.0.0-20180814232043-cdeb9e1e981e/go.mod h1:SWZznP1z5Ki7hDT2ioqiFKEse8K9tU2OUvaRI0NeGQo= -github.com/tsenart/vegeta/v12 v12.8.4/go.mod h1:ZiJtwLn/9M4fTPdMY7bdbIeyNeFVE8/AHbWFqCsUuho= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/vdemeester/k8s-pkg-credentialprovider v1.21.0-1/go.mod h1:l4LxiP0cmEcc5q4BTDE8tZSyIiyXe0T28x37yHpMzoM= -github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= -github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= -github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/tektoncd/pipeline v0.41.0 h1:FksQuX83ZRasZygQPNmaR6hKBh6gy822XxRuoKBqPUE= +github.com/tektoncd/pipeline v0.41.0/go.mod h1:YY4+PGfdsd6Qxn3PZXmCpKeS3heK8pIIcnUt37vRJ2Q= github.com/vrischmann/envconfig v1.3.0 h1:4XIvQTXznxmWMnjouj0ST5lFo/WAYf5Exgl3x82crEk= github.com/vrischmann/envconfig v1.3.0/go.mod h1:bbvxFYJdRSpXrhS63mBFtKJzkDiNkyArOLXtY6q0kuI= -github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= -github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= -github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= -github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= -github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.11-0.20210813005559-691160354723 h1:sHOAIxRGBp443oHZIPB+HsUGaksVCXVQENPxwTfQdH4= -go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= -go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= -go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= -golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= -golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= -golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1125,8 +503,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -1135,38 +511,24 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= +golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1177,49 +539,26 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= -golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= -golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= +golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= +golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1230,58 +569,30 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191119060738-e882bf8e40c2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1291,100 +602,57 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= -golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U= -golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191118222007-07fc4c7f2b98/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1402,7 +670,6 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -1410,27 +677,16 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= -gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= -gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= +gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -1438,7 +694,6 @@ google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEn google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.1-0.20200106000736-b8fc810ca6b5/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= @@ -1449,30 +704,19 @@ google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.114.0 h1:1xQPji6cO2E2vLiI+C/XiFAnsn1WV3mjaEwGLhi3grE= -google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= +google.golang.org/api v0.185.0 h1:ENEKk1k4jW8SmmaT6RE+ZasxmxezCrD5Vw4npvr+pAU= +google.golang.org/api v0.185.0/go.mod h1:HNfvIkJGlgrIlrbYkAm9W9IdkmKZjOTVh33YltygGbg= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -1481,7 +725,6 @@ google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvx google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -1500,32 +743,14 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210416161957-9910b6c460de/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= -google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 h1:MuYw1wJzT+ZkybKfaOXKp5hJiZDn2iHaXRw0mRYdHSc= +google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4/go.mod h1:px9SlOOZBg1wM1zdnr8jEL4CNGUBZ+ZKYtNPApNQc4c= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -1534,20 +759,9 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= -google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1559,50 +773,30 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= -gopkg.in/h2non/gentleman.v1 v1.0.4/go.mod h1:JYuHVdFzS4MKOXe0o+chKJ4hCe6tqKKw9XH9YP6WFrg= -gopkg.in/h2non/gock.v1 v1.0.16 h1:F11k+OafeuFENsjei5t2vMTSTs9L62AdyTe4E1cgdG8= -gopkg.in/h2non/gock.v1 v1.0.16/go.mod h1:XVuDAssexPLwgxCLMvDTWNU5eqklsydR6I5phZ9oPB8= +gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= +gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= +gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY= +gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 h1:E846t8CnR+lv5nE+VuiKTDG/v1U2stad0QzddfJC7kY= gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5/go.mod h1:hiOFpYm0ZJbusNj2ywpbrXowU3G8U6GIQzqn2mw1UIE= -gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= -gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= -gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE= -gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/validator.v2 v2.0.0-20200605151824-2b28d334fa05 h1:l9eKDCWy9n7C5NAiQAMvDePh0vyLAweR6LcSUVXFUGg= gopkg.in/validator.v2 v2.0.0-20200605151824-2b28d334fa05/go.mod h1:o4V0GXN9/CAmCsvJ0oXYZvrZOe7syiDZSN1GWGZTGzc= -gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -1614,15 +808,10 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= -gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= -helm.sh/helm/v3 v3.11.1 h1:cmL9fFohOoNQf+wnp2Wa0OhNFH0KFnSzEkVxi3fcc3I= -helm.sh/helm/v3 v3.11.1/go.mod h1:z/Bu/BylToGno/6dtNGuSmjRqxKq5gaH+FU0BPO+AQ8= +helm.sh/helm/v3 v3.15.3 h1:HcZDaVFe9uHa6hpsR54mJjYyRy4uz/pc6csg27nxFOc= +helm.sh/helm/v3 v3.15.3/go.mod h1:FzSIP8jDQaa6WAVg9F+OkKz7J0ZmAga4MABtTbsb9WQ= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1630,71 +819,30 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.21.5 h1:9zp3SslPRB+rqxhGKqqTo6VsN3HX0Ype1nWV6UQQ+Sk= -k8s.io/api v0.21.5/go.mod h1:Un8C5Hemo2r3MfPOjZvwQQ9KkBbiTBUCGrjlivo9uJ0= -k8s.io/apiextensions-apiserver v0.21.4/go.mod h1:OoC8LhI9LnV+wKjZkXIBbLUwtnOGJiTRE33qctH5CIk= -k8s.io/apiextensions-apiserver v0.26.0 h1:Gy93Xo1eg2ZIkNX/8vy5xviVSxwQulsnUdQ00nEdpDo= -k8s.io/apiextensions-apiserver v0.26.0/go.mod h1:7ez0LTiyW5nq3vADtK6C3kMESxadD51Bh6uz3JOlqWQ= -k8s.io/apimachinery v0.21.5 h1:56bnsHcUNboSCbD779GGi4Lh5kHTDFUoDrnHbhLTiaw= -k8s.io/apimachinery v0.21.5/go.mod h1:3PfBV+4PPXNs0aueD+7fHcGyhdkFFYqXeshQtsKCi+4= -k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= -k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= -k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= -k8s.io/apiserver v0.21.0/go.mod h1:w2YSn4/WIwYuxG5zJmcqtRdtqgW/J2JRgFAqps3bBpg= -k8s.io/apiserver v0.21.4/go.mod h1:SErUuFBBPZUcD2nsUU8hItxoYheqyYr2o/pCINEPW8g= -k8s.io/client-go v0.21.5 h1:zkVidiWVgciPKYqWpMFMjCUF+4rRXcfkKoyQS1Ue21k= -k8s.io/client-go v0.21.5/go.mod h1:EUornVlr3rBrPKXUoMPNggJdEQmvFNMpYO3Kb6432kw= -k8s.io/cloud-provider v0.21.0/go.mod h1:z17TQgu3JgUFjcgby8sj5X86YdVK5Pbt+jm/eYMZU9M= -k8s.io/code-generator v0.21.4/go.mod h1:K3y0Bv9Cz2cOW2vXUrNZlFbflhuPvuadW6JdnN6gGKo= -k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= -k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= -k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.21.0/go.mod h1:qvtjz6X0USWXbgmbfXR+Agik4RZ3jv2Bgr5QnZzdPYw= -k8s.io/component-base v0.21.4/go.mod h1:ZKG0eHVX+tUDcaoIGpU3Vtk4TIjMddN9uhEWDmW6Nyg= -k8s.io/controller-manager v0.21.0/go.mod h1:Ohy0GRNRKPVjB8C8G+dV+4aPn26m8HYUI6ejloUBvUA= -k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= -k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= -k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= -k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= -k8s.io/csi-translation-lib v0.21.0/go.mod h1:edq+UMpgqEx3roTuGF/03uIuSOsI986jtu65+ytLlkA= -k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/gengo v0.0.0-20210203185629-de9496dff47b/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= -k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= -k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20210113233702-8566a335510f h1:ZcWbnalfwIst131Zff7dGd1HQdt+NA9q7z9Fi0vbsHY= -k8s.io/kube-openapi v0.0.0-20210113233702-8566a335510f/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= -k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/legacy-cloud-providers v0.21.0/go.mod h1:bNxo7gDg+PGkBmT/MFZswLTWdSWK9kAlS1s8DJca5q4= -k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs= -k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/hack v0.0.0-20210806075220-815cd312d65c/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/pkg v0.0.0-20210827184538-2bd91f75571c h1:PAwmOrSKh2Ge+/skT7T2nS2rpWYXgPo9vpZ/ScAaPtc= -knative.dev/pkg v0.0.0-20210827184538-2bd91f75571c/go.mod h1:jMSqkNMsrzuy+XR4Yr/BMy7SDVbUOl3KKB6+5MR+ZU8= -pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= +k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8= +k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE= +k8s.io/apiextensions-apiserver v0.30.2 h1:l7Eue2t6QiLHErfn2vwK4KgF4NeDgjQkCXtEbOocKIE= +k8s.io/apiextensions-apiserver v0.30.2/go.mod h1:lsJFLYyK40iguuinsb3nt+Sj6CmodSI4ACDLep1rgjw= +k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4= +k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4= +k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs= +k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= +k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a h1:zD1uj3Jf+mD4zmA7W+goE5TxDkI7OGJjBNBzq5fJtLA= +k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +knative.dev/pkg v0.0.0-20231023150739-56bfe0dd9626 h1:qFE+UDBRg6cpF5LbA0sv1XK4XZ36Z7aTRCa+HcuxnNQ= +knative.dev/pkg v0.0.0-20231023150739-56bfe0dd9626/go.mod h1:g+UCgSKQ2f15kHYu/V3CPtoKo5F1x/2Y1ot0NSK7gA0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/kustomize/kyaml v0.13.9 h1:Qz53EAaFFANyNgyOEJbT/yoIHygK40/ZcvU3rgry2Tk= -sigs.k8s.io/kustomize/kyaml v0.13.9/go.mod h1:QsRbD0/KcU+wdk0/L0fIp2KLnohkVzs6fQ85/nOXac4= -sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= -sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +sigs.k8s.io/kustomize/kyaml v0.17.1 h1:TnxYQxFXzbmNG6gOINgGWQt09GghzgTP6mIurOgrLCQ= +sigs.k8s.io/kustomize/kyaml v0.17.1/go.mod h1:9V0mCjIEYjlXuCdYsSXvyoy2BTsLESH7TlGV81S282U= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/pkg/cmd/importcmd/buildpacks.go b/pkg/cmd/importcmd/buildpacks.go index 4358588..84c96eb 100644 --- a/pkg/cmd/importcmd/buildpacks.go +++ b/pkg/cmd/importcmd/buildpacks.go @@ -9,7 +9,6 @@ import ( v1 "github.com/jenkins-x/jx-api/v4/pkg/apis/jenkins.io/v1" "github.com/jenkins-x-plugins/jx-gitops/pkg/apis/gitops/v1alpha1" - "github.com/jenkins-x-plugins/jx-project/pkg/config" "github.com/jenkins-x-plugins/jx-project/pkg/gitresolver" "github.com/jenkins-x/jx-helpers/v3/pkg/files" "github.com/jenkins-x/jx-helpers/v3/pkg/gitclient" @@ -17,22 +16,18 @@ import ( "github.com/jenkins-x/jx-helpers/v3/pkg/yamls" jxdraft "github.com/jenkins-x-plugins/jx-project/pkg/draft" - "github.com/jenkins-x-plugins/jx-project/pkg/jenkinsfile" "github.com/jenkins-x/jx-logging/v3/pkg/log" "github.com/pkg/errors" ) // InvokeDraftPack used to pass arguments into the draft pack invocation type InvokeDraftPack struct { - Dir string - DevEnvCloneDir string - CustomDraftPack string - Jenkinsfile string - InitialisedGit bool - DisableAddFiles bool - UseNextGenPipeline bool - CreateJenkinsxYamlIfMissing bool - ProjectConfig *config.ProjectConfig + Dir string + DevEnvCloneDir string + CustomDraftPack string + Jenkinsfile string + InitialisedGit bool + DisableAddFiles bool } // InitBuildPacks initialise the build packs @@ -151,8 +146,6 @@ func (o *ImportOptions) InvokeDraftPack(i *InvokeDraftPack) (string, error) { // was: // lets configure the draft pack mode based on the team settings // if settings.GetImportMode() != v1.ImportModeTypeJenkinsfile { - i.UseNextGenPipeline = true - i.CreateJenkinsxYamlIfMissing = true dir := i.Dir customDraftPack := i.CustomDraftPack @@ -161,18 +154,8 @@ func (o *ImportOptions) InvokeDraftPack(i *InvokeDraftPack) (string, error) { gradleName := filepath.Join(dir, "build.gradle") jenkinsPluginsName := filepath.Join(dir, "plugins.txt") packagerConfigName := filepath.Join(dir, "packager-config.yml") - jenkinsxYaml := filepath.Join(dir, config.ProjectConfigFileName) envChart := filepath.Join(dir, "env", "Chart.yaml") lpack := "" - if customDraftPack == "" { - if i.ProjectConfig == nil { - i.ProjectConfig, _, err = config.LoadProjectConfig(dir) - if err != nil { - return "", err - } - } - customDraftPack = i.ProjectConfig.BuildPack - } if len(customDraftPack) > 0 { log.Logger().Infof("trying to use draft pack: %s", customDraftPack) @@ -256,7 +239,7 @@ func (o *ImportOptions) InvokeDraftPack(i *InvokeDraftPack) (string, error) { } } if lpack == "" { - exists, err2 := files.FileExists(filepath.Join(dir, jenkinsfile.Name)) + exists, err2 := files.FileExists(filepath.Join(dir, JenkinsfileName)) if exists && err2 == nil { lpack = filepath.Join(packsDir, "custom-jenkins") err = nil @@ -284,10 +267,6 @@ func (o *ImportOptions) InvokeDraftPack(i *InvokeDraftPack) (string, error) { } chartsDir := filepath.Join(dir, "charts") - jenkinsxYamlExists, err := files.FileExists(jenkinsxYaml) - if err != nil { - return pack, err - } err = o.copyBuildPack(dir, lpack) if err != nil { @@ -309,31 +288,6 @@ func (o *ImportOptions) InvokeDraftPack(i *InvokeDraftPack) (string, error) { } } - if !jenkinsxYamlExists && i.CreateJenkinsxYamlIfMissing { - // lets check if we have a lighthouse trigger - g := filepath.Join(dir, ".lighthouse", "*", "triggers.yaml") - matches, err := filepath.Glob(g) - if err != nil { - return pack, errors.Wrapf(err, "failed to evaluate glob %s", g) - } - if len(matches) == 0 { - pipelineConfig, err := config.LoadProjectConfigFile(jenkinsxYaml) - if err != nil { - return pack, err - } - - // only update the build pack if its not currently set to none so that build packs can - // use a custom pipeline plugin mechanism - if pipelineConfig.BuildPack != pack && pipelineConfig.BuildPack != "none" { - pipelineConfig.BuildPack = pack - err = pipelineConfig.SaveConfig(jenkinsxYaml) - if err != nil { - return pack, err - } - } - } - } - lighthouseDir := filepath.Join(packsDir, pack, ".lighthouse") exists, err = files.DirExists(lighthouseDir) if err != nil { @@ -348,24 +302,6 @@ func (o *ImportOptions) InvokeDraftPack(i *InvokeDraftPack) (string, error) { return pack, nil } -// DiscoverBuildPack discovers the build pack given the build pack configuration -func (o *ImportOptions) DiscoverBuildPack(dir string, projectConfig *config.ProjectConfig, packConfig string) (string, error) { - if packConfig != "" { - return packConfig, nil - } - args := &InvokeDraftPack{ - Dir: dir, - CustomDraftPack: packConfig, - ProjectConfig: projectConfig, - DisableAddFiles: true, - } - pack, err := o.InvokeDraftPack(args) - if err != nil { - return pack, errors.Wrapf(err, "failed to discover task pack in dir %s", dir) - } - return pack, nil -} - // Refactor: taken from jx so we can also bring in the draft pack and not fail when copying buildpacks without a charts dir // CopyBuildPack copies the build pack from the source dir to the destination dir func (o *ImportOptions) copyBuildPack(dest, src string) error { @@ -420,11 +356,6 @@ func (o *ImportOptions) copyBuildPack(dest, src string) error { } } - // let's remove any files we think should be zapped - for _, file := range []string{jenkinsfile.PipelineConfigFileName, jenkinsfile.PipelineTemplateFileName} { - delete(p.Files, file) - } - if o.PackFilter != nil { o.PackFilter(p) } diff --git a/pkg/cmd/importcmd/convert_pipeline.go b/pkg/cmd/importcmd/convert_pipeline.go deleted file mode 100644 index 6c45b53..0000000 --- a/pkg/cmd/importcmd/convert_pipeline.go +++ /dev/null @@ -1,44 +0,0 @@ -package importcmd - -import ( - "os" - "path/filepath" - - "github.com/jenkins-x/jx-helpers/v3/pkg/cmdrunner" - "github.com/pkg/errors" -) - -// convertOldPipeline converts the old pipeline and returns true if it was converted -func (o *ImportOptions) convertOldPipeline() (bool, error) { - if !o.BatchMode { - flag, err := o.Input.Confirm("Convert the old jenkins-x.yml file to the new tekton yaml?: ", true, "please confirm you wish to convert the pipeline") - if err != nil { - return flag, errors.Wrapf(err, "failed to conform conversion") - } - if !flag { - return false, nil - } - } - dir, err := filepath.Abs(o.Dir) - if err != nil { - return false, errors.Wrapf(err, "failed to get absolute dir of %s", o.Dir) - } - - args := []string{"pipeline", "convert", "--dir", dir} - if o.BatchMode { - args = append(args, "--batch-mode") - } - c := &cmdrunner.Command{ - Dir: dir, - Name: "jx", - Args: args, - Out: os.Stdout, - Err: os.Stderr, - In: os.Stdin, - } - _, err = o.CommandRunner(c) - if err != nil { - return false, errors.Wrapf(err, "failed to convert old pipeline via %s", c.CLI()) - } - return true, nil -} diff --git a/pkg/cmd/importcmd/evaluate_buildpack.go b/pkg/cmd/importcmd/evaluate_buildpack.go index 4be1ffd..fb7cb91 100644 --- a/pkg/cmd/importcmd/evaluate_buildpack.go +++ b/pkg/cmd/importcmd/evaluate_buildpack.go @@ -17,7 +17,7 @@ func (o *ImportOptions) HasJenkinsfile() (string, error) { dir := o.Dir var err error - jenkinsfile := jenkinsfileName + jenkinsfile := JenkinsfileName if o.Jenkinsfile != "" { jenkinsfile = o.Jenkinsfile } @@ -58,13 +58,6 @@ func (o *ImportOptions) EvaluateBuildPack(devEnvCloneDir, jenkinsfile string) er return err } - /* TODO - err = o.modifyDeployKind() - if err != nil { - return err - } - - */ if o.PostDraftPackCallback != nil { err = o.PostDraftPackCallback() if err != nil { diff --git a/pkg/cmd/importcmd/import.go b/pkg/cmd/importcmd/import.go index 51cc9ee..e34c77d 100644 --- a/pkg/cmd/importcmd/import.go +++ b/pkg/cmd/importcmd/import.go @@ -13,7 +13,6 @@ import ( "github.com/denormal/go-gitignore" "github.com/jenkins-x-plugins/jx-project/pkg/cmd/common" - "github.com/jenkins-x-plugins/jx-project/pkg/config" "github.com/jenkins-x-plugins/jx-project/pkg/constants" "github.com/jenkins-x-plugins/jx-project/pkg/maven" "github.com/jenkins-x/go-scm/scm" @@ -93,7 +92,6 @@ type ImportOptions struct { NoDevPullRequest bool IgnoreExistingRepository bool IgnoreCollaborator bool - IgnoreJenkinsXFile bool PullRequestPollPeriod time.Duration PullRequestPollTimeout time.Duration DeployOptions v1.DeployOptions @@ -129,7 +127,7 @@ type ImportOptions struct { const ( updateBotMavenPluginVersion = "RELEASE" - jenkinsfileName = "Jenkinsfile" + JenkinsfileName = "Jenkinsfile" ) var ( @@ -415,34 +413,6 @@ func (o *ImportOptions) Run() error { } } - // let's disable the build pack if we have a jenkins-x.yml or a .lighthouse/*/triggers.yaml file - jxProjectFile := filepath.Join(o.Dir, config.ProjectConfigFileName) - jxProjectFileExists, err := files.FileExists(jxProjectFile) - if err != nil { - return errors.Wrapf(err, "failed to check if dir contains a %s file", jxProjectFile) - } - if jxProjectFileExists && !o.IgnoreJenkinsXFile { - converted, err := o.convertOldPipeline() - if err != nil { - return errors.Wrapf(err, "failed to convert old pipeline") - } - - o.DisableBuildPack = true - if !converted { - // we may need to add a custom build pack to handle the old jenkins-x.yml build packs - projectConfig, projectConfigFile, err := config.LoadProjectConfig(o.Dir) - if err != nil { - return errors.Wrapf(err, "failed to load project oconfig file from %s", o.Dir) - } - if projectConfig.BuildPackGitURef == "" || strings.HasPrefix(projectConfig.BuildPackGitURef, "https://github.com/jenkins-x/jx3-pipeline-catalog") { - projectConfig.BuildPackGitURef = "https://github.com/jenkins-x/jxr-packs-kubernetes" - err = projectConfig.SaveConfig(projectConfigFile) - if err != nil { - return errors.Wrapf(err, "failed to save config file %s", projectConfigFile) - } - } - } - } if !o.DisableBuildPack { g := filepath.Join(o.Dir, ".lighthouse", "*", "triggers.yaml") matches, err := filepath.Glob(g) @@ -806,24 +776,6 @@ func (o *ImportOptions) DefaultGitIgnore() error { func (o *ImportOptions) doImport() error { gitURL := o.DiscoveredGitURL - dockerfileLocation := "" - if o.Dir != "" { - dockerfileLocation = filepath.Join(o.Dir, "Dockerfile") - } else { - dockerfileLocation = "Dockerfile" - } - dockerfileExists, err := files.FileExists(dockerfileLocation) - if err != nil { - return err - } - - if dockerfileExists { - err = o.ensureDockerRepositoryExists() - if err != nil { - return err - } - } - // TODO should we prompt the user for the git kind if we can't detect / find it? gitKind := o.ScmFactory.GitKind @@ -883,47 +835,6 @@ func (o *ImportOptions) doImport() error { return nil } -// ensureDockerRepositoryExists for some kinds of container registry we need to pre-initialise its use such as for ECR -func (o *ImportOptions) ensureDockerRepositoryExists() error { - orgName := o.getOrganisationOrCurrentUser() - appName := o.AppName - if orgName == "" { - log.Logger().Warnf("Missing organisation name!") - return nil - } - if appName == "" { - log.Logger().Warnf("Missing application name!") - return nil - } - - /* TODO - kubeClient, curNs, err := o.KubeClientAndNamespace() - if err != nil { - return err - } - ns, _, err := jxenv.GetDevNamespace(kubeClient, curNs) - if err != nil { - return err - } - - region, _ := kube.ReadRegion(kubeClient, ns) - cm, err := kubeClient.CoreV1().ConfigMaps(ns).Get(kube.ConfigMapJenkinsDockerRegistry, metav1.GetOptions{}) - if err != nil { - return fmt.Errorf("Could not find ConfigMap %s in namespace %s: %s", kube.ConfigMapJenkinsDockerRegistry, ns, err) - } - if cm.Data != nil { - dockerRegistry := cm.Data["docker.registry"] - if dockerRegistry != "" { - if strings.HasSuffix(dockerRegistry, ".amazonaws.com") && strings.Index(dockerRegistry, ".ecr.") > 0 { - return amazon.LazyCreateRegistry(kubeClient, ns, region, dockerRegistry, o.getDockerRegistryOrg(), appName) - } - } - } - - */ - return nil -} - // ReplacePlaceholders replaces app name, git server name, git org, and docker registry org placeholders func (o *ImportOptions) ReplacePlaceholders(gitServerName, dockerRegistryOrg string) error { safeOrganisationName := naming.ToValidName(strings.ToLower(o.Organisation)) @@ -951,6 +862,7 @@ func (o *ImportOptions) ReplacePlaceholders(gitServerName, dockerRegistryOrg str pathsToRename = append([]string{f}, pathsToRename...) } if !fi.IsDir() { + // TODO: Apply https://docs.gomplate.ca/ if .jx/gotemplate.yaml exists if err := replacePlaceholdersInFile(replacer, f); err != nil { return err } @@ -1312,140 +1224,6 @@ func (o *ImportOptions) GetGitRepositoryDetails() (*CreateRepoData, error) { return details, nil } -/** TODO -// modifyDeployKind lets modify the deployment kind if the team settings or CLI settings are different -func (o *ImportOptions) modifyDeployKind() error { - deployKind := o.DeployKind - if deployKind == "" { - return nil - } - dopts := o.DeployOptions - - copy := *o.CommonOptions - cmd, eo := edit.NewCmdEditDeployKindAndOption(©) - eo.Dir = o.Dir - - // let's parse the CLI arguments so that the flags are marked as specified to force them to be overridden - err := cmd.Flags().Parse(edit.ToDeployArguments(OptionKind, deployKind, dopts.Canary, dopts.HPA)) - if err != nil { - return err - } - err = eo.Run() - if err != nil { - return errors.Wrapf(err, "failed to modify the deployment kind to %s", deployKind) - } - return nil -} - -*/ - -// enableTriggerPipelineJenkinsXPipeline lets generate the jenkins-x.yml if one doesn't exist -// let's use JENKINS_SERVER to point to the jenkins server to use -/* TODO -func (o *ImportOptions) enableTriggerPipelineJenkinsXPipeline(destination ImportDestination) error { - projectConfig, fileName, err := config.LoadProjectConfig(o.Dir) - if err != nil { - return errors.Wrapf(err, "failed to load Jenkins X Pipeline in dir %s", o.Dir) - } - changed := false - if projectConfig.BuildPack != triggerPipelineBuildPack { - projectConfig.BuildPack = triggerPipelineBuildPack - changed = true - } - if projectConfig.PipelineConfig == nil { - projectConfig.PipelineConfig = &jenkinsfile.PipelineConfig{} - } - jenkinsServerName := destination.Jenkins.JenkinsName - found := false - for i, e := range projectConfig.PipelineConfig.Env { - if e.Name == jenkinsServerEnvVar { - if e.Value != jenkinsServerName { - projectConfig.PipelineConfig.Env[i].Value = jenkinsServerName - found = true - changed = true - } - } - } - if !found { - projectConfig.PipelineConfig.Env = append(projectConfig.PipelineConfig.Env, corev1.EnvVar{ - Name: jenkinsServerEnvVar, - Value: jenkinsServerName, - }) - changed = true - } - if changed { - err := projectConfig.SaveConfig(fileName) - if err != nil { - return err - } - } - return nil -} - -// enableJenkinsfileRunnerPipeline lets enable the JenkinfileRunner pipeline -func (o *ImportOptions) enableJenkinsfileRunnerPipeline(destination ImportDestination) error { - projectConfig, fileName, err := config.LoadProjectConfig(o.Dir) - if err != nil { - return errors.Wrapf(err, "failed to load Jenkins X Pipeline in dir %s", o.Dir) - } - changed := false - if projectConfig.BuildPack != jenkinsfileRunnerBuildPack { - projectConfig.BuildPack = jenkinsfileRunnerBuildPack - changed = true - } - imageName := destination.JenkinsfileRunner.Image - if imageName != "" { - // let's add override for the run steps image - if projectConfig.PipelineConfig == nil { - projectConfig.PipelineConfig = &jenkinsfile.PipelineConfig{} - } - - stepType := syntax.StepOverrideReplace - found := false - for i, o := range projectConfig.PipelineConfig.Pipelines.Overrides { - if o.Name == "run" { - found = true - step := o.Step - if step == nil { - step = &syntax.Step{} - } - if o.Step.Image != imageName { - step.Image = imageName - // not really necessary but is until https://github.com/jenkins-x/jx/issues/6739 is fixed - step.Command = defaultJenkinsfileRunnerCommand - - projectConfig.PipelineConfig.Pipelines.Overrides[i].Step = step - projectConfig.PipelineConfig.Pipelines.Overrides[i].Type = &stepType - changed = true - } - break - } - } - if !found { - o := &syntax.PipelineOverride{ - Name: "run", - Type: &stepType, - Step: &syntax.Step{ - Image: imageName, - - // not really necessary but is until https://github.com/jenkins-x/jx/issues/6739 is fixed - Command: defaultJenkinsfileRunnerCommand, - }, - } - projectConfig.PipelineConfig.Pipelines.Overrides = append(projectConfig.PipelineConfig.Pipelines.Overrides, o) - changed = true - } - } - if changed { - err := projectConfig.SaveConfig(fileName) - if err != nil { - return err - } - } - return nil -} -*/ - // PickCatalogFolderName if not in batch mode lets confirm to the user which catalog folder we are going to use func (o *ImportOptions) PickCatalogFolderName(dir, chosenPack string) (string, error) { if o.BatchMode || o.Pack != "" { diff --git a/pkg/cmd/importcmd/import_bad_name_integration_test.go b/pkg/cmd/importcmd/import_bad_name_integration_test.go index 4f76d7b..281b235 100644 --- a/pkg/cmd/importcmd/import_bad_name_integration_test.go +++ b/pkg/cmd/importcmd/import_bad_name_integration_test.go @@ -12,7 +12,6 @@ import ( "github.com/jenkins-x-plugins/jx-project/pkg/cmd/importcmd" "github.com/jenkins-x-plugins/jx-project/pkg/cmd/testimports" - "github.com/jenkins-x-plugins/jx-project/pkg/config" "github.com/jenkins-x/jx-helpers/v3/pkg/files" "github.com/jenkins-x/jx-helpers/v3/pkg/kube/naming" @@ -53,7 +52,6 @@ func TestImportBadNameProject(t *testing.T) { assert.FileExists(t, filepath.Join(testDir, "Dockerfile")) assert.FileExists(t, filepath.Join(testDir, "charts", dirName, "Chart.yaml")) assert.FileExists(t, filepath.Join(testDir, "preview", "helmfile.yaml")) - assert.NoFileExists(t, filepath.Join(testDir, config.ProjectConfigFileName)) assert.FileExists(t, filepath.Join(testDir, ".lighthouse", "jenkins-x", "triggers.yaml")) var commands []string diff --git a/pkg/cmd/importcmd/import_github_action_integration_test.go b/pkg/cmd/importcmd/import_github_action_integration_test.go index 2e5b546..8e33d23 100644 --- a/pkg/cmd/importcmd/import_github_action_integration_test.go +++ b/pkg/cmd/importcmd/import_github_action_integration_test.go @@ -11,7 +11,6 @@ import ( "github.com/jenkins-x-plugins/jx-project/pkg/cmd/importcmd" "github.com/jenkins-x-plugins/jx-project/pkg/cmd/testimports" - "github.com/jenkins-x-plugins/jx-project/pkg/config" "github.com/jenkins-x/jx-helpers/v3/pkg/files" "github.com/jenkins-x/jx-helpers/v3/pkg/kube/jxenv" "github.com/jenkins-x/jx-helpers/v3/pkg/kube/naming" @@ -62,10 +61,4 @@ func TestImportGitHubActionProject(t *testing.T) { assert.FileExists(t, filepath.Join(testDir, "charts", dirName, "Chart.yaml")) assert.FileExists(t, filepath.Join(testDir, ".github", "pullrequest", "task.yml")) assert.FileExists(t, filepath.Join(testDir, ".github", "release", "task.yml")) - assert.FileExists(t, filepath.Join(testDir, config.ProjectConfigFileName)) - - projectConfig, projectFileName, err := config.LoadProjectConfig(testDir) - require.NoError(t, err, "could not load jenkins configuration at %s", testDir) - - assert.Equal(t, "none", projectConfig.BuildPack, "buildPack property in file %s", projectFileName) } diff --git a/pkg/cmd/importcmd/import_golang_integration_test.go b/pkg/cmd/importcmd/import_golang_integration_test.go index f67c8dc..242bd8f 100644 --- a/pkg/cmd/importcmd/import_golang_integration_test.go +++ b/pkg/cmd/importcmd/import_golang_integration_test.go @@ -12,7 +12,6 @@ import ( "github.com/jenkins-x-plugins/jx-project/pkg/cmd/importcmd" "github.com/jenkins-x-plugins/jx-project/pkg/cmd/testimports" - "github.com/jenkins-x-plugins/jx-project/pkg/config" "github.com/jenkins-x/jx-helpers/v3/pkg/files" "github.com/jenkins-x/jx-helpers/v3/pkg/kube/naming" "github.com/jenkins-x/jx-helpers/v3/pkg/testhelpers" @@ -52,7 +51,6 @@ func TestImportGoLangProject(t *testing.T) { assert.FileExists(t, filepath.Join(testDir, "Dockerfile")) assert.FileExists(t, filepath.Join(testDir, "charts", dirName, "Chart.yaml")) assert.FileExists(t, filepath.Join(testDir, "preview", "helmfile.yaml")) - assert.NoFileExists(t, filepath.Join(testDir, config.ProjectConfigFileName)) assert.FileExists(t, filepath.Join(testDir, ".lighthouse", "jenkins-x", "triggers.yaml")) // let's verify we have comments still in the values yaml diff --git a/pkg/cmd/importcmd/import_integration_test.go b/pkg/cmd/importcmd/import_integration_test.go index c3f655f..cc26cc5 100644 --- a/pkg/cmd/importcmd/import_integration_test.go +++ b/pkg/cmd/importcmd/import_integration_test.go @@ -12,14 +12,12 @@ import ( "github.com/jenkins-x-plugins/jx-project/pkg/cmd/importcmd" "github.com/jenkins-x-plugins/jx-project/pkg/cmd/testimports" - "github.com/jenkins-x-plugins/jx-project/pkg/config" "github.com/jenkins-x-plugins/jx-project/pkg/constants" "github.com/jenkins-x/jx-helpers/v3/pkg/files" "github.com/jenkins-x/jx-helpers/v3/pkg/kube/jxenv" "github.com/jenkins-x/jx-helpers/v3/pkg/kube/naming" "github.com/jenkins-x/jx-helpers/v3/pkg/testhelpers" - "github.com/jenkins-x-plugins/jx-project/pkg/jenkinsfile" v1 "github.com/jenkins-x/jx-api/v4/pkg/apis/jenkins.io/v1" "github.com/jenkins-x/jx-logging/v3/pkg/log" "github.com/stretchr/testify/require" @@ -143,18 +141,16 @@ func assertImport(t *testing.T, testDir string, testcase string, importToJenkins err := o.Run() assert.NoError(t, err, "Failed %s with %s", dirName, err) if err == nil { - defaultJenkinsfileName := jenkinsfile.Name - defaultJenkinsfileBackupSuffix := jenkinsfile.BackupSuffix - defaultJenkinsfile := filepath.Join(testDir, defaultJenkinsfileName) + defaultJenkinsfileBackupSuffix := ".backup" + defaultJenkinsfile := filepath.Join(testDir, importcmd.JenkinsfileName) jfname := defaultJenkinsfile - if o.Jenkinsfile != "" && o.Jenkinsfile != defaultJenkinsfileName { + if o.Jenkinsfile != "" && o.Jenkinsfile != importcmd.JenkinsfileName { jfname = filepath.Join(testDir, o.Jenkinsfile) } if dirName == "custom-jenkins" { - assert.FileExists(t, filepath.Join(testDir, jenkinsfile.Name)) - assert.NoFileExists(t, filepath.Join(testDir, jenkinsfile.Name+".backup")) - assert.NoFileExists(t, filepath.Join(testDir, jenkinsfile.Name+"-Renamed")) - assert.NoFileExists(t, filepath.Join(testDir, config.ProjectConfigFileName)) + assert.FileExists(t, filepath.Join(testDir, importcmd.JenkinsfileName)) + assert.NoFileExists(t, filepath.Join(testDir, importcmd.JenkinsfileName+defaultJenkinsfileBackupSuffix)) + assert.NoFileExists(t, filepath.Join(testDir, importcmd.JenkinsfileName+"-Renamed")) } else if importToJenkinsX { assert.NoFileExists(t, jfname) } else { diff --git a/pkg/cmd/importcmd/import_jenkinsxyml_integration_test.go b/pkg/cmd/importcmd/import_jenkinsxyml_integration_test.go deleted file mode 100644 index 4f4fb0d..0000000 --- a/pkg/cmd/importcmd/import_jenkinsxyml_integration_test.go +++ /dev/null @@ -1,79 +0,0 @@ -//go:build integration -// +build integration - -package importcmd_test - -import ( - "fmt" - "os" - "path" - "path/filepath" - "testing" - - "github.com/jenkins-x/jx-helpers/v3/pkg/stringhelpers" - - "github.com/jenkins-x-plugins/jx-project/pkg/cmd/importcmd" - "github.com/jenkins-x-plugins/jx-project/pkg/cmd/testimports" - "github.com/jenkins-x-plugins/jx-project/pkg/config" - "github.com/jenkins-x/jx-helpers/v3/pkg/files" - "github.com/jenkins-x/jx-helpers/v3/pkg/kube/naming" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestImportOldProject(t *testing.T) { - // this will only work if using k8s connectivity as we create a separate - // 'jx pipeline convert' command - useRealJXConvert := false - - tempDir := t.TempDir() - - testData := path.Join("test_data", "import_projects") - _, err := os.Stat(testData) - assert.NoError(t, err) - - name := "maven_custom_build_pack" - dirName := naming.ToValidName(name) - - srcDir := filepath.Join(testData, name) - assert.DirExists(t, srcDir, "source dir does not exist") - - testDir := tempDir - - files.CopyDir(srcDir, testDir, true) - //_, dirName := filepath.Split(testDir) - _, o := importcmd.NewCmdImportAndOptions() - - testimports.SetFakeClients(t, o, useRealJXConvert) - - // let's setup git - g := o.Git() - _, err = g.Command(tempDir, "init") - require.NoError(t, err, "failed to git init dir %s", tempDir) - - gitURL := fmt.Sprintf("https://github.com/myowner/%s.git", dirName) - _, err = g.Command(tempDir, "remote", "add", "origin", gitURL) - require.NoError(t, err, "failed to setup git remote URL %s", gitURL) - - // fake discovering the git url - o.DiscoveredGitURL = stringhelpers.UrlJoin(o.ScmFactory.GitServerURL, "myowner", "myrepo") - o.BatchMode = true - o.Dir = testDir - o.DisableMaven = true - o.UseDefaultGit = true - o.WaitForSourceRepositoryPullRequest = false - o.Destination.JenkinsX.Enabled = true - - err = o.Run() - require.NoError(t, err, "Failed %s with %s", dirName, err) - - assert.FileExists(t, filepath.Join(testDir, "Dockerfile")) - assert.FileExists(t, filepath.Join(testDir, "charts", dirName, "Chart.yaml")) - //assert.FileExists(t, filepath.Join(testDir, "preview", "helmfile.yaml")) - - if useRealJXConvert { - assert.NoFileExists(t, filepath.Join(testDir, config.ProjectConfigFileName)) - assert.FileExists(t, filepath.Join(testDir, ".lighthouse", "jenkins-x", "triggers.yaml")) - } -} diff --git a/pkg/cmd/importcmd/import_remote_cluster_integration_test.go b/pkg/cmd/importcmd/import_remote_cluster_integration_test.go index 9eb32fa..d0c28d2 100644 --- a/pkg/cmd/importcmd/import_remote_cluster_integration_test.go +++ b/pkg/cmd/importcmd/import_remote_cluster_integration_test.go @@ -11,7 +11,6 @@ import ( "github.com/jenkins-x-plugins/jx-project/pkg/cmd/importcmd" "github.com/jenkins-x-plugins/jx-project/pkg/cmd/testimports" - "github.com/jenkins-x-plugins/jx-project/pkg/config" "github.com/jenkins-x/jx-helpers/v3/pkg/files" "github.com/jenkins-x/jx-helpers/v3/pkg/kube/naming" @@ -45,7 +44,6 @@ func TestImportRemoteCluster(t *testing.T) { assert.NoFileExists(t, filepath.Join(testDir, "Dockerfile")) assert.NoFileExists(t, filepath.Join(testDir, "charts", dirName, "Chart.yaml")) assert.NoFileExists(t, filepath.Join(testDir, "preview", "helmfile.yaml")) - assert.NoFileExists(t, filepath.Join(testDir, config.ProjectConfigFileName)) assert.FileExists(t, filepath.Join(testDir, ".lighthouse", "jenkins-x", "triggers.yaml")) for _, c := range runner.OrderedCommands { diff --git a/pkg/cmd/importcmd/import_tekton_catalog_integration_test.go b/pkg/cmd/importcmd/import_tekton_catalog_integration_test.go index e6cd439..e31b1f3 100644 --- a/pkg/cmd/importcmd/import_tekton_catalog_integration_test.go +++ b/pkg/cmd/importcmd/import_tekton_catalog_integration_test.go @@ -61,7 +61,6 @@ func TestImportTektonCatalogProject(t *testing.T) { assert.FileExists(t, filepath.Join(testDir, ".lighthouse", "jenkins-x", "release.yaml")) assert.FileExists(t, filepath.Join(testDir, ".lighthouse", "jenkins-x", "pullrequest.yaml")) assert.NoFileExists(t, filepath.Join(testDir, ".lighthouse", "jenkins-x", "Kptfile")) - assert.NoFileExists(t, filepath.Join(testDir, "jenkins-x.yml")) assert.FileExists(t, filepath.Join(testDir, "Dockerfile")) assert.FileExists(t, filepath.Join(testDir, "charts", dirName, "Chart.yaml")) diff --git a/pkg/cmd/importcmd/source_config_pr.go b/pkg/cmd/importcmd/source_config_pr.go index b035f10..6b232eb 100644 --- a/pkg/cmd/importcmd/source_config_pr.go +++ b/pkg/cmd/importcmd/source_config_pr.go @@ -6,7 +6,6 @@ import ( "github.com/jenkins-x-plugins/jx-gitops/pkg/cmd/repository/add" "github.com/jenkins-x-plugins/jx-promote/pkg/environments" - "github.com/jenkins-x/go-scm/scm" v1 "github.com/jenkins-x/jx-api/v4/pkg/apis/jenkins.io/v1" "github.com/jenkins-x/jx-helpers/v3/pkg/kube/jxenv" "github.com/jenkins-x/jx-helpers/v3/pkg/stringhelpers" @@ -91,15 +90,8 @@ func (o *ImportOptions) addSourceConfigPullRequest(gitURL, gitKind string) (bool log.Logger().Infof("defaulting the user name to %s so we can create a PullRequest", pro.Username) } */ - prDetails := &scm.PullRequest{ - Labels: []*scm.Label{ - { - Name: "env/dev", - }, - }, - } - pr, err := pro.Create(devGitURL, "", prDetails, false) + pr, err := pro.Create(devGitURL, "", []string{"env/dev"}, false) if err != nil { return remoteCluster, errors.Wrapf(err, "failed to create Pull Request on the development environment git repository %s", devGitURL) } diff --git a/pkg/cmd/root/enable/enable.go b/pkg/cmd/root/enable/enable.go index 0f03c96..516917b 100644 --- a/pkg/cmd/root/enable/enable.go +++ b/pkg/cmd/root/enable/enable.go @@ -47,7 +47,6 @@ func NewCmdPipelineEnable() (*cobra.Command, *Options) { o.ImportOptions.NoDevPullRequest = true o.ImportOptions.DisableStartPipeline = true o.ImportOptions.DisableStartPipeline = true - o.ImportOptions.IgnoreJenkinsXFile = true if o.RegenCharts { o.ImportOptions.PackFilter = func(pack *importcmd.Pack) { diff --git a/pkg/cmd/root/mlquickstart_integration_test.go b/pkg/cmd/root/mlquickstart_integration_test.go index f38b634..00edee1 100644 --- a/pkg/cmd/root/mlquickstart_integration_test.go +++ b/pkg/cmd/root/mlquickstart_integration_test.go @@ -35,17 +35,13 @@ func TestCreateMLQuickstartProjects(t *testing.T) { if err == nil { appName1 := appName + "-service" appDir1 := filepath.Join(testDir, appName1) - pipelineFile1 := filepath.Join(appDir1, "jenkins-x.yml") assert.FileExists(t, filepath.Join(appDir1, "Dockerfile")) assert.FileExists(t, filepath.Join(appDir1, "charts", appName1, "Chart.yaml")) - assert.NoFileExists(t, pipelineFile1) assert.FileExists(t, filepath.Join(appDir1, ".lighthouse", "jenkins-x", "triggers.yaml")) appName2 := appName + "-training" appDir2 := filepath.Join(testDir, appName2) - pipelineFile2 := filepath.Join(appDir2, "jenkins-x.yml") assert.FileExists(t, filepath.Join(appDir2, "Dockerfile")) - assert.NoFileExists(t, pipelineFile2) assert.FileExists(t, filepath.Join(appDir2, ".lighthouse", "jenkins-x", "triggers.yaml")) } } diff --git a/pkg/cmd/root/quickstart_integration_test.go b/pkg/cmd/root/quickstart_integration_test.go index bd2bfb6..49ca4a9 100644 --- a/pkg/cmd/root/quickstart_integration_test.go +++ b/pkg/cmd/root/quickstart_integration_test.go @@ -34,10 +34,8 @@ func TestCreateQuickstartProjects(t *testing.T) { assert.NoError(t, err) if err == nil { appDir := filepath.Join(testDir, appName) - pipelineFile := filepath.Join(appDir, "jenkins-x.yml") assert.FileExists(t, filepath.Join(appDir, "Dockerfile")) assert.FileExists(t, filepath.Join(appDir, "charts", appName, "Chart.yaml")) - assert.NoFileExists(t, pipelineFile) assert.FileExists(t, filepath.Join(appDir, ".lighthouse", "jenkins-x", "triggers.yaml")) } } @@ -64,11 +62,9 @@ func TestCreateQuickstartProjectWithChart(t *testing.T) { assert.NoError(t, err) if err == nil { appDir := filepath.Join(testDir, appName) - pipelineFile := filepath.Join(appDir, "jenkins-x.yml") assert.FileExists(t, filepath.Join(appDir, "Dockerfile")) assert.FileExists(t, filepath.Join(appDir, "charts", appName, "Chart.yaml")) assert.NoFileExists(t, filepath.Join(appDir, "charts", "Chart.yaml")) - assert.NoFileExists(t, pipelineFile) assert.FileExists(t, filepath.Join(appDir, ".lighthouse", "jenkins-x", "triggers.yaml")) } } diff --git a/pkg/config/project_config.go b/pkg/config/project_config.go deleted file mode 100644 index 3862efc..0000000 --- a/pkg/config/project_config.go +++ /dev/null @@ -1,172 +0,0 @@ -package config - -import ( - "fmt" - "os" - "path/filepath" - "reflect" - "strings" - - "github.com/jenkins-x-plugins/jx-project/pkg/jenkinsfile" - "github.com/jenkins-x-plugins/jx-project/pkg/tekton/syntax" - "github.com/jenkins-x/jx-helpers/v3/pkg/files" - "github.com/jenkins-x/jx-helpers/v3/pkg/yamls/validate" - "github.com/pkg/errors" - "sigs.k8s.io/yaml" - - corev1 "k8s.io/api/core/v1" -) - -const ( - // ProjectConfigFileName is the name of the project configuration file - ProjectConfigFileName = "jenkins-x.yml" -) - -// +exported - -// ProjectConfig defines Jenkins X Pipelines usually stored inside the `jenkins-x.yml` file in projects -type ProjectConfig struct { - // List of global environment variables to add to each branch build and each step - Env []corev1.EnvVar `json:"env,omitempty"` - - PreviewEnvironments *PreviewEnvironmentConfig `json:"previewEnvironments,omitempty"` - IssueTracker *IssueTrackerConfig `json:"issueTracker,omitempty"` - Chat *ChatConfig `json:"chat,omitempty"` - Wiki *WikiConfig `json:"wiki,omitempty"` - Addons []*AddonConfig `json:"addons,omitempty"` - BuildPack string `json:"buildPack,omitempty"` - BuildPackGitURL string `json:"buildPackGitURL,omitempty"` - BuildPackGitURef string `json:"buildPackGitRef,omitempty"` - PipelineConfig *jenkinsfile.PipelineConfig `json:"pipelineConfig,omitempty"` - NoReleasePrepare bool `json:"noReleasePrepare,omitempty"` - DockerRegistryHost string `json:"dockerRegistryHost,omitempty"` - DockerRegistryOwner string `json:"dockerRegistryOwner,omitempty"` -} - -type PreviewEnvironmentConfig struct { - Disabled bool `json:"disabled,omitempty"` - MaximumInstances int `json:"maximumInstances,omitempty"` -} - -type IssueTrackerConfig struct { - Kind string `json:"kind,omitempty"` - URL string `json:"url,omitempty"` - Project string `json:"project,omitempty"` -} - -type WikiConfig struct { - Kind string `json:"kind,omitempty"` - URL string `json:"url,omitempty"` - Space string `json:"space,omitempty"` -} - -type ChatConfig struct { - Kind string `json:"kind,omitempty"` - URL string `json:"url,omitempty"` - DeveloperChannel string `json:"developerChannel,omitempty"` - UserChannel string `json:"userChannel,omitempty"` -} - -type AddonConfig struct { - Name string `json:"name,omitempty"` - Version string `json:"version,omitempty"` -} - -// LoadProjectConfig loads the project configuration if there is a project configuration file -func LoadProjectConfig(projectDir string) (*ProjectConfig, string, error) { - fileName := ProjectConfigFileName - if projectDir != "" { - fileName = filepath.Join(projectDir, fileName) - } - config, err := LoadProjectConfigFile(fileName) - return config, fileName, err -} - -// LoadProjectConfigFile loads a specific project YAML configuration file -func LoadProjectConfigFile(fileName string) (*ProjectConfig, error) { - config := ProjectConfig{} - exists, err := files.FileExists(fileName) - if err != nil || !exists { - return &config, err - } - data, err := os.ReadFile(fileName) - if err != nil { - return &config, fmt.Errorf("Failed to load file %s due to %s", fileName, err) - } - validationErrors, err := validate.ValidateYaml(&config, data) - if err != nil { - return &config, fmt.Errorf("failed to validate YAML file %s due to %s", fileName, err) - } - if len(validationErrors) > 0 { - return &config, fmt.Errorf("Validation failures in YAML file %s:\n%s", fileName, strings.Join(validationErrors, "\n")) - } - err = yaml.Unmarshal(data, &config) - if err != nil { - return &config, fmt.Errorf("Failed to unmarshal YAML file %s due to %s", fileName, err) - } - return &config, nil -} - -// IsEmpty returns true if this configuration is empty -func (c *ProjectConfig) IsEmpty() bool { - empty := &ProjectConfig{} - return reflect.DeepEqual(empty, c) -} - -// SaveConfig saves the configuration file to the given project directory -func (c *ProjectConfig) SaveConfig(fileName string) error { - data, err := yaml.Marshal(c) - if err != nil { - return err - } - err = os.WriteFile(fileName, data, files.DefaultFileWritePermissions) - if err != nil { - return errors.Wrapf(err, "failed to save file %s", fileName) - } - return nil -} - -// GetOrCreatePipelineConfig lazily creates a PipelineConfig if required -func (c *ProjectConfig) GetOrCreatePipelineConfig() *jenkinsfile.PipelineConfig { - if c.PipelineConfig == nil { - c.PipelineConfig = &jenkinsfile.PipelineConfig{} - } - return c.PipelineConfig -} - -// GetPipeline retrieves the parsed pipeline for the specified type -func (c *ProjectConfig) GetPipeline(kind string) (*syntax.ParsedPipeline, error) { - var parsed *syntax.ParsedPipeline - - if c.PipelineConfig == nil { - return nil, nil - } - - switch kind { - case jenkinsfile.PipelineKindRelease: - if c.PipelineConfig.Pipelines.Release == nil { - parsed = nil - } else { - parsed = c.PipelineConfig.Pipelines.Release.Pipeline - } - case jenkinsfile.PipelineKindPullRequest: - if c.PipelineConfig.Pipelines.PullRequest == nil { - parsed = nil - } else { - parsed = c.PipelineConfig.Pipelines.PullRequest.Pipeline - } - case jenkinsfile.PipelineKindFeature: - if c.PipelineConfig.Pipelines.Feature == nil { - parsed = nil - } else { - parsed = c.PipelineConfig.Pipelines.Feature.Pipeline - } - default: - return nil, errors.Errorf("unknown pipeline kind %s", kind) - } - - if parsed == nil { - return nil, errors.Errorf("no pipeline defined for kind %s", kind) - } - return parsed, nil -} diff --git a/pkg/config/project_config_test.go b/pkg/config/project_config_test.go deleted file mode 100644 index 2e86859..0000000 --- a/pkg/config/project_config_test.go +++ /dev/null @@ -1,107 +0,0 @@ -//go:build unit -// +build unit - -package config_test - -import ( - "testing" - - "github.com/jenkins-x-plugins/jx-project/pkg/config" - "github.com/jenkins-x-plugins/jx-project/pkg/jenkinsfile" - "github.com/jenkins-x-plugins/jx-project/pkg/tekton/syntax" - "github.com/jenkins-x/jx-helpers/v3/pkg/testhelpers" - "github.com/jenkins-x/jx-logging/v3/pkg/log" - corev1 "k8s.io/api/core/v1" - "sigs.k8s.io/yaml" - - "github.com/stretchr/testify/assert" -) - -var ( - testProjectConfigMaven = &config.ProjectConfig{ - BuildPack: "maven", - Env: []corev1.EnvVar{ - { - Name: "ORG", - Value: "myorg", - }, - { - Name: "APP_NAME", - Value: "thingy", - }, - }, - PipelineConfig: &jenkinsfile.PipelineConfig{ - Pipelines: jenkinsfile.Pipelines{ - PullRequest: &jenkinsfile.PipelineLifecycles{ - Build: &jenkinsfile.PipelineLifecycle{ - Steps: []*syntax.Step{ - { - Command: "mvn test", - }, - }, - }, - }, - Release: &jenkinsfile.PipelineLifecycles{ - Build: &jenkinsfile.PipelineLifecycle{ - Steps: []*syntax.Step{ - { - Command: "mvn test", - }, - { - Command: "mvn deploy", - }, - { - Command: "jx promote --all-auto", - }, - }, - }, - Pipeline: &syntax.ParsedPipeline{}, - }, - }, - Env: []corev1.EnvVar{ - { - Name: "PREVIEW_VERSION", - Value: "0.0.0-SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER", - }, - }, - }, - } -) - -func TestProjectConfigMarshal(t *testing.T) { - t.Parallel() - - data, err := yaml.Marshal(testProjectConfigMaven) - assert.NoError(t, err) - - if testhelpers.IsDebugLog() { - text := string(data) - log.Logger().Infof("Generated YAML: %s", text) - } - - copy := &config.ProjectConfig{} - - err = yaml.Unmarshal(data, copy) - assert.NoError(t, err) - - assert.Equal(t, 2, len(testProjectConfigMaven.Env), "len(testProjectConfigMaven.Env)") - assert.NotNil(t, testProjectConfigMaven.PipelineConfig, "testProjectConfigMaven.PipelineConfig") - assert.NotNil(t, testProjectConfigMaven.PipelineConfig.Pipelines.Release, "testProjectConfigMaven.PipelineConfig.Pipelines.Release") - assert.Equal(t, 1, len(testProjectConfigMaven.PipelineConfig.Env), "len(testProjectConfigMaven.PipelineConfig.Env)") -} - -func TestGetPipeline(t *testing.T) { - releasePipeline, err := testProjectConfigMaven.GetPipeline(jenkinsfile.PipelineKindRelease) - assert.NoError(t, err) - assert.NotNil(t, releasePipeline) - - pullRequestPipeline, err := testProjectConfigMaven.GetPipeline(jenkinsfile.PipelineKindPullRequest) - assert.Error(t, err) - assert.Equal(t, err.Error(), "no pipeline defined for kind pullrequest") - assert.Nil(t, pullRequestPipeline) - - featurePipeline, err := testProjectConfigMaven.GetPipeline(jenkinsfile.PipelineKindFeature) - assert.Error(t, err) - assert.Equal(t, err.Error(), "no pipeline defined for kind feature") - assert.Nil(t, featurePipeline) -} diff --git a/pkg/gitresolver/buildpack_test.go b/pkg/gitresolver/buildpack_test.go index 4f4554c..10d8f51 100644 --- a/pkg/gitresolver/buildpack_test.go +++ b/pkg/gitresolver/buildpack_test.go @@ -50,7 +50,7 @@ func TestBuildPackInitClone(t *testing.T) { assert.NoError(t, err) err = gitclient.FetchBranch(gitter, gitDir, "origin", defaultBranch) assert.NoError(t, err) - err = gitclient.Merge(gitter, gitDir, "origin/master") + err = gitclient.Merge(gitter, gitDir, "origin/main") assert.NoError(t, err) // Removing the remote tracking information, after executing InitBuildPack, it should have not failed and it should've set a remote tracking branch @@ -65,6 +65,6 @@ func TestBuildPackInitClone(t *testing.T) { output, err := gitter.Command(gitDir, "status", "-sb") assert.NoError(t, err) // Check the current branch is tracking the origin/master one - assert.Equal(t, "## master", output) + assert.Equal(t, "## main", output) //assert.Equal(t, "## master...origin/master", output) } diff --git a/pkg/jenkinsfile/doc.go b/pkg/jenkinsfile/doc.go deleted file mode 100644 index 07a419a..0000000 --- a/pkg/jenkinsfile/doc.go +++ /dev/null @@ -1,6 +0,0 @@ -// +k8s:deepcopy-gen=package -// +k8s:openapi-gen=true -// Package v1 is the v1 version of the API. -// +groupName=config.jenkins.io -// +apiVersion=v1 -package jenkinsfile diff --git a/pkg/jenkinsfile/jenkinsfile.go b/pkg/jenkinsfile/jenkinsfile.go deleted file mode 100644 index d211edc..0000000 --- a/pkg/jenkinsfile/jenkinsfile.go +++ /dev/null @@ -1,9 +0,0 @@ -package jenkinsfile - -const ( - // Name Jenkinsifile name - Name = "Jenkinsfile" - - // BackupSuffix the suffix used by Jenkins for backups - BackupSuffix = ".backup" -) diff --git a/pkg/jenkinsfile/modules.go b/pkg/jenkinsfile/modules.go deleted file mode 100644 index f47dfff..0000000 --- a/pkg/jenkinsfile/modules.go +++ /dev/null @@ -1,39 +0,0 @@ -package jenkinsfile - -import ( - "github.com/jenkins-x/jx-helpers/v3/pkg/options" -) - -const ( - // ModuleFileName the name of the module imports file name - ModuleFileName = "imports.yaml" -) - -// ImportFile represents an import of a file from a module (usually a version of a git repo) -type ImportFile struct { - Import string - File string -} - -// ImportFileResolver resolves a build pack file resolver strategy -type ImportFileResolver func(importFile *ImportFile) (string, error) - -// Modules defines the dependent modules for a build pack -type Modules struct { - Modules []*Module `json:"modules,omitempty"` -} - -// Module defines a dependent module for a build pack -type Module struct { - Name string `json:"name,omitempty"` - GitURL string `json:"gitUrl,omitempty"` - GitRef string `json:"gitRef,omitempty"` -} - -// Validate returns an error if any data is missing -func (m *Module) Validate() error { - if m.GitURL == "" { - return options.MissingOption("GitURL") - } - return nil -} diff --git a/pkg/jenkinsfile/pipeline.go b/pkg/jenkinsfile/pipeline.go deleted file mode 100644 index b84109d..0000000 --- a/pkg/jenkinsfile/pipeline.go +++ /dev/null @@ -1,965 +0,0 @@ -package jenkinsfile - -import ( - "fmt" - "os" - "path/filepath" - "reflect" - "strconv" - "strings" - "text/template" - - "github.com/jenkins-x-plugins/jx-project/pkg/statement" - "github.com/jenkins-x-plugins/jx-project/pkg/tekton/syntax" - "github.com/jenkins-x/jx-helpers/v3/pkg/files" - "github.com/jenkins-x/jx-helpers/v3/pkg/kube/naming" - "github.com/jenkins-x/jx-helpers/v3/pkg/yamls/validate" - "github.com/jenkins-x/jx-logging/v3/pkg/log" - "github.com/pkg/errors" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/equality" - "sigs.k8s.io/yaml" -) - -const ( - // PipelineConfigFileName is the name of the pipeline configuration file - PipelineConfigFileName = "pipeline.yaml" - - // PipelineTemplateFileName defines the jenkisnfile template used to generate the pipeline - PipelineTemplateFileName = "Jenkinsfile.tmpl" - - // PipelineKindRelease represents a release pipeline triggered on merge to master (or a release branch) - PipelineKindRelease = "release" - - // PipelineKindPullRequest represents a Pull Request pipeline - PipelineKindPullRequest = "pullrequest" - - // PipelineKindFeature represents a pipeline on a feature branch - PipelineKindFeature = "feature" - - // the modes of adding a step - - // CreateStepModePre creates steps before any existing steps - CreateStepModePre = "pre" - - // CreateStepModePost creates steps after the existing steps - CreateStepModePost = "post" - - // CreateStepModeReplace replaces the existing steps with the new steps - CreateStepModeReplace = "replace" -) - -var ( - // PipelineKinds the possible values of pipeline - PipelineKinds = []string{PipelineKindRelease, PipelineKindPullRequest, PipelineKindFeature} - - // PipelineLifecycleNames the possible names of lifecycles of pipeline - PipelineLifecycleNames = []string{"setup", "setversion", "prebuild", "build", "postbuild", "promote"} - - // CreateStepModes the step creation modes - CreateStepModes = []string{CreateStepModePre, CreateStepModePost, CreateStepModeReplace} -) - -// Pipelines contains all the different kinds of pipeline for different branches -type Pipelines struct { - PullRequest *PipelineLifecycles `json:"pullRequest,omitempty"` - Release *PipelineLifecycles `json:"release,omitempty"` - Feature *PipelineLifecycles `json:"feature,omitempty"` - Post *PipelineLifecycle `json:"post,omitempty"` - Overrides []*syntax.PipelineOverride `json:"overrides,omitempty"` - Default *syntax.ParsedPipeline `json:"default,omitempty"` -} - -// PipelineLifecycles defines the steps of a lifecycle section -type PipelineLifecycles struct { - Setup *PipelineLifecycle `json:"setup,omitempty"` - SetVersion *PipelineLifecycle `json:"setVersion,omitempty"` - PreBuild *PipelineLifecycle `json:"preBuild,omitempty"` - Build *PipelineLifecycle `json:"build,omitempty"` - PostBuild *PipelineLifecycle `json:"postBuild,omitempty"` - Promote *PipelineLifecycle `json:"promote,omitempty"` - Pipeline *syntax.ParsedPipeline `json:"pipeline,omitempty"` -} - -// PipelineLifecycle defines the steps of a lifecycle section -type PipelineLifecycle struct { - Steps []*syntax.Step `json:"steps,omitempty"` - - // PreSteps if using inheritance then invoke these steps before the base steps - PreSteps []*syntax.Step `json:"preSteps,omitempty"` - - // Replace if using inheritance then replace steps from the base pipeline - Replace bool `json:"replace,omitempty"` -} - -// NamedLifecycle a lifecycle and its name -type NamedLifecycle struct { - Name string - Lifecycle *PipelineLifecycle -} - -// PipelineLifecycleArray an array of named lifecycle pointers -type PipelineLifecycleArray []NamedLifecycle - -// PipelineExtends defines the extension (e.g. parent pipeline which is overloaded -type PipelineExtends struct { - Import string `json:"import,omitempty"` - File string `json:"file,omitempty"` -} - -// ImportFile returns an ImportFile for the given extension -func (x *PipelineExtends) ImportFile() *ImportFile { - return &ImportFile{ - Import: x.Import, - File: x.File, - } -} - -// PipelineConfig defines the pipeline configuration -type PipelineConfig struct { - Extends *PipelineExtends `json:"extends,omitempty"` - Agent *syntax.Agent `json:"agent,omitempty"` - Env []corev1.EnvVar `json:"env,omitempty"` - Environment string `json:"environment,omitempty"` - Pipelines Pipelines `json:"pipelines,omitempty"` - ContainerOptions *corev1.Container `json:"containerOptions,omitempty"` -} - -// CreateJenkinsfileArguments contains the arguents to generate a Jenkinsfiles dynamically -type CreateJenkinsfileArguments struct { - ConfigFile string - TemplateFile string - OutputFile string - IsTekton bool - ClearContainerNames bool -} - -// +k8s:deepcopy-gen=false - -// CreatePipelineArguments contains the arguments to translate a build pack into a pipeline -type CreatePipelineArguments struct { - Lifecycles *PipelineLifecycles - PodTemplates map[string]*corev1.Pod - CustomImage string - DefaultImage string - WorkspaceDir string - GitHost string - GitName string - GitOrg string - ProjectID string - DockerRegistry string - DockerRegistryOrg string - KanikoImage string - UseKaniko bool - NoReleasePrepare bool - StepCounter int -} - -// Validate validates all the arguments are set correctly -func (a *CreateJenkinsfileArguments) Validate() error { - if a.ConfigFile == "" { - return fmt.Errorf("missing argument: ConfigFile") - } - if a.TemplateFile == "" { - return fmt.Errorf("missing argument: TemplateFile") - } - if a.OutputFile == "" { - return fmt.Errorf("missing argument: ReportName") - } - return nil -} - -// Groovy returns the groovy expression for all of the lifecycles -func (a *PipelineLifecycles) Groovy() string { - return a.All().Groovy() -} - -// All returns all lifecycles in order -func (a *PipelineLifecycles) All() PipelineLifecycleArray { - return []NamedLifecycle{ - {"setup", a.Setup}, - {"setversion", a.SetVersion}, - {"prebuild", a.PreBuild}, - {"build", a.Build}, - {"postbuild", a.PostBuild}, - {"promote", a.Promote}, - } -} - -// AllButPromote returns all lifecycles but promote -func (a *PipelineLifecycles) AllButPromote() PipelineLifecycleArray { - return []NamedLifecycle{ - {"setup", a.Setup}, - {"setversion", a.SetVersion}, - {"prebuild", a.PreBuild}, - {"build", a.Build}, - {"postbuild", a.PostBuild}, - } -} - -// RemoveWhenStatements removes any when conditions -func (a *PipelineLifecycles) RemoveWhenStatements(prow bool) { - for _, n := range a.All() { - v := n.Lifecycle - if v != nil { - v.RemoveWhenStatements(prow) - } - } -} - -// GetLifecycle returns the pipeline lifecycle of the given name lazy creating on the fly if required -// or returns an error if the name is not valid -func (a *PipelineLifecycles) GetLifecycle(name string, lazyCreate bool) (*PipelineLifecycle, error) { - switch name { - case "setup": - if a.Setup == nil && lazyCreate { - a.Setup = &PipelineLifecycle{} - } - return a.Setup, nil - case "setversion": - if a.SetVersion == nil && lazyCreate { - a.SetVersion = &PipelineLifecycle{} - } - return a.SetVersion, nil - case "prebuild": - if a.PreBuild == nil && lazyCreate { - a.PreBuild = &PipelineLifecycle{} - } - return a.PreBuild, nil - case "build": - if a.Build == nil && lazyCreate { - a.Build = &PipelineLifecycle{} - } - return a.Build, nil - case "postbuild": - if a.PostBuild == nil && lazyCreate { - a.PostBuild = &PipelineLifecycle{} - } - return a.PostBuild, nil - case "promote": - if a.Promote == nil && lazyCreate { - a.Promote = &PipelineLifecycle{} - } - return a.Promote, nil - default: - return nil, fmt.Errorf("unknown pipeline lifecycle stage: %s", name) - } -} - -// Groovy returns the groovy string for the lifecycles -func (s PipelineLifecycleArray) Groovy() string { - statements := []*statement.Statement{} - for _, n := range s { - l := n.Lifecycle - if l != nil { - statements = append(statements, l.ToJenkinsfileStatements()...) - } - } - text := statement.WriteJenkinsfileStatements(4, statements) - // let's remove the very last newline so its easier to compose in templates - text = strings.TrimSuffix(text, "\n") - return text -} - -// Groovy returns the groovy expression for this lifecycle -func (l *NamedLifecycle) Groovy() string { - lifecycles := PipelineLifecycleArray([]NamedLifecycle{*l}) - return lifecycles.Groovy() -} - -// PutAllEnvVars puts all the defined environment variables in the given map -func (l *NamedLifecycle) PutAllEnvVars(m map[string]string) { - if l.Lifecycle != nil { - for _, step := range l.Lifecycle.Steps { - step.PutAllEnvVars(m) - } - } -} - -// Groovy returns the groovy expression for this lifecycle -func (l *PipelineLifecycle) Groovy() string { - nl := &NamedLifecycle{Name: "", Lifecycle: l} - return nl.Groovy() -} - -// ToJenkinsfileStatements converts the lifecycle to one or more jenkinsfile statements -func (l *PipelineLifecycle) ToJenkinsfileStatements() []*statement.Statement { - statements := []*statement.Statement{} - for _, step := range l.Steps { - statements = append(statements, step.ToJenkinsfileStatements()...) - } - return statements -} - -// RemoveWhenStatements removes any when conditions -func (l *PipelineLifecycle) RemoveWhenStatements(prow bool) { - l.PreSteps = removeWhenSteps(prow, l.PreSteps) - l.Steps = removeWhenSteps(prow, l.Steps) -} - -// CreateStep creates the given step using the mode -func (l *PipelineLifecycle) CreateStep(mode string, step *syntax.Step) error { - err := step.Validate() - if err != nil { - return err - } - switch mode { - case CreateStepModePre: - l.PreSteps = append(l.PreSteps, step) - case CreateStepModePost: - l.Steps = append(l.Steps, step) - case CreateStepModeReplace: - l.Steps = []*syntax.Step{step} - l.Replace = true - default: - return fmt.Errorf("uknown create mode: %s", mode) - } - return nil -} - -func removeWhenSteps(prow bool, steps []*syntax.Step) []*syntax.Step { - answer := []*syntax.Step{} - for _, step := range steps { - when := strings.TrimSpace(step.When) - if prow && when == "!prow" { - continue - } - if !prow && when == "prow" { - continue - } - step.Steps = removeWhenSteps(prow, step.Steps) - answer = append(answer, step) - } - return answer -} - -// Extend extends these pipelines with the base pipeline -func (p *Pipelines) Extend(base *Pipelines) error { - p.PullRequest = ExtendPipelines("pullRequest", p.PullRequest, base.PullRequest, p.Overrides) - p.Release = ExtendPipelines("release", p.Release, base.Release, p.Overrides) - p.Feature = ExtendPipelines("feature", p.Feature, base.Feature, p.Overrides) - p.Post = ExtendLifecycle("", "post", p.Post, base.Post, p.Overrides) - return nil -} - -// All returns all the lifecycles in this pipeline, some may be null -func (p *Pipelines) All() []*PipelineLifecycles { - return []*PipelineLifecycles{p.PullRequest, p.Feature, p.Release} -} - -// AllMap returns all the lifecycles in this pipeline indexed by the pipeline name -func (p *Pipelines) AllMap() map[string]*PipelineLifecycles { - m := map[string]*PipelineLifecycles{} - if p.PullRequest != nil { - m[PipelineKindPullRequest] = p.PullRequest - } - if p.Feature != nil { - m[PipelineKindFeature] = p.Feature - } - if p.Release != nil { - m[PipelineKindRelease] = p.Release - } - return m -} - -// defaultContainerAndDir defaults the container if none is being used -func (p *Pipelines) defaultContainerAndDir(container, dir string) { - defaultContainerAndDir(container, dir, p.All()...) -} - -// RemoveWhenStatements removes any prow or !prow statements -func (p *Pipelines) RemoveWhenStatements(prow bool) { - for _, l := range p.All() { - if l != nil { - l.RemoveWhenStatements(prow) - } - } - if p.Post != nil { - p.Post.RemoveWhenStatements(prow) - } -} - -// GetPipeline returns the pipeline for the given name, creating if required if lazyCreate is true or returns an error if its not a valid name -func (p *Pipelines) GetPipeline(kind string, lazyCreate bool) (*PipelineLifecycles, error) { - switch kind { - case PipelineKindRelease: - if p.Release == nil && lazyCreate { - p.Release = &PipelineLifecycles{} - } - return p.Release, nil - case PipelineKindPullRequest: - if p.PullRequest == nil && lazyCreate { - p.PullRequest = &PipelineLifecycles{} - } - return p.PullRequest, nil - case PipelineKindFeature: - if p.Feature == nil && lazyCreate { - p.Feature = &PipelineLifecycles{} - } - return p.Feature, nil - default: - return nil, fmt.Errorf("no such pipeline kind: %s", kind) - } -} - -func defaultContainerAndDir(container, dir string, lifecycles ...*PipelineLifecycles) { - for _, l := range lifecycles { - if l != nil { - defaultLifecycleContainerAndDir(container, dir, l.All()) - } - } -} - -func defaultLifecycleContainerAndDir(container, dir string, lifecycles PipelineLifecycleArray) { - if container == "" && dir == "" { - return - } - for _, n := range lifecycles { - l := n.Lifecycle - if l != nil { - if dir != "" { - l.PreSteps = defaultDirAroundSteps(dir, l.PreSteps) - l.Steps = defaultDirAroundSteps(dir, l.Steps) - } - if container != "" { - l.PreSteps = defaultContainerAroundSteps(container, l.PreSteps) - l.Steps = defaultContainerAroundSteps(container, l.Steps) - } - } - } -} - -func defaultContainerAroundSteps(container string, steps []*syntax.Step) []*syntax.Step { - if container == "" { - return steps - } - var containerStep *syntax.Step - result := []*syntax.Step{} - for _, step := range steps { - if step.GetImage() != "" { - result = append(result, step) - } else { - if containerStep == nil { - containerStep = &syntax.Step{ - Image: container, - } - result = append(result, containerStep) - } - containerStep.Steps = append(containerStep.Steps, step) - } - } - return result -} - -func defaultDirAroundSteps(dir string, steps []*syntax.Step) []*syntax.Step { - if dir == "" { - return steps - } - var dirStep *syntax.Step - result := []*syntax.Step{} - for _, step := range steps { - if step.GetImage() != "" { - step.Steps = defaultDirAroundSteps(dir, step.Steps) - result = append(result, step) - } else if step.Dir != "" { - result = append(result, step) - } else { - if dirStep == nil { - dirStep = &syntax.Step{ - Dir: dir, - } - result = append(result, dirStep) - } - dirStep.Steps = append(dirStep.Steps, step) - } - } - return result -} - -// LoadPipelineConfig returns the pipeline configuration -func LoadPipelineConfig(fileName string, resolver ImportFileResolver, isTekton, clearContainer bool) (*PipelineConfig, error) { - return LoadPipelineConfigAndMaybeValidate(fileName, resolver, isTekton, clearContainer, true) -} - -// LoadPipelineConfigAndMaybeValidate returns the pipeline configuration, optionally after validating the YAML. -func LoadPipelineConfigAndMaybeValidate(fileName string, resolver ImportFileResolver, isTekton, clearContainer, skipYamlValidation bool) (*PipelineConfig, error) { - config := PipelineConfig{} - exists, err := files.FileExists(fileName) - if err != nil || !exists { - return &config, err - } - data, err := os.ReadFile(fileName) - if err != nil { - return &config, errors.Wrapf(err, "Failed to load file %s", fileName) - } - if !skipYamlValidation { - validationErrors, err := validate.ValidateYaml(&config, data) - if err != nil { - return &config, fmt.Errorf("failed to validate YAML file %s due to %s", fileName, err) - } - if len(validationErrors) > 0 { - return &config, fmt.Errorf("validation failures in YAML file %s:\n%s", fileName, strings.Join(validationErrors, "\n")) - } - } - err = yaml.Unmarshal(data, &config) - if err != nil { - return &config, errors.Wrapf(err, "Failed to unmarshal file %s", fileName) - } - pipelines := &config.Pipelines - pipelines.RemoveWhenStatements(isTekton) - if clearContainer { - // let's force any agent for prow / jenkinsfile runner - config.Agent = clearContainerAndLabel(config.Agent) - } - config.PopulatePipelinesFromDefault() - if config.Extends == nil || config.Extends.File == "" { - config.defaultContainerAndDir() - return &config, nil - } - file := config.Extends.File - importModule := config.Extends.Import - if importModule != "" { - file, err = resolver(config.Extends.ImportFile()) - if err != nil { - return &config, errors.Wrapf(err, "Failed to resolve imports for file %s", fileName) - } - - } else if !filepath.IsAbs(file) { - dir, _ := filepath.Split(fileName) - if dir != "" { - file = filepath.Join(dir, file) - } - } - exists, err = files.FileExists(file) - if err != nil { - return &config, errors.Wrapf(err, "base pipeline file does not exist %s", file) - } - if !exists { - return &config, fmt.Errorf("base pipeline file does not exist %s", file) - } - basePipeline, err := LoadPipelineConfig(file, resolver, isTekton, clearContainer) - if err != nil { - return &config, errors.Wrapf(err, "Failed to base pipeline file %s", file) - } - err = config.ExtendPipeline(basePipeline, clearContainer) - return &config, err -} - -// PopulatePipelinesFromDefault sets the Release, PullRequest, and Feature pipelines, if unset, with the Default pipeline. -func (c *PipelineConfig) PopulatePipelinesFromDefault() { - if c != nil && c.Pipelines.Default != nil { - if c.Pipelines.Default.Agent == nil && c.Agent != nil { - c.Pipelines.Default.Agent = c.Agent.DeepCopyForParsedPipeline() - } - if c.Pipelines.Release == nil { - c.Pipelines.Release = &PipelineLifecycles{ - Pipeline: c.Pipelines.Default.DeepCopy(), - } - } - if c.Pipelines.PullRequest == nil { - c.Pipelines.PullRequest = &PipelineLifecycles{ - Pipeline: c.Pipelines.Default.DeepCopy(), - } - } - if c.Pipelines.Feature == nil { - c.Pipelines.Feature = &PipelineLifecycles{ - Pipeline: c.Pipelines.Default.DeepCopy(), - } - } - } -} - -// clearContainerAndLabel wipes the label and container from an Agent, preserving the Dir if it exists. -func clearContainerAndLabel(agent *syntax.Agent) *syntax.Agent { - if agent != nil { - agent.Container = "" - agent.Image = "" - agent.Label = "" - - return agent - } - return &syntax.Agent{} -} - -// IsEmpty returns true if this configuration is empty -func (c *PipelineConfig) IsEmpty() bool { - empty := &PipelineConfig{} - return reflect.DeepEqual(empty, c) -} - -// SaveConfig saves the configuration file to the given project directory -func (c *PipelineConfig) SaveConfig(fileName string) error { - data, err := yaml.Marshal(c) - if err != nil { - return err - } - return os.WriteFile(fileName, data, files.DefaultFileWritePermissions) -} - -// ExtendPipeline inherits this pipeline from the given base pipeline -func (c *PipelineConfig) ExtendPipeline(base *PipelineConfig, clearContainer bool) error { - if clearContainer { - c.Agent = clearContainerAndLabel(c.Agent) - base.Agent = clearContainerAndLabel(base.Agent) - } else { - if c.Agent == nil { - c.Agent = &syntax.Agent{} - } - if base.Agent == nil { - base.Agent = &syntax.Agent{} - } - if c.Agent.Label == "" { - c.Agent.Label = base.Agent.Label - } else if base.Agent.Label == "" && c.Agent.Label != "" { - base.Agent.Label = c.Agent.Label - } - if c.Agent.GetImage() == "" { - c.Agent.Image = base.Agent.GetImage() - } else if base.Agent.GetImage() == "" && c.Agent.GetImage() != "" { - base.Agent.Image = c.Agent.GetImage() - } - } - if c.Agent.Dir == "" { - c.Agent.Dir = base.Agent.Dir - } else if base.Agent.Dir == "" && c.Agent.Dir != "" { - base.Agent.Dir = c.Agent.Dir - } - mergedContainer, err := syntax.MergeContainers(base.ContainerOptions, c.ContainerOptions) - if err != nil { - return err - } - c.ContainerOptions = mergedContainer - base.defaultContainerAndDir() - c.defaultContainerAndDir() - c.Env = syntax.CombineEnv(c.Env, base.Env) - err = c.Pipelines.Extend(&base.Pipelines) - if err != nil { - return err - } - return nil -} - -func (c *PipelineConfig) defaultContainerAndDir() { - if c.Agent != nil { - c.Pipelines.defaultContainerAndDir(c.Agent.GetImage(), c.Agent.Dir) - } -} - -// GetAllEnvVars finds all the environment variables defined in all pipelines + steps with the first value we find -func (c *PipelineConfig) GetAllEnvVars() map[string]string { - answer := map[string]string{} - - for _, pipeline := range c.Pipelines.All() { - if pipeline != nil { - for _, lifecycle := range pipeline.All() { - lifecycle.PutAllEnvVars(answer) - } - } - } - for _, env := range c.Env { - if env.Value != "" || answer[env.Name] == "" { - answer[env.Name] = env.Value - } - } - return answer -} - -// ExtendPipelines extends the parent lifecycle with the base -func ExtendPipelines(pipelineName string, parent, base *PipelineLifecycles, overrides []*syntax.PipelineOverride) *PipelineLifecycles { - if base == nil { - return parent - } - if parent == nil { - parent = &PipelineLifecycles{} - } - l := &PipelineLifecycles{ - Setup: ExtendLifecycle(pipelineName, "setup", parent.Setup, base.Setup, overrides), - SetVersion: ExtendLifecycle(pipelineName, "setVersion", parent.SetVersion, base.SetVersion, overrides), - PreBuild: ExtendLifecycle(pipelineName, "preBuild", parent.PreBuild, base.PreBuild, overrides), - Build: ExtendLifecycle(pipelineName, "build", parent.Build, base.Build, overrides), - PostBuild: ExtendLifecycle(pipelineName, "postBuild", parent.PostBuild, base.PostBuild, overrides), - Promote: ExtendLifecycle(pipelineName, "promote", parent.Promote, base.Promote, overrides), - } - if parent.Pipeline != nil { - l.Pipeline = parent.Pipeline - } else if base.Pipeline != nil { - l.Pipeline = base.Pipeline - } - for _, override := range overrides { - if override.MatchesPipeline(pipelineName) { - // If no name, stage, or agent is specified, remove the whole pipeline. - if override.Name == "" && override.Stage == "" && override.Agent == nil && override.ContainerOptions == nil && len(override.Volumes) == 0 { - return &PipelineLifecycles{} - } - - l.Pipeline = syntax.ApplyStepOverridesToPipeline(l.Pipeline, override) - } - } - return l -} - -// ExtendLifecycle extends the lifecycle with the inherited base lifecycle -func ExtendLifecycle(pipelineName, stageName string, parent, base *PipelineLifecycle, overrides []*syntax.PipelineOverride) *PipelineLifecycle { - var lifecycle *PipelineLifecycle - if parent == nil { - lifecycle = base - } else if base == nil { - lifecycle = parent - } else if parent.Replace { - lifecycle = parent - } else { - steps := []*syntax.Step{} - steps = append(steps, parent.PreSteps...) - steps = append(steps, base.Steps...) - steps = append(steps, parent.Steps...) - lifecycle = &PipelineLifecycle{ - Steps: steps, - } - } - - if lifecycle != nil { - for _, override := range overrides { - if override.MatchesPipeline(pipelineName) && override.MatchesStage(stageName) { - overriddenSteps := []*syntax.Step{} - - // If a step name is specified on this override, override looking for that step. - if override.Name != "" { - for _, s := range lifecycle.Steps { - for k := range syntax.OverrideStep(s, override) { - overriddenStep := syntax.OverrideStep(s, override)[k] - overriddenSteps = append(overriddenSteps, &overriddenStep) - } - } - // If no step name was specified but there are steps, just replace all steps in the stage/lifecycle, - // or add the new steps before/after the existing steps in the stage/lifecycle - } else if steps := override.AsStepsSlice(); len(steps) > 0 { - if override.Type == nil || *override.Type == syntax.StepOverrideReplace { - overriddenSteps = append(overriddenSteps, steps...) - } else if *override.Type == syntax.StepOverrideBefore { - overriddenSteps = append(overriddenSteps, steps...) - overriddenSteps = append(overriddenSteps, lifecycle.Steps...) - } else if *override.Type == syntax.StepOverrideAfter { - overriddenSteps = append(overriddenSteps, lifecycle.Steps...) - overriddenSteps = append(overriddenSteps, override.Steps...) - } - } - // If there aren't any steps as well as no step name, then we're removing all steps from this stage/lifecycle, - // so do nothing. =) - - lifecycle.Steps = overriddenSteps - } - } - } - - return lifecycle -} - -// GenerateJenkinsfile generates the jenkinsfile -func (a *CreateJenkinsfileArguments) GenerateJenkinsfile(resolver ImportFileResolver) error { - err := a.Validate() - if err != nil { - return err - } - config, err := LoadPipelineConfig(a.ConfigFile, resolver, a.IsTekton, a.ClearContainerNames) - if err != nil { - return err - } - - templateFile := a.TemplateFile - - data, err := os.ReadFile(templateFile) - if err != nil { - return errors.Wrapf(err, "failed to load template %s", templateFile) - } - - t, err := template.New("myJenkinsfile").Parse(string(data)) - if err != nil { - return errors.Wrapf(err, "failed to parse template %s", templateFile) - } - outFile := a.OutputFile - outDir, _ := filepath.Split(outFile) - if outDir != "" { - err = os.MkdirAll(outDir, files.DefaultDirWritePermissions) - if err != nil { - return errors.Wrapf(err, "failed to make directory %s when creating Jenkinsfile %s", outDir, outFile) - } - } - file, err := os.Create(outFile) - if err != nil { - return errors.Wrapf(err, "failed to create file %s", outFile) - } - defer file.Close() - - err = t.Execute(file, config) - if err != nil { - return errors.Wrapf(err, "failed to write file %s", outFile) - } - return nil -} - -// createPipelineSteps translates a step into one or more steps that can be used in jenkins-x.yml pipeline syntax. -func (c *PipelineConfig) createPipelineSteps(step *syntax.Step, prefixPath string, args *CreatePipelineArguments) ([]syntax.Step, int) { - steps := []syntax.Step{} - - containerName := c.Agent.GetImage() - - if step.GetImage() != "" { - containerName = step.GetImage() - } - - dir := args.WorkspaceDir - - if step.Dir != "" { - dir = step.Dir - } - - if step.GetCommand() != "" { - if containerName == "" { - containerName = args.DefaultImage - log.Logger().Warnf("No 'agent.container' specified in the pipeline configuration so defaulting to use: %s", containerName) - } - - s := syntax.Step{} - args.StepCounter++ - prefix := prefixPath - if prefix != "" { - prefix += "-" - } - stepName := step.Name - if stepName == "" { - stepName = "step" + strconv.Itoa(1+args.StepCounter) - } - s.Name = prefix + stepName - s.Command = replaceCommandText(step) - if args.CustomImage != "" { - s.Image = args.CustomImage - } else { - s.Image = containerName - } - - s.Dir = dir - s.Env = step.Env - steps = append(steps, s) - } else if step.Loop != nil { - // Just copy in the loop step without altering it. - // TODO: We don't get magic around image resolution etc, but we avoid naming collisions that result otherwise. - steps = append(steps, *step) - } - for _, s := range step.Steps { - // TODO add child prefix? - childPrefixPath := prefixPath - args.WorkspaceDir = dir - nestedSteps, nestedCounter := c.createPipelineSteps(s, childPrefixPath, args) - args.StepCounter = nestedCounter - steps = append(steps, nestedSteps...) - } - return steps, args.StepCounter -} - -// replaceCommandText lets remove any escaped "\$" stuff in the pipeline library -// and replace any use of the VERSION file with using the VERSION env var -func replaceCommandText(step *syntax.Step) string { - answer := strings.Replace(step.GetFullCommand(), "\\$", "$", -1) - - // let's replace the old way of setting versions - answer = strings.Replace(answer, "export VERSION=`cat VERSION` && ", "", 1) - answer = strings.Replace(answer, "export VERSION=$PREVIEW_VERSION && ", "", 1) - - for _, text := range []string{"$(cat VERSION)", "$(cat ../VERSION)", "$(cat ../../VERSION)"} { - answer = strings.Replace(answer, text, "${VERSION}", -1) - } - return answer -} - -// createStageForBuildPack generates the Task for a build pack -func (c *PipelineConfig) createStageForBuildPack(args *CreatePipelineArguments) (*syntax.Stage, int, error) { - if args.Lifecycles == nil { - return nil, args.StepCounter, errors.New("generatePipeline: no lifecycles") - } - - // let's generate the pipeline using the build packs - container := "" - if c.Agent != nil { - container = c.Agent.GetImage() - } - if args.CustomImage != "" { - container = args.CustomImage - } - if container == "" { - container = args.DefaultImage - } - - steps := []syntax.Step{} - for _, n := range args.Lifecycles.All() { - l := n.Lifecycle - if l == nil { - continue - } - if !args.NoReleasePrepare && n.Name == "setversion" { - continue - } - - for _, s := range l.Steps { - newSteps, newCounter := c.createPipelineSteps(s, n.Name, args) - args.StepCounter = newCounter - steps = append(steps, newSteps...) - } - } - - stage := &syntax.Stage{ - Name: syntax.DefaultStageNameForBuildPack, - Agent: &syntax.Agent{ - Image: container, - }, - Steps: steps, - } - - return stage, args.StepCounter, nil -} - -// CreatePipelineForBuildPack translates a set of lifecycles into a full pipeline. -func (c *PipelineConfig) CreatePipelineForBuildPack(args *CreatePipelineArguments) (*syntax.ParsedPipeline, int, error) { - args.GitOrg = naming.ToValidName(strings.ToLower(args.GitOrg)) - args.GitName = naming.ToValidName(strings.ToLower(args.GitName)) - args.DockerRegistryOrg = strings.ToLower(args.DockerRegistryOrg) - - stage, newCounter, err := c.createStageForBuildPack(args) - if err != nil { - return nil, args.StepCounter, errors.Wrapf(err, "Failed to generate stage from build pack") - } - - parsed := &syntax.ParsedPipeline{ - Stages: []syntax.Stage{*stage}, - } - - // If agent.container is specified, use that for default container configuration for step images. - containerName := c.Agent.GetImage() - if containerName != "" { - if args.PodTemplates != nil && args.PodTemplates[containerName] != nil { - podTemplate := args.PodTemplates[containerName] - container := podTemplate.Spec.Containers[0] - if !equality.Semantic.DeepEqual(container, corev1.Container{}) { - container.Name = "" - container.Command = nil - container.Args = nil - container.Image = "" - container.WorkingDir = "" - container.Stdin = false - container.TTY = false - if parsed.Options == nil { - parsed.Options = &syntax.RootOptions{} - } - parsed.Options.ContainerOptions = &container - for k := range podTemplate.Spec.Volumes { - v := podTemplate.Spec.Volumes[k] - parsed.Options.Volumes = append(parsed.Options.Volumes, &corev1.Volume{ - Name: v.Name, - VolumeSource: v.VolumeSource, - }) - } - } - } - } - - return parsed, newCounter, nil -} diff --git a/pkg/jenkinsfile/pipeline_test.go b/pkg/jenkinsfile/pipeline_test.go deleted file mode 100644 index 90878c7..0000000 --- a/pkg/jenkinsfile/pipeline_test.go +++ /dev/null @@ -1,69 +0,0 @@ -//go:build unit -// +build unit - -package jenkinsfile_test - -import ( - "testing" - - "github.com/jenkins-x-plugins/jx-project/pkg/jenkinsfile" - "github.com/stretchr/testify/assert" -) - -func TestGetLifecycleReturnsSetup(t *testing.T) { - lifecycles := jenkinsfile.PipelineLifecycles{} - lifecycles.Setup = &jenkinsfile.PipelineLifecycle{} - lifecycle, _ := lifecycles.GetLifecycle("setup", false) - assert.Equal(t, lifecycles.Setup, lifecycle) -} - -func TestGetLifecycleReturnsSetVersion(t *testing.T) { - lifecycles := jenkinsfile.PipelineLifecycles{} - lifecycles.SetVersion = &jenkinsfile.PipelineLifecycle{} - lifecycle, _ := lifecycles.GetLifecycle("setversion", false) - assert.Equal(t, lifecycles.SetVersion, lifecycle) -} - -func TestGetLifecycleReturnsPreBuild(t *testing.T) { - lifecycles := jenkinsfile.PipelineLifecycles{} - lifecycles.PreBuild = &jenkinsfile.PipelineLifecycle{} - lifecycle, _ := lifecycles.GetLifecycle("prebuild", false) - assert.Equal(t, lifecycles.PreBuild, lifecycle) -} - -func TestGetLifecycleReturnsBuild(t *testing.T) { - lifecycles := jenkinsfile.PipelineLifecycles{} - lifecycles.Build = &jenkinsfile.PipelineLifecycle{} - lifecycle, _ := lifecycles.GetLifecycle("build", false) - assert.Equal(t, lifecycles.Build, lifecycle) -} - -func TestGetLifecycleReturnsPostBuild(t *testing.T) { - lifecycles := jenkinsfile.PipelineLifecycles{} - lifecycles.PostBuild = &jenkinsfile.PipelineLifecycle{} - lifecycle, _ := lifecycles.GetLifecycle("postbuild", false) - assert.Equal(t, lifecycles.PostBuild, lifecycle) -} - -func TestGetLifecycleReturnsPromote(t *testing.T) { - lifecycles := jenkinsfile.PipelineLifecycles{} - lifecycles.Promote = &jenkinsfile.PipelineLifecycle{} - lifecycle, _ := lifecycles.GetLifecycle("promote", false) - assert.Equal(t, lifecycles.Promote, lifecycle) -} - -func TestGetLifecycleReturnsEmptyLifecycle(t *testing.T) { - names := []string{"setup", "setversion", "prebuild", "build", "postbuild", "promote"} - for _, name := range names { - lifecycles := jenkinsfile.PipelineLifecycles{} - lifecycles.Setup = &jenkinsfile.PipelineLifecycle{} - lifecycle, _ := lifecycles.GetLifecycle(name, true) - assert.NotNil(t, lifecycle) - } -} - -func TestGetLifecycleReturnsError(t *testing.T) { - lifecycles := jenkinsfile.PipelineLifecycles{} - _, err := lifecycles.GetLifecycle("something-else", false) - assert.Error(t, err) -} diff --git a/pkg/jenkinsfile/zz_generated.deepcopy.go b/pkg/jenkinsfile/zz_generated.deepcopy.go deleted file mode 100644 index cce02cb..0000000 --- a/pkg/jenkinsfile/zz_generated.deepcopy.go +++ /dev/null @@ -1,324 +0,0 @@ -// +build !ignore_autogenerated - -// Code generated by deepcopy-gen. DO NOT EDIT. - -package jenkinsfile - -import ( - syntax "github.com/jenkins-x-plugins/jx-project/pkg/tekton/syntax" - v1 "k8s.io/api/core/v1" -) - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CreateJenkinsfileArguments) DeepCopyInto(out *CreateJenkinsfileArguments) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CreateJenkinsfileArguments. -func (in *CreateJenkinsfileArguments) DeepCopy() *CreateJenkinsfileArguments { - if in == nil { - return nil - } - out := new(CreateJenkinsfileArguments) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ImportFile) DeepCopyInto(out *ImportFile) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ImportFile. -func (in *ImportFile) DeepCopy() *ImportFile { - if in == nil { - return nil - } - out := new(ImportFile) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Module) DeepCopyInto(out *Module) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Module. -func (in *Module) DeepCopy() *Module { - if in == nil { - return nil - } - out := new(Module) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Modules) DeepCopyInto(out *Modules) { - *out = *in - if in.Modules != nil { - in, out := &in.Modules, &out.Modules - *out = make([]*Module, len(*in)) - for i := range *in { - if (*in)[i] != nil { - in, out := &(*in)[i], &(*out)[i] - *out = new(Module) - **out = **in - } - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Modules. -func (in *Modules) DeepCopy() *Modules { - if in == nil { - return nil - } - out := new(Modules) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *NamedLifecycle) DeepCopyInto(out *NamedLifecycle) { - *out = *in - if in.Lifecycle != nil { - in, out := &in.Lifecycle, &out.Lifecycle - *out = new(PipelineLifecycle) - (*in).DeepCopyInto(*out) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NamedLifecycle. -func (in *NamedLifecycle) DeepCopy() *NamedLifecycle { - if in == nil { - return nil - } - out := new(NamedLifecycle) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PipelineConfig) DeepCopyInto(out *PipelineConfig) { - *out = *in - if in.Extends != nil { - in, out := &in.Extends, &out.Extends - *out = new(PipelineExtends) - **out = **in - } - if in.Agent != nil { - in, out := &in.Agent, &out.Agent - *out = new(syntax.Agent) - **out = **in - } - if in.Env != nil { - in, out := &in.Env, &out.Env - *out = make([]v1.EnvVar, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - in.Pipelines.DeepCopyInto(&out.Pipelines) - if in.ContainerOptions != nil { - in, out := &in.ContainerOptions, &out.ContainerOptions - *out = new(v1.Container) - (*in).DeepCopyInto(*out) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PipelineConfig. -func (in *PipelineConfig) DeepCopy() *PipelineConfig { - if in == nil { - return nil - } - out := new(PipelineConfig) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PipelineExtends) DeepCopyInto(out *PipelineExtends) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PipelineExtends. -func (in *PipelineExtends) DeepCopy() *PipelineExtends { - if in == nil { - return nil - } - out := new(PipelineExtends) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PipelineLifecycle) DeepCopyInto(out *PipelineLifecycle) { - *out = *in - if in.Steps != nil { - in, out := &in.Steps, &out.Steps - *out = make([]*syntax.Step, len(*in)) - for i := range *in { - if (*in)[i] != nil { - in, out := &(*in)[i], &(*out)[i] - *out = new(syntax.Step) - (*in).DeepCopyInto(*out) - } - } - } - if in.PreSteps != nil { - in, out := &in.PreSteps, &out.PreSteps - *out = make([]*syntax.Step, len(*in)) - for i := range *in { - if (*in)[i] != nil { - in, out := &(*in)[i], &(*out)[i] - *out = new(syntax.Step) - (*in).DeepCopyInto(*out) - } - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PipelineLifecycle. -func (in *PipelineLifecycle) DeepCopy() *PipelineLifecycle { - if in == nil { - return nil - } - out := new(PipelineLifecycle) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in PipelineLifecycleArray) DeepCopyInto(out *PipelineLifecycleArray) { - { - in := &in - *out = make(PipelineLifecycleArray, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - return - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PipelineLifecycleArray. -func (in PipelineLifecycleArray) DeepCopy() PipelineLifecycleArray { - if in == nil { - return nil - } - out := new(PipelineLifecycleArray) - in.DeepCopyInto(out) - return *out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PipelineLifecycles) DeepCopyInto(out *PipelineLifecycles) { - *out = *in - if in.Setup != nil { - in, out := &in.Setup, &out.Setup - *out = new(PipelineLifecycle) - (*in).DeepCopyInto(*out) - } - if in.SetVersion != nil { - in, out := &in.SetVersion, &out.SetVersion - *out = new(PipelineLifecycle) - (*in).DeepCopyInto(*out) - } - if in.PreBuild != nil { - in, out := &in.PreBuild, &out.PreBuild - *out = new(PipelineLifecycle) - (*in).DeepCopyInto(*out) - } - if in.Build != nil { - in, out := &in.Build, &out.Build - *out = new(PipelineLifecycle) - (*in).DeepCopyInto(*out) - } - if in.PostBuild != nil { - in, out := &in.PostBuild, &out.PostBuild - *out = new(PipelineLifecycle) - (*in).DeepCopyInto(*out) - } - if in.Promote != nil { - in, out := &in.Promote, &out.Promote - *out = new(PipelineLifecycle) - (*in).DeepCopyInto(*out) - } - if in.Pipeline != nil { - in, out := &in.Pipeline, &out.Pipeline - *out = new(syntax.ParsedPipeline) - (*in).DeepCopyInto(*out) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PipelineLifecycles. -func (in *PipelineLifecycles) DeepCopy() *PipelineLifecycles { - if in == nil { - return nil - } - out := new(PipelineLifecycles) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Pipelines) DeepCopyInto(out *Pipelines) { - *out = *in - if in.PullRequest != nil { - in, out := &in.PullRequest, &out.PullRequest - *out = new(PipelineLifecycles) - (*in).DeepCopyInto(*out) - } - if in.Release != nil { - in, out := &in.Release, &out.Release - *out = new(PipelineLifecycles) - (*in).DeepCopyInto(*out) - } - if in.Feature != nil { - in, out := &in.Feature, &out.Feature - *out = new(PipelineLifecycles) - (*in).DeepCopyInto(*out) - } - if in.Post != nil { - in, out := &in.Post, &out.Post - *out = new(PipelineLifecycle) - (*in).DeepCopyInto(*out) - } - if in.Overrides != nil { - in, out := &in.Overrides, &out.Overrides - *out = make([]*syntax.PipelineOverride, len(*in)) - for i := range *in { - if (*in)[i] != nil { - in, out := &(*in)[i], &(*out)[i] - *out = new(syntax.PipelineOverride) - (*in).DeepCopyInto(*out) - } - } - } - if in.Default != nil { - in, out := &in.Default, &out.Default - *out = new(syntax.ParsedPipeline) - (*in).DeepCopyInto(*out) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Pipelines. -func (in *Pipelines) DeepCopy() *Pipelines { - if in == nil { - return nil - } - out := new(Pipelines) - in.DeepCopyInto(out) - return out -} diff --git a/pkg/statement/jenkinsfile_writer.go b/pkg/statement/jenkinsfile_writer.go deleted file mode 100644 index b90e882..0000000 --- a/pkg/statement/jenkinsfile_writer.go +++ /dev/null @@ -1,128 +0,0 @@ -package statement - -import ( - "bytes" - "strings" - - "github.com/jenkins-x/jx-helpers/v3/pkg/stringhelpers" -) - -var contextFunctions = map[string]bool{ - "container": true, - "dir": true, -} - -// Statement represents a statement in a Jenkinsfile -type Statement struct { - Function string - Arguments []string - Statement string - Children []*Statement -} - -// Text returns the text line of the current function or statement -func (s *Statement) Text() string { - if s.Function != "" { - text := s.Function - expressions := []string{} - for _, arg := range s.Arguments { - expressions = append(expressions, asArgumentExpression(arg)) - } - return text + "(" + strings.Join(expressions, ", ") + ")" - } - return s.Statement -} - -// ContextEquals returns true if this statement is a context statement and it equals -// the same context as that statement -func (s *Statement) ContextEquals(that *Statement) bool { - if s.Function == that.Function && contextFunctions[s.Function] { - return stringhelpers.StringArraysEqual(s.Arguments, that.Arguments) - } - return false -} - -func asArgumentExpression(arg string) string { - return "'" + arg + "'" -} - -// Writer implements the struct for Jenkinsfilewriter -type Writer struct { - InitialIndent string - IndentText string - Buffer bytes.Buffer - IndentCount int -} - -// WriteJenkinsfileStatements writes the given Jenkinsfile statements as a string -func WriteJenkinsfileStatements(indentCount int, statements []*Statement) string { - writer := NewWriter(indentCount) - writer.Write(statements) - return writer.String() -} - -// NewWriter creates a Jenkinsfile writer -func NewWriter(indentCount int) *Writer { - return &Writer{ - IndentText: " ", - IndentCount: indentCount, - } -} - -func (w *Writer) Write(inputStatements []*Statement) { - statements := w.combineSimilarContexts(inputStatements) - w.writeStatement(statements) -} - -func (w *Writer) writeStatement(statements []*Statement) { - for _, s := range statements { - text := s.Text() - hasChildren := len(s.Children) > 0 - if hasChildren { - text += " {" - } - w.println(text) - if hasChildren { - w.IndentCount++ - w.writeStatement(s.Children) - w.IndentCount-- - } - if hasChildren { - w.println("}") - } - } -} - -func (w *Writer) println(text string) { - if text != "" { - for i := 0; i < w.IndentCount; i++ { - w.Buffer.WriteString(w.IndentText) - } - w.Buffer.WriteString(text) - } - w.Buffer.WriteString("\n") -} - -// String returns the string value of this writer -func (w *Writer) String() string { - return w.Buffer.String() -} - -func (w *Writer) combineSimilarContexts(statements []*Statement) []*Statement { - answer := append([]*Statement{}, statements...) - for i := 0; i < len(answer)-1; { - s1 := answer[i] - s2 := answer[i+1] - // let's combine the children to the first node if the contexts are equal - if s1.ContextEquals(s2) { - s1.Children = append(s1.Children, s2.Children...) - answer = append(answer[0:i+1], answer[i+2:]...) - } else { - i++ - } - } - for _, s := range answer { - s.Children = w.combineSimilarContexts(s.Children) - } - return answer -} diff --git a/pkg/statement/jenkinsfile_writer_test.go b/pkg/statement/jenkinsfile_writer_test.go deleted file mode 100644 index 54cd4df..0000000 --- a/pkg/statement/jenkinsfile_writer_test.go +++ /dev/null @@ -1,59 +0,0 @@ -//go:build unit -// +build unit - -package statement_test - -import ( - "testing" - - "github.com/jenkins-x-plugins/jx-project/pkg/statement" - "github.com/stretchr/testify/assert" -) - -func TestJenkinsfileWriter(t *testing.T) { - expectedValue := `container('maven') { - dir('/foo/bar') { - sh "ls -al" - sh "mvn deploy" - } -} -` - writer := statement.NewWriter(0) - - statements := []*statement.Statement{ - { - Function: "container", - Arguments: []string{"maven"}, - Children: []*statement.Statement{ - { - Function: "dir", - Arguments: []string{"/foo/bar"}, - Children: []*statement.Statement{ - { - Statement: "sh \"ls -al\"", - }, - }, - }, - }, - }, - { - Function: "container", - Arguments: []string{"maven"}, - Children: []*statement.Statement{ - { - Function: "dir", - Arguments: []string{"/foo/bar"}, - Children: []*statement.Statement{ - { - Statement: "sh \"mvn deploy\"", - }, - }, - }, - }, - }, - } - writer.Write(statements) - text := writer.String() - - assert.Equal(t, expectedValue, text, "for statements %#v", statements) -} diff --git a/pkg/tekton/syntax/constants.go b/pkg/tekton/syntax/constants.go deleted file mode 100644 index 2977508..0000000 --- a/pkg/tekton/syntax/constants.go +++ /dev/null @@ -1,18 +0,0 @@ -package syntax - -const ( - // TektonAPIVersion the APIVersion for using Tekton - TektonAPIVersion = "tekton.dev/v1alpha1" - - // LabelStageName - the name for the label that will have the stage name on the Task. - LabelStageName = "jenkins.io/task-stage-name" - - // DefaultStageNameForBuildPack - the name we use for the single stage created from build packs currently. - DefaultStageNameForBuildPack = "from-build-pack" - - // KanikoDockerImage - the default image used for Kaniko builds - KanikoDockerImage = "gcr.io/kaniko-project/executor:v0.22.0" - - // DefaultContainerImage - the default image used for pipelines if none is specified. - DefaultContainerImage = "ghcr.io/jenkins-x/builder-maven" -) diff --git a/pkg/tekton/syntax/doc.go b/pkg/tekton/syntax/doc.go deleted file mode 100644 index bf4b3cf..0000000 --- a/pkg/tekton/syntax/doc.go +++ /dev/null @@ -1,6 +0,0 @@ -// +k8s:deepcopy-gen=package -// +k8s:openapi-gen=true -// Package v1 is the v1 version of the API. -// +groupName=config.jenkins.io -// +apiVersion=v1 -package syntax diff --git a/pkg/tekton/syntax/pipeline.go b/pkg/tekton/syntax/pipeline.go deleted file mode 100644 index 1e6083f..0000000 --- a/pkg/tekton/syntax/pipeline.go +++ /dev/null @@ -1,2585 +0,0 @@ -package syntax - -import ( - "bytes" - "context" - "encoding/json" - "fmt" - "os" - "path/filepath" - "regexp" - "runtime" - "sort" - "strconv" - "strings" - "time" - - "github.com/jenkins-x-plugins/jx-project/pkg/constants" - "github.com/jenkins-x-plugins/jx-project/pkg/statement" - "github.com/jenkins-x/jx-helpers/v3/pkg/kube/naming" - "github.com/jenkins-x/jx-helpers/v3/pkg/maps" - "github.com/jenkins-x/jx-helpers/v3/pkg/termcolor" - "github.com/jenkins-x/jx-helpers/v3/pkg/versionstream" - "github.com/jenkins-x/jx-logging/v3/pkg/log" - "github.com/pkg/errors" - "github.com/tektoncd/pipeline/pkg/apis/pipeline" - tektonv1alpha1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1" - tektonv1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/equality" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/strategicpatch" - "k8s.io/client-go/kubernetes" - "knative.dev/pkg/apis" -) - -const ( - // GitMergeImage is the default image name that is used in the git merge step of a pipeline - GitMergeImage = "ghcr.io/jenkins-x/builder-jx" - - // WorkingDirRoot is the root directory for working directories. - WorkingDirRoot = "/workspace" - - // braceMatchingRegex matches "${inputs.params.foo}" so we can replace it with "$(inputs.params.foo)" - braceMatchingRegex = "(\\$(\\{(?Pinputs\\.params\\.[_a-zA-Z][_a-zA-Z0-9.-]*)\\}))" -) - -var ( - ipAddressRegistryRegex = regexp.MustCompile(`\d+\.\d+\.\d+\.\d+.\d+(:\d+)?`) - - commandIsSkaffoldRegex = regexp.MustCompile(`export VERSION=.*? && skaffold build.*`) -) - -// ParsedPipeline is the internal representation of the Pipeline, used to validate and create CRDs -type ParsedPipeline struct { - Agent *Agent `json:"agent,omitempty"` - Env []corev1.EnvVar `json:"env,omitempty"` - Options *RootOptions `json:"options,omitempty"` - Stages []Stage `json:"stages"` - Post []Post `json:"post,omitempty"` - WorkingDir *string `json:"dir,omitempty"` - - // Replaced by Env, retained for backwards compatibility - Environment []corev1.EnvVar `json:"environment,omitempty"` -} - -// Agent defines where the pipeline, stage, or step should run. -type Agent struct { - // One of label or image is required. - Label string `json:"label,omitempty"` - Image string `json:"image,omitempty"` - - // Legacy fields from jenkinsfile.PipelineAgent - Container string `json:"container,omitempty"` - Dir string `json:"dir,omitempty"` -} - -// TimeoutUnit is used for calculating timeout duration -type TimeoutUnit string - -// The available time units. -const ( - TimeoutUnitSeconds TimeoutUnit = "seconds" - TimeoutUnitMinutes TimeoutUnit = "minutes" - TimeoutUnitHours TimeoutUnit = "hours" - TimeoutUnitDays TimeoutUnit = "days" -) - -// All possible time units, used for validation -var allTimeoutUnits = []TimeoutUnit{TimeoutUnitSeconds, TimeoutUnitMinutes, TimeoutUnitHours, TimeoutUnitDays} - -func allTimeoutUnitsAsStrings() []string { - tu := make([]string, len(allTimeoutUnits)) - - for i, u := range allTimeoutUnits { - tu[i] = string(u) - } - - return tu -} - -// Timeout defines how long a stage or pipeline can run before timing out. -type Timeout struct { - Time int64 `json:"time"` - // Has some sane default - probably seconds - Unit TimeoutUnit `json:"unit,omitempty"` -} - -// ToDuration generates a duration struct from a Timeout -func (t *Timeout) ToDuration() (*metav1.Duration, error) { - durationStr := "" - // TODO: Populate a default timeout unit, most likely seconds. - if t.Unit != "" { - durationStr = fmt.Sprintf("%d%c", t.Time, t.Unit[0]) - } else { - durationStr = fmt.Sprintf("%ds", t.Time) - } - - d, err := time.ParseDuration(durationStr) - if err != nil { - return nil, err - } - return &metav1.Duration{Duration: d}, nil -} - -// RootOptions contains options that can be configured on either a pipeline or a stage -type RootOptions struct { - Timeout *Timeout `json:"timeout,omitempty"` - Retry int8 `json:"retry,omitempty"` - // ContainerOptions allows for advanced configuration of containers for a single stage or the whole - // pipeline, adding to configuration that can be configured through the syntax already. This includes things - // like CPU/RAM requests/limits, secrets, ports, etc. Some of these things will end up with native syntax approaches - // down the road. - ContainerOptions *corev1.Container `json:"containerOptions,omitempty"` - Sidecars []*corev1.Container `json:"sidecars,omitempty"` - Volumes []*corev1.Volume `json:"volumes,omitempty"` - DistributeParallelAcrossNodes bool `json:"distributeParallelAcrossNodes,omitempty"` - Tolerations []corev1.Toleration `json:"tolerations,omitempty"` - PodLabels map[string]string `json:"podLabels,omitempty"` -} - -// Stash defines files to be saved for use in a later stage, marked with a name -type Stash struct { - Name string `json:"name"` - // Eventually make this optional so that you can do volumes instead - Files string `json:"files"` -} - -// Unstash defines a previously-defined stash to be copied into this stage's workspace -type Unstash struct { - Name string `json:"name"` - Dir string `json:"dir,omitempty"` -} - -// StageOptions contains both options that can be configured on either a pipeline or a stage, via -// RootOptions, or stage-specific options. -type StageOptions struct { - *RootOptions `json:",inline"` - - // TODO: Not yet implemented in build-pipeline - Stash *Stash `json:"stash,omitempty"` - Unstash *Unstash `json:"unstash,omitempty"` - - Workspace *string `json:"workspace,omitempty"` -} - -// Step defines a single step, from the author's perspective, to be executed within a stage. -type Step struct { - // An optional name to give the step for reporting purposes - Name string `json:"name,omitempty"` - - // One of command, step, or loop is required. - Command string `json:"command,omitempty"` - // args is optional, but only allowed with command - Arguments []string `json:"args,omitempty"` - // dir is optional, but only allowed with command. Refers to subdirectory of workspace - Dir string `json:"dir,omitempty"` - - Step string `json:"step,omitempty"` - // options is optional, but only allowed with step - // Also, we'll need to do some magic to do type verification during translation - i.e., this step wants a number - // for this option, so translate the string value for that option to a number. - Options map[string]string `json:"options,omitempty"` - - Loop *Loop `json:"loop,omitempty"` - - // agent can be overridden on a step - Agent *Agent `json:"agent,omitempty"` - - // Image alows the docker image for a step to be specified - Image string `json:"image,omitempty"` - - // env allows defining per-step environment variables - Env []corev1.EnvVar `json:"env,omitempty"` - - // Legacy fields from jenkinsfile.PipelineStep before it was eliminated. - Comment string `json:"comment,omitempty"` - Groovy string `json:"groovy,omitempty"` - Steps []*Step `json:"steps,omitempty"` - When string `json:"when,omitempty"` - Container string `json:"container,omitempty"` - Sh string `json:"sh,omitempty"` -} - -// Loop is a special step that defines a variable, a list of possible values for that variable, and a set of steps to -// repeat for each value for the variable, with the variable set with that value in the environment for the execution of -// those steps. -type Loop struct { - // The variable name. - Variable string `json:"variable"` - // The list of values to iterate over - Values []string `json:"values"` - // The steps to run - Steps []Step `json:"steps"` -} - -// Stage is a unit of work in a pipeline, corresponding either to a Task or a set of Tasks to be run sequentially or in -// parallel with common configuration. -type Stage struct { - Name string `json:"name"` - Agent *Agent `json:"agent,omitempty"` - Env []corev1.EnvVar `json:"env,omitempty"` - Options *StageOptions `json:"options,omitempty"` - Steps []Step `json:"steps,omitempty"` - Stages []Stage `json:"stages,omitempty"` - Parallel []Stage `json:"parallel,omitempty"` - Post []Post `json:"post,omitempty"` - WorkingDir *string `json:"dir,omitempty"` - - // Replaced by Env, retained for backwards compatibility - Environment []corev1.EnvVar `json:"environment,omitempty"` -} - -// PostCondition is used to specify under what condition a post action should be executed. -type PostCondition string - -// Probably extensible down the road -const ( - PostConditionSuccess PostCondition = "success" - PostConditionFailure PostCondition = "failure" - PostConditionAlways PostCondition = "always" -) - -// Post contains a PostCondition and one more actions to be executed after a pipeline or stage if the condition is met. -type Post struct { - // TODO: Conditional execution of something after a Task or Pipeline completes is not yet implemented - Condition PostCondition `json:"condition"` - Actions []PostAction `json:"actions"` -} - -// PostAction contains the name of a built-in post action and options to pass to that action. -type PostAction struct { - // TODO: Notifications are not yet supported in Build Pipeline per se. - Name string `json:"name"` - // Also, we'll need to do some magic to do type verification during translation - i.e., this action wants a number - // for this option, so translate the string value for that option to a number. - Options map[string]string `json:"options,omitempty"` -} - -// StepOverrideType is used to specify whether the existing step should be replaced (default), new step(s) should be -// prepended before the existing step, or new step(s) should be appended after the existing step. -type StepOverrideType string - -// The available override types -const ( - StepOverrideReplace StepOverrideType = "replace" - StepOverrideBefore StepOverrideType = "before" - StepOverrideAfter StepOverrideType = "after" -) - -// PipelineOverride allows for overriding named steps, stages, or pipelines in the build pack or default pipeline -type PipelineOverride struct { - Pipeline string `json:"pipeline,omitempty"` - Stage string `json:"stage,omitempty"` - Name string `json:"name,omitempty"` - Step *Step `json:"step,omitempty"` - Steps []*Step `json:"steps,omitempty"` - Type *StepOverrideType `json:"type,omitempty"` - Agent *Agent `json:"agent,omitempty"` - ContainerOptions *corev1.Container `json:"containerOptions,omitempty"` - Sidecars []*corev1.Container `json:"sidecars,omitempty"` - Volumes []*corev1.Volume `json:"volumes,omitempty"` -} - -var _ apis.Validatable = (*ParsedPipeline)(nil) - -// stageLabelName replaces invalid characters in stage names for label usage. -func (s *Stage) stageLabelName() string { - return MangleToRfc1035Label(s.Name, "") -} - -// GroovyBlock returns the groovy expression for this step -// Legacy code for Jenkinsfile generation -func (s *Step) GroovyBlock(parentIndent string) string { - var buffer bytes.Buffer - indent := parentIndent - if s.Comment != "" { - buffer.WriteString(indent) - buffer.WriteString("// ") - buffer.WriteString(s.Comment) - buffer.WriteString("\n") - } - if s.GetImage() != "" { - buffer.WriteString(indent) - buffer.WriteString("container('") - buffer.WriteString(s.GetImage()) - buffer.WriteString("') {\n") - } else if s.Dir != "" { - buffer.WriteString(indent) - buffer.WriteString("dir('") - buffer.WriteString(s.Dir) - buffer.WriteString("') {\n") - } else if s.GetFullCommand() != "" { - buffer.WriteString(indent) - buffer.WriteString("sh \"") - buffer.WriteString(s.GetFullCommand()) - buffer.WriteString("\"\n") - } else if s.Groovy != "" { - lines := strings.Split(s.Groovy, "\n") - lastIdx := len(lines) - 1 - for i, line := range lines { - buffer.WriteString(indent) - buffer.WriteString(line) - if i >= lastIdx && len(s.Steps) > 0 { - buffer.WriteString(" {") - } - buffer.WriteString("\n") - } - } - childIndent := indent + " " - for _, child := range s.Steps { - buffer.WriteString(child.GroovyBlock(childIndent)) - } - return buffer.String() -} - -// ToJenkinsfileStatements converts the step to one or more jenkinsfile statements -// Legacy code for Jenkinsfile generation -func (s *Step) ToJenkinsfileStatements() []*statement.Statement { - statements := []*statement.Statement{} - if s.Comment != "" { - statements = append(statements, &statement.Statement{ - Statement: "", - }, &statement.Statement{ - Statement: "// " + s.Comment, - }) - } - if s.GetImage() != "" { - statements = append(statements, &statement.Statement{ - Function: "container", - Arguments: []string{s.GetImage()}, - }) - } else if s.Dir != "" { - statements = append(statements, &statement.Statement{ - Function: "dir", - Arguments: []string{s.Dir}, - }) - } else if s.GetFullCommand() != "" { - statements = append(statements, &statement.Statement{ - Statement: "sh \"" + s.GetFullCommand() + "\"", - }) - } else if s.Groovy != "" { - lines := strings.Split(s.Groovy, "\n") - for _, line := range lines { - statements = append(statements, &statement.Statement{ - Statement: line, - }) - } - } - if len(statements) > 0 { - last := statements[len(statements)-1] - for _, c := range s.Steps { - last.Children = append(last.Children, c.ToJenkinsfileStatements()...) - } - } - return statements -} - -// Validate validates the step is populated correctly -// Legacy code for Jenkinsfile generation -func (s *Step) Validate() error { - if len(s.Steps) > 0 || s.GetCommand() != "" { - return nil - } - return fmt.Errorf("invalid step %#v as no child steps or command", s) -} - -// PutAllEnvVars puts all the defined environment variables in the given map -// Legacy code for Jenkinsfile generation -func (s *Step) PutAllEnvVars(m map[string]string) { - for _, step := range s.Steps { - step.PutAllEnvVars(m) - } -} - -// GetCommand gets the step's command to execute, opting for Command if set, then Sh. -func (s *Step) GetCommand() string { - if s.Command != "" { - return s.Command - } - - return s.Sh -} - -// GetFullCommand gets the full command to execute, including arguments. -func (s *Step) GetFullCommand() string { - cmd := s.GetCommand() - - // If GetCommand() was an empty string, don't deal with arguments, just return. - if len(s.Arguments) > 0 && cmd != "" { - cmd = fmt.Sprintf("%s %s", cmd, strings.Join(s.Arguments, " ")) - } - - return cmd -} - -// GetImage gets the step's image to run on, opting for Image if set, then Container. -func (s *Step) GetImage() string { - if s.Image != "" { - return s.Image - } - if s.Agent != nil && s.Agent.Image != "" { - return s.Agent.Image - } - - return s.Container -} - -// DeepCopyForParsedPipeline returns a copy of the Agent with deprecated fields migrated to current ones. -func (a *Agent) DeepCopyForParsedPipeline() *Agent { - agent := a.DeepCopy() - if agent.Container != "" { - agent.Image = agent.GetImage() - agent.Container = "" - agent.Label = "" - } - - return agent -} - -// Groovy returns the agent groovy expression for the agent or `any` if its blank -// Legacy code for Jenkinsfile generation -func (a *Agent) Groovy() string { - if a.Label != "" { - return fmt.Sprintf(`{ - label "%s" - }`, a.Label) - } - // let's use any for Prow - return "any" -} - -// GetImage gets the agent's image to run on, opting for Image if set, then Container. -func (a *Agent) GetImage() string { - if a.Image != "" { - return a.Image - } - - return a.Container -} - -// MangleToRfc1035Label - Task/Step names need to be RFC 1035/1123 compliant DNS labels, so we mangle -// them to make them compliant. Results should match the following regex and be -// no more than 63 characters long: -// -// [a-z]([-a-z0-9]*[a-z0-9])? -// -// cf. https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names -// body is assumed to have at least one ASCII letter. -// suffix is assumed to be alphanumeric and non-empty. -// TODO: Combine with kube.ToValidName (that function needs to handle lengths) -func MangleToRfc1035Label(body, suffix string) string { - const maxLabelLength = 63 - maxBodyLength := maxLabelLength - if len(suffix) > 0 { - maxBodyLength = maxLabelLength - len(suffix) - 1 // Add an extra hyphen before the suffix - } - var sb strings.Builder - bufferedHyphen := false // Used to make sure we don't output consecutive hyphens. - for _, codepoint := range body { - toWrite := 0 - if sb.Len() != 0 { // Digits and hyphens aren't allowed to be the first character - if codepoint == ' ' || codepoint == '-' || codepoint == '.' { - bufferedHyphen = true - } else if codepoint >= '0' && codepoint <= '9' { - toWrite = 1 - } - } - - if codepoint >= 'A' && codepoint <= 'Z' { - codepoint += ('a' - 'A') // Offset to make character lowercase - toWrite = 1 - } else if codepoint >= 'a' && codepoint <= 'z' { - toWrite = 1 - } - - if toWrite > 0 { - if bufferedHyphen { - toWrite++ - } - if sb.Len()+toWrite > maxBodyLength { - break - } - if bufferedHyphen { - sb.WriteRune('-') - bufferedHyphen = false - } - sb.WriteRune(codepoint) - } - } - - if suffix != "" { - sb.WriteRune('-') - sb.WriteString(suffix) - } - return sb.String() -} - -// GetEnv gets the environment for the ParsedPipeline, returning Env first and Environment if Env isn't populated. -func (j *ParsedPipeline) GetEnv() []corev1.EnvVar { - if j != nil { - if len(j.Env) > 0 { - return j.Env - } - - return j.Environment - } - return []corev1.EnvVar{} -} - -// GetEnv gets the environment for the Stage, returning Env first and Environment if Env isn't populated. -func (s *Stage) GetEnv() []corev1.EnvVar { - if len(s.Env) > 0 { - return s.Env - } - - return s.Environment -} - -// Validate checks the ParsedPipeline to find any errors in it, without validating against the cluster. -func (j *ParsedPipeline) Validate(context context.Context) *apis.FieldError { - return j.ValidateInCluster(context, nil, "") -} - -// ValidateInCluster checks the parsed ParsedPipeline to find any errors in it, including validation against the cluster. -func (j *ParsedPipeline) ValidateInCluster(context context.Context, kubeClient kubernetes.Interface, ns string) *apis.FieldError { - if err := validateAgent(j.Agent).ViaField("agent"); err != nil { - return err - } - - var volumes []*corev1.Volume - if j.Options != nil && len(j.Options.Volumes) > 0 { - volumes = append(volumes, j.Options.Volumes...) - } - if err := validateStages(j.Stages, j.Agent, volumes, kubeClient, ns); err != nil { - return err - } - - if err := validateStageNames(j); err != nil { - return err - } - - if err := validateRootOptions(j.Options, volumes, kubeClient, ns).ViaField("options"); err != nil { - return err - } - - return nil -} - -func validateAgent(a *Agent) *apis.FieldError { - // TODO: This is the same whether you specify an agent without label or image, or if you don't specify an agent - // at all, which is nonoptimal. - if a != nil { - if a.Container != "" { - return &apis.FieldError{ - Message: "the container field is deprecated - please use image instead", - Paths: []string{"container"}, - } - } - if a.Dir != "" { - return &apis.FieldError{ - Message: "the dir field is only valid in legacy build packs, not in jenkins-x.yml. Please remove it.", - Paths: []string{"dir"}, - } - } - - if a.Image != "" && a.Label != "" { - return apis.ErrMultipleOneOf("label", "image") - } - - if a.Image == "" && a.Label == "" { - return apis.ErrMissingOneOf("label", "image") - } - } - - return nil -} - -var containsASCIILetter = regexp.MustCompile(`[a-zA-Z]`).MatchString - -func validateStage(s *Stage, parentAgent *Agent, parentVolumes []*corev1.Volume, kubeClient kubernetes.Interface, ns string) *apis.FieldError { - if len(s.Steps) == 0 && len(s.Stages) == 0 && len(s.Parallel) == 0 { - return apis.ErrMissingOneOf("steps", "stages", "parallel") - } - - if !containsASCIILetter(s.Name) { - return &apis.FieldError{ - Message: "Stage name must contain at least one ASCII letter", - Paths: []string{"name"}, - } - } - - var volumes []*corev1.Volume - - volumes = append(volumes, parentVolumes...) - if s.Options != nil && s.Options.RootOptions != nil && len(s.Options.Volumes) > 0 { - volumes = append(volumes, s.Options.Volumes...) - } - - stageAgent := s.Agent.DeepCopy() - if stageAgent == nil { - stageAgent = parentAgent.DeepCopy() - } - - if stageAgent == nil { - return &apis.FieldError{ - Message: "No agent specified for stage or for its parent(s)", - Paths: []string{"agent"}, - } - } - - if len(s.Steps) > 0 { - if len(s.Stages) > 0 || len(s.Parallel) > 0 { - return apis.ErrMultipleOneOf("steps", "stages", "parallel") - } - seenStepNames := make(map[string]int) - for i := range s.Steps { - step := s.Steps[i] - if err := validateStep(&step).ViaFieldIndex("steps", i); err != nil { - return err - } - if step.Name != "" { - if count, exists := seenStepNames[step.Name]; exists { - seenStepNames[step.Name] = count + 1 - } else { - seenStepNames[step.Name] = 1 - } - } - } - - var duplicateSteps []string - for k, v := range seenStepNames { - if v > 1 { - duplicateSteps = append(duplicateSteps, k) - } - } - if len(duplicateSteps) > 0 { - sort.Strings(duplicateSteps) - return &apis.FieldError{ - Message: "step names within a stage must be unique", - Details: fmt.Sprintf("The following step names in the stage %s are used more than once: %s", s.Name, strings.Join(duplicateSteps, ", ")), - Paths: []string{"steps"}, - } - } - } - - if len(s.Stages) > 0 { - if len(s.Parallel) > 0 { - return apis.ErrMultipleOneOf("steps", "stages", "parallel") - } - for i := range s.Stages { - if err := validateStage(&s.Stages[i], parentAgent, volumes, kubeClient, ns).ViaFieldIndex("stages", i); err != nil { - return err - } - } - } - - if len(s.Parallel) > 0 { - for i := range s.Parallel { - if err := validateStage(&s.Parallel[i], parentAgent, volumes, kubeClient, ns).ViaFieldIndex("parallel", i); err != nil { - return nil - } - } - } - - return validateStageOptions(s.Options, volumes, kubeClient, ns).ViaField("options") -} - -func moreThanOneAreTrue(vals ...bool) bool { - count := 0 - - for _, v := range vals { - if v { - count++ - } - } - - return count > 1 -} - -func validateStep(s *Step) *apis.FieldError { - // Special cases for when you use legacy build pack syntax inside a pipeline definition - if s.Container != "" { - return &apis.FieldError{ - Message: "the container field is deprecated - please use image instead", - Paths: []string{"container"}, - } - } - if s.Groovy != "" { - return &apis.FieldError{ - Message: "the groovy field is only valid in legacy build packs, not in jenkins-x.yml. Please remove it.", - Paths: []string{"groovy"}, - } - } - if s.Comment != "" { - return &apis.FieldError{ - Message: "the comment field is only valid in legacy build packs, not in jenkins-x.yml. Please remove it.", - Paths: []string{"comment"}, - } - } - if s.When != "" { - return &apis.FieldError{ - Message: "the when field is only valid in legacy build packs, not in jenkins-x.yml. Please remove it.", - Paths: []string{"when"}, - } - } - if len(s.Steps) > 0 { - return &apis.FieldError{ - Message: "the steps field is only valid in legacy build packs, not in jenkins-x.yml. Please remove it and list the nested stages sequentially instead.", - Paths: []string{"steps"}, - } - } - - if s.GetCommand() == "" && s.Step == "" && s.Loop == nil { - return apis.ErrMissingOneOf("command", "step", "loop") - } - - if moreThanOneAreTrue(s.GetCommand() != "", s.Step != "", s.Loop != nil) { - return apis.ErrMultipleOneOf("command", "step", "loop") - } - - if (s.GetCommand() != "" || s.Loop != nil) && len(s.Options) != 0 { - return &apis.FieldError{ - Message: "Cannot set options for a command or a loop", - Paths: []string{"options"}, - } - } - - if (s.Step != "" || s.Loop != nil) && len(s.Arguments) != 0 { - return &apis.FieldError{ - Message: "Cannot set command-line arguments for a step or a loop", - Paths: []string{"args"}, - } - } - - if err := validateLoop(s.Loop); err != nil { - return err.ViaField("loop") - } - - if s.Agent != nil { - return validateAgent(s.Agent).ViaField("agent") - } - return nil -} - -func validateLoop(l *Loop) *apis.FieldError { - if l != nil { - if l.Variable == "" { - return apis.ErrMissingField("variable") - } - - if len(l.Steps) == 0 { - return apis.ErrMissingField("steps") - } - - if len(l.Values) == 0 { - return apis.ErrMissingField("values") - } - - for i := range l.Steps { - if err := validateStep(&l.Steps[i]).ViaFieldIndex("steps", i); err != nil { - return err - } - } - } - - return nil -} - -func validateStages(stages []Stage, parentAgent *Agent, parentVolumes []*corev1.Volume, kubeClient kubernetes.Interface, ns string) *apis.FieldError { - if len(stages) == 0 { - return apis.ErrMissingField("stages") - } - - for i := range stages { - if err := validateStage(&stages[i], parentAgent, parentVolumes, kubeClient, ns).ViaFieldIndex("stages", i); err != nil { - return err - } - } - - return nil -} - -func validateRootOptions(o *RootOptions, volumes []*corev1.Volume, kubeClient kubernetes.Interface, ns string) *apis.FieldError { - if o != nil { - if o.Timeout != nil { - if err := validateTimeout(o.Timeout); err != nil { - return err.ViaField("timeout") - } - } - - // TODO: retry will default to 0, so we're kinda stuck checking if it's less than zero here. - if o.Retry < 0 { - return &apis.FieldError{ - Message: "Retry count cannot be negative", - Paths: []string{"retry"}, - } - } - - for i, v := range o.Volumes { - if err := validateVolume(v, kubeClient, ns).ViaFieldIndex("volumes", i); err != nil { - return err - } - } - - for i, s := range o.Sidecars { - if err := validateSidecarContainer(s, volumes).ViaFieldIndex("sidecars", i); err != nil { - return err - } - } - - return validateContainerOptions(o.ContainerOptions, volumes).ViaField("containerOptions") - } - - return nil -} - -func validateVolume(v *corev1.Volume, kubeClient kubernetes.Interface, ns string) *apis.FieldError { - if v != nil { - if v.Name == "" { - return apis.ErrMissingField("name") - } - if kubeClient != nil { - if v.Secret != nil { - _, err := kubeClient.CoreV1().Secrets(ns).Get(context.TODO(), v.Secret.SecretName, metav1.GetOptions{}) - if err != nil { - return &apis.FieldError{ - Message: fmt.Sprintf("Secret %s does not exist, so cannot be used as a volume", v.Secret.SecretName), - Paths: []string{"secretName"}, - } - } - } else if v.PersistentVolumeClaim != nil { - _, err := kubeClient.CoreV1().PersistentVolumeClaims(ns).Get(context.TODO(), v.PersistentVolumeClaim.ClaimName, metav1.GetOptions{}) - if err != nil { - return &apis.FieldError{ - Message: fmt.Sprintf("PVC %s does not exist, so cannot be used as a volume", v.PersistentVolumeClaim.ClaimName), - Paths: []string{"claimName"}, - } - } - } - } - } - - return nil -} - -func validateContainerOptions(c *corev1.Container, volumes []*corev1.Volume) *apis.FieldError { - if c != nil { - if len(c.Command) != 0 { - return &apis.FieldError{ - Message: "Command cannot be specified in containerOptions", - Paths: []string{"command"}, - } - } - if len(c.Args) != 0 { - return &apis.FieldError{ - Message: "Arguments cannot be specified in containerOptions", - Paths: []string{"args"}, - } - } - if c.Image != "" { - return &apis.FieldError{ - Message: "Image cannot be specified in containerOptions", - Paths: []string{"image"}, - } - } - if c.WorkingDir != "" { - return &apis.FieldError{ - Message: "WorkingDir cannot be specified in containerOptions", - Paths: []string{"workingDir"}, - } - } - if c.Name != "" { - return &apis.FieldError{ - Message: "Name cannot be specified in containerOptions", - Paths: []string{"name"}, - } - } - if c.Stdin { - return &apis.FieldError{ - Message: "Stdin cannot be specified in containerOptions", - Paths: []string{"stdin"}, - } - } - if c.TTY { - return &apis.FieldError{ - Message: "TTY cannot be specified in containerOptions", - Paths: []string{"tty"}, - } - } - if len(c.VolumeMounts) > 0 { - for i := range c.VolumeMounts { - m := c.VolumeMounts[i] - if !isVolumeMountValid(&m, volumes) { - fieldErr := &apis.FieldError{ - Message: fmt.Sprintf("Volume mount name %s not found in volumes for stage or pipeline", m.Name), - Paths: []string{"name"}, - } - - return fieldErr.ViaFieldIndex("volumeMounts", i) - } - } - } - } - - return nil -} - -func validateSidecarContainer(c *corev1.Container, volumes []*corev1.Volume) *apis.FieldError { - if c != nil { - if c.Name == "" { - return &apis.FieldError{ - Message: "Name cannot be empty in sidecar", - Paths: []string{"name"}, - } - } - if c.Image == "" { - return &apis.FieldError{ - Message: "Image cannot be empty in sidecar", - Paths: []string{"image"}, - } - } - if len(c.VolumeMounts) > 0 { - for i := range c.VolumeMounts { - m := c.VolumeMounts[i] - if !isVolumeMountValid(&m, volumes) { - fieldErr := &apis.FieldError{ - Message: fmt.Sprintf("Volume mount name %s not found in volumes for stage or pipeline", m.Name), - Paths: []string{"name"}, - } - - return fieldErr.ViaFieldIndex("volumeMounts", i) - } - } - } - } - - return nil -} - -func isVolumeMountValid(mount *corev1.VolumeMount, volumes []*corev1.Volume) bool { - foundVolume := false - - for _, v := range volumes { - if v.Name == mount.Name { - foundVolume = true - break - } - } - - return foundVolume -} - -func validateStageOptions(o *StageOptions, volumes []*corev1.Volume, kubeClient kubernetes.Interface, ns string) *apis.FieldError { - if o != nil { - if err := validateStash(o.Stash); err != nil { - return err.ViaField("stash") - } - - if o.Unstash != nil { - if err := validateUnstash(o.Unstash); err != nil { - return err.ViaField("unstash") - } - } - - if o.Workspace != nil { - if err := validateWorkspace(*o.Workspace); err != nil { - return err - } - } - - if o.RootOptions != nil && o.RootOptions.DistributeParallelAcrossNodes { - return &apis.FieldError{ - Message: "distributeParallelAcrossNodes cannot be used in a stage", - Paths: []string{"distributeParallelAcrossNodes"}, - } - } - - return validateRootOptions(o.RootOptions, volumes, kubeClient, ns) - } - - return nil -} - -func validateTimeout(t *Timeout) *apis.FieldError { - if t != nil { - isAllowed := false - for _, allowed := range allTimeoutUnits { - if t.Unit == allowed { - isAllowed = true - } - } - - if !isAllowed { - return &apis.FieldError{ - Message: fmt.Sprintf("%s is not a valid time unit. Valid time units are %s", string(t.Unit), - strings.Join(allTimeoutUnitsAsStrings(), ", ")), - Paths: []string{"unit"}, - } - } - - if t.Time < 1 { - return &apis.FieldError{ - Message: "Timeout must be greater than zero", - Paths: []string{"time"}, - } - } - } - - return nil -} - -func validateUnstash(u *Unstash) *apis.FieldError { - if u != nil { - // TODO: Check to make sure the corresponding stash is defined somewhere - if u.Name == "" { - return &apis.FieldError{ - Message: "The unstash name must be provided", - Paths: []string{"name"}, - } - } - } - - return nil -} - -func validateStash(s *Stash) *apis.FieldError { - if s != nil { - if s.Name == "" { - return &apis.FieldError{ - Message: "The stash name must be provided", - Paths: []string{"name"}, - } - } - if s.Files == "" { - return &apis.FieldError{ - Message: "files to stash must be provided", - Paths: []string{"files"}, - } - } - } - - return nil -} - -func validateWorkspace(w string) *apis.FieldError { - if w == "" { - return &apis.FieldError{ - Message: "The workspace name must be unspecified or non-empty", - Paths: []string{"workspace"}, - } - } - - return nil -} - -// EnvMapToSlice transforms a map of environment variables into a slice that can be used in container configuration -func EnvMapToSlice(envMap map[string]corev1.EnvVar) []corev1.EnvVar { - env := make([]corev1.EnvVar, 0, len(envMap)) - - // Avoid nondeterministic results by sorting the keys and appending vars in that order. - var envVars []string - for k := range envMap { - envVars = append(envVars, k) - } - sort.Strings(envVars) - - for _, envVar := range envVars { - env = append(env, envMap[envVar]) - } - - return env -} - -// GetPodLabels returns the optional additional labels to apply to all pods for this pipeline. The labels and their values -// will be converted to RFC1035-compliant strings. -func (j *ParsedPipeline) GetPodLabels() map[string]string { - sanitizedLabels := make(map[string]string) - if j.Options != nil { - for k, v := range j.Options.PodLabels { - sanitizedKey := MangleToRfc1035Label(k, "") - sanitizedValue := MangleToRfc1035Label(v, "") - if sanitizedKey != k || sanitizedValue != v { - log.Logger().Infof("Converted custom label/value '%s' to '%s' to conform to Kubernetes label requirements", - termcolor.ColorInfo(k+"="+v), termcolor.ColorInfo(sanitizedKey+"="+sanitizedValue)) - } - sanitizedLabels[sanitizedKey] = sanitizedValue - } - } - return sanitizedLabels -} - -// GetTolerations returns the tolerations configured in the root options for this pipeline, if any. -func (j *ParsedPipeline) GetTolerations() []corev1.Toleration { - if j.Options != nil { - return j.Options.Tolerations - } - return nil -} - -// GetPossibleAffinityPolicy takes the pipeline name and returns the appropriate affinity policy for pods in this -// pipeline given its configuration, specifically of options.distributeParallelAcrossNodes. -func (j *ParsedPipeline) GetPossibleAffinityPolicy(name string) *corev1.Affinity { - if j.Options != nil && j.Options.DistributeParallelAcrossNodes { - - antiAffinityLabels := make(map[string]string) - if len(j.Options.PodLabels) > 0 { - antiAffinityLabels = maps.MergeMaps(j.GetPodLabels()) - } else { - antiAffinityLabels[pipeline.GroupName+pipeline.PipelineRunLabelKey] = name - } - return &corev1.Affinity{ - PodAntiAffinity: &corev1.PodAntiAffinity{ - RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{{ - LabelSelector: &metav1.LabelSelector{ - MatchLabels: antiAffinityLabels, - }, - TopologyKey: "kubernetes.io/hostname", - }}, - }, - } - } - return nil -} - -// StepPlaceholderReplacementArgs specifies the arguments required for replacing placeholders in build pack directories. -type StepPlaceholderReplacementArgs struct { - WorkspaceDir string - GitName string - GitOrg string - GitHost string - DockerRegistry string - DockerRegistryOrg string - ProjectID string - KanikoImage string - UseKaniko bool -} - -func (p *StepPlaceholderReplacementArgs) workingDirAsPointer() *string { - // TODO: Is there a better way to ensure that we're creating a pointer of a copy of the string? - copyOfWorkingDir := p.WorkspaceDir - return ©OfWorkingDir -} - -// ReplacePlaceholdersInStepAndStageDirs traverses this pipeline's stages and any nested stages for any steps (and any nested steps) -// within the stages, and replaces "REPLACE_ME_..." placeholders in those steps' directories. -func (j *ParsedPipeline) ReplacePlaceholdersInStepAndStageDirs(args *StepPlaceholderReplacementArgs) { - var stages []Stage - for k := range j.Stages { - s := j.Stages[k] - s.replacePlaceholdersInStage(j.WorkingDir, args) - stages = append(stages, s) - } - j.Stages = stages -} - -func (s *Stage) replacePlaceholdersInStage(parentDir *string, args *StepPlaceholderReplacementArgs) { - var steps []Step - var stages []Stage - var parallel []Stage - // If there's no working directory and this stage contains steps, we should set a stage directory - if s.WorkingDir == nil && len(s.Steps) > 0 { - // If there's no parent working directory, use the default provided. - if parentDir == nil { - s.WorkingDir = args.workingDirAsPointer() - } else { - s.WorkingDir = parentDir - } - } - s.WorkingDir = replacePlaceholdersInDir(s.WorkingDir, args) - for k := range s.Steps { - step := s.Steps[k] - step.replacePlaceholdersInStep(args) - steps = append(steps, step) - } - for k := range s.Stages { - nested := s.Stages[k] - nested.replacePlaceholdersInStage(s.WorkingDir, args) - stages = append(stages, nested) - } - for k := range s.Parallel { - p := s.Parallel[k] - p.replacePlaceholdersInStage(s.WorkingDir, args) - parallel = append(parallel, p) - } - s.Steps = steps - s.Stages = stages - s.Parallel = parallel -} - -func replacePlaceholdersInDir(originalDir *string, args *StepPlaceholderReplacementArgs) *string { - if originalDir == nil || *originalDir == "" { - return originalDir - } - dir := *originalDir - // Replace the Go buildpack path with the correct location for Tekton builds. - dir = strings.Replace(dir, "/home/jenkins/go/src/REPLACE_ME_GIT_PROVIDER/REPLACE_ME_ORG/REPLACE_ME_APP_NAME", args.WorkspaceDir, -1) - - dir = strings.Replace(dir, constants.PlaceHolderAppName, strings.ToLower(args.GitName), -1) - dir = strings.Replace(dir, constants.PlaceHolderOrg, strings.ToLower(args.GitOrg), -1) - dir = strings.Replace(dir, constants.PlaceHolderGitProvider, strings.ToLower(args.GitHost), -1) - dir = strings.Replace(dir, constants.PlaceHolderDockerRegistryOrg, strings.ToLower(args.DockerRegistryOrg), -1) - - if strings.HasPrefix(dir, "./") { - dir = args.WorkspaceDir + strings.TrimPrefix(dir, ".") - } - if !filepath.IsAbs(dir) { - dir = filepath.Join(args.WorkspaceDir, dir) - } - return &dir -} - -func (s *Step) replacePlaceholdersInStep(args *StepPlaceholderReplacementArgs) { - if s.GetCommand() != "" { - s.modifyStep(args) - s.Dir = *replacePlaceholdersInDir(&s.Dir, args) - } - var steps []*Step - for _, nested := range s.Steps { - nested.replacePlaceholdersInStep(args) - steps = append(steps, nested) - } - s.Steps = steps - if s.Loop != nil { - var loopSteps []Step - for k := range s.Loop.Steps { - nested := s.Loop.Steps[k] - nested.replacePlaceholdersInStep(args) - loopSteps = append(loopSteps, nested) - } - s.Loop.Steps = loopSteps - } -} - -// modifyStep allows a container step to be modified to do something different -func (s *Step) modifyStep(params *StepPlaceholderReplacementArgs) { - if params.UseKaniko { - if strings.HasPrefix(s.GetCommand(), "skaffold build") || - (len(s.Arguments) > 0 && strings.HasPrefix(strings.Join(s.Arguments[1:], " "), "skaffold build")) || - commandIsSkaffoldRegex.MatchString(s.GetCommand()) { - - sourceDir := params.WorkspaceDir - dockerfile := filepath.Join(sourceDir, "Dockerfile") - localRepo := params.DockerRegistry - destination := params.DockerRegistry + "/" + params.DockerRegistryOrg + "/" + naming.ToValidName(params.GitName) - - args := []string{ - "--cache=true", "--cache-dir=/workspace", - "--context=" + sourceDir, - "--dockerfile=" + dockerfile, - "--destination=" + destination + ":${inputs.params.version}", - "--cache-repo=" + localRepo + "/" + params.ProjectID + "/cache", - } - if localRepo != "gcr.io" { - args = append(args, "--skip-tls-verify-registry="+localRepo) - } - - if ipAddressRegistryRegex.MatchString(localRepo) { - args = append(args, "--insecure") - } - - s.Command = "/kaniko/executor" - s.Arguments = args - - s.Image = params.KanikoImage - } - } -} - -// AddContainerEnvVarsToPipeline allows for adding a slice of container environment variables directly to the -// pipeline, if they're not already defined. -func (j *ParsedPipeline) AddContainerEnvVarsToPipeline(origEnv []corev1.EnvVar) { - if len(origEnv) > 0 { - envMap := make(map[string]corev1.EnvVar) - - // Add the container env vars first. - for _, e := range origEnv { - if e.ValueFrom == nil { - envMap[e.Name] = corev1.EnvVar{ - Name: e.Name, - Value: e.Value, - } - } - } - - // Overwrite with the existing pipeline environment, if it exists - for _, e := range j.GetEnv() { - envMap[e.Name] = e - } - - env := make([]corev1.EnvVar, 0, len(envMap)) - - // Avoid nondeterministic results by sorting the keys and appending vars in that order. - var envVars []string - for k := range envMap { - envVars = append(envVars, k) - } - sort.Strings(envVars) - - for _, envVar := range envVars { - env = append(env, envMap[envVar]) - } - - j.Env = env - } -} - -func scopedEnv(newEnv, parentEnv []corev1.EnvVar) []corev1.EnvVar { - if len(parentEnv) == 0 && len(newEnv) == 0 { - return nil - } - return CombineEnv(newEnv, parentEnv) -} - -// CombineEnv combines the two environments into a single unified slice where -// the `newEnv` overrides anything in the `parentEnv` -func CombineEnv(newEnv, parentEnv []corev1.EnvVar) []corev1.EnvVar { - envMap := make(map[string]corev1.EnvVar) - - for _, e := range parentEnv { - envMap[e.Name] = e - } - - for _, e := range newEnv { - envMap[e.Name] = e - } - - return EnvMapToSlice(envMap) -} - -type transformedStage struct { - Stage Stage - // Only one of Sequential, Parallel, and Task is non-empty - Sequential []*transformedStage - Parallel []*transformedStage - Task *tektonv1alpha1.Task - // PipelineTask is non-empty only if Task is non-empty, but it is populated - // after Task is populated so the reverse is not true. - PipelineTask *tektonv1alpha1.PipelineTask - // The depth of this stage in the full tree of stages - Depth int8 - // The parallel or sequntial stage enclosing this stage, or nil if this stage is at top level - EnclosingStage *transformedStage - // The stage immediately before this stage at the same depth, or nil if there is no such stage - PreviousSiblingStage *transformedStage - // TODO: Add the equivalent reverse relationship -} - -func (ts *transformedStage) isSequential() bool { - return len(ts.Sequential) > 0 -} - -func (ts *transformedStage) isParallel() bool { - return len(ts.Parallel) > 0 -} - -func (ts *transformedStage) getLinearTasks() []*tektonv1alpha1.Task { - if ts.isSequential() { - var tasks []*tektonv1alpha1.Task - for _, seqTs := range ts.Sequential { - tasks = append(tasks, seqTs.getLinearTasks()...) - } - return tasks - } else if ts.isParallel() { - var tasks []*tektonv1alpha1.Task - for _, parTs := range ts.Parallel { - tasks = append(tasks, parTs.getLinearTasks()...) - } - return tasks - } else { - return []*tektonv1alpha1.Task{ts.Task} - } -} - -// If the workspace is nil, sets it to the parent's workspace -func (ts *transformedStage) computeWorkspace(parentWorkspace string) { - if ts.Stage.Options == nil { - ts.Stage.Options = &StageOptions{ - RootOptions: &RootOptions{}, - } - } - if ts.Stage.Options.Workspace == nil { - ts.Stage.Options.Workspace = &parentWorkspace - } -} - -type stageToTaskParams struct { - parentParams CRDsFromPipelineParams - stage Stage - baseWorkingDir *string - parentEnv []corev1.EnvVar - parentAgent *Agent - parentWorkspace string - parentContainer *corev1.Container - parentSidecars []*corev1.Container - parentVolumes []*corev1.Volume - depth int8 - enclosingStage *transformedStage - previousSiblingStage *transformedStage -} - -func stageToTask(params *stageToTaskParams) (*transformedStage, error) { - if len(params.stage.Post) != 0 { - return nil, errors.New("post on stages not yet supported") - } - - stageContainer := &corev1.Container{} - var stageSidecars []*corev1.Container - var stageVolumes []*corev1.Volume - - if params.stage.Options != nil { - o := params.stage.Options - if o.RootOptions == nil { - o.RootOptions = &RootOptions{} - } else { - if o.Timeout != nil { - return nil, errors.New("Timeout on stage not yet supported") - } - if o.ContainerOptions != nil { - stageContainer = o.ContainerOptions - } - stageSidecars = o.Sidecars - stageVolumes = o.Volumes - } - if o.Stash != nil { - return nil, errors.New("Stash on stage not yet supported") - } - if o.Unstash != nil { - return nil, errors.New("Unstash on stage not yet supported") - } - } - - // Don't overwrite the inherited working dir if we don't have one specified here. - if params.stage.WorkingDir != nil { - params.baseWorkingDir = params.stage.WorkingDir - } - - if params.parentContainer != nil { - merged, err := MergeContainers(params.parentContainer, stageContainer) - if err != nil { - return nil, errors.Wrapf(err, "Error merging stage and parent container overrides: %s", err) - } - stageContainer = merged - } - stageSidecars = append(stageSidecars, params.parentSidecars...) - stageVolumes = append(stageVolumes, params.parentVolumes...) - - env := scopedEnv(params.stage.GetEnv(), params.parentEnv) - - agent := params.stage.Agent.DeepCopy() - - if agent == nil { - agent = params.parentAgent.DeepCopy() - } - - stepCounter := 0 - defaultTaskSpec, err := getDefaultTaskSpec(env, stageContainer, params.parentParams.DefaultImage, params.parentParams.VersionsDir) - if err != nil { - return nil, err - } - - if len(params.stage.Steps) > 0 { - t := &tektonv1alpha1.Task{ - TypeMeta: metav1.TypeMeta{ - APIVersion: TektonAPIVersion, - Kind: "Task", - }, - ObjectMeta: metav1.ObjectMeta{ - Namespace: params.parentParams.Namespace, - Name: MangleToRfc1035Label(fmt.Sprintf("%s-%s", params.parentParams.PipelineIdentifier, params.stage.Name), params.parentParams.BuildIdentifier), - Labels: maps.MergeMaps(params.parentParams.Labels, map[string]string{LabelStageName: params.stage.stageLabelName()}), - }, - } - // Only add the default git merge step if this is the first actual step stage - including if the stage is one of - // N stages within a parallel stage, and that parallel stage is the first stage in the pipeline - if params.previousSiblingStage == nil && isNestedFirstStepsStage(params.enclosingStage) { - t.Spec = defaultTaskSpec - } - prependedSteps, err := builderHomeStep(env, stageContainer, params.parentParams.DefaultImage, params.parentParams.VersionsDir) - if err != nil { - return nil, err - } - t.Spec.Steps = append(prependedSteps, t.Spec.Steps...) - t.SetDefaults(context.Background()) - - ws := &tektonv1alpha1.TaskResource{ - ResourceDeclaration: tektonv1alpha1.ResourceDeclaration{ - Name: "workspace", - TargetPath: params.parentParams.SourceDir, - Type: tektonv1alpha1.PipelineResourceTypeGit, - }, - } - - t.Spec.Inputs = &tektonv1alpha1.Inputs{ - Resources: []tektonv1alpha1.TaskResource{*ws}, - } - - t.Spec.Outputs = &tektonv1alpha1.Outputs{ - Resources: []tektonv1alpha1.TaskResource{*ws}, - } - - for _, sidecar := range stageSidecars { - if sidecar != nil { - t.Spec.Sidecars = append(t.Spec.Sidecars, tektonv1beta1.Sidecar{ - Container: *sidecar, - }) - } - } - - // We don't want to dupe volumes for the Task if there are multiple steps - volumes := make(map[string]corev1.Volume) - - for _, v := range stageVolumes { - volumes[v.Name] = *v - } - - for k := range params.stage.Steps { - actualSteps, stepVolumes, newCounter, err := generateSteps(&generateStepsParams{ - stageParams: *params, - step: params.stage.Steps[k], - inheritedAgent: agent.Image, - env: env, - parentContainer: stageContainer, - stepCounter: stepCounter, - }) - if err != nil { - return nil, err - } - - stepCounter = newCounter - - t.Spec.Steps = append(t.Spec.Steps, actualSteps...) - for k := range stepVolumes { - volumes[k] = stepVolumes[k] - } - } - - // Avoid nondeterministic results by sorting the keys and appending volumes in that order. - var volNames []string - for k := range volumes { - volNames = append(volNames, k) - } - sort.Strings(volNames) - - for _, v := range volNames { - t.Spec.Volumes = append(t.Spec.Volumes, volumes[v]) - } - - ts := transformedStage{Stage: params.stage, Task: t, Depth: params.depth, EnclosingStage: params.enclosingStage, PreviousSiblingStage: params.previousSiblingStage} - ts.computeWorkspace(params.parentWorkspace) - return &ts, nil - } - if len(params.stage.Stages) > 0 { - var tasks []*transformedStage - ts := transformedStage{Stage: params.stage, Depth: params.depth, EnclosingStage: params.enclosingStage, PreviousSiblingStage: params.previousSiblingStage} - ts.computeWorkspace(params.parentWorkspace) - - for i := range params.stage.Stages { - var nestedPreviousSibling *transformedStage - if i > 0 { - nestedPreviousSibling = tasks[i-1] - } - nestedTask, err := stageToTask(&stageToTaskParams{ - parentParams: params.parentParams, - stage: params.stage.Stages[i], - baseWorkingDir: params.baseWorkingDir, - parentEnv: env, - parentAgent: agent, - parentWorkspace: *ts.Stage.Options.Workspace, - parentContainer: stageContainer, - parentSidecars: stageSidecars, - parentVolumes: stageVolumes, - depth: params.depth + 1, - enclosingStage: &ts, - previousSiblingStage: nestedPreviousSibling, - }) - if err != nil { - return nil, err - } - tasks = append(tasks, nestedTask) - } - ts.Sequential = tasks - - return &ts, nil - } - - if len(params.stage.Parallel) > 0 { - var tasks []*transformedStage - ts := transformedStage{Stage: params.stage, Depth: params.depth, EnclosingStage: params.enclosingStage, PreviousSiblingStage: params.previousSiblingStage} - ts.computeWorkspace(params.parentWorkspace) - - for k := range params.stage.Parallel { - nestedTask, err := stageToTask(&stageToTaskParams{ - parentParams: params.parentParams, - stage: params.stage.Parallel[k], - baseWorkingDir: params.baseWorkingDir, - parentEnv: env, - parentAgent: agent, - parentWorkspace: *ts.Stage.Options.Workspace, - parentContainer: stageContainer, - parentSidecars: stageSidecars, - parentVolumes: stageVolumes, - depth: params.depth + 1, - enclosingStage: &ts, - }) - if err != nil { - return nil, err - } - tasks = append(tasks, nestedTask) - } - ts.Parallel = tasks - - return &ts, nil - } - return nil, errors.New("no steps, sequential stages, or parallel stages") -} - -// MergeContainers combines parent and child container structs, with the child overriding the parent. -func MergeContainers(parentContainer, childContainer *corev1.Container) (*corev1.Container, error) { - if parentContainer == nil { - return childContainer, nil - } else if childContainer == nil { - return parentContainer, nil - } - - // We need JSON bytes to generate a patch to merge the child containers onto the parent container, so marshal the parent. - parentAsJSON, err := json.Marshal(parentContainer) - if err != nil { - return nil, err - } - // We need to do a three-way merge to actually combine the parent and child containers, so we need an empty container - // as the "original" - emptyAsJSON, err := json.Marshal(&corev1.Container{}) - if err != nil { - return nil, err - } - // Marshal the child to JSON - childAsJSON, err := json.Marshal(childContainer) - if err != nil { - return nil, err - } - - // Get the patch meta for Container, which is needed for generating and applying the merge patch. - patchSchema, err := strategicpatch.NewPatchMetaFromStruct(parentContainer) - if err != nil { - return nil, err - } - - // Create a merge patch, with the empty JSON as the original, the child JSON as the modified, and the parent - // JSON as the current - this lets us do a deep merge of the parent and child containers, with awareness of - // the "patchMerge" tags. - patch, err := strategicpatch.CreateThreeWayMergePatch(emptyAsJSON, childAsJSON, parentAsJSON, patchSchema, true) - if err != nil { - return nil, err - } - - // Actually apply the merge patch to the parent JSON. - mergedAsJSON, err := strategicpatch.StrategicMergePatchUsingLookupPatchMeta(parentAsJSON, patch, patchSchema) - if err != nil { - return nil, err - } - - // Unmarshal the merged JSON to a Container pointer, and return it. - merged := &corev1.Container{} - err = json.Unmarshal(mergedAsJSON, merged) - if err != nil { - return nil, err - } - - return merged, nil -} - -func isNestedFirstStepsStage(enclosingStage *transformedStage) bool { - if enclosingStage != nil { - if enclosingStage.PreviousSiblingStage != nil { - return false - } - return isNestedFirstStepsStage(enclosingStage.EnclosingStage) - } - return true -} - -type generateStepsParams struct { - stageParams stageToTaskParams - step Step - inheritedAgent string - env []corev1.EnvVar - parentContainer *corev1.Container - stepCounter int -} - -func generateSteps(params *generateStepsParams) ([]tektonv1alpha1.Step, map[string]corev1.Volume, int, error) { - volumes := make(map[string]corev1.Volume) - var steps []tektonv1alpha1.Step - - stepImage := params.inheritedAgent - if params.step.GetImage() != "" { - stepImage = params.step.GetImage() - } - - // Default to ${WorkingDirRoot}/${sourceDir} - workingDir := filepath.Join(WorkingDirRoot, params.stageParams.parentParams.SourceDir) - - // Directory we will cd to if it differs from the working dir. - targetDir := workingDir - - if params.step.Dir != "" { - targetDir = params.step.Dir - } else if params.stageParams.baseWorkingDir != nil { - targetDir = *(params.stageParams.baseWorkingDir) - } - // Relative working directories are always just added to /workspace/source, e.g. - if !filepath.IsAbs(targetDir) { - targetDir = filepath.Join(WorkingDirRoot, params.stageParams.parentParams.SourceDir, targetDir) - } - - if params.step.GetCommand() != "" { - var targetDirPrefix []string - if targetDir != workingDir && !params.stageParams.parentParams.InterpretMode { - targetDirPrefix = append(targetDirPrefix, "cd", targetDir, "&&") - } - c := &corev1.Container{} - if params.parentContainer != nil { - c = params.parentContainer.DeepCopy() - } - if params.stageParams.parentParams.PodTemplates != nil && params.stageParams.parentParams.PodTemplates[stepImage] != nil { - podTemplate := params.stageParams.parentParams.PodTemplates[stepImage] - containers := podTemplate.Spec.Containers - for k := range podTemplate.Spec.Volumes { - volume := podTemplate.Spec.Volumes[k] - volumes[volume.Name] = volume - } - if !equality.Semantic.DeepEqual(c, &corev1.Container{}) { - merged, err := MergeContainers(&containers[0], c) - if err != nil { - return nil, nil, params.stepCounter, errors.Wrapf(err, "Error merging pod template and parent container: %s", err) - } - c = merged - } else { - c = &containers[0] - } - } else { - c.Image = stepImage - c.Command = []string{GetSh(), "-c"} - } - - resolvedImage, err := versionstream.ResolveDockerImage(params.stageParams.parentParams.VersionsDir, c.Image) - if err != nil { - log.Logger().Warnf("failed to resolve step image version: %s due to %s", c.Image, err.Error()) - } else { - c.Image = resolvedImage - } - // Special-casing for commands starting with /kaniko/warmer, which doesn't have sh at all - if strings.HasPrefix(params.step.GetCommand(), "/kaniko/warmer") { - targetDirPrefix = append(targetDirPrefix, params.step.GetCommand()) - c.Command = targetDirPrefix - c.Args = params.step.Arguments - } else { - // If it's /kaniko/executor, use /busybox/sh instead of /bin/sh, and use the debug image - if strings.HasPrefix(params.step.GetCommand(), "/kaniko/executor") && strings.Contains(c.Image, "gcr.io/kaniko-project") { - if !strings.Contains(c.Image, "debug") { - c.Image = strings.Replace(c.Image, "/executor:", "/executor:debug-", 1) - } - c.Command = []string{"/busybox/sh", "-c"} - } - cmdStr := params.step.GetCommand() - if len(params.step.Arguments) > 0 { - cmdStr += " " + strings.Join(params.step.Arguments, " ") - } - if len(targetDirPrefix) > 0 { - cmdStr = strings.Join(targetDirPrefix, " ") + " " + cmdStr - } - c.Args = []string{cmdStr} - } - if params.stageParams.parentParams.InterpretMode { - c.WorkingDir = targetDir - } else { - var newCmd []string - var newArgs []string - for _, c := range c.Command { - newCmd = append(newCmd, ReplaceCurlyWithParen(c)) - } - c.Command = newCmd - for _, a := range c.Args { - newArgs = append(newArgs, ReplaceCurlyWithParen(a)) - } - c.Args = newArgs - c.WorkingDir = workingDir - } - params.stepCounter++ - if params.step.Name != "" { - c.Name = MangleToRfc1035Label(params.step.Name, "") - } else { - c.Name = "step" + strconv.Itoa(1+params.stepCounter) - } - - c.Stdin = false - c.TTY = false - c.Env = scopedEnv(params.step.Env, scopedEnv(params.env, c.Env)) - - steps = append(steps, tektonv1alpha1.Step{ - Container: *c, - }) - } else if params.step.Loop != nil { - for i, v := range params.step.Loop.Values { - loopEnv := scopedEnv([]corev1.EnvVar{{Name: params.step.Loop.Variable, Value: v}}, params.env) - - for k := range params.step.Loop.Steps { - s := params.step.Loop.Steps[k] - if s.Name != "" { - s.Name += strconv.Itoa(1 + i) - } - loopSteps, loopVolumes, loopCounter, loopErr := generateSteps(&generateStepsParams{ - stageParams: params.stageParams, - step: s, - inheritedAgent: stepImage, - env: loopEnv, - parentContainer: params.parentContainer, - stepCounter: params.stepCounter, - }) - if loopErr != nil { - return nil, nil, loopCounter, loopErr - } - - // Bump the step counter to what we got from the loop - params.stepCounter = loopCounter - - // Add the loop-generated steps - steps = append(steps, loopSteps...) - - // Add any new volumes that may have shown up - for k := range loopVolumes { - volumes[k] = loopVolumes[k] - } - } - } - } else { - return nil, nil, params.stepCounter, errors.New("syntactic sugar steps not yet supported") - } - - // let's make sure if we've overloaded any environment variables we remove any remaining valueFrom structs - // to avoid creating bad Tasks - for i := range steps { - for j, e := range steps[i].Env { - if e.Value != "" { - steps[i].Env[j].ValueFrom = nil - } - } - } - - return steps, volumes, params.stepCounter, nil -} - -// PipelineRunName returns the pipeline name given the pipeline and build identifier -func PipelineRunName(pipelineIdentifier, buildIdentifier string) string { - return MangleToRfc1035Label(pipelineIdentifier, buildIdentifier) -} - -// CRDsFromPipelineParams is how the parameters to GenerateCRDs are specified -type CRDsFromPipelineParams struct { - PipelineIdentifier string - BuildIdentifier string - Namespace string - PodTemplates map[string]*corev1.Pod - VersionsDir string - TaskParams []tektonv1alpha1.ParamSpec - SourceDir string - Labels map[string]string - DefaultImage string - InterpretMode bool -} - -// GenerateCRDs translates the Pipeline into the corresponding Pipeline and Task CRDs -func (j *ParsedPipeline) GenerateCRDs(params *CRDsFromPipelineParams) (*tektonv1alpha1.Pipeline, []*tektonv1alpha1.Task, error) { - if len(j.Post) != 0 { - return nil, nil, errors.New("Post at top level not yet supported") - } - - var parentContainer *corev1.Container - var parentSidecars []*corev1.Container - var parentVolumes []*corev1.Volume - - baseWorkingDir := j.WorkingDir - - if j.Options != nil { - o := j.Options - if o.Retry > 0 { - return nil, nil, errors.New("Retry at top level not yet supported") - } - parentContainer = o.ContainerOptions - parentSidecars = o.Sidecars - parentVolumes = o.Volumes - } - - p := &tektonv1alpha1.Pipeline{ - TypeMeta: metav1.TypeMeta{ - APIVersion: TektonAPIVersion, - Kind: "Pipeline", - }, - ObjectMeta: metav1.ObjectMeta{ - Namespace: params.Namespace, - Name: PipelineRunName(params.PipelineIdentifier, params.BuildIdentifier), - }, - Spec: tektonv1alpha1.PipelineSpec{ - Resources: []tektonv1alpha1.PipelineDeclaredResource{ - { - Name: params.PipelineIdentifier, - Type: tektonv1alpha1.PipelineResourceTypeGit, - }, - }, - }, - } - - p.SetDefaults(context.Background()) - - if len(params.Labels) > 0 { - p.Labels = maps.MergeMaps(params.Labels) - } - - var previousStage *transformedStage - - var tasks []*tektonv1alpha1.Task - - baseEnv := j.GetEnv() - - for i := range j.Stages { - s := j.Stages[i] - isLastStage := i == len(j.Stages)-1 - - stage, err := stageToTask(&stageToTaskParams{ - parentParams: *params, - stage: s, - baseWorkingDir: baseWorkingDir, - parentEnv: baseEnv, - parentAgent: j.Agent, - parentWorkspace: "default", - parentContainer: parentContainer, - parentSidecars: parentSidecars, - parentVolumes: parentVolumes, - depth: 0, - previousSiblingStage: previousStage, - }) - if err != nil { - return nil, nil, err - } - - o := stage.Stage.Options - if o.RootOptions != nil { - if o.Retry > 0 { - stage.Stage.Options.Retry = s.Options.Retry - log.Logger().Infof("setting retries to %d for stage %s", stage.Stage.Options.Retry, stage.Stage.Name) - } - } - previousStage = stage - - pipelineTasks := createPipelineTasks(stage, p.Spec.Resources[0].Name) - - linearTasks := stage.getLinearTasks() - - for index, lt := range linearTasks { - if shouldRemoveWorkspaceOutput(stage, lt.Name, index, len(linearTasks), isLastStage) { - pipelineTasks[index].Resources.Outputs = nil - lt.Spec.Outputs = nil - } - if len(lt.Spec.Inputs.Params) == 0 { - lt.Spec.Inputs.Params = params.TaskParams - } - } - - tasks = append(tasks, linearTasks...) - p.Spec.Tasks = append(p.Spec.Tasks, pipelineTasks...) - - } - - return p, tasks, nil -} - -func shouldRemoveWorkspaceOutput(stage *transformedStage, taskName string, index, tasksLen int, isLastStage bool) bool { - if stage.isParallel() { - parallelStages := stage.Parallel - for k := range parallelStages { - ps := parallelStages[k] - if ps.Task != nil && ps.Task.Name == taskName { - return true - } - seq := ps.Sequential - if len(seq) > 0 { - lastSeq := seq[len(seq)-1] - if lastSeq.Task.Name == taskName { - return true - } - } - - } - } else if index == tasksLen-1 && isLastStage { - return true - } - return false -} - -func createPipelineTasks(stage *transformedStage, resourceName string) []tektonv1alpha1.PipelineTask { - if stage.isSequential() { - var pTasks []tektonv1alpha1.PipelineTask - for _, nestedStage := range stage.Sequential { - pTasks = append(pTasks, createPipelineTasks(nestedStage, resourceName)...) - } - return pTasks - } else if stage.isParallel() { - var pTasks []tektonv1alpha1.PipelineTask - for _, nestedStage := range stage.Parallel { - pTasks = append(pTasks, createPipelineTasks(nestedStage, resourceName)...) - } - return pTasks - } else { - pTask := tektonv1alpha1.PipelineTask{ - Name: stage.Stage.stageLabelName(), - TaskRef: &tektonv1alpha1.TaskRef{ - Name: stage.Task.Name, - }, - Retries: int(stage.Stage.Options.Retry), - } - - _, provider := findWorkspaceProvider(stage, stage.getEnclosing(0)) - var previousStageNames []string - for _, previousStage := range findPreviousNonBlockStages(stage) { - previousStageNames = append(previousStageNames, previousStage.PipelineTask.Name) - } - pTask.Resources = &tektonv1alpha1.PipelineTaskResources{ - Inputs: []tektonv1alpha1.PipelineTaskInputResource{ - { - Name: "workspace", - Resource: resourceName, - From: provider, - }, - }, - Outputs: []tektonv1alpha1.PipelineTaskOutputResource{ - { - Name: "workspace", - Resource: resourceName, - }, - }, - } - pTask.RunAfter = previousStageNames - stage.PipelineTask = &pTask - - return []tektonv1alpha1.PipelineTask{pTask} - } -} - -// Looks for the most recent Task using the desired workspace that was not in the -// same parallel stage and returns the name of the corresponding Task. -func findWorkspaceProvider(stage, sibling *transformedStage) (bool, []string) { - if *stage.Stage.Options.Workspace == "empty" { - return true, nil - } - - for sibling != nil { - if sibling.isSequential() { - found, provider := findWorkspaceProvider(stage, sibling.Sequential[len(sibling.Sequential)-1]) - if found { - return true, provider - } - } else if sibling.isParallel() { - // We don't want to use a workspace from a parallel stage outside of that stage, - // but we do need to descend inwards in case stage is in that same stage. - if stage.getEnclosing(sibling.Depth) == sibling { - for _, nested := range sibling.Parallel { - // Pick the parallel branch that has stage - if stage.getEnclosing(nested.Depth) == nested { - found, provider := findWorkspaceProvider(stage, nested) - if found { - return true, provider - } - } - } - } - // TODO: What to do about custom workspaces? Check for erroneous uses specially? - // Allow them if only one of the parallel tasks uses the same resource? - } else if sibling.PipelineTask != nil { - if *sibling.Stage.Options.Workspace == *stage.Stage.Options.Workspace { - return true, []string{sibling.PipelineTask.Name} - } - } - sibling = sibling.PreviousSiblingStage - } - - return false, nil -} - -// Find the end tasks for this stage, traversing down to the end stages of any -// nested sequential or parallel stages as well. -func findEndStages(stage *transformedStage) []*transformedStage { - if stage.isSequential() { - return findEndStages(stage.Sequential[len(stage.Sequential)-1]) - } else if stage.isParallel() { - var endTasks []*transformedStage - for _, v := range stage.Parallel { - endTasks = append(endTasks, findEndStages(v)...) - } - return endTasks - } else { - return []*transformedStage{stage} - } -} - -// Find the tasks that run immediately before this stage, not including -// sequential or parallel wrapper stages. -func findPreviousNonBlockStages(stage *transformedStage) []*transformedStage { - if stage.PreviousSiblingStage != nil { - return findEndStages(stage.PreviousSiblingStage) - } else if stage.EnclosingStage != nil { - return findPreviousNonBlockStages(stage.EnclosingStage) - } else { - return []*transformedStage{} - } -} - -// Return the stage that encloses this stage at the given depth, or nil if there is no such stage. -// Depth must be >= 0. Returns the stage itself if depth == stage.Depth -func (ts *transformedStage) getEnclosing(depth int8) *transformedStage { - if ts.Depth == depth { - return ts - } else if ts.EnclosingStage == nil { - return nil - } else { - return ts.EnclosingStage.getEnclosing(depth) - } -} - -func findDuplicates(names []string) *apis.FieldError { - // Count members - counts := make(map[string]int) - mangled := make(map[string]string) - for _, v := range names { - counts[MangleToRfc1035Label(v, "")]++ - mangled[v] = MangleToRfc1035Label(v, "") - } - - var duplicateNames []string - for k, v := range mangled { - if counts[v] > 1 { - duplicateNames = append(duplicateNames, "'"+k+"'") - } - } - - if len(duplicateNames) > 0 { - // Avoid nondeterminism in error messages - sort.Strings(duplicateNames) - return &apis.FieldError{ - Message: "Stage names must be unique", - Details: "The following stage names are used more than once: " + strings.Join(duplicateNames, ", "), - } - } - return nil -} - -func validateStageNames(j *ParsedPipeline) (err *apis.FieldError) { - var validate func(stages []Stage, stageNames *[]string) - validate = func(stages []Stage, stageNames *[]string) { - for k := range stages { - stage := stages[k] - *stageNames = append(*stageNames, stage.Name) - if len(stage.Stages) > 0 { - validate(stage.Stages, stageNames) - } - } - } - var names []string - - validate(j.Stages, &names) - - err = findDuplicates(names) - - return -} - -func builderHomeStep(envs []corev1.EnvVar, parentContainer *corev1.Container, defaultImage, versionsDir string) ([]tektonv1alpha1.Step, error) { - var err error - image := defaultImage - if image == "" { - image = os.Getenv("BUILDER_JX_IMAGE") - if image == "" { - image, err = versionstream.ResolveDockerImage(versionsDir, GitMergeImage) - if err != nil { - return []tektonv1alpha1.Step{}, err - } - } - } - - builderHomeContainer := &corev1.Container{ - Name: "setup-builder-home", - Image: image, - Command: []string{GetSh(), "-c"}, - Args: []string{`[ -d /builder/home ] || mkdir -p /builder && ln -s /tekton/home /builder/home`}, - WorkingDir: "/workspace/source", - Env: envs, - } - - if parentContainer != nil { - mergedHome, err := MergeContainers(parentContainer, builderHomeContainer) - if err != nil { - return []tektonv1alpha1.Step{}, err - } - builderHomeContainer = mergedHome - } - - return []tektonv1alpha1.Step{{ - Container: *builderHomeContainer, - }}, nil -} - -// todo JR lets remove this when we switch tekton to using git merge type pipelineresources -func getDefaultTaskSpec(envs []corev1.EnvVar, parentContainer *corev1.Container, defaultImage, versionsDir string) (tektonv1alpha1.TaskSpec, error) { - var err error - image := defaultImage - if image == "" { - image = os.Getenv("BUILDER_JX_IMAGE") - if image == "" { - image, err = versionstream.ResolveDockerImage(versionsDir, GitMergeImage) - if err != nil { - return tektonv1alpha1.TaskSpec{}, err - } - } - } - - childContainer := &corev1.Container{ - Name: "git-merge", - Image: image, - Command: []string{"jx"}, - Args: []string{"step", "git", "merge", "--verbose"}, - WorkingDir: "/workspace/source", - Env: envs, - } - - if parentContainer != nil { - mergedChild, err := MergeContainers(parentContainer, childContainer) - if err != nil { - return tektonv1alpha1.TaskSpec{}, err - } - childContainer = mergedChild - } - - return tektonv1alpha1.TaskSpec{ - TaskSpec: tektonv1beta1.TaskSpec{ - Steps: []tektonv1alpha1.Step{ - { - Container: *childContainer, - }, - }, - }, - }, nil -} - -// HasNonStepOverrides returns true if this override contains configuration like agent, containerOptions, or volumes. -func (p *PipelineOverride) HasNonStepOverrides() bool { - return p.ContainerOptions != nil || p.Agent != nil || len(p.Volumes) > 0 -} - -// AsStepsSlice returns a possibly empty slice of the step or steps in this override -func (p *PipelineOverride) AsStepsSlice() []*Step { - if p.Step != nil { - return []*Step{p.Step} - } - if len(p.Steps) > 0 { - return p.Steps - } - return []*Step{} -} - -// MatchesPipeline returns true if the pipeline name is specified in the override or no pipeline is specified at all in the override -func (p *PipelineOverride) MatchesPipeline(name string) bool { - if p.Pipeline == "" || strings.EqualFold(p.Pipeline, name) { - return true - } - return false -} - -// MatchesStage returns true if the stage/lifecycle name is specified in the override or no stage/lifecycle is specified at all in the override -func (p *PipelineOverride) MatchesStage(name string) bool { - if p.Stage == "" || p.Stage == name { - return true - } - return false -} - -// ApplyStepOverridesToPipeline applies an individual override to the pipeline, replacing named steps in specified stages (or all stages if -// no stage name is specified). -func ApplyStepOverridesToPipeline(pipeline *ParsedPipeline, override *PipelineOverride) *ParsedPipeline { - if pipeline == nil || override == nil { - return pipeline - } - - var newStages []Stage - for k := range pipeline.Stages { - overriddenStage := ApplyStepOverridesToStage(&pipeline.Stages[k], override) - if !equality.Semantic.DeepEqual(overriddenStage, Stage{}) { - newStages = append(newStages, overriddenStage) - } - } - pipeline.Stages = newStages - - return pipeline -} - -func stepPointerSliceToStepSlice(orig []*Step) []Step { - var newSteps []Step - for _, s := range orig { - if s != nil { - newSteps = append(newSteps, *s) - } - } - - return newSteps -} - -// ApplyNonStepOverridesToPipeline applies the non-step configuration from an individual override to the pipeline. -func ApplyNonStepOverridesToPipeline(pipeline *ParsedPipeline, override *PipelineOverride) *ParsedPipeline { - if pipeline == nil || override == nil { - return pipeline - } - - // Only apply this override to the top-level pipeline if no stage is specified. - if override.Stage == "" { - if override.Agent != nil { - pipeline.Agent = override.Agent - } - if override.ContainerOptions != nil { - containerOptionsCopy := *override.ContainerOptions - if pipeline.Options == nil { - pipeline.Options = &RootOptions{} - } - if pipeline.Options.ContainerOptions == nil { - pipeline.Options.ContainerOptions = &containerOptionsCopy - } else { - mergedContainer, err := MergeContainers(pipeline.Options.ContainerOptions, &containerOptionsCopy) - if err != nil { - log.Logger().Warnf("couldn't merge override container options: %s", err) - } else { - pipeline.Options.ContainerOptions = mergedContainer - } - } - } - if len(override.Sidecars) > 0 { - if pipeline.Options == nil { - pipeline.Options = &RootOptions{} - } - pipeline.Options.Sidecars = append(pipeline.Options.Sidecars, override.Sidecars...) - } - if len(override.Volumes) > 0 { - if pipeline.Options == nil { - pipeline.Options = &RootOptions{} - } - pipeline.Options.Volumes = append(pipeline.Options.Volumes, override.Volumes...) - } - } - - var newStages []Stage - for k := range pipeline.Stages { - overriddenStage := ApplyNonStepOverridesToStage(&pipeline.Stages[k], override) - if !equality.Semantic.DeepEqual(overriddenStage, Stage{}) { - newStages = append(newStages, overriddenStage) - } - } - pipeline.Stages = newStages - - return pipeline -} - -// ApplyNonStepOverridesToStage applies non-step overrides, such as stage agent, containerOptions, and volumes, to this -// stage and its children. -func ApplyNonStepOverridesToStage(stage *Stage, override *PipelineOverride) Stage { - if override == nil { - return *stage - } - - // Since a traditional build pack only has one stage at this point, treat anything that's stage-specific as valid here. - if (override.MatchesStage(stage.Name) || stage.Name == DefaultStageNameForBuildPack) && override.Stage != "" { - if override.Agent != nil { - stage.Agent = override.Agent - } - if override.ContainerOptions != nil { - containerOptionsCopy := *override.ContainerOptions - if stage.Options == nil { - stage.Options = &StageOptions{ - RootOptions: &RootOptions{}, - } - } - if stage.Options.ContainerOptions == nil { - stage.Options.ContainerOptions = &containerOptionsCopy - } else { - mergedContainer, err := MergeContainers(stage.Options.ContainerOptions, &containerOptionsCopy) - if err != nil { - log.Logger().Warnf("couldn't merge override container options: %s", err) - } else { - stage.Options.ContainerOptions = mergedContainer - } - } - } - - if len(override.Sidecars) > 0 { - if stage.Options == nil { - stage.Options = &StageOptions{ - RootOptions: &RootOptions{}, - } - } - stage.Options.Sidecars = append(stage.Options.Sidecars, override.Sidecars...) - } - - if len(override.Volumes) > 0 { - if stage.Options == nil { - stage.Options = &StageOptions{ - RootOptions: &RootOptions{}, - } - } - stage.Options.Volumes = append(stage.Options.Volumes, override.Volumes...) - } - } - if len(stage.Stages) > 0 { - var newStages []Stage - for k := range stage.Stages { - newStages = append(newStages, ApplyNonStepOverridesToStage(&stage.Stages[k], override)) - } - stage.Stages = newStages - } - if len(stage.Parallel) > 0 { - var newParallel []Stage - for k := range stage.Parallel { - newParallel = append(newParallel, ApplyNonStepOverridesToStage(&stage.Parallel[k], override)) - } - stage.Parallel = newParallel - } - - return *stage -} - -// ApplyStepOverridesToStage applies a set of overrides to named steps in this stage and its children -func ApplyStepOverridesToStage(stage *Stage, override *PipelineOverride) Stage { - if override == nil { - return *stage - } - - if override.MatchesStage(stage.Name) { - if len(stage.Steps) > 0 { - var newSteps []Step - if override.Name != "" { - for k := range stage.Steps { - newSteps = append(newSteps, OverrideStep(&stage.Steps[k], override)...) - } - // If no step name was specified but there are steps, just replace all steps in the stage/lifecycle, - // or add the new steps before/after the existing steps in the stage/lifecycle - } else if steps := override.AsStepsSlice(); len(steps) > 0 { - if override.Type == nil || *override.Type == StepOverrideReplace { - newSteps = append(newSteps, stepPointerSliceToStepSlice(steps)...) - } else if *override.Type == StepOverrideBefore { - newSteps = append(newSteps, stepPointerSliceToStepSlice(steps)...) - newSteps = append(newSteps, stage.Steps...) - } else if *override.Type == StepOverrideAfter { - newSteps = append(newSteps, stage.Steps...) - newSteps = append(newSteps, stepPointerSliceToStepSlice(steps)...) - } - } - // If there aren't any steps as well as no step name, then we're removing all steps from this stage/lifecycle, - // so just don't add anything to newSteps, and we'll end up returning an empty stage - - // If newSteps isn't empty, use it for the stage's steps list. Otherwise, if no agent override is specified, - // we're removing this stage, so return an empty stage. - if len(newSteps) > 0 { - stage.Steps = newSteps - } else if !override.HasNonStepOverrides() { - return Stage{} - } - } - } - if len(stage.Stages) > 0 { - var newStages []Stage - for k := range stage.Stages { - newStages = append(newStages, ApplyStepOverridesToStage(&stage.Stages[k], override)) - } - stage.Stages = newStages - } - if len(stage.Parallel) > 0 { - var newParallel []Stage - for k := range stage.Parallel { - newParallel = append(newParallel, ApplyStepOverridesToStage(&stage.Parallel[k], override)) - } - stage.Parallel = newParallel - } - - return *stage -} - -// OverrideStep overrides an existing step, if it matches the override's name, with the contents of the override. It also -// recurses into child steps. -func OverrideStep(step *Step, override *PipelineOverride) []Step { - if override != nil { - if step.Name == override.Name { - var newSteps []Step - - if override.Step != nil { - if override.Step.Name == "" { - override.Step.Name = step.Name - } - newSteps = append(newSteps, *override.Step) - } - if override.Steps != nil { - for _, s := range override.Steps { - newSteps = append(newSteps, *s) - } - } - - if override.Type == nil || *override.Type == StepOverrideReplace { - return newSteps - } else if *override.Type == StepOverrideBefore { - return append(newSteps, *step) - } else if *override.Type == StepOverrideAfter { - return append([]Step{*step}, newSteps...) - } - - // Fall back on just returning the original. We shouldn't ever get here. - return []Step{*step} - } - - if len(step.Steps) > 0 { - var newSteps []*Step - for _, s := range step.Steps { - for k := range OverrideStep(s, override) { - newSteps = append(newSteps, &OverrideStep(s, override)[k]) - } - } - step.Steps = newSteps - } - } - - return []Step{*step} -} - -// StringParamValue generates a Tekton ArrayOrString value for the given string -func StringParamValue(val string) tektonv1alpha1.ArrayOrString { - return tektonv1alpha1.ArrayOrString{ - Type: tektonv1alpha1.ParamTypeString, - StringVal: val, - } -} - -// ReplaceCurlyWithParen replaces legacy "${inputs.params.foo}" with "$(inputs.params.foo)" -func ReplaceCurlyWithParen(input string) string { - re := regexp.MustCompile(braceMatchingRegex) - matches := re.FindAllStringSubmatch(input, -1) - for _, m := range matches { - if len(m) >= 3 { - input = strings.ReplaceAll(input, m[0], "$("+m[3]+")") - } - } - return input -} - -// GetSh returns the default sh path. -// Windows returns sh, other platform returns /bin/sh. -func GetSh() string { - shell := "/bin/sh" - if runtime.GOOS == "windows" { - shell = "sh" - } - - return shell -} diff --git a/pkg/tekton/syntax/zz_generated.deepcopy.go b/pkg/tekton/syntax/zz_generated.deepcopy.go deleted file mode 100644 index aea52a7..0000000 --- a/pkg/tekton/syntax/zz_generated.deepcopy.go +++ /dev/null @@ -1,542 +0,0 @@ -// +build !ignore_autogenerated - -// Code generated by deepcopy-gen. DO NOT EDIT. - -package syntax - -import ( - v1alpha1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1" - v1 "k8s.io/api/core/v1" -) - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Agent) DeepCopyInto(out *Agent) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Agent. -func (in *Agent) DeepCopy() *Agent { - if in == nil { - return nil - } - out := new(Agent) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CRDsFromPipelineParams) DeepCopyInto(out *CRDsFromPipelineParams) { - *out = *in - if in.PodTemplates != nil { - in, out := &in.PodTemplates, &out.PodTemplates - *out = make(map[string]*v1.Pod, len(*in)) - for key, val := range *in { - var outVal *v1.Pod - if val == nil { - (*out)[key] = nil - } else { - in, out := &val, &outVal - *out = new(v1.Pod) - (*in).DeepCopyInto(*out) - } - (*out)[key] = outVal - } - } - if in.TaskParams != nil { - in, out := &in.TaskParams, &out.TaskParams - *out = make([]v1alpha1.ParamSpec, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.Labels != nil { - in, out := &in.Labels, &out.Labels - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CRDsFromPipelineParams. -func (in *CRDsFromPipelineParams) DeepCopy() *CRDsFromPipelineParams { - if in == nil { - return nil - } - out := new(CRDsFromPipelineParams) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Loop) DeepCopyInto(out *Loop) { - *out = *in - if in.Values != nil { - in, out := &in.Values, &out.Values - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.Steps != nil { - in, out := &in.Steps, &out.Steps - *out = make([]Step, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Loop. -func (in *Loop) DeepCopy() *Loop { - if in == nil { - return nil - } - out := new(Loop) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ParsedPipeline) DeepCopyInto(out *ParsedPipeline) { - *out = *in - if in.Agent != nil { - in, out := &in.Agent, &out.Agent - *out = new(Agent) - **out = **in - } - if in.Env != nil { - in, out := &in.Env, &out.Env - *out = make([]v1.EnvVar, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.Options != nil { - in, out := &in.Options, &out.Options - *out = new(RootOptions) - (*in).DeepCopyInto(*out) - } - if in.Stages != nil { - in, out := &in.Stages, &out.Stages - *out = make([]Stage, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.Post != nil { - in, out := &in.Post, &out.Post - *out = make([]Post, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.WorkingDir != nil { - in, out := &in.WorkingDir, &out.WorkingDir - *out = new(string) - **out = **in - } - if in.Environment != nil { - in, out := &in.Environment, &out.Environment - *out = make([]v1.EnvVar, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ParsedPipeline. -func (in *ParsedPipeline) DeepCopy() *ParsedPipeline { - if in == nil { - return nil - } - out := new(ParsedPipeline) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PipelineOverride) DeepCopyInto(out *PipelineOverride) { - *out = *in - if in.Step != nil { - in, out := &in.Step, &out.Step - *out = new(Step) - (*in).DeepCopyInto(*out) - } - if in.Steps != nil { - in, out := &in.Steps, &out.Steps - *out = make([]*Step, len(*in)) - for i := range *in { - if (*in)[i] != nil { - in, out := &(*in)[i], &(*out)[i] - *out = new(Step) - (*in).DeepCopyInto(*out) - } - } - } - if in.Type != nil { - in, out := &in.Type, &out.Type - *out = new(StepOverrideType) - **out = **in - } - if in.Agent != nil { - in, out := &in.Agent, &out.Agent - *out = new(Agent) - **out = **in - } - if in.ContainerOptions != nil { - in, out := &in.ContainerOptions, &out.ContainerOptions - *out = new(v1.Container) - (*in).DeepCopyInto(*out) - } - if in.Volumes != nil { - in, out := &in.Volumes, &out.Volumes - *out = make([]*v1.Volume, len(*in)) - for i := range *in { - if (*in)[i] != nil { - in, out := &(*in)[i], &(*out)[i] - *out = new(v1.Volume) - (*in).DeepCopyInto(*out) - } - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PipelineOverride. -func (in *PipelineOverride) DeepCopy() *PipelineOverride { - if in == nil { - return nil - } - out := new(PipelineOverride) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Post) DeepCopyInto(out *Post) { - *out = *in - if in.Actions != nil { - in, out := &in.Actions, &out.Actions - *out = make([]PostAction, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Post. -func (in *Post) DeepCopy() *Post { - if in == nil { - return nil - } - out := new(Post) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PostAction) DeepCopyInto(out *PostAction) { - *out = *in - if in.Options != nil { - in, out := &in.Options, &out.Options - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PostAction. -func (in *PostAction) DeepCopy() *PostAction { - if in == nil { - return nil - } - out := new(PostAction) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *RootOptions) DeepCopyInto(out *RootOptions) { - *out = *in - if in.Timeout != nil { - in, out := &in.Timeout, &out.Timeout - *out = new(Timeout) - **out = **in - } - if in.ContainerOptions != nil { - in, out := &in.ContainerOptions, &out.ContainerOptions - *out = new(v1.Container) - (*in).DeepCopyInto(*out) - } - if in.Volumes != nil { - in, out := &in.Volumes, &out.Volumes - *out = make([]*v1.Volume, len(*in)) - for i := range *in { - if (*in)[i] != nil { - in, out := &(*in)[i], &(*out)[i] - *out = new(v1.Volume) - (*in).DeepCopyInto(*out) - } - } - } - if in.Tolerations != nil { - in, out := &in.Tolerations, &out.Tolerations - *out = make([]v1.Toleration, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.PodLabels != nil { - in, out := &in.PodLabels, &out.PodLabels - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RootOptions. -func (in *RootOptions) DeepCopy() *RootOptions { - if in == nil { - return nil - } - out := new(RootOptions) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Stage) DeepCopyInto(out *Stage) { - *out = *in - if in.Agent != nil { - in, out := &in.Agent, &out.Agent - *out = new(Agent) - **out = **in - } - if in.Env != nil { - in, out := &in.Env, &out.Env - *out = make([]v1.EnvVar, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.Options != nil { - in, out := &in.Options, &out.Options - *out = new(StageOptions) - (*in).DeepCopyInto(*out) - } - if in.Steps != nil { - in, out := &in.Steps, &out.Steps - *out = make([]Step, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.Stages != nil { - in, out := &in.Stages, &out.Stages - *out = make([]Stage, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.Parallel != nil { - in, out := &in.Parallel, &out.Parallel - *out = make([]Stage, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.Post != nil { - in, out := &in.Post, &out.Post - *out = make([]Post, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.WorkingDir != nil { - in, out := &in.WorkingDir, &out.WorkingDir - *out = new(string) - **out = **in - } - if in.Environment != nil { - in, out := &in.Environment, &out.Environment - *out = make([]v1.EnvVar, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Stage. -func (in *Stage) DeepCopy() *Stage { - if in == nil { - return nil - } - out := new(Stage) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *StageOptions) DeepCopyInto(out *StageOptions) { - *out = *in - if in.RootOptions != nil { - in, out := &in.RootOptions, &out.RootOptions - *out = new(RootOptions) - (*in).DeepCopyInto(*out) - } - if in.Stash != nil { - in, out := &in.Stash, &out.Stash - *out = new(Stash) - **out = **in - } - if in.Unstash != nil { - in, out := &in.Unstash, &out.Unstash - *out = new(Unstash) - **out = **in - } - if in.Workspace != nil { - in, out := &in.Workspace, &out.Workspace - *out = new(string) - **out = **in - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StageOptions. -func (in *StageOptions) DeepCopy() *StageOptions { - if in == nil { - return nil - } - out := new(StageOptions) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Stash) DeepCopyInto(out *Stash) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Stash. -func (in *Stash) DeepCopy() *Stash { - if in == nil { - return nil - } - out := new(Stash) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Step) DeepCopyInto(out *Step) { - *out = *in - if in.Arguments != nil { - in, out := &in.Arguments, &out.Arguments - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.Options != nil { - in, out := &in.Options, &out.Options - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } - if in.Loop != nil { - in, out := &in.Loop, &out.Loop - *out = new(Loop) - (*in).DeepCopyInto(*out) - } - if in.Agent != nil { - in, out := &in.Agent, &out.Agent - *out = new(Agent) - **out = **in - } - if in.Env != nil { - in, out := &in.Env, &out.Env - *out = make([]v1.EnvVar, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - if in.Steps != nil { - in, out := &in.Steps, &out.Steps - *out = make([]*Step, len(*in)) - for i := range *in { - if (*in)[i] != nil { - in, out := &(*in)[i], &(*out)[i] - *out = new(Step) - (*in).DeepCopyInto(*out) - } - } - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Step. -func (in *Step) DeepCopy() *Step { - if in == nil { - return nil - } - out := new(Step) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *StepPlaceholderReplacementArgs) DeepCopyInto(out *StepPlaceholderReplacementArgs) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StepPlaceholderReplacementArgs. -func (in *StepPlaceholderReplacementArgs) DeepCopy() *StepPlaceholderReplacementArgs { - if in == nil { - return nil - } - out := new(StepPlaceholderReplacementArgs) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Timeout) DeepCopyInto(out *Timeout) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Timeout. -func (in *Timeout) DeepCopy() *Timeout { - if in == nil { - return nil - } - out := new(Timeout) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Unstash) DeepCopyInto(out *Unstash) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Unstash. -func (in *Unstash) DeepCopy() *Unstash { - if in == nil { - return nil - } - out := new(Unstash) - in.DeepCopyInto(out) - return out -}