From f6413df0b3578cee4bcac8fc18a0ab1759325d59 Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Tue, 5 Jul 2022 10:16:59 -0400 Subject: [PATCH 01/14] update go to 1.18 Signed-off-by: Jonathan Marcantonio --- .github/workflows/go-postsubmit.yml | 2 +- .github/workflows/go-presubmit.yml | 2 +- .github/workflows/go-release.yml | 2 +- build/Dockerfile | 2 +- build/Dockerfile.prow | 2 +- common/config/.golangci.yml | 1 + go.mod | 2 +- go.sum | 215 ---------------------------- 8 files changed, 7 insertions(+), 221 deletions(-) diff --git a/.github/workflows/go-postsubmit.yml b/.github/workflows/go-postsubmit.yml index ce9074e4..a9af46d1 100644 --- a/.github/workflows/go-postsubmit.yml +++ b/.github/workflows/go-postsubmit.yml @@ -8,7 +8,7 @@ on: env: # Common versions - GO_VERSION: '1.17' + GO_VERSION: '1.18' GO_REQUIRED_MIN_VERSION: '' GOPATH: '/home/runner/work/multicloud-operators-subscription/multicloud-operators-subscription/go' defaults: diff --git a/.github/workflows/go-presubmit.yml b/.github/workflows/go-presubmit.yml index cc02a092..3d202b23 100644 --- a/.github/workflows/go-presubmit.yml +++ b/.github/workflows/go-presubmit.yml @@ -8,7 +8,7 @@ on: env: # Common versions - GO_VERSION: '1.17' + GO_VERSION: '1.18' GO_REQUIRED_MIN_VERSION: '' GOPATH: '/home/runner/work/multicloud-operators-subscription/multicloud-operators-subscription/go' defaults: diff --git a/.github/workflows/go-release.yml b/.github/workflows/go-release.yml index e96ce143..72f9d348 100644 --- a/.github/workflows/go-release.yml +++ b/.github/workflows/go-release.yml @@ -6,7 +6,7 @@ on: - 'v*.*.*' env: # Common versions - GO_VERSION: '1.17' + GO_VERSION: '1.18' GO_REQUIRED_MIN_VERSION: '' GOPATH: '/home/runner/work/multicloud-operators-subscription/multicloud-operators-subscription/go' GITHUB_REF: ${{ github.ref }} diff --git a/build/Dockerfile b/build/Dockerfile index 61e22476..663d3ee4 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/stolostron/builder:go1.17-linux AS plugin-builder +FROM registry.ci.openshift.org/stolostron/builder:go1.18-linux AS plugin-builder ENV POLICY_GENERATOR_TAG=v1.7.0 WORKDIR /policy-generator diff --git a/build/Dockerfile.prow b/build/Dockerfile.prow index 29e2163b..72c72df0 100644 --- a/build/Dockerfile.prow +++ b/build/Dockerfile.prow @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/stolostron/builder:go1.17-linux AS builder +FROM registry.ci.openshift.org/stolostron/builder:go1.18-linux AS builder ENV POLICY_GENERATOR_TAG=v1.7.0 WORKDIR /go/src/github.com/stolostron/multicluster-operators-subscription diff --git a/common/config/.golangci.yml b/common/config/.golangci.yml index e72e0a9d..a2197e37 100644 --- a/common/config/.golangci.yml +++ b/common/config/.golangci.yml @@ -5,6 +5,7 @@ run: # timeout for analysis, e.g. 30s, 5m, default is 1m deadline: 20m timeout: 20m + go: '1.17' # which dirs to skip: they won't be analyzed; # can use regexp here: generated.*, regexp is applied on full path; diff --git a/go.mod b/go.mod index e616e60c..84a882a2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module open-cluster-management.io/multicloud-operators-subscription -go 1.17 +go 1.18 require ( github.com/Masterminds/semver/v3 v3.1.1 diff --git a/go.sum b/go.sum index 008a6579..68c29d02 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,4 @@ bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= -bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM= 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= @@ -29,7 +28,6 @@ cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= -cloud.google.com/go v0.100.2 h1:t9Iw5QH5v4XtlEQaCtUY7x6sCABps8sW0acw7e2WQ6Y= cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= 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= @@ -54,7 +52,6 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl 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= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v56.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= @@ -95,11 +92,9 @@ github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= -github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8= github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= @@ -125,12 +120,10 @@ github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg3 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 v0.8.20/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= github.com/Microsoft/hcsshim v0.8.23/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg= github.com/Microsoft/hcsshim v0.9.1/go.mod h1:Y/0uV2jUab5kBI7SQgl62at0AVX7uaruzADAVmxm3eM= github.com/Microsoft/hcsshim v0.9.2 h1:wB06W5aYFfUB3IvootYAY2WnOmIdgPGfqSI6tufQNnY= -github.com/Microsoft/hcsshim v0.9.2/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= 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= @@ -144,7 +137,6 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2/go.mod h1:XyjUkMA8GN+tOOPXvnbi3XuRxWFvTJntqvTFnjmhzbk= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= @@ -158,7 +150,6 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF 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 v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= @@ -181,7 +172,6 @@ github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:W github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.17.4/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.34.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.42.27/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= github.com/aws/aws-sdk-go v1.42.50 h1:FA5pbpkLz2fdnMt+AWyHnNaIA269rqr/sYAe3WKCYN4= github.com/aws/aws-sdk-go v1.42.50/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= github.com/aws/aws-sdk-go-v2 v1.13.0 h1:1XIXAfxsEmbhbj5ry3D3vX+6ZcUYvIqSm4CWWEuGZCA= @@ -216,7 +206,6 @@ github.com/aws/smithy-go v1.10.0 h1:gsoZQMNHnX+PaghNw4ynPsyGP7aUCqx5sY2dlPQsZ0w= github.com/aws/smithy-go v1.10.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/benbjohnson/clock v1.3.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= @@ -231,29 +220,21 @@ github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb github.com/blang/semver v3.5.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/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= -github.com/bradleyfalzon/ghinstallation/v2 v2.0.3/go.mod h1:tlgi+JWCXnKFx/Y4WtnDbZEINo31N5bcvnCoqieefmk= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/bshuster-repo/logrus-logstash-hook v1.0.2 h1:JYRWo+QGnQdedgshosug9hxpPYTB9oJ1ZZD3fY31alU= -github.com/bshuster-repo/logrus-logstash-hook v1.0.2/go.mod h1:HgYntJprnHSPaF9VPPPLP1L5S1vMWxRfa1J+vzDrDTw= github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= -github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/bugsnag-go v2.1.2+incompatible h1:E7dor84qzwUO8KdCM68CZwq9QOSR7HXlLx3Wj5vui2s= -github.com/bugsnag/bugsnag-go v2.1.2+incompatible/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/bugsnag/panicwrap v1.3.4 h1:A6sXFtDGsgU/4BLf5JT0o5uYg3EeKgGx3Sfs+/uk3pU= -github.com/bugsnag/panicwrap v1.3.4/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= -github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= 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/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= -github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= 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 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= @@ -262,7 +243,6 @@ github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 h1:7aWHqerlJ41 github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= -github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= 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= @@ -271,7 +251,6 @@ github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLI 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/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= -github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= @@ -305,13 +284,11 @@ github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTF github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= github.com/containerd/cgroups v1.0.2/go.mod h1:qpbpJ1jmlqsR9f2IyaLPsdkCdnt0rbDVqIDlhuu5tRY= github.com/containerd/cgroups v1.0.3 h1:ADZftAkglvCiD44c77s5YmMqaP2pzVCFZvBmAlBdAP4= -github.com/containerd/cgroups v1.0.3/go.mod h1:/ofk34relqNjSGyqPrmEULrO4Sc8LJhvJmWbUCUKqj8= 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/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= 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= @@ -326,9 +303,7 @@ github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo 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.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g= -github.com/containerd/containerd v1.5.2/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g= github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c= -github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s= github.com/containerd/containerd v1.5.9/go.mod h1:fvQqCfadDGga5HZyn3j4+dx56qj2I9YwBrlSdalvJYQ= github.com/containerd/containerd v1.6.2 h1:pcaPUGbYW8kBw6OgIZwIVIeEhdWVrBzsoCfVJ5BjrLU= github.com/containerd/containerd v1.6.2/go.mod h1:sidY30/InSE1j2vdD1ihtKoJz+lWdaXMdiAeIupaf+s= @@ -339,7 +314,6 @@ github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cE 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/continuity v0.2.2/go.mod h1:pWygW9u7LtS1o4N/Tn0FoCFDIXZ7rxcMX7HX1Dmibvk= 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= @@ -348,8 +322,6 @@ github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1S 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-cni v1.1.0/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= -github.com/containerd/go-cni v1.1.3/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= 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= @@ -359,7 +331,6 @@ github.com/containerd/imgcrypt v1.0.1/go.mod h1:mdd8cEPW7TPgNG4FpuP3sGBiQ7Yi/zak 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/imgcrypt v1.1.3/go.mod h1:/TPA1GIDXMzbj01yd8pIbQiLdQxed5ue1wb8bP7PQu4= 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= @@ -382,21 +353,17 @@ github.com/containerd/zfs v1.0.0/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNR 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/cni v1.0.1/go.mod h1:AKuhXbN5EzmD4yTNtfSsX3tPcmtrBI6QcRV0NiNt15Y= 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/containernetworking/plugins v1.0.1/go.mod h1:QHCfGpaTwYTbbH+nZXKVTxNBDZcxSOplJT5ico8/FLE= 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/containers/ocicrypt v1.1.2/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-iptables v0.6.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= 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= @@ -417,7 +384,6 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do 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= @@ -441,26 +407,20 @@ github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8l 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-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/distribution/distribution/v3 v3.0.0-20210804104954-38ab4c606ee3/go.mod h1:gt38b7cvVKazi5XkHvINNytZXgTEntyhtyM3HQz46Nk= github.com/distribution/distribution/v3 v3.0.0-20211118083504-a29a3c99a684/go.mod h1:UfCu3YXJJCI+IdnqGgYP82dk2+Joxmv+mUTVBES6wac= github.com/distribution/distribution/v3 v3.0.0-20220208183205-a4d9db5a884b h1:YI54auHWsSGyphTnIL3B28Q+MsnOJ9ccawTWPepYOrA= -github.com/distribution/distribution/v3 v3.0.0-20220208183205-a4d9db5a884b/go.mod h1:pHGe5DAymRLfcpa4RA8cglvo6+/PEiICnY88fHx4NIE= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v20.10.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v20.10.11+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v20.10.12+incompatible h1:lZlz0uzG+GH+c0plStMUdF/qk3ppmgnswpR5EbqzVGA= github.com/docker/cli v20.10.12+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/distribution v0.0.0-20180920194744-16128bbac47f/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= 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/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.11+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.12+incompatible h1:CEeNmFM0QZIsJCZKMkZx0ZcahTiewkrgiwfYD+dfl1U= github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= @@ -480,7 +440,6 @@ github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw 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/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4= -github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= 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= @@ -518,14 +477,12 @@ github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSY github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= -github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= 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/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -548,8 +505,6 @@ github.com/gliderlabs/ssh v0.3.3 h1:mBQ8NiOgDkINJrZtoizkC3nDNYgSaWtxyem6S2XHBtA= github.com/gliderlabs/ssh v0.3.3/go.mod h1:ZSS+CUoKHDrqVakTfTWUlKSr9MtMFkC4UvtQKD7O914= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= -github.com/go-bindata/go-bindata/v3 v3.1.3/go.mod h1:1/zrpXsLD8YDIbhZRqXzm1Ghc7NhEvIN9+Z6R5/xH4I= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= @@ -577,17 +532,11 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= 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.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2 h1:ahHml/yUpnlb96Rp8HCvtYVPY8ZYpxq3g7UYchIYwbs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI= -github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-logr/zapr v0.4.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= github.com/go-logr/zapr v1.2.2 h1:5YNlIL6oZLydaV4dOFjL8YpgXF/tPeTbnpatnu3cq6o= -github.com/go-logr/zapr v1.2.2/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= @@ -624,7 +573,6 @@ github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsd github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= 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/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= @@ -640,15 +588,11 @@ github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/e github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= -github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= -github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/gobuffalo/flect v0.2.0/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= -github.com/gobuffalo/flect v0.2.2/go.mod h1:vmkQwuZYhN5Pc4ljYQZzP+1sq+NEkK+lh20jmEmX3jc= github.com/gobuffalo/logger v1.0.3/go.mod h1:SoeejUwldiS7ZsyCBphOGURmWdwUFXs0J7TCjEhjKxM= github.com/gobuffalo/logger v1.0.6 h1:nnZNpxYo0zx+Aj9RfMPBm+x9zAU2OayFh/xrAWi34HU= github.com/gobuffalo/logger v1.0.6/go.mod h1:J31TBEHR1QLV2683OXTAItYIg8pv2JMHnF/quuAbMjs= @@ -660,18 +604,15 @@ github.com/gobuffalo/packr/v2 v2.8.3 h1:xE1yzvnO56cUC0sTpKR3DIbxZgB54AftTFMhB2XE github.com/gobuffalo/packr/v2 v2.8.3/go.mod h1:0SahksCVcx4IMnigTjiFuyldmTrdTctXsOdiU5KwbKc= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -github.com/goccy/go-yaml v1.8.1/go.mod h1:wS4gNoLalDSJxo/SpngzPQ2BN4uuZVLCmbM4S3vd4+Y= 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/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godror/godror v0.24.2/go.mod h1:wZv/9vPiUib6tkoDl+AZ/QLf5YZgMravZ7jxH2eQWAE= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0= -github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= 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/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -726,13 +667,6 @@ github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/gomodule/redigo v1.8.8 h1:f6cXq6RRfiyrOJEV7p3JhLDlmawGBVBBP1MggY8Mo4E= -github.com/gomodule/redigo v1.8.8/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE= -github.com/gonum/blas v0.0.0-20181208220705-f22b278b28ac/go.mod h1:P32wAyui1PQ58Oce/KYkOqQv8cVw1zAapXOl+dRFGbc= -github.com/gonum/floats v0.0.0-20181209220543-c233463c7e82/go.mod h1:PxC8OnwL11+aosOB5+iEPoV3picfs8tUpkVd0pDo+Kg= -github.com/gonum/graph v0.0.0-20170401004347-50b27dea7ebb/go.mod h1:ye018NnX1zrbOLqwBvs2HqyyTouQgnL8C+qzYk1snPY= -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/matrix v0.0.0-20181209220409-c518dec07be9/go.mod h1:0EXg4mc1CNP0HCqCz+K4ts155PXIlUywf0wqN+GfPZw= 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/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= @@ -754,7 +688,6 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= -github.com/google/go-github/v39 v39.0.0/go.mod h1:C1s8C5aCC9L+JXIYpJM5GYytdX52vC1bLvHEF1IhBrE= github.com/google/go-github/v42 v42.0.0 h1:YNT0FwjPrEysRkLIiKuEfSvBPCGKphW5aS5PxwaoLec= github.com/google/go-github/v42 v42.0.0/go.mod h1:jgg/jvyI0YlDOM1/ps6XYh04HNQ3vKf0CVko62/EhRg= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= @@ -780,7 +713,6 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe 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-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= @@ -833,7 +765,6 @@ github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyN github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= @@ -845,7 +776,6 @@ github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iP 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/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= -github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= @@ -884,9 +814,7 @@ github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= -github.com/j-keck/arping v1.0.2/go.mod h1:aJbELhR92bSk7tp79AWM/ftfc90EfEi2bQJrbBFOsPw= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= @@ -898,7 +826,6 @@ github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeY github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= 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/jmoiron/sqlx v1.3.1/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= github.com/jmoiron/sqlx v1.3.4 h1:wv+0IJZfL5z0uZoUjlpKgHkgaFSYD+r9CfrXjEXsO7w= github.com/jmoiron/sqlx v1.3.4/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= @@ -924,7 +851,6 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV 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/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA= -github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/karrick/godirwalk v1.15.8/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw= github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= @@ -951,19 +877,16 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN 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.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= 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/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= -github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk= @@ -999,8 +922,6 @@ github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaO github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= 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= @@ -1020,7 +941,6 @@ github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= -github.com/mattn/go-shellwords v1.0.11/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg= @@ -1033,13 +953,11 @@ github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3N github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37/go.mod h1:dYWq+UWoFCDY1TndvFUQuhBbIYmZpjreC8adEAx93zE= 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/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/cli v1.1.2/go.mod h1:6iaV0fGdElS6dPBx0EApTxHrcWvmJphyh2n8YBLPPZ4= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= -github.com/mitchellh/copystructure v1.1.1/go.mod h1:EBArHfARyrSWO/+Wyr9zwEkc6XMFB9XyNgFNmRkZZU4= 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= @@ -1057,7 +975,6 @@ github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/mapstructure v1.4.3/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.1/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 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= @@ -1068,12 +985,8 @@ github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2J github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= github.com/moby/sys/mountinfo v0.6.1 h1:+H/KnGEAGRpTrEAqNVQ2AM3SiwMgJUt/TXj+Z8cmCIc= -github.com/moby/sys/mountinfo v0.6.1/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= -github.com/moby/sys/signal v0.6.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg= github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= -github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs= 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/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= @@ -1099,7 +1012,6 @@ github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= 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/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= @@ -1113,13 +1025,8 @@ github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+ github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= -github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= 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.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -1130,9 +1037,6 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= -github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= -github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= -github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -1143,7 +1047,6 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 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/image-spec v1.0.2-0.20211117181255-693428a734f5/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1 h1:9iFHD5Kt9hkOfeawBNiEeEaV7bmC4/Z5wJp8E9BptMs= github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1/go.mod h1:K/JAU0m27RFhDRX4PcFdIKntROP6y5Ed6O91aZYDQfs= @@ -1153,7 +1056,6 @@ github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h 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/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= -github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= 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= @@ -1164,17 +1066,12 @@ github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mo 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/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= -github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/openshift/api v0.0.0-20211209135129-c58d9f695577 h1:NUe82M8wMYXbd5s+WBAJ2QAZZivs+nhZ3zYgZFwKfqw= github.com/openshift/api v0.0.0-20211209135129-c58d9f695577/go.mod h1:DoslCwtqUpr3d/gsbq4ZlkaMEdYqKxuypsDjorcHhME= github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= -github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= -github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3/go.mod h1:cwhyki5lqBmrT0m8Im+9I7PGFaraOzcYPtEz93RcsGY= -github.com/openshift/library-go v0.0.0-20220112153822-ac82336bd076/go.mod h1:4UQ9snU1vg53fyTpHQw3vLPiAxI8ub5xrc+y8KPQQFs= github.com/openshift/library-go v0.0.0-20220203150523-45e0cded6a36 h1:LSXlqkXjPU5cmxZmBANg93rFCwM6xHFP22ssDfRa+1E= github.com/openshift/library-go v0.0.0-20220203150523-45e0cded6a36/go.mod h1:6AmNM4N4nHftckybV/U7bQW+5AvK5TW81ndSI6KEidw= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/operator-framework/api v0.10.0/go.mod h1:tV0BUNvly7szq28ZPBXhjp1Sqg5yHCOeX19ui9K4vjI= github.com/operator-framework/operator-lib v0.10.0 h1:tTjrt8Udi0msABkMpgxKHp7sXKnC73jFPO5Col0tWso= github.com/operator-framework/operator-lib v0.10.0/go.mod h1:sdCls/olFjSHLXU0bHlaPtmyeIdentoxz/9miyw27kw= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= @@ -1189,14 +1086,12 @@ github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+v github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 h1:Ii+DKncOVM8Cu1Hc+ETb5K+23HdAMvESYE3ZJ5b5cMI= -github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= 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.3.0/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -1231,7 +1126,6 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b 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 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1257,10 +1151,8 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So 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.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= -github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rubenv/sql-migrate v0.0.0-20210614095031-55d5740dbbcc/go.mod h1:HFLT6i9iR4QBOF5rdCyjddC9t59ArqWJV2xx+jwcCMo= github.com/rubenv/sql-migrate v1.1.1 h1:haR5Hn8hbW9/SpAICrXoZqXnywS7Q5WijwkQENPeNWY= github.com/rubenv/sql-migrate v1.1.1/go.mod h1:/7TZymwxN8VWumcIxw1jjHEcR1djpdkMHQPT4FWdnbQ= @@ -1275,14 +1167,11 @@ github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5P github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs= github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= -github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= 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/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= @@ -1323,7 +1212,6 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= 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.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= @@ -1350,7 +1238,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ 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.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As= -github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -1370,7 +1257,6 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM= 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= @@ -1381,11 +1267,9 @@ github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv 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/netlink v1.1.1-0.20210330154013-f5de75959ad5/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/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= 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= @@ -1401,7 +1285,6 @@ github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf 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/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8= github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk= github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= @@ -1412,16 +1295,12 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de 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/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/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/go-metrics v0.0.0-20150112132944-c25f46c4b940 h1:p7OofyZ509h8DmPLh8Hn+EIIZm/xYhdZHJ9GnXHdr6U= -github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940/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/gorelic v0.0.7 h1:4DTF1WOM2ZZS/xMOkTFBOcb6XiHu/PKn3rVo6dbewQE= -github.com/yvasiyarov/gorelic v0.0.7/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 h1:AsFN8kXcCVkUFHyuzp1FtYbzp1nCO/H6+1uPSGEyPzM= -github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -1454,25 +1333,16 @@ go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0/go.mod h1:hO1KLR7jcKaDDKDkvI9dP/FIhpmna5lkqPUQdEjFAM8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0/go.mod h1:keUU7UfnwWTWpJ+FWnyqmogPa82nuU5VUANFq49hlMY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= -go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= go.starlark.net v0.0.0-20220203230714-bb14e151c28f h1:aW4TkS39/naJa9wPSbIXtZUQOlvuUh8gxCsLRrJoByU= go.starlark.net v0.0.0-20220203230714-bb14e151c28f/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0= @@ -1480,22 +1350,15 @@ 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/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= -go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= 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/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/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= -go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= golang.org/x/arch v0.0.0-20180920145803-b19384d3c130/go.mod h1:cYlCBUl1MsqxdiKgmc4uh7TxZfWSFLOGSRR090WDxt8= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1515,25 +1378,20 @@ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/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-20200820211705-5c72a883971a/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-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 h1:S25/rfnfsMVgORT4/J61MJ7rdyseOZOyvLIrZEZ7s6s= golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1570,12 +1428,10 @@ 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.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 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= @@ -1628,26 +1484,21 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY 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-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4= golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1720,7 +1571,6 @@ golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191010194322-b09406accb47/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= @@ -1765,11 +1615,9 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w 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-20210112080510-489259a85091/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-20210303074136-134d130e1a04/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= @@ -1779,7 +1627,6 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1794,26 +1641,18 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/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-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/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-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= 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-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1904,7 +1743,6 @@ golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4X 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-20201224043029-2b0845dc783e/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= @@ -2100,7 +1938,6 @@ google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscL google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= -gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= 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= @@ -2112,18 +1949,14 @@ gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS 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/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= -gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= -gopkg.in/go-playground/validator.v9 v9.30.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw= 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/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ldap.v2 v2.5.1/go.mod h1:oI0cpe/D7HRtBQl8aTg+ZmzFUAvu4lsv3eLXMLGFxWk= gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod h1:N1eN2tsCx0Ydtgjl4cqmbRCsY4/+z4cYDeqwZTk6zog= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= 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= @@ -2159,8 +1992,6 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= gotest.tools/v3 v3.1.0 h1:rVV8Tcg/8jHUkPUorwjaMTtemIMVXfIPKiOqnhEhakk= -gotest.tools/v3 v3.1.0/go.mod h1:fHy7eyTmJFO5bQbUsEGQ1v4m2J3Jz9eWL54TP2/ZuYQ= -helm.sh/helm/v3 v3.7.2/go.mod h1:UXuiAn0+FfBpqbiMuwWt8/aAKkfJvnWLBJ6f4HcFs0M= helm.sh/helm/v3 v3.8.0 h1:vlQQDDQkrH4NECOFbGcwjjKyHL5Sa3xNLjMxXm7fMVo= helm.sh/helm/v3 v3.8.0/go.mod h1:0nYPSuvuj8TTJDLRSAfbzGGbazPZsayaDpP8s9FfZT8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -2175,18 +2006,12 @@ k8s.io/api v0.18.0-beta.2/go.mod h1:2oeNnWEqcSmaM/ibSh3t7xcIqbkGXhzZdn4ezV9T4m0= k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= -k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= -k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs= k8s.io/api v0.23.0/go.mod h1:8wmDdLBHBNxtOIytwLstXt5E9PddnZb0GaMcqsvDBpg= k8s.io/api v0.23.1/go.mod h1:WfXnOnwSqNtG62Y1CdjoMxh7r7u9QXGCkA1u0na2jgo= k8s.io/api v0.23.3 h1:KNrME8KHGr12Ozjf8ytOewKzZh6hl/hHUZeHddT3a38= k8s.io/api v0.23.3/go.mod h1:w258XdGyvCmnBj/vGzQMj6kzdufJZVUwEM1U2fRJwSQ= k8s.io/apiextensions-apiserver v0.17.0/go.mod h1:XiIFUakZywkUl54fVXa7QTEHcqQz9HG55nHd1DCoHj8= k8s.io/apiextensions-apiserver v0.18.0-beta.2/go.mod h1:Hnrg5jx8/PbxRbUoqDGxtQkULjwx8FDW4WYJaKNK+fk= -k8s.io/apiextensions-apiserver v0.21.1/go.mod h1:KESQFCGjqVcVsZ9g0xX5bacMjyX5emuWcS2arzdEouA= -k8s.io/apiextensions-apiserver v0.22.4/go.mod h1:kH9lxD8dbJ+k0ZizGET55lFgdGjO8t45fgZnCVdZEpw= -k8s.io/apiextensions-apiserver v0.23.0/go.mod h1:xIFAEEDlAZgpVBl/1VSjGDmLoXAWRG40+GsWhKhAxY4= k8s.io/apiextensions-apiserver v0.23.1/go.mod h1:0qz4fPaHHsVhRApbtk3MGXNn2Q9M/cVWWhfHdY2SxiM= k8s.io/apiextensions-apiserver v0.23.3 h1:JvPJA7hSEAqMRteveq4aj9semilAZYcJv+9HHFWfUdM= k8s.io/apiextensions-apiserver v0.23.3/go.mod h1:/ZpRXdgKZA6DvIVPEmXDCZJN53YIQEUDF+hrpIQJL38= @@ -2195,10 +2020,6 @@ k8s.io/apimachinery v0.18.0-beta.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZF k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= -k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= -k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= -k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U= k8s.io/apimachinery v0.23.0/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc= k8s.io/apimachinery v0.23.1/go.mod h1:SADt2Kl8/sttJ62RRsi9MIV4o8f5S3coArm0Iu3fBno= k8s.io/apimachinery v0.23.3 h1:7IW6jxNzrXTsP0c8yXz2E5Yx/WTzVPTsHIx/2Vm0cIk= @@ -2208,14 +2029,10 @@ k8s.io/apiserver v0.18.0-beta.2/go.mod h1:bnblMkMoCFnIfVnVftd0SXJPzyvrk3RtaqSbbl 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.1/go.mod h1:nLLYZvMWn35glJ4/FZRhzLG/3MPxAaZTgV4FJZdr+tY= -k8s.io/apiserver v0.22.4/go.mod h1:38WmcUZiiy41A7Aty8/VorWRa8vDGqoUzDf2XYlku0E= -k8s.io/apiserver v0.22.5/go.mod h1:s2WbtgZAkTKt679sYtSudEQrTGWUSQAPe6MupLnlmaQ= k8s.io/apiserver v0.23.0/go.mod h1:Cec35u/9zAepDPPFyT+UMrgqOCjgJ5qtfVJDxjZYmt4= k8s.io/apiserver v0.23.1/go.mod h1:Bqt0gWbeM2NefS8CjWswwd2VNAKN6lUKR85Ft4gippY= k8s.io/apiserver v0.23.3 h1:gWY1DmA0AdAGR/H+Q/1FtyGkFq8xqSaZOw7oLopmO8k= k8s.io/apiserver v0.23.3/go.mod h1:3HhsTmC+Pn+Jctw+Ow0LHA4dQ4oXrQ4XJDzrVDG64T4= -k8s.io/cli-runtime v0.22.4/go.mod h1:x35r0ERHXr/MrbR1C6MPJxQ3xKG6+hXi9m2xLzlMPZA= k8s.io/cli-runtime v0.23.1/go.mod h1:r9r8H/qfXo9w+69vwUL7LokKlLRKW5D6A8vUKCx+YL0= k8s.io/cli-runtime v0.23.3 h1:aJiediw+uUbxkfO6BNulcAMTUoU9Om43g3R7rIkYqcw= k8s.io/cli-runtime v0.23.3/go.mod h1:yA00O5pDqnjkBh8fkuugBbfIfjB1nOpz+aYLotbnOfc= @@ -2224,9 +2041,6 @@ k8s.io/client-go v0.23.3/go.mod h1:47oMd+YvAOqZM7pcQ6neJtBiFH7alOyfunYN48VsmwE= k8s.io/code-generator v0.17.0/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= k8s.io/code-generator v0.18.0-beta.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= -k8s.io/code-generator v0.20.0/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg= -k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= -k8s.io/code-generator v0.22.4/go.mod h1:qjYl54pQ/emhkT0UxbufbREYJMWsHNNV/jSVwhYZQGw= k8s.io/code-generator v0.23.0/go.mod h1:vQvOhDXhuzqiVfM/YHp+dmg10WDZCchJVObc9MvowsE= k8s.io/code-generator v0.23.1/go.mod h1:V7yn6VNTCWW8GqodYCESVo95fuiEg713S8B7WacWZDA= k8s.io/code-generator v0.23.3/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk= @@ -2235,28 +2049,22 @@ k8s.io/component-base v0.18.0-beta.2/go.mod h1:HVk5FpRnyzQ/MjBr9//e/yEBjTVa2qjGX 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.1/go.mod h1:NgzFZ2qu4m1juby4TnrmpR8adRk6ka62YdH5DkIIyKA= -k8s.io/component-base v0.22.4/go.mod h1:MrSaQy4a3tFVViff8TZL6JHYSewNCLshZCwHYM58v5A= -k8s.io/component-base v0.22.5/go.mod h1:VK3I+TjuF9eaa+Ln67dKxhGar5ynVbwnGrUiNF4MqCI= k8s.io/component-base v0.23.0/go.mod h1:DHH5uiFvLC1edCpvcTDV++NKULdYYU6pR9Tt3HIKMKI= k8s.io/component-base v0.23.1/go.mod h1:6llmap8QtJIXGDd4uIWJhAq0Op8AtQo6bDW2RrNMTeo= k8s.io/component-base v0.23.3 h1:q+epprVdylgecijVGVdf4MbizEL2feW4ssd7cdo6LVY= k8s.io/component-base v0.23.3/go.mod h1:1Smc4C60rWG7d3HjSYpIwEbySQ3YWg0uzH5a2AtaTLg= -k8s.io/component-helpers v0.22.4/go.mod h1:A50qTyczDFbhZDifIfS2zFrHuPk9UNOWPpvNZ+3RSIs= k8s.io/component-helpers v0.23.1/go.mod h1:ZK24U+2oXnBPcas2KolLigVVN9g5zOzaHLkHiQMFGr0= k8s.io/component-helpers v0.23.3/go.mod h1:SH+W/WPTaTenbWyDEeY7iytAQiMh45aqKxkvlqQ57cg= 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/cri-api v0.23.1/go.mod h1:REJE3PSU0h/LOV1APBrupxrEJqnoxZC8KWzkBUHwrK4= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= @@ -2265,8 +2073,6 @@ 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.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.40.1 h1:P4RRucWk/lFOlDdkAr3mc7iWFkgKrZY9qZMAgek06S4= k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= @@ -2277,26 +2083,20 @@ k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKf k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= -k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf h1:M9XBsiMslw2lb2ZzglC0TOkBPK5NQi0/noUrdnoFwUg= k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= -k8s.io/kubectl v0.22.4/go.mod h1:ok2qRT6y2Gy4+y+mniJVyUMKeBHP4OWS9Rdtf/QTM5I= k8s.io/kubectl v0.23.1/go.mod h1:Ui7dJKdUludF8yWAOSN7JZEkOuYixX5yF6E6NjoukKE= k8s.io/kubectl v0.23.3 h1:gJsF7cahkWDPYlNvYKK+OrBZLAJUBzCym+Zsi+dfi1E= k8s.io/kubectl v0.23.3/go.mod h1:VBeeXNgLhSabu4/k0O7Q0YujgnA3+CLTUE0RcmF73yY= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/metrics v0.22.4/go.mod h1:6F/iwuYb1w2QDCoHkeMFLf4pwHBcYKLm4mPtVHKYrIw= k8s.io/metrics v0.23.1/go.mod h1:qXvsM1KANrc+ZZeFwj6Phvf0NLiC+d3RwcsLcdGc+xs= k8s.io/metrics v0.23.3/go.mod h1:Ut8TvkbsO4oMVeUzaTArvPrcw9QRFLs2XNzUlORjdYE= k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210527160623-6fdb442a123b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220127004650-9b3446523e65 h1:ONWS0Wgdg5wRiQIAui7L/023aC9+IxrIrydY7l8llsE= @@ -2308,62 +2108,47 @@ modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= open-cluster-management.io/addon-framework v0.3.0 h1:tO1zW0yfYrH/bzsM34SH3c6GTa/w7agC/yzN6VuXffg= open-cluster-management.io/addon-framework v0.3.0/go.mod h1:8QG1fHwPCEdyRrzY2Jji+qhMmJl+/HzTpuSDVmeG+7s= -open-cluster-management.io/api v0.5.1-0.20220112073018-2d280a97a052/go.mod h1:0IUTh8J+p4pv1THh1r9oO0luX9Z1FLDEAmvzW09qC0o= -open-cluster-management.io/api v0.6.0/go.mod h1:0IUTh8J+p4pv1THh1r9oO0luX9Z1FLDEAmvzW09qC0o= open-cluster-management.io/api v0.6.1-0.20220208144021-3297cac74dc5 h1:0Zn4+5qfXTHCjoa7pg8+fI/Gebr4bQDHWR+d1XPa47c= open-cluster-management.io/api v0.6.1-0.20220208144021-3297cac74dc5/go.mod h1:0IUTh8J+p4pv1THh1r9oO0luX9Z1FLDEAmvzW09qC0o= open-cluster-management.io/multicloud-operators-channel v0.7.1-0.20220413191652-67d1cc8d57fc h1:PVLeG9gab6YCC+ilbDaLJFGs2mgC/yEFQEarMLU6YmU= open-cluster-management.io/multicloud-operators-channel v0.7.1-0.20220413191652-67d1cc8d57fc/go.mod h1:G7CbabcOmZxZ7UWSc6Ek4NEZzjcH0xYJSopFj2dyMYo= -oras.land/oras-go v0.4.0/go.mod h1:VJcU+VE4rkclUbum5C0O7deEZbBYnsnpbGSACwTjOcg= oras.land/oras-go v1.1.0 h1:tfWM1RT7PzUwWphqHU6ptPU3ZhwVnSw/9nEGf519rYg= oras.land/oras-go v1.1.0/go.mod h1:1A7vR/0KknT2UkJVWh+xMi95I/AhK8ZrxrnUSmXN0bQ= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/letsencrypt v0.0.3/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY= 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.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= 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/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27/go.mod h1:tq2nT0Kx7W+/f2JVE+zxYtUhdjuELJkVpNz+x/QN5R4= -sigs.k8s.io/controller-runtime v0.9.0/go.mod h1:TgkfvrhhEw3PlI0BRL/5xM+89y3/yc0ZDfdbTl84si8= sigs.k8s.io/controller-runtime v0.11.0 h1:DqO+c8mywcZLFJWILq4iktoECTyn30Bkj0CwgqMpZWQ= sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA= sigs.k8s.io/controller-tools v0.2.8/go.mod h1:9VKHPszmf2DHz/QmHkcfZoewO6BL7pPs9uAiBVsaJSE= -sigs.k8s.io/controller-tools v0.6.0/go.mod h1:baRMVPrctU77F+rfAuH2uPqW93k6yQnZA2dhUOr7ihc= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= sigs.k8s.io/kube-storage-version-migrator v0.0.4 h1:qsCecgZHgdismlTt8xCmS/3numvpxrj58RWJeIg76wc= sigs.k8s.io/kube-storage-version-migrator v0.0.4/go.mod h1:mXfSLkx9xbJHQsgNDDUZK/iQTs2tMbx/hsJlWe6Fthw= -sigs.k8s.io/kustomize/api v0.8.11/go.mod h1:a77Ls36JdfCWojpUqR6m60pdGY1AYFix4AH83nJtY1g= sigs.k8s.io/kustomize/api v0.10.1/go.mod h1:2FigT1QN6xKdcnGS2Ppp1uIWrtWN28Ms8A3OZUZhwr8= sigs.k8s.io/kustomize/api v0.11.1 h1:/Vutu+gAqVo8skw1xCZrsZD39SN4Adg+z7FrSTw9pds= sigs.k8s.io/kustomize/api v0.11.1/go.mod h1:GZuhith5YcqxIDe0GnRJNx5xxPTjlwaLTt/e+ChUtJA= -sigs.k8s.io/kustomize/cmd/config v0.9.13/go.mod h1:7547FLF8W/lTaDf0BDqFTbZxM9zqwEJqCKN9sSR0xSs= sigs.k8s.io/kustomize/cmd/config v0.10.2/go.mod h1:K2aW7nXJ0AaT+VA/eO0/dzFLxmpFcTzudmAgDwPY1HQ= -sigs.k8s.io/kustomize/kustomize/v4 v4.2.0/go.mod h1:MOkR6fmhwG7hEDRXBYELTi5GSFcLwfqwzTRHW3kv5go= sigs.k8s.io/kustomize/kustomize/v4 v4.4.1/go.mod h1:qOKJMMz2mBP+vcS7vK+mNz4HBLjaQSWRY22EF6Tb7Io= -sigs.k8s.io/kustomize/kyaml v0.11.0/go.mod h1:GNMwjim4Ypgp/MueD3zXHLRJEjz7RvtPae0AwlvEMFM= sigs.k8s.io/kustomize/kyaml v0.13.0/go.mod h1:FTJxEZ86ScK184NpGSAQcfEqee0nul8oLCK30D47m4E= sigs.k8s.io/kustomize/kyaml v0.13.3 h1:tNNQIC+8cc+aXFTVg+RtQAOsjwUdYBZRAgYOVI3RBc4= sigs.k8s.io/kustomize/kyaml v0.13.3/go.mod h1:/ya3Gk4diiQzlE4mBh7wykyLRFZNvqlbh+JnwQ9Vhrc= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06 h1:zD2IemQ4LmOcAumeiyDWXKUI2SO0NYDe3H6QGvPOVgU= sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= 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.0/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= 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= -vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= From b5b85cbb53aced05132daac8242eb9c9d9d5d5c4 Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Tue, 5 Jul 2022 12:53:42 -0400 Subject: [PATCH 02/14] disable linters Signed-off-by: Jonathan Marcantonio --- common/config/.golangci.yml | 59 ++++++++++++++++++++++++++++--------- common/scripts/lint_go.sh | 2 +- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/common/config/.golangci.yml b/common/config/.golangci.yml index a2197e37..832e0fba 100644 --- a/common/config/.golangci.yml +++ b/common/config/.golangci.yml @@ -1,6 +1,6 @@ service: # When updating this, also update the version stored in docker/build-tools/Dockerfile in the multicloudlab/tools repo. - golangci-lint-version: 1.28.x # use the fixed version to not introduce new linters unexpectedly + golangci-lint-version: 1.46.x # use the fixed version to not introduce new linters unexpectedly run: # timeout for analysis, e.g. 30s, 5m, default is 1m deadline: 20m @@ -30,31 +30,62 @@ run: linters: enable-all: true disable: - - exhaustive - - maligned + - bodyclose - depguard - dupl + - exhaustive + - exhaustruct + - exhaustivestruct + - funlen + - gci - gochecknoglobals - gochecknoinits - goconst - gocyclo + + - godot + - goerr113 + - gofumpt + - golint + - gomnd - gosec + - ifshort + - ireturn + - ineffassign + - interfacer + - maintidx + - maligned - nakedret + - nestif + - nilnil + - nlreturn + - noctx + - nonamedreturns + - nolintlint + - paralleltest - prealloc + - predeclared - scopelint - - funlen - - bodyclose - - - testpackage - stylecheck - - noctx - - gomnd - - goerr113 - - godot - - gofumpt - - nestif - - ineffassign + - tagliatelle + - tenv + - thelper + - testpackage - unused + - varnamelen + - wastedassign + - wrapcheck + - gosimple + - nilerr + - forcetypeassert + - cyclop + - errchkjson + - errorlint + - contextcheck + - forbidigo + - gocritic + - revive + - gomoddirectives fast: false linters-settings: diff --git a/common/scripts/lint_go.sh b/common/scripts/lint_go.sh index e15cc4fa..ca2fad67 100755 --- a/common/scripts/lint_go.sh +++ b/common/scripts/lint_go.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.28.3 +curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.46.2 export GOLANGCI_LINT_CACHE=/tmp/golangci-cache rm -rf $GOLANGCI_LINT_CACHE From d175038e2c02768f67ed02f37d61caf146e05d27 Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Tue, 5 Jul 2022 13:37:37 -0400 Subject: [PATCH 03/14] disable staticcheck lint Signed-off-by: Jonathan Marcantonio --- common/config/.golangci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/common/config/.golangci.yml b/common/config/.golangci.yml index 832e0fba..1d198729 100644 --- a/common/config/.golangci.yml +++ b/common/config/.golangci.yml @@ -86,6 +86,7 @@ linters: - gocritic - revive - gomoddirectives + - staticcheck fast: false linters-settings: From ba967620ff58da511990d21cc2ab3f1f8f5d27ee Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Tue, 5 Jul 2022 14:03:18 -0400 Subject: [PATCH 04/14] Fix revive linter Signed-off-by: Jonathan Marcantonio --- cmd/appsubsummary/exec/manager.go | 6 +++--- cmd/manager/exec/manager.go | 6 +++--- cmd/placementrule/exec/manager.go | 6 +++--- common/config/.golangci.yml | 1 - pkg/addonmanager/addon.go | 2 +- pkg/controller/mcmhub/hook_test.go | 2 +- pkg/controller/mcmhub/hub.go | 2 +- pkg/subscriber/git/git_subscriber.go | 2 +- pkg/subscriber/helmrepo/hemrepo_subscriber.go | 2 +- pkg/subscriber/objectbucket/objectbucket_subscriber.go | 2 +- pkg/synchronizer/kubernetes/synchronizer.go | 2 +- 11 files changed, 16 insertions(+), 17 deletions(-) diff --git a/cmd/appsubsummary/exec/manager.go b/cmd/appsubsummary/exec/manager.go index ddf20929..f44b00eb 100644 --- a/cmd/appsubsummary/exec/manager.go +++ b/cmd/appsubsummary/exec/manager.go @@ -30,9 +30,9 @@ import ( // Change below variables to serve metrics on different host or port. var ( - metricsHost = "0.0.0.0" - metricsPort int = 8391 - operatorMetricsPort int = 8691 + metricsHost = "0.0.0.0" + metricsPort = 8391 + operatorMetricsPort = 8691 ) // RunManager starts the actual manager. diff --git a/cmd/manager/exec/manager.go b/cmd/manager/exec/manager.go index 23f51c51..2b5741f7 100644 --- a/cmd/manager/exec/manager.go +++ b/cmd/manager/exec/manager.go @@ -48,9 +48,9 @@ import ( // Change below variables to serve metrics on different host or port. var ( - metricsHost = "0.0.0.0" - metricsPort int = 8381 - operatorMetricsPort int = 8684 + metricsHost = "0.0.0.0" + metricsPort = 8381 + operatorMetricsPort = 8684 ) const ( diff --git a/cmd/placementrule/exec/manager.go b/cmd/placementrule/exec/manager.go index 5e6d4008..63db792f 100644 --- a/cmd/placementrule/exec/manager.go +++ b/cmd/placementrule/exec/manager.go @@ -31,9 +31,9 @@ import ( // Change below variables to serve metrics on different host or port. var ( - metricsHost = "0.0.0.0" - metricsPort int = 8383 - operatorMetricsPort int = 8686 + metricsHost = "0.0.0.0" + metricsPort = 8383 + operatorMetricsPort = 8686 ) // RunManager starts the actual manager diff --git a/common/config/.golangci.yml b/common/config/.golangci.yml index 1d198729..12f706d7 100644 --- a/common/config/.golangci.yml +++ b/common/config/.golangci.yml @@ -84,7 +84,6 @@ linters: - contextcheck - forbidigo - gocritic - - revive - gomoddirectives - staticcheck fast: false diff --git a/pkg/addonmanager/addon.go b/pkg/addonmanager/addon.go index 1c2e3677..f33ac27e 100644 --- a/pkg/addonmanager/addon.go +++ b/pkg/addonmanager/addon.go @@ -58,7 +58,7 @@ type subscriptionAgent struct { } func NewAgent(agentImage string, kubeClient kubernetes.Interface, agentInstallAllStrategy bool) agent.AgentAddon { - var agentInstallStrategy *agent.InstallStrategy = nil + var agentInstallStrategy *agent.InstallStrategy if agentInstallAllStrategy { agentInstallStrategy = agent.InstallAllStrategy(addonDefaultInstallNamespace) diff --git a/pkg/controller/mcmhub/hook_test.go b/pkg/controller/mcmhub/hook_test.go index e30752ef..7b91e132 100644 --- a/pkg/controller/mcmhub/hook_test.go +++ b/pkg/controller/mcmhub/hook_test.go @@ -519,7 +519,7 @@ var _ = Describe("given a subscription pointing to a git path,where pre hook fol st := nSub.Status if st.Phase == subv1.SubscriptionPropagated { - return errors.New(fmt.Sprintf("waiting for phase %s, got %s", + return fmt.Errorf(fmt.Sprintf("waiting for phase %s, got %s", subv1.SubscriptionPropagationFailed, st.Phase)) } diff --git a/pkg/controller/mcmhub/hub.go b/pkg/controller/mcmhub/hub.go index 8595bf44..0a0c83ec 100644 --- a/pkg/controller/mcmhub/hub.go +++ b/pkg/controller/mcmhub/hub.go @@ -287,7 +287,7 @@ func (r *ReconcileSubscription) IsNamespacedResource(group, version, kind string return true } - var isNamespaced bool = true + var isNamespaced = true if mapping.Scope.Name() != "namespace" { isNamespaced = false diff --git a/pkg/subscriber/git/git_subscriber.go b/pkg/subscriber/git/git_subscriber.go index 722f220b..96cd737d 100644 --- a/pkg/subscriber/git/git_subscriber.go +++ b/pkg/subscriber/git/git_subscriber.go @@ -173,7 +173,7 @@ func (ghs *Subscriber) SubscribeItem(subitem *appv1alpha1.SubscriberItem) error klog.Info("Polling enabled on SubscriberItem ", ghssubitem.Subscription.Name) ghssubitem.webhookEnabled = false - var restart bool = false + var restart = false if strings.EqualFold(previousReconcileLevel, ghssubitem.reconcileRate) && strings.EqualFold(ghssubitem.reconcileRate, "off") { // auto reconcile off but something changed in subscription. restart to reconcile resources diff --git a/pkg/subscriber/helmrepo/hemrepo_subscriber.go b/pkg/subscriber/helmrepo/hemrepo_subscriber.go index 9b091699..452fb87c 100644 --- a/pkg/subscriber/helmrepo/hemrepo_subscriber.go +++ b/pkg/subscriber/helmrepo/hemrepo_subscriber.go @@ -134,7 +134,7 @@ func (hrs *Subscriber) SubscribeItem(subitem *appv1alpha1.SubscriberItem) error hrssubitem.reconcileRate = "off" } - var restart bool = false + var restart = false if previousReconcileLevel != "" && !strings.EqualFold(previousReconcileLevel, hrssubitem.reconcileRate) { // reconcile frequency has changed. restart the go routine diff --git a/pkg/subscriber/objectbucket/objectbucket_subscriber.go b/pkg/subscriber/objectbucket/objectbucket_subscriber.go index 629e479a..1cc552a1 100644 --- a/pkg/subscriber/objectbucket/objectbucket_subscriber.go +++ b/pkg/subscriber/objectbucket/objectbucket_subscriber.go @@ -132,7 +132,7 @@ func (obs *Subscriber) SubscribeItem(subitem *appv1alpha1.SubscriberItem) error obssubitem.reconcileRate = "off" } - var restart bool = false + var restart = false if previousReconcileLevel != "" && !strings.EqualFold(previousReconcileLevel, obssubitem.reconcileRate) { // reconcile frequency has changed. restart the go routine diff --git a/pkg/synchronizer/kubernetes/synchronizer.go b/pkg/synchronizer/kubernetes/synchronizer.go index 370b8ad2..0df3439b 100644 --- a/pkg/synchronizer/kubernetes/synchronizer.go +++ b/pkg/synchronizer/kubernetes/synchronizer.go @@ -43,7 +43,7 @@ func (sync *KubeSynchronizer) getGVRfromGVK(group, version, kind string) (schema return schema.GroupVersionResource{}, false, fmt.Errorf("failed to get GVR from restmapping: %v", err) } - var isNamespaced bool = true + var isNamespaced = true if mapping.Scope.Name() != "namespace" { isNamespaced = false From 6049b481e1d062bee6aa6c11bdfc3555b9eb91e8 Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Tue, 5 Jul 2022 16:06:29 -0400 Subject: [PATCH 05/14] fix linters Signed-off-by: Jonathan Marcantonio --- common/config/.golangci.yml | 33 +++---- pkg/addonmanager/addon.go | 4 +- .../appsubsummary_controller_suite_test.go | 3 +- pkg/controller/mcmhub/deployable.go | 96 ------------------- pkg/controller/mcmhub/hook.go | 17 ++-- pkg/controller/mcmhub/hook_test.go | 13 ++- pkg/controller/mcmhub/hub.go | 22 ++--- pkg/controller/mcmhub/mcmhub_controller.go | 23 +++-- .../mcmhub/mcmhub_controller_suite_test.go | 3 +- pkg/controller/mcmhub/metaupdate.go | 38 +------- .../subscription/subscription_controller.go | 13 +-- .../subscription_controller_suite_test.go | 3 +- .../controller/placementrule/placement.go | 56 ----------- pkg/placementrule/utils/auth.go | 2 +- pkg/subscriber/git/git_subscriber_test.go | 12 +-- .../kubernetes/sync_appsubstatus.go | 5 +- .../kubernetes/sync_appsubstatus_test.go | 52 +++++----- pkg/synchronizer/kubernetes/synchronizer.go | 9 +- pkg/utils/gitrepo.go | 2 +- pkg/utils/gitrepo_test.go | 9 +- pkg/utils/helmrepo.go | 3 +- pkg/utils/helmrepo_test.go | 11 +-- pkg/utils/reference.go | 2 +- pkg/utils/subscription.go | 5 +- pkg/utils/subscription_test.go | 79 ++++++++------- pkg/utils/util_suite_test.go | 3 +- .../listener/webhook_listener_suite_test.go | 5 +- 27 files changed, 152 insertions(+), 371 deletions(-) delete mode 100644 pkg/controller/mcmhub/deployable.go diff --git a/common/config/.golangci.yml b/common/config/.golangci.yml index 12f706d7..19eda91b 100644 --- a/common/config/.golangci.yml +++ b/common/config/.golangci.yml @@ -31,61 +31,56 @@ linters: enable-all: true disable: - bodyclose + - contextcheck + - cyclop - depguard - dupl + - forbidigo + - funlen + - errchkjson - exhaustive - exhaustruct - exhaustivestruct - - funlen + - forcetypeassert - gci - gochecknoglobals - gochecknoinits + - gocognit - goconst + - gocritic - gocyclo - - godot - goerr113 - gofumpt - golint - gomnd + - gomoddirectives - gosec - ifshort - - ireturn - ineffassign - interfacer - - maintidx + - ireturn + - maintidx - maligned - nakedret - nestif - nilnil - nlreturn - noctx - - nonamedreturns - nolintlint + - nonamedreturns - paralleltest - prealloc - predeclared - scopelint - - stylecheck - tagliatelle - tenv - - thelper - testpackage - - unused + - typecheck + - thelper - varnamelen - wastedassign - wrapcheck - - gosimple - - nilerr - - forcetypeassert - - cyclop - - errchkjson - - errorlint - - contextcheck - - forbidigo - - gocritic - - gomoddirectives - - staticcheck fast: false linters-settings: diff --git a/pkg/addonmanager/addon.go b/pkg/addonmanager/addon.go index f33ac27e..8e608578 100644 --- a/pkg/addonmanager/addon.go +++ b/pkg/addonmanager/addon.go @@ -85,7 +85,7 @@ func (s *subscriptionAgent) Manifests(cluster *clusterv1.ManagedCluster, addon * if err != nil { return objects, fmt.Errorf( - "error while decoding YAML file %s. Err was: %s", file, err) + "error while decoding YAML file %s. Err was: %w", file, err) } objects = append(objects, obj) @@ -97,7 +97,7 @@ func (s *subscriptionAgent) Manifests(cluster *clusterv1.ManagedCluster, addon * if err != nil { return objects, fmt.Errorf( - "error while decoding YAML object file %s. Err was: %s", agentDeploymentFile, err) + "error while decoding YAML object file %s. Err was: %w", agentDeploymentFile, err) } deployment := obj.(*appsv1.Deployment) diff --git a/pkg/controller/appsubsummary/appsubsummary_controller_suite_test.go b/pkg/controller/appsubsummary/appsubsummary_controller_suite_test.go index 76434361..ef89f546 100644 --- a/pkg/controller/appsubsummary/appsubsummary_controller_suite_test.go +++ b/pkg/controller/appsubsummary/appsubsummary_controller_suite_test.go @@ -17,7 +17,6 @@ package appsubsummary import ( "context" "log" - stdlog "log" "os" "path/filepath" "sync" @@ -55,7 +54,7 @@ func TestMain(m *testing.M) { var err error if cfg, err = t.Start(); err != nil { - stdlog.Fatal(err) + log.Fatal(err) } var c client.Client diff --git a/pkg/controller/mcmhub/deployable.go b/pkg/controller/mcmhub/deployable.go deleted file mode 100644 index b377470b..00000000 --- a/pkg/controller/mcmhub/deployable.go +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright 2022 The Kubernetes Authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package mcmhub - -import ( - "context" - "fmt" - - metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog/v2" - deployableV1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/deployable/v1" - appSubV1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" - "open-cluster-management.io/multicloud-operators-subscription/pkg/utils" - "sigs.k8s.io/controller-runtime/pkg/client" -) - -func (r *ReconcileSubscription) cleanupDeployables(appsub *appSubV1.Subscription) error { - // Delete child deployables with labels: hosting-deployable-name: git-gb-subscription-4-deployable - deployableList := &deployableV1.DeployableList{} - listopts := &client.ListOptions{} - - deployableSelector := &metaV1.LabelSelector{ - MatchLabels: map[string]string{ - "hosting-deployable-name": fmt.Sprintf("%.63s", appsub.GetName()+"-deployable"), - }, - } - - deployableLabels, err := utils.ConvertLabels(deployableSelector) - if err != nil { - klog.Error("Failed to convert deployable label selector, err:", err) - - return err - } - - listopts.LabelSelector = deployableLabels - - err = r.List(context.TODO(), deployableList, listopts) - if err != nil { - klog.Errorf("Failed to list deployables by hosting label, err:%v", err) - - return err - } - - for _, deployable := range deployableList.Items { - curDeployable := deployable.DeepCopy() - err := r.Delete(context.TODO(), curDeployable) - - if err != nil { - klog.Warningf("Error in deleting deployable: %v/%v, err: %v ", curDeployable.GetNamespace(), curDeployable.GetName(), err) - - // Log and continue with other cleanup instead of failing - continue - } - - klog.Infof("Deployable deleted: %v/%v", curDeployable.GetNamespace(), curDeployable.GetName()) - } - - // Delete deployable in app NS - listopts = &client.ListOptions{} - listopts.Namespace = appsub.GetNamespace() - - err = r.List(context.TODO(), deployableList, listopts) - if err != nil { - klog.Errorf("Failed to list deployables in appsub NS, err:%v", err) - - return err - } - - for _, deployable := range deployableList.Items { - curDeployable := deployable.DeepCopy() - err := r.Delete(context.TODO(), curDeployable) - - if err != nil { - klog.Warningf("Error in deleting deployable: %v/%v, err: %v ", curDeployable.GetNamespace(), curDeployable.GetName(), err) - - // Log and continue with other cleanup instead of failing - continue - } - - klog.Infof("Deployable deleted: %v/%v", curDeployable.GetNamespace(), curDeployable.GetName()) - } - - return nil -} diff --git a/pkg/controller/mcmhub/hook.go b/pkg/controller/mcmhub/hook.go index 48355419..5cf275c2 100644 --- a/pkg/controller/mcmhub/hook.go +++ b/pkg/controller/mcmhub/hook.go @@ -28,7 +28,6 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" ansiblejob "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/ansible/v1alpha1" - appv1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" subv1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" placementutils "open-cluster-management.io/multicloud-operators-subscription/pkg/placementrule/utils" "open-cluster-management.io/multicloud-operators-subscription/pkg/utils" @@ -76,9 +75,9 @@ type HookProcessor interface { //also the procssed subscription(which should carry all the update status on //the given reconciel), then WriteStatusToSubscription will append the hook //status info and make a update to the cluster - AppendStatusToSubscription(*appv1.Subscription) appv1.SubscriptionStatus + AppendStatusToSubscription(*subv1.Subscription) subv1.SubscriptionStatus - AppendPreHookStatusToSubscription(*appv1.Subscription) appv1.SubscriptionStatus + AppendPreHookStatusToSubscription(*subv1.Subscription) subv1.SubscriptionStatus GetLastAppliedInstance(types.NamespacedName) AppliedInstance } @@ -346,12 +345,12 @@ func getHookPath(subIns *subv1.Subscription) (string, string) { annotations := subIns.GetAnnotations() preHookPath, postHookPath := "", "" - if annotations[appv1.AnnotationGithubPath] != "" { - preHookPath = fmt.Sprintf("%v/prehook", annotations[appv1.AnnotationGithubPath]) - postHookPath = fmt.Sprintf("%v/posthook", annotations[appv1.AnnotationGithubPath]) - } else if annotations[appv1.AnnotationGitPath] != "" { - preHookPath = fmt.Sprintf("%v/prehook", annotations[appv1.AnnotationGitPath]) - postHookPath = fmt.Sprintf("%v/posthook", annotations[appv1.AnnotationGitPath]) + if annotations[subv1.AnnotationGithubPath] != "" { + preHookPath = fmt.Sprintf("%v/prehook", annotations[subv1.AnnotationGithubPath]) + postHookPath = fmt.Sprintf("%v/posthook", annotations[subv1.AnnotationGithubPath]) + } else if annotations[subv1.AnnotationGitPath] != "" { + preHookPath = fmt.Sprintf("%v/prehook", annotations[subv1.AnnotationGitPath]) + postHookPath = fmt.Sprintf("%v/posthook", annotations[subv1.AnnotationGitPath]) } return preHookPath, postHookPath diff --git a/pkg/controller/mcmhub/hook_test.go b/pkg/controller/mcmhub/hook_test.go index 7b91e132..992f0628 100644 --- a/pkg/controller/mcmhub/hook_test.go +++ b/pkg/controller/mcmhub/hook_test.go @@ -24,7 +24,6 @@ import ( "github.com/ghodss/yaml" . "github.com/onsi/ginkgo/v2" - "github.com/onsi/gomega" . "github.com/onsi/gomega" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" @@ -262,14 +261,14 @@ var _ = Describe("given a subscription pointing to a git path without hook folde u := &subv1.Subscription{} if err := k8sClt.Get(ctx, subKey, u); err != nil { - return fmt.Errorf("failed to get subscription %s, err: %s", subKey, err.Error()) + return fmt.Errorf("failed to get subscription %s, err: %w", subKey, err) } fmt.Printf("subscription= %+v\n", u) appsubReport := &appsubReportV1alpha1.SubscriptionReport{} if err := k8sClt.Get(ctx, appsubReportKey, appsubReport); err != nil { - return fmt.Errorf("failed to get the appsub AppsubReport %s, err: %s", appsubReportKey, err.Error()) + return fmt.Errorf("failed to get the appsub AppsubReport %s, err: %w", appsubReportKey, err) } fmt.Printf("AppsubReport= %+v\n", appsubReport) @@ -302,7 +301,7 @@ var _ = Describe("given a subscription pointing to a git path,where pre hook fol testManagedCluster := &spokeClusterV1.ManagedCluster{} err := yaml.Unmarshal([]byte(testCluster), &testManagedCluster) - Expect(err).NotTo(gomega.HaveOccurred()) + Expect(err).NotTo(HaveOccurred()) Expect(k8sClt.Create(ctx, testManagedCluster)).Should(Succeed()) Expect(k8sClt.Create(ctx, chnIns.DeepCopy())).Should(Succeed()) @@ -394,7 +393,7 @@ var _ = Describe("given a subscription pointing to a git path,where pre hook fol testManagedCluster := &spokeClusterV1.ManagedCluster{} err := yaml.Unmarshal([]byte(testCluster), &testManagedCluster) - Expect(err).NotTo(gomega.HaveOccurred()) + Expect(err).NotTo(HaveOccurred()) Expect(k8sClt.Create(ctx, testManagedCluster)).Should(Succeed()) Expect(k8sClt.Create(ctx, chnIns.DeepCopy())).Should(Succeed()) @@ -556,7 +555,7 @@ var _ = Describe("given a subscription pointing to a git path,where post hook fo testManagedCluster := &spokeClusterV1.ManagedCluster{} err := yaml.Unmarshal([]byte(testCluster), &testManagedCluster) - Expect(err).NotTo(gomega.HaveOccurred()) + Expect(err).NotTo(HaveOccurred()) Expect(k8sClt.Create(ctx, testManagedCluster)).Should(Succeed()) @@ -818,7 +817,7 @@ var _ = Describe("given a subscription pointing to a git path,where both pre and testManagedCluster := &spokeClusterV1.ManagedCluster{} err := yaml.Unmarshal([]byte(testCluster), &testManagedCluster) - Expect(err).NotTo(gomega.HaveOccurred()) + Expect(err).NotTo(HaveOccurred()) Expect(k8sClt.Create(ctx, testManagedCluster)).Should(Succeed()) Expect(k8sClt.Create(ctx, testPath.chnIns.DeepCopy())).Should(Succeed()) diff --git a/pkg/controller/mcmhub/hub.go b/pkg/controller/mcmhub/hub.go index 0a0c83ec..3804c860 100644 --- a/pkg/controller/mcmhub/hub.go +++ b/pkg/controller/mcmhub/hub.go @@ -22,10 +22,8 @@ import ( "strings" gerr "github.com/pkg/errors" - corev1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" - metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" @@ -33,11 +31,9 @@ import ( "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/client" - chnv1 "open-cluster-management.io/multicloud-operators-channel/pkg/apis/apps/v1" chnv1alpha1 "open-cluster-management.io/multicloud-operators-channel/pkg/apis/apps/v1" "github.com/ghodss/yaml" - appv1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" appv1alpha1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" appsubreportv1alpha1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1alpha1" helmops "open-cluster-management.io/multicloud-operators-subscription/pkg/subscriber/helmrepo" @@ -75,7 +71,7 @@ func (r *ReconcileSubscription) doMCMHubReconcile(sub *appv1alpha1.Subscription) chnAnnotations := primaryChannel.GetAnnotations() - if chnAnnotations[appv1.AnnotationResourceReconcileLevel] != "" { + if chnAnnotations[appv1alpha1.AnnotationResourceReconcileLevel] != "" { // When channel reconcile rate is changed, this label is used to trigger // managed cluster to pick up the channel change and adjust reconcile rate. sublabels := sub.GetLabels() @@ -84,8 +80,8 @@ func (r *ReconcileSubscription) doMCMHubReconcile(sub *appv1alpha1.Subscription) sublabels = make(map[string]string) } - sublabels[appv1.AnnotationResourceReconcileLevel] = chnAnnotations[appv1.AnnotationResourceReconcileLevel] - klog.Info("Adding subscription label ", appv1.AnnotationResourceReconcileLevel, ": ", chnAnnotations[appv1.AnnotationResourceReconcileLevel]) + sublabels[appv1alpha1.AnnotationResourceReconcileLevel] = chnAnnotations[appv1alpha1.AnnotationResourceReconcileLevel] + klog.Info("Adding subscription label ", appv1alpha1.AnnotationResourceReconcileLevel, ": ", chnAnnotations[appv1alpha1.AnnotationResourceReconcileLevel]) sub.SetLabels(sublabels) } @@ -196,7 +192,7 @@ func (r *ReconcileSubscription) GetChannelNamespaceType(s *appv1alpha1.Subscript return chNameSpace, chName, chType } -func GetSubscriptionRefChannel(clt client.Client, s *appv1.Subscription) (*chnv1.Channel, *chnv1.Channel, error) { +func GetSubscriptionRefChannel(clt client.Client, s *appv1alpha1.Subscription) (*chnv1alpha1.Channel, *chnv1alpha1.Channel, error) { primaryChannel, err := parseGetChannel(clt, s.Spec.Channel) if err != nil { @@ -218,7 +214,7 @@ func GetSubscriptionRefChannel(clt client.Client, s *appv1.Subscription) (*chnv1 return primaryChannel, secondaryChannel, err } -func parseGetChannel(clt client.Client, channelName string) (*chnv1.Channel, error) { +func parseGetChannel(clt client.Client, channelName string) (*chnv1alpha1.Channel, error) { if channelName == "" { return nil, nil } @@ -233,7 +229,7 @@ func parseGetChannel(clt client.Client, channelName string) (*chnv1.Channel, err } chkey := types.NamespacedName{Name: chName, Namespace: chNameSpace} - channel := &chnv1.Channel{} + channel := &chnv1alpha1.Channel{} err := clt.Get(context.TODO(), chkey, channel) if err != nil { @@ -317,7 +313,7 @@ func (r *ReconcileSubscription) createAppAppsubReport(sub *appv1alpha1.Subscript } appsubReport := &appsubreportv1alpha1.SubscriptionReport{ - TypeMeta: metaV1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "SubscriptionReport", APIVersion: "apps.open-cluster-management.io/v1alpha1", }, @@ -435,7 +431,7 @@ func (r *ReconcileSubscription) initObjectStore(channel *chnv1alpha1.Channel) (* region := "" if channel.Spec.SecretRef != nil { - channelSecret := &corev1.Secret{} + channelSecret := &v1.Secret{} chnseckey := types.NamespacedName{ Name: channel.Spec.SecretRef.Name, Namespace: channel.Namespace, @@ -514,7 +510,7 @@ func (r *ReconcileSubscription) getObjectBucketResources(sub *appv1alpha1.Subscr var folderName *string annotations := sub.GetAnnotations() - bucketPath := annotations[appv1.AnnotationBucketPath] + bucketPath := annotations[appv1alpha1.AnnotationBucketPath] if bucketPath != "" { folderName = &bucketPath diff --git a/pkg/controller/mcmhub/mcmhub_controller.go b/pkg/controller/mcmhub/mcmhub_controller.go index 5c4b39c8..3e37432b 100644 --- a/pkg/controller/mcmhub/mcmhub_controller.go +++ b/pkg/controller/mcmhub/mcmhub_controller.go @@ -16,13 +16,13 @@ package mcmhub import ( "context" + "errors" "fmt" "strconv" "strings" "time" rbacv1 "k8s.io/api/rbac/v1" - "k8s.io/apimachinery/pkg/api/errors" k8serrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -45,7 +45,6 @@ import ( clusterapi "open-cluster-management.io/api/cluster/v1beta1" chnv1 "open-cluster-management.io/multicloud-operators-channel/pkg/apis/apps/v1" appv1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" - subv1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" appSubStatusV1alpha1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1alpha1" "open-cluster-management.io/multicloud-operators-subscription/pkg/utils" ) @@ -501,7 +500,7 @@ func (r *ReconcileSubscription) Reconcile(ctx context.Context, request reconcile err := r.Get(context.TODO(), request.NamespacedName, instance) if err != nil { - if errors.IsNotFound(err) { + if k8serrors.IsNotFound(err) { klog.Info("Subscription: ", request.NamespacedName, " is gone") klog.Infof("Clean up all the manifestWorks owned by appsub: %v", request.NamespacedName) @@ -552,7 +551,7 @@ func (r *ReconcileSubscription) Reconcile(ctx context.Context, request reconcile strings.EqualFold(string(primaryChannel.Spec.Type), chnv1.ChannelTypeGitHub) { if err := r.hubGitOps.RegisterBranch(instance); err != nil { logger.Error(err, "failed to initialize Git connection") - preErr = fmt.Errorf("failed to initialize Git connection, err: %v", err) + preErr = fmt.Errorf("failed to initialize Git connection, err: %w", err) passedBranchRegistration = false @@ -562,7 +561,7 @@ func (r *ReconcileSubscription) Reconcile(ctx context.Context, request reconcile // register will skip the failed clone repo if err := r.hooks.RegisterSubscription(instance, placementDecisionUpdated, placementDecisionRv); err != nil { logger.Error(err, "failed to register hooks, skip the subscription reconcile") - preErr = fmt.Errorf("failed to register hooks, err: %v", err) + preErr = fmt.Errorf("failed to register hooks, err: %w", err) passedPrehook = false @@ -655,7 +654,7 @@ func (r *ReconcileSubscription) Reconcile(ctx context.Context, request reconcile // b, for each of the subscription created on managed cluster, it will check if // it is 1, propagated and 2, subscribed func (r *ReconcileSubscription) IsSubscriptionCompleted(subKey types.NamespacedName) (bool, error) { - subIns := &subv1.Subscription{} + subIns := &appv1.Subscription{} if err := r.Get(context.TODO(), subKey, subIns); err != nil { if k8serrors.IsNotFound(err) { return true, nil @@ -664,10 +663,10 @@ func (r *ReconcileSubscription) IsSubscriptionCompleted(subKey types.NamespacedN return false, err } - subFailSet := map[subv1.SubscriptionPhase]struct{}{ - subv1.SubscriptionPropagationFailed: {}, - subv1.SubscriptionFailed: {}, - subv1.SubscriptionUnknown: {}, + subFailSet := map[appv1.SubscriptionPhase]struct{}{ + appv1.SubscriptionPropagationFailed: {}, + appv1.SubscriptionFailed: {}, + appv1.SubscriptionUnknown: {}, } //check up the hub cluster status if _, ok := subFailSet[subIns.Status.Phase]; ok { @@ -720,7 +719,7 @@ func (r *ReconcileSubscription) IsSubscriptionCompleted(subKey types.NamespacedN //the requeue logic is done via set up the RequeueAfter parameter of the //reconciel.Result func (r *ReconcileSubscription) finalCommit(passedBranchRegistration bool, passedPrehook bool, preErr error, - oIns, nIns *subv1.Subscription, + oIns, nIns *appv1.Subscription, request reconcile.Request, res *reconcile.Result) { r.logger.Info("Enter finalCommit...") defer r.logger.Info("Exit finalCommit...") @@ -820,7 +819,7 @@ func (r *ReconcileSubscription) finalCommit(passedBranchRegistration bool, passe } // post hook will in a apply and don't report back manner - if err != r.hooks.ApplyPostHooks(request.NamespacedName) { + if !errors.Is(err, r.hooks.ApplyPostHooks(request.NamespacedName)) { r.logger.Error(err, "failed to apply postHook, skip the subscription reconcile, err:") } diff --git a/pkg/controller/mcmhub/mcmhub_controller_suite_test.go b/pkg/controller/mcmhub/mcmhub_controller_suite_test.go index 7a4dd756..47c6a371 100644 --- a/pkg/controller/mcmhub/mcmhub_controller_suite_test.go +++ b/pkg/controller/mcmhub/mcmhub_controller_suite_test.go @@ -17,7 +17,6 @@ package mcmhub import ( "context" "log" - stdlog "log" "os" "path/filepath" "sync" @@ -61,7 +60,7 @@ func TestMain(m *testing.M) { var err error if cfg, err = t.Start(); err != nil { - stdlog.Fatal(err) + log.Fatal(err) } var c client.Client diff --git a/pkg/controller/mcmhub/metaupdate.go b/pkg/controller/mcmhub/metaupdate.go index 2a3c5954..1f6402a0 100644 --- a/pkg/controller/mcmhub/metaupdate.go +++ b/pkg/controller/mcmhub/metaupdate.go @@ -34,7 +34,6 @@ import ( "k8s.io/client-go/discovery" cached "k8s.io/client-go/discovery/cached" "k8s.io/client-go/rest" - restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/klog/v2" @@ -164,7 +163,7 @@ func getHelmTopoResources(helmRls []*releasev1.HelmRelease, hubClt client.Client } //generateResourceList generates the resource list for given HelmRelease -func generateResourceList(client client.Client, rm meta.RESTMapper, cfg *restclient.Config, s *releasev1.HelmRelease) []*v1.ObjectReference { +func generateResourceList(client client.Client, rm meta.RESTMapper, cfg *rest.Config, s *releasev1.HelmRelease) []*v1.ObjectReference { chartDir, err := downloadChart(client, s) if err != nil { klog.Warning(err, " - Failed to download the chart") @@ -292,40 +291,7 @@ func (r *ReconcileSubscription) overridePrehookTopoAnnotation(subIns *subv1.Subs subIns.SetAnnotations(anno) } -func (r *ReconcileSubscription) appendAnsiblejobToSubsriptionAnnotation(anno map[string]string, subKey types.NamespacedName) map[string]string { - if len(anno) == 0 { - anno = map[string]string{} - } - - applied := r.hooks.GetLastAppliedInstance(subKey) - - topo := anno[subv1.AnnotationTopo] - - tPreJobs := applied.pre - tPostJobs := applied.post - - if len(tPreJobs) != 0 { - if len(topo) == 0 { - topo = tPreJobs - } else { - topo = fmt.Sprintf("%s,%s", topo, tPreJobs) - } - } - - if len(tPostJobs) != 0 { - if len(topo) == 0 { - topo = tPostJobs - } else { - topo = fmt.Sprintf("%s,%s", topo, tPostJobs) - } - } - - anno[subv1.AnnotationTopo] = topo - - return anno -} - -func newRESTClientGetter(rm meta.RESTMapper, cfg *restclient.Config, ns string) (genericclioptions.RESTClientGetter, error) { +func newRESTClientGetter(rm meta.RESTMapper, cfg *rest.Config, ns string) (genericclioptions.RESTClientGetter, error) { dc, err := discovery.NewDiscoveryClientForConfig(cfg) if err != nil { return nil, err diff --git a/pkg/controller/subscription/subscription_controller.go b/pkg/controller/subscription/subscription_controller.go index be71acad..6690a823 100644 --- a/pkg/controller/subscription/subscription_controller.go +++ b/pkg/controller/subscription/subscription_controller.go @@ -35,7 +35,6 @@ import ( hrsub "open-cluster-management.io/multicloud-operators-subscription/pkg/subscriber/helmrepo" ossub "open-cluster-management.io/multicloud-operators-subscription/pkg/subscriber/objectbucket" "open-cluster-management.io/multicloud-operators-subscription/pkg/utils" - subutil "open-cluster-management.io/multicloud-operators-subscription/pkg/utils" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/handler" @@ -245,7 +244,7 @@ func (r *ReconcileSubscription) Reconcile(ctx context.Context, request reconcile instance.Status.Phase = appv1.SubscriptionFailed instance.Status.Reason = reconcileErr.Error() - var emptyStatuses appv1.SubscriptionClusterStatusMap = make(appv1.SubscriptionClusterStatusMap) + var emptyStatuses = make(appv1.SubscriptionClusterStatusMap) instance.Status.Statuses = emptyStatuses klog.Errorf("doReconcile got error %v", reconcileErr) @@ -253,14 +252,12 @@ func (r *ReconcileSubscription) Reconcile(ctx context.Context, request reconcile // Update AppstatusReference appsubStatusName := request.NamespacedName.Name - if strings.HasSuffix(appsubStatusName, "-local") { - appsubStatusName = appsubStatusName[:len(appsubStatusName)-6] - } + appsubStatusName = strings.TrimSuffix(appsubStatusName, "-local") instance.Status.AppstatusReference = fmt.Sprintf("kubectl get appsubstatus -n %s %s", request.NamespacedName.Namespace, appsubStatusName) // if the subscription pause lable is true, stop updating subscription status. - if subutil.GetPauseLabel(instance) { + if utils.GetPauseLabel(instance) { klog.Info("updating subscription status: ", request.NamespacedName, " is paused") return reconcile.Result{}, nil @@ -300,7 +297,7 @@ func (r *ReconcileSubscription) Reconcile(ctx context.Context, request reconcile klog.Infof("Subscription %v is no longer local subscription. Remove subscription packages.", request.NamespacedName) // no longer local // if the subscription pause lable is true, stop unsubscription here. - if subutil.GetPauseLabel(instance) { + if utils.GetPauseLabel(instance) { klog.Info("unsubscribing: ", request.NamespacedName, " is paused") return reconcile.Result{}, nil @@ -491,7 +488,7 @@ func (r *ReconcileSubscription) doReconcile(instance *appv1.Subscription) error klog.V(1).Infof("k: %v, sub: %v, subtype:%v, unsubscribe %v/%v", k, sub, subtype, subitem.Subscription.Namespace, subitem.Subscription.Name) // if the subscription pause lable is true, stop unsubscription here. - if subutil.GetPauseLabel(subitem.Subscription) { + if utils.GetPauseLabel(subitem.Subscription) { klog.Infof("unsubscription: %v/%v is paused.", subitem.Subscription.Namespace, subitem.Subscription.Name) continue } diff --git a/pkg/controller/subscription/subscription_controller_suite_test.go b/pkg/controller/subscription/subscription_controller_suite_test.go index 8e043534..912f67ef 100644 --- a/pkg/controller/subscription/subscription_controller_suite_test.go +++ b/pkg/controller/subscription/subscription_controller_suite_test.go @@ -17,7 +17,6 @@ package subscription import ( "context" "log" - stdlog "log" "os" "path/filepath" "sync" @@ -51,7 +50,7 @@ func TestMain(m *testing.M) { var err error if cfg, err = t.Start(); err != nil { - stdlog.Fatal(err) + log.Fatal(err) } var c client.Client diff --git a/pkg/placementrule/controller/placementrule/placement.go b/pkg/placementrule/controller/placementrule/placement.go index 549e0585..50008795 100644 --- a/pkg/placementrule/controller/placementrule/placement.go +++ b/pkg/placementrule/controller/placementrule/placement.go @@ -22,10 +22,8 @@ import ( "strings" - rbacv1 "k8s.io/api/authorization/v1" cbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/resource" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" @@ -436,60 +434,6 @@ func (r *ReconcilePlacementRule) GetManagedClusters(clusterRoleName string, clma return managedClusters } -func (r *ReconcilePlacementRule) filteClustersByIdentityAnno(instance *appv1alpha1.PlacementRule, clmap map[string]*spokeClusterV1.ManagedCluster) { - objanno := instance.GetAnnotations() - if objanno == nil { - return - } - - if _, ok := objanno[appv1alpha1.UserIdentityAnnotation]; !ok { - return - } - - user, groups := utils.ExtractUserAndGroup(objanno) - - userKubeClient := r.Impersonate(user, groups) - - for clusterName, cl := range clmap { - manageCluster := cl.DeepCopy() - if !r.checkUserPermission(userKubeClient, manageCluster, user, groups) { - delete(clmap, clusterName) - } - } - - r.UnsetImpersonate(user, groups) -} - -// checkUserPermission checks if user can get managedCluster KIND resource. -func (r *ReconcilePlacementRule) checkUserPermission(userKubeClient *kubernetes.Clientset, managedCluster *spokeClusterV1.ManagedCluster, - user string, groups []string) bool { - clusterName := managedCluster.GetName() - - selfSAR := &rbacv1.SelfSubjectAccessReview{ - Spec: rbacv1.SelfSubjectAccessReviewSpec{ - ResourceAttributes: &rbacv1.ResourceAttributes{ - Name: clusterName, - Group: "cluster.open-cluster-management.io", - Verb: "get", - Resource: "managedclusters", - }, - }, - } - - result, err := userKubeClient.AuthorizationV1().SelfSubjectAccessReviews().Create(context.TODO(), selfSAR, v1.CreateOptions{}) - klog.Infof("user: %v, groups: %v, cluster:%v, result:%v, err:%v", user, groups, clusterName, result, err) - - if err != nil { - return false - } - - if !result.Status.Allowed { - return false - } - - return true -} - func (r *ReconcilePlacementRule) Impersonate(user string, groups []string) *kubernetes.Clientset { klog.Info("Impersonate user config...") diff --git a/pkg/placementrule/utils/auth.go b/pkg/placementrule/utils/auth.go index 304fd21d..34ecbce6 100644 --- a/pkg/placementrule/utils/auth.go +++ b/pkg/placementrule/utils/auth.go @@ -44,7 +44,7 @@ var ( func FilteClustersByIdentity(authClient kubernetes.Interface, object runtime.Object, clmap map[string]*spokeClusterV1.ManagedCluster) error { objmeta, err := meta.Accessor(object) if err != nil { - return nil + return err } objanno := objmeta.GetAnnotations() diff --git a/pkg/subscriber/git/git_subscriber_test.go b/pkg/subscriber/git/git_subscriber_test.go index 7ea92eb7..af0139c7 100644 --- a/pkg/subscriber/git/git_subscriber_test.go +++ b/pkg/subscriber/git/git_subscriber_test.go @@ -20,7 +20,6 @@ import ( "github.com/ghodss/yaml" . "github.com/onsi/ginkgo/v2" - "github.com/onsi/gomega" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -29,7 +28,6 @@ import ( chnv1alpha1 "open-cluster-management.io/multicloud-operators-channel/pkg/apis/apps/v1" - appv1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" appv1alpha1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" testutils "open-cluster-management.io/multicloud-operators-subscription/pkg/utils" ) @@ -189,7 +187,7 @@ var _ = Describe("github subscriber reconcile logic", func() { // Test kube resource with no package filter errMsg := subitem.checkFilters(rsc) - Expect(errMsg).To(gomega.Equal("")) + Expect(errMsg).To(Equal("")) matchLabels := make(map[string]string) matchLabels["environment"] = "dev" @@ -536,8 +534,8 @@ var _ = Describe("github subscriber reconcile options", func() { "propagate them to the synchronizer", func() { subAnnotations := make(map[string]string) - subAnnotations[appv1.AnnotationClusterAdmin] = "true" - subAnnotations[appv1.AnnotationResourceReconcileOption] = "merge" + subAnnotations[appv1alpha1.AnnotationClusterAdmin] = "true" + subAnnotations[appv1alpha1.AnnotationResourceReconcileOption] = "merge" subAnnotations[appv1alpha1.AnnotationGitBranch] = "main" githubsub.SetAnnotations(subAnnotations) githubsub.Spec.PackageFilter = nil @@ -559,7 +557,7 @@ data: Expect(err).NotTo(HaveOccurred()) rscAnnotations := resource.GetAnnotations() - Expect(rscAnnotations[appv1.AnnotationClusterAdmin]).To(Equal("true")) - Expect(rscAnnotations[appv1.AnnotationResourceReconcileOption]).To(Equal("merge")) + Expect(rscAnnotations[appv1alpha1.AnnotationClusterAdmin]).To(Equal("true")) + Expect(rscAnnotations[appv1alpha1.AnnotationResourceReconcileOption]).To(Equal("merge")) }) }) diff --git a/pkg/synchronizer/kubernetes/sync_appsubstatus.go b/pkg/synchronizer/kubernetes/sync_appsubstatus.go index f8e6bc73..1288f007 100644 --- a/pkg/synchronizer/kubernetes/sync_appsubstatus.go +++ b/pkg/synchronizer/kubernetes/sync_appsubstatus.go @@ -23,7 +23,6 @@ import ( metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" appv1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" - v1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" v1alpha1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1alpha1" "open-cluster-management.io/multicloud-operators-subscription/pkg/utils" ) @@ -416,7 +415,7 @@ func updateAppsubReportResult(rClient client.Client, appsubNs, appsubName, if standalone { // Check if a hosting-subscription exists - appsub := &v1.Subscription{} + appsub := &appv1.Subscription{} if isLocalCluster && !strings.HasSuffix(appsubName, localSuffix) { appsubName += localSuffix @@ -503,7 +502,7 @@ func deleteAppsubReportResult(rClient client.Client, appsubNs, appsubName, clust if standalone { // Check if a hosting-subscription exists - appsub := &v1.Subscription{} + appsub := &appv1.Subscription{} if err := rClient.Get(context.TODO(), client.ObjectKey{Name: appsubName, Namespace: appsubNs}, appsub); err != nil { diff --git a/pkg/synchronizer/kubernetes/sync_appsubstatus_test.go b/pkg/synchronizer/kubernetes/sync_appsubstatus_test.go index 5f807347..1bebeeda 100644 --- a/pkg/synchronizer/kubernetes/sync_appsubstatus_test.go +++ b/pkg/synchronizer/kubernetes/sync_appsubstatus_test.go @@ -20,14 +20,12 @@ import ( "time" . "github.com/onsi/ginkgo/v2" - "github.com/onsi/gomega" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" appv1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" appSubStatusV1alpha1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1alpha1" - v1alpha1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -109,19 +107,19 @@ var _ = Describe("test create/update/delete appsub status for standalone and man pkgstatusNs := appsubClusterStatus.AppSub.Namespace pkgstatusName := appsubName - pkgstatuses := &v1alpha1.SubscriptionStatusList{} + pkgstatuses := &appSubStatusV1alpha1.SubscriptionStatusList{} listopts := &client.ListOptions{Namespace: pkgstatusNs} err = k8sClient.List(context.TODO(), pkgstatuses, listopts) Expect(err).NotTo(HaveOccurred()) - Expect(len(pkgstatuses.Items)).To(gomega.Equal(1)) - Expect(pkgstatuses.Items[0].Name).To(gomega.Equal(pkgstatusName)) - Expect(len(pkgstatuses.Items[0].Statuses.SubscriptionStatus)).To(gomega.Equal(1)) + Expect(len(pkgstatuses.Items)).To(Equal(1)) + Expect(pkgstatuses.Items[0].Name).To(Equal(pkgstatusName)) + Expect(len(pkgstatuses.Items[0].Statuses.SubscriptionStatus)).To(Equal(1)) // No cluster appsub report is created appsubReport := &appSubStatusV1alpha1.SubscriptionReport{} err = k8sClient.Get(context.TODO(), client.ObjectKey{Name: appsubClusterStatus.Cluster, Namespace: appsubClusterStatus.Cluster}, appsubReport) Expect(err).To(HaveOccurred()) - Expect(errors.IsNotFound(err)).To(gomega.BeTrue()) + Expect(errors.IsNotFound(err)).To(BeTrue()) // Update to add a subscription unit status appSubUnitStatus2.Phase = string(appSubStatusV1alpha1.PackageDeployed) @@ -139,10 +137,10 @@ var _ = Describe("test create/update/delete appsub status for standalone and man err = k8sClient.List(context.TODO(), pkgstatuses, listopts) Expect(err).NotTo(HaveOccurred()) - Expect(len(pkgstatuses.Items)).To(gomega.Equal(1)) + Expect(len(pkgstatuses.Items)).To(Equal(1)) - Expect(pkgstatuses.Items[0].Name).To(gomega.Equal(pkgstatusName)) - Expect(len(pkgstatuses.Items[0].Statuses.SubscriptionStatus)).To(gomega.Equal(2)) + Expect(pkgstatuses.Items[0].Name).To(Equal(pkgstatusName)) + Expect(len(pkgstatuses.Items[0].Statuses.SubscriptionStatus)).To(Equal(2)) // Delete rmAppsubClusterStatus := SubscriptionClusterStatus{ @@ -159,7 +157,7 @@ var _ = Describe("test create/update/delete appsub status for standalone and man err = k8sClient.List(context.TODO(), pkgstatuses, listopts) Expect(err).NotTo(HaveOccurred()) - Expect(len(pkgstatuses.Items)).To(gomega.Equal(0)) + Expect(len(pkgstatuses.Items)).To(Equal(0)) // Wait for cleanup to complete time.Sleep(4 * time.Second) @@ -202,19 +200,19 @@ var _ = Describe("test create/update/delete appsub status for standalone and man pkgstatusNs = appsubClusterStatus.AppSub.Namespace pkgstatusName = appsubName - pkgstatuses = &v1alpha1.SubscriptionStatusList{} + pkgstatuses = &appSubStatusV1alpha1.SubscriptionStatusList{} listopts = &client.ListOptions{Namespace: pkgstatusNs} err = k8sClient.List(context.TODO(), pkgstatuses, listopts) Expect(err).NotTo(HaveOccurred()) - Expect(len(pkgstatuses.Items)).To(gomega.Equal(1)) - Expect(pkgstatuses.Items[0].Name).To(gomega.Equal(pkgstatusName)) + Expect(len(pkgstatuses.Items)).To(Equal(1)) + Expect(pkgstatuses.Items[0].Name).To(Equal(pkgstatusName)) // Cluster appsub report is created with a deployed result cAppsubReport := &appSubStatusV1alpha1.SubscriptionReport{} err = k8sClient.Get(context.TODO(), client.ObjectKey{Name: appsubClusterStatus.Cluster, Namespace: appsubClusterStatus.Cluster}, cAppsubReport) Expect(err).NotTo(HaveOccurred()) - Expect(len(cAppsubReport.Results)).To(gomega.Equal(1)) - Expect(cAppsubReport.Results[0].Result).To(gomega.Equal(appSubStatusV1alpha1.SubscriptionResult("deployed"))) + Expect(len(cAppsubReport.Results)).To(Equal(1)) + Expect(cAppsubReport.Results[0].Result).To(Equal(appSubStatusV1alpha1.SubscriptionResult("deployed"))) // Update to add a failed subscription unit status appSubUnitStatus2.Phase = string(appSubStatusV1alpha1.PackageDeployFailed) @@ -232,15 +230,15 @@ var _ = Describe("test create/update/delete appsub status for standalone and man err = k8sClient.List(context.TODO(), pkgstatuses, listopts) Expect(err).NotTo(HaveOccurred()) - Expect(len(pkgstatuses.Items)).To(gomega.Equal(1)) + Expect(len(pkgstatuses.Items)).To(Equal(1)) - Expect(pkgstatuses.Items[0].Name).To(gomega.Equal(pkgstatusName)) - Expect(len(pkgstatuses.Items[0].Statuses.SubscriptionStatus)).To(gomega.Equal(2)) + Expect(pkgstatuses.Items[0].Name).To(Equal(pkgstatusName)) + Expect(len(pkgstatuses.Items[0].Statuses.SubscriptionStatus)).To(Equal(2)) err = k8sClient.Get(context.TODO(), client.ObjectKey{Name: appsubClusterStatus.Cluster, Namespace: appsubClusterStatus.Cluster}, cAppsubReport) Expect(err).NotTo(HaveOccurred()) - Expect(len(cAppsubReport.Results)).To(gomega.Equal(1)) - Expect(cAppsubReport.Results[0].Result).To(gomega.Equal(appSubStatusV1alpha1.SubscriptionResult("failed"))) + Expect(len(cAppsubReport.Results)).To(Equal(1)) + Expect(cAppsubReport.Results[0].Result).To(Equal(appSubStatusV1alpha1.SubscriptionResult("failed"))) // Update to change phase of failed subscription unit status to deployed appSubUnitStatus2.Phase = string(appSubStatusV1alpha1.PackageDeployed) @@ -260,15 +258,15 @@ var _ = Describe("test create/update/delete appsub status for standalone and man err = k8sClient.List(context.TODO(), pkgstatuses, listopts) Expect(err).NotTo(HaveOccurred()) - Expect(len(pkgstatuses.Items)).To(gomega.Equal(1)) + Expect(len(pkgstatuses.Items)).To(Equal(1)) - Expect(pkgstatuses.Items[0].Name).To(gomega.Equal(pkgstatusName)) - Expect(len(pkgstatuses.Items[0].Statuses.SubscriptionStatus)).To(gomega.Equal(2)) + Expect(pkgstatuses.Items[0].Name).To(Equal(pkgstatusName)) + Expect(len(pkgstatuses.Items[0].Statuses.SubscriptionStatus)).To(Equal(2)) err = k8sClient.Get(context.TODO(), client.ObjectKey{Name: appsubClusterStatus.Cluster, Namespace: appsubClusterStatus.Cluster}, cAppsubReport) Expect(err).NotTo(HaveOccurred()) - Expect(len(cAppsubReport.Results)).To(gomega.Equal(1)) - Expect(cAppsubReport.Results[0].Result).To(gomega.Equal(appSubStatusV1alpha1.SubscriptionResult("deployed"))) + Expect(len(cAppsubReport.Results)).To(Equal(1)) + Expect(cAppsubReport.Results[0].Result).To(Equal(appSubStatusV1alpha1.SubscriptionResult("deployed"))) // Delete rmAppsubClusterStatus = SubscriptionClusterStatus{ @@ -285,7 +283,7 @@ var _ = Describe("test create/update/delete appsub status for standalone and man err = k8sClient.List(context.TODO(), pkgstatuses, listopts) Expect(err).NotTo(HaveOccurred()) - Expect(len(pkgstatuses.Items)).To(gomega.Equal(0)) + Expect(len(pkgstatuses.Items)).To(Equal(0)) // clean up cluster policy report after the test. Or it could fail the first standalone test if the test is done earlier err = k8sClient.Delete(context.TODO(), cAppsubReport) diff --git a/pkg/synchronizer/kubernetes/synchronizer.go b/pkg/synchronizer/kubernetes/synchronizer.go index 0df3439b..0afac98d 100644 --- a/pkg/synchronizer/kubernetes/synchronizer.go +++ b/pkg/synchronizer/kubernetes/synchronizer.go @@ -17,7 +17,6 @@ import ( corev1 "k8s.io/api/core/v1" errors "k8s.io/apimachinery/pkg/api/errors" - metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" @@ -40,7 +39,7 @@ func (sync *KubeSynchronizer) getGVRfromGVK(group, version, kind string) (schema mapping, err := sync.RestMapper.RESTMapping(pkgGK, version) if err != nil { - return schema.GroupVersionResource{}, false, fmt.Errorf("failed to get GVR from restmapping: %v", err) + return schema.GroupVersionResource{}, false, fmt.Errorf("failed to get GVR from restmapping: %w", err) } var isNamespaced = true @@ -134,7 +133,7 @@ func (sync *KubeSynchronizer) PurgeAllSubscribedResources(appsub *appv1alpha1.Su klog.Infof("Prepare to purge all resources deployed by the appsub: %v", hostSub.String()) appSubStatus := &appSubStatusV1alpha1.SubscriptionStatus{ - TypeMeta: metaV1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "SubscriptionStatus", APIVersion: "apps.open-cluster-management.io/v1alpha1", }, @@ -145,9 +144,7 @@ func (sync *KubeSynchronizer) PurgeAllSubscribedResources(appsub *appv1alpha1.Su // Handle appsubstatus on local-cluster if sync.hub && !sync.standalone { - if strings.HasSuffix(appsubStatusName, "-local") { - appsubStatusName = appsubStatusName[:len(appsubStatusName)-6] - } + appsubStatusName = strings.TrimSuffix(appsubStatusName, "-local") } appSubStatusKey := types.NamespacedName{ diff --git a/pkg/utils/gitrepo.go b/pkg/utils/gitrepo.go index c69a0f8d..387c0540 100644 --- a/pkg/utils/gitrepo.go +++ b/pkg/utils/gitrepo.go @@ -824,7 +824,7 @@ func sortKubeResource(crdsAndNamespaceFiles, rbacFiles, otherFiles []string, pat if err != nil { klog.Warning("Failed to unmarshal YAML file") // Just ignore the YAML - return crdsAndNamespaceFiles, rbacFiles, otherFiles, nil + return crdsAndNamespaceFiles, rbacFiles, otherFiles, err } if t.APIVersion != "" && t.Kind != "" { diff --git a/pkg/utils/gitrepo_test.go b/pkg/utils/gitrepo_test.go index 262c32f5..530dacf6 100644 --- a/pkg/utils/gitrepo_test.go +++ b/pkg/utils/gitrepo_test.go @@ -37,7 +37,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" chnv1 "open-cluster-management.io/multicloud-operators-channel/pkg/apis/apps/v1" - appv1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" appv1alpha1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" ) @@ -58,12 +57,12 @@ var ( }, } - githubsub = &appv1.Subscription{ + githubsub = &appv1alpha1.Subscription{ ObjectMeta: metav1.ObjectMeta{ Name: sharedkey.Name, Namespace: sharedkey.Namespace, }, - Spec: appv1.SubscriptionSpec{ + Spec: appv1alpha1.SubscriptionSpec{ Channel: sharedkey.String(), }, } @@ -905,7 +904,7 @@ metadata: func subAdminClusterRole() *rbacv1.ClusterRole { return &rbacv1.ClusterRole{ ObjectMeta: metav1.ObjectMeta{ - Name: appv1.SubscriptionAdmin, + Name: appv1alpha1.SubscriptionAdmin, }, Rules: []rbacv1.PolicyRule{ { @@ -939,7 +938,7 @@ func subAdminClusterRoleBinding() *rbacv1.ClusterRoleBinding { }, RoleRef: rbacv1.RoleRef{ Kind: "ClusterRole", - Name: appv1.SubscriptionAdmin, + Name: appv1alpha1.SubscriptionAdmin, }, } } diff --git a/pkg/utils/helmrepo.go b/pkg/utils/helmrepo.go index cc1279a6..6dcdeab4 100644 --- a/pkg/utils/helmrepo.go +++ b/pkg/utils/helmrepo.go @@ -30,7 +30,6 @@ import ( clientsetx "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" @@ -668,7 +667,7 @@ func DeleteHelmReleaseCRD(runtimeClient client.Client, crdx *clientsetx.Clientse } } // now get rid of the crd - err = crdx.ApiextensionsV1().CustomResourceDefinitions().Delete(context.TODO(), "helmreleases.apps.open-cluster-management.io", v1.DeleteOptions{}) + err = crdx.ApiextensionsV1().CustomResourceDefinitions().Delete(context.TODO(), "helmreleases.apps.open-cluster-management.io", metav1.DeleteOptions{}) if err != nil { klog.Infof("Deleting helmrelease CRD failed. err: %s", err.Error()) } else { diff --git a/pkg/utils/helmrepo_test.go b/pkg/utils/helmrepo_test.go index 72dbcf92..8d4493de 100644 --- a/pkg/utils/helmrepo_test.go +++ b/pkg/utils/helmrepo_test.go @@ -33,7 +33,6 @@ import ( chnv1 "open-cluster-management.io/multicloud-operators-channel/pkg/apis/apps/v1" releasev1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/helmrelease/v1" - appv1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" appv1alpha1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" ) @@ -54,12 +53,12 @@ var ( }, } - helmsub = &appv1.Subscription{ + helmsub = &appv1alpha1.Subscription{ ObjectMeta: metav1.ObjectMeta{ Name: helmkey.Name, Namespace: helmkey.Namespace, }, - Spec: appv1.SubscriptionSpec{ + Spec: appv1alpha1.SubscriptionSpec{ Channel: helmkey.String(), }, } @@ -71,14 +70,14 @@ func TestGetPackageAlias(t *testing.T) { pkgAlias := GetPackageAlias(githubsub, "") g.Expect(pkgAlias).To(gomega.Equal("")) - pkgOverrides1 := &appv1.Overrides{} + pkgOverrides1 := &appv1alpha1.Overrides{} pkgOverrides1.PackageName = "pkgName1" - pkgOverrides2 := &appv1.Overrides{} + pkgOverrides2 := &appv1alpha1.Overrides{} pkgOverrides2.PackageName = "pkgName2" pkgOverrides2.PackageAlias = "pkgName2Alias" - packageOverrides := make([]*appv1.Overrides, 0) + packageOverrides := make([]*appv1alpha1.Overrides, 0) packageOverrides = append(packageOverrides, pkgOverrides1, pkgOverrides2) githubsub.Spec.PackageOverrides = packageOverrides diff --git a/pkg/utils/reference.go b/pkg/utils/reference.go index 3fa09553..9b4ff09a 100644 --- a/pkg/utils/reference.go +++ b/pkg/utils/reference.go @@ -212,7 +212,7 @@ func DeleteReferredObjects(clt client.Client, rq types.NamespacedName, gvk schem u.SetOwnerReferences(newOwers) err := clt.Update(context.TODO(), u) if err != nil { - return nil + return err } } } diff --git a/pkg/utils/subscription.go b/pkg/utils/subscription.go index e17e3eec..ae79dfe9 100644 --- a/pkg/utils/subscription.go +++ b/pkg/utils/subscription.go @@ -42,7 +42,6 @@ import ( "k8s.io/apimachinery/pkg/api/equality" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" @@ -822,12 +821,12 @@ func DeleteSubscriptionCRD(runtimeClient client.Client, crdx *clientsetx.Clients } } - _, err := crdx.ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), "multiclusterhubs.operator.open-cluster-management.io", v1.GetOptions{}) + _, err := crdx.ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), "multiclusterhubs.operator.open-cluster-management.io", metav1.GetOptions{}) if err != nil && kerrors.IsNotFound(err) { klog.Info("This is not ACM hub cluster. Deleting subscription CRD.") // now get rid of the crd. - err = crdx.ApiextensionsV1().CustomResourceDefinitions().Delete(context.TODO(), "subscriptions.apps.open-cluster-management.io", v1.DeleteOptions{}) + err = crdx.ApiextensionsV1().CustomResourceDefinitions().Delete(context.TODO(), "subscriptions.apps.open-cluster-management.io", metav1.DeleteOptions{}) if err != nil { klog.Infof("Deleting subscription CRD failed. err: %s", err.Error()) } else { diff --git a/pkg/utils/subscription_test.go b/pkg/utils/subscription_test.go index afc815cf..e30d9efa 100644 --- a/pkg/utils/subscription_test.go +++ b/pkg/utils/subscription_test.go @@ -23,7 +23,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" clientsetx "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apimachinery/pkg/api/errors" @@ -283,10 +282,10 @@ var _ = Describe("subscription(s)", func() { }) func TestDeleteSubscriptionCRD(t *testing.T) { - g := gomega.NewGomegaWithT(t) + g := NewGomegaWithT(t) mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"}) - g.Expect(err).NotTo(gomega.HaveOccurred()) + g.Expect(err).NotTo(HaveOccurred()) c = mgr.GetClient() @@ -299,24 +298,24 @@ func TestDeleteSubscriptionCRD(t *testing.T) { }() crdx, err := clientsetx.NewForConfig(cfg) - g.Expect(err).NotTo(gomega.HaveOccurred()) + g.Expect(err).NotTo(HaveOccurred()) runtimeClient, err := client.New(cfg, client.Options{}) - g.Expect(err).NotTo(gomega.HaveOccurred()) + g.Expect(err).NotTo(HaveOccurred()) slist := &appv1.SubscriptionList{} err = runtimeClient.List(context.TODO(), slist, &client.ListOptions{}) - g.Expect(err).NotTo(gomega.HaveOccurred()) + g.Expect(err).NotTo(HaveOccurred()) DeleteSubscriptionCRD(runtimeClient, crdx) slist = &appv1.SubscriptionList{} err = runtimeClient.List(context.TODO(), slist, &client.ListOptions{}) - g.Expect(!errors.IsNotFound(err)).To(gomega.BeTrue()) + g.Expect(!errors.IsNotFound(err)).To(BeTrue()) slist = &appv1.SubscriptionList{} err = runtimeClient.List(context.TODO(), slist, &client.ListOptions{}) - g.Expect(!errors.IsNotFound(err)).To(gomega.BeTrue()) + g.Expect(!errors.IsNotFound(err)).To(BeTrue()) } func TestIsEqaulSubscriptionStatus(t *testing.T) { @@ -633,90 +632,90 @@ func TestIsSubscriptionBasicChanged(t *testing.T) { } func TestGetReconcileRate(t *testing.T) { - g := gomega.NewGomegaWithT(t) + g := NewGomegaWithT(t) chnAnnotations := make(map[string]string) subAnnotations := make(map[string]string) // defaut medium - g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(gomega.Equal("medium")) + g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(Equal("medium")) chnAnnotations[appv1.AnnotationResourceReconcileLevel] = "off" - g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(gomega.Equal("off")) + g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(Equal("off")) chnAnnotations[appv1.AnnotationResourceReconcileLevel] = "low" - g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(gomega.Equal("low")) + g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(Equal("low")) chnAnnotations[appv1.AnnotationResourceReconcileLevel] = "medium" - g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(gomega.Equal("medium")) + g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(Equal("medium")) chnAnnotations[appv1.AnnotationResourceReconcileLevel] = "high" - g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(gomega.Equal("high")) + g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(Equal("high")) // Subscription can override reconcile level to be off subAnnotations[appv1.AnnotationResourceReconcileLevel] = "off" - g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(gomega.Equal("off")) + g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(Equal("off")) // Subscription can not override reconcile level to be something other than off subAnnotations[appv1.AnnotationResourceReconcileLevel] = "low" - g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(gomega.Equal("high")) + g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(Equal("high")) // If annotation has unknown value, default to medium chnAnnotations[appv1.AnnotationResourceReconcileLevel] = "mediumhigh" - g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(gomega.Equal("medium")) + g.Expect(GetReconcileRate(chnAnnotations, subAnnotations)).To(Equal("medium")) } func TestGetReconcileInterval(t *testing.T) { - g := gomega.NewGomegaWithT(t) + g := NewGomegaWithT(t) // these intervals are not used if off. Just default values loopPeriod, retryInterval, retries := GetReconcileInterval("off", chnv1.ChannelTypeGit) - g.Expect(loopPeriod).To(gomega.Equal(3 * time.Minute)) - g.Expect(retryInterval).To(gomega.Equal(90 * time.Second)) - g.Expect(retries).To(gomega.Equal(1)) + g.Expect(loopPeriod).To(Equal(3 * time.Minute)) + g.Expect(retryInterval).To(Equal(90 * time.Second)) + g.Expect(retries).To(Equal(1)) // if reconcile rate is unknown, just default values loopPeriod, retryInterval, retries = GetReconcileInterval("unknown", chnv1.ChannelTypeGit) - g.Expect(loopPeriod).To(gomega.Equal(3 * time.Minute)) - g.Expect(retryInterval).To(gomega.Equal(90 * time.Second)) - g.Expect(retries).To(gomega.Equal(1)) + g.Expect(loopPeriod).To(Equal(3 * time.Minute)) + g.Expect(retryInterval).To(Equal(90 * time.Second)) + g.Expect(retries).To(Equal(1)) loopPeriod, retryInterval, retries = GetReconcileInterval("low", chnv1.ChannelTypeGit) - g.Expect(loopPeriod).To(gomega.Equal(1 * time.Hour)) - g.Expect(retryInterval).To(gomega.Equal(3 * time.Minute)) - g.Expect(retries).To(gomega.Equal(3)) + g.Expect(loopPeriod).To(Equal(1 * time.Hour)) + g.Expect(retryInterval).To(Equal(3 * time.Minute)) + g.Expect(retries).To(Equal(3)) loopPeriod, retryInterval, retries = GetReconcileInterval("medium", chnv1.ChannelTypeGit) - g.Expect(loopPeriod).To(gomega.Equal(3 * time.Minute)) - g.Expect(retryInterval).To(gomega.Equal(90 * time.Second)) - g.Expect(retries).To(gomega.Equal(1)) + g.Expect(loopPeriod).To(Equal(3 * time.Minute)) + g.Expect(retryInterval).To(Equal(90 * time.Second)) + g.Expect(retries).To(Equal(1)) loopPeriod, retryInterval, retries = GetReconcileInterval("medium", chnv1.ChannelTypeHelmRepo) - g.Expect(loopPeriod).To(gomega.Equal(15 * time.Minute)) - g.Expect(retryInterval).To(gomega.Equal(90 * time.Second)) - g.Expect(retries).To(gomega.Equal(1)) + g.Expect(loopPeriod).To(Equal(15 * time.Minute)) + g.Expect(retryInterval).To(Equal(90 * time.Second)) + g.Expect(retries).To(Equal(1)) loopPeriod, retryInterval, retries = GetReconcileInterval("high", chnv1.ChannelTypeGit) - g.Expect(loopPeriod).To(gomega.Equal(2 * time.Minute)) - g.Expect(retryInterval).To(gomega.Equal(60 * time.Second)) - g.Expect(retries).To(gomega.Equal(1)) + g.Expect(loopPeriod).To(Equal(2 * time.Minute)) + g.Expect(retryInterval).To(Equal(60 * time.Second)) + g.Expect(retries).To(Equal(1)) } func TestSetPartOfLabel(t *testing.T) { - g := gomega.NewGomegaWithT(t) + g := NewGomegaWithT(t) // No app label in subscription sub := &appv1.Subscription{} obj := &unstructured.Unstructured{} SetPartOfLabel(sub, obj) labels := obj.GetLabels() - g.Expect(labels).To(gomega.BeNil()) + g.Expect(labels).To(BeNil()) // Has app label in subscription subLabels := make(map[string]string) @@ -724,6 +723,6 @@ func TestSetPartOfLabel(t *testing.T) { sub.Labels = subLabels SetPartOfLabel(sub, obj) labels = obj.GetLabels() - g.Expect(labels).NotTo(gomega.BeNil()) - g.Expect(labels["app.kubernetes.io/part-of"]).To(gomega.Equal("testApp")) + g.Expect(labels).NotTo(BeNil()) + g.Expect(labels["app.kubernetes.io/part-of"]).To(Equal("testApp")) } diff --git a/pkg/utils/util_suite_test.go b/pkg/utils/util_suite_test.go index ff738c0c..0772baf8 100644 --- a/pkg/utils/util_suite_test.go +++ b/pkg/utils/util_suite_test.go @@ -18,7 +18,6 @@ import ( "context" "fmt" "log" - stdlog "log" "os" "path/filepath" "sync" @@ -53,7 +52,7 @@ func TestMain(m *testing.M) { var err error if cfg, err = t.Start(); err != nil { - stdlog.Fatal(fmt.Errorf("got error while start up the envtest, err: %v", err)) + log.Fatal(fmt.Errorf("got error while start up the envtest, err: %w", err)) } var c client.Client diff --git a/pkg/webhook/listener/webhook_listener_suite_test.go b/pkg/webhook/listener/webhook_listener_suite_test.go index 4c554923..2a90dd18 100644 --- a/pkg/webhook/listener/webhook_listener_suite_test.go +++ b/pkg/webhook/listener/webhook_listener_suite_test.go @@ -17,7 +17,6 @@ package listener import ( "context" "log" - stdlog "log" "os" "sync" "testing" @@ -52,11 +51,11 @@ func TestMain(m *testing.M) { var err error if cfg, err = t.Start(); err != nil { - stdlog.Fatal(err) + log.Fatal(err) } if c, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}); err != nil { - stdlog.Fatal(err) + log.Fatal(err) } err = c.Create(context.Background(), &corev1.Namespace{ From f836a696d28563d79a1c7c8a928eb5b9b68b3a3b Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Tue, 5 Jul 2022 16:16:06 -0400 Subject: [PATCH 06/14] staticcheck Signed-off-by: Jonathan Marcantonio --- common/config/.golangci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/common/config/.golangci.yml b/common/config/.golangci.yml index 19eda91b..fe0f1b42 100644 --- a/common/config/.golangci.yml +++ b/common/config/.golangci.yml @@ -72,6 +72,7 @@ linters: - paralleltest - prealloc - predeclared + - staticcheck - scopelint - tagliatelle - tenv From 606495df7b5d51ce570ea450df31a964b453128b Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Wed, 6 Jul 2022 10:48:29 -0400 Subject: [PATCH 07/14] fix golangci-lint version Signed-off-by: Jonathan Marcantonio --- build/run-code-lint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/run-code-lint.sh b/build/run-code-lint.sh index 5a684676..f4d2f362 100755 --- a/build/run-code-lint.sh +++ b/build/run-code-lint.sh @@ -37,7 +37,7 @@ gem install mdl gem install awesome_bot # Install golangci-lint -curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin v1.28.3 +curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin v1.46.2 # Start lint task make -f Makefile.prow lint-all From a25d928f42096de3abc3f919428c67dfb5783a0d Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Wed, 6 Jul 2022 16:38:35 -0400 Subject: [PATCH 08/14] patch CVE-2022-31030 Signed-off-by: Jonathan Marcantonio --- go.mod | 2 +- go.sum | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 84a882a2..4481d710 100644 --- a/go.mod +++ b/go.mod @@ -77,7 +77,7 @@ require ( github.com/blang/semver v3.5.1+incompatible // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/chai2010/gettext-go v1.0.2 // indirect - github.com/containerd/containerd v1.6.2 // indirect + github.com/containerd/containerd v1.6.6 // indirect github.com/cyphar/filepath-securejoin v0.2.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/cli v20.10.12+incompatible // indirect diff --git a/go.sum b/go.sum index 68c29d02..a0b6a6e3 100644 --- a/go.sum +++ b/go.sum @@ -123,7 +123,7 @@ github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+V github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= github.com/Microsoft/hcsshim v0.8.23/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg= github.com/Microsoft/hcsshim v0.9.1/go.mod h1:Y/0uV2jUab5kBI7SQgl62at0AVX7uaruzADAVmxm3eM= -github.com/Microsoft/hcsshim v0.9.2 h1:wB06W5aYFfUB3IvootYAY2WnOmIdgPGfqSI6tufQNnY= +github.com/Microsoft/hcsshim v0.9.3 h1:k371PzBuRrz2b+ebGuI2nVgVhgsVX60jMfSw80NECxo= 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= @@ -305,8 +305,8 @@ github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoT github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g= github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c= github.com/containerd/containerd v1.5.9/go.mod h1:fvQqCfadDGga5HZyn3j4+dx56qj2I9YwBrlSdalvJYQ= -github.com/containerd/containerd v1.6.2 h1:pcaPUGbYW8kBw6OgIZwIVIeEhdWVrBzsoCfVJ5BjrLU= -github.com/containerd/containerd v1.6.2/go.mod h1:sidY30/InSE1j2vdD1ihtKoJz+lWdaXMdiAeIupaf+s= +github.com/containerd/containerd v1.6.6 h1:xJNPhbrmz8xAMDNoVjHy9YHtWwEQNS+CDkcIRh7t8Y0= +github.com/containerd/containerd v1.6.6/go.mod h1:ZoP1geJldzCVY3Tonoz7b1IXk8rIX0Nltt5QE4OMNk0= 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= From d56eb24394410573fa675a83f6ad330d1544734f Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Thu, 7 Jul 2022 15:13:03 -0400 Subject: [PATCH 09/14] enable linters gocognit, nolintlint, typecheck Signed-off-by: Jonathan Marcantonio --- common/config/.golangci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/config/.golangci.yml b/common/config/.golangci.yml index fe0f1b42..40214058 100644 --- a/common/config/.golangci.yml +++ b/common/config/.golangci.yml @@ -45,7 +45,6 @@ linters: - gci - gochecknoglobals - gochecknoinits - - gocognit - goconst - gocritic - gocyclo @@ -67,7 +66,6 @@ linters: - nilnil - nlreturn - noctx - - nolintlint - nonamedreturns - paralleltest - prealloc @@ -77,7 +75,6 @@ linters: - tagliatelle - tenv - testpackage - - typecheck - thelper - varnamelen - wastedassign @@ -93,6 +90,10 @@ linters-settings: # report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`; # default is false: such cases aren't reported by default. check-blank: false + nolintlint: + # Disable to ensure that all nolint directives actually have an effect. + # Default: false + allow-unused: true govet: # report about shadowed variables check-shadowing: false From f0b179883017341bff39839d48daf81ef556519f Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Thu, 7 Jul 2022 15:17:15 -0400 Subject: [PATCH 10/14] fix build Signed-off-by: Jonathan Marcantonio --- go.sum | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) diff --git a/go.sum b/go.sum index bc070508..9344427e 100644 --- a/go.sum +++ b/go.sum @@ -123,9 +123,7 @@ github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+V github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= github.com/Microsoft/hcsshim v0.8.23/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg= github.com/Microsoft/hcsshim v0.9.1/go.mod h1:Y/0uV2jUab5kBI7SQgl62at0AVX7uaruzADAVmxm3eM= -github.com/Microsoft/hcsshim v0.9.2/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= github.com/Microsoft/hcsshim v0.9.3 h1:k371PzBuRrz2b+ebGuI2nVgVhgsVX60jMfSw80NECxo= -github.com/Microsoft/hcsshim v0.9.3/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= 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= @@ -307,11 +305,6 @@ github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoT github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g= github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c= github.com/containerd/containerd v1.5.9/go.mod h1:fvQqCfadDGga5HZyn3j4+dx56qj2I9YwBrlSdalvJYQ= -<<<<<<< HEAD -======= -github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE= -github.com/containerd/containerd v1.6.2/go.mod h1:sidY30/InSE1j2vdD1ihtKoJz+lWdaXMdiAeIupaf+s= ->>>>>>> main github.com/containerd/containerd v1.6.6 h1:xJNPhbrmz8xAMDNoVjHy9YHtWwEQNS+CDkcIRh7t8Y0= github.com/containerd/containerd v1.6.6/go.mod h1:ZoP1geJldzCVY3Tonoz7b1IXk8rIX0Nltt5QE4OMNk0= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= @@ -329,12 +322,6 @@ github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1S 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= -<<<<<<< HEAD -======= -github.com/containerd/go-cni v1.1.0/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= -github.com/containerd/go-cni v1.1.3/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= -github.com/containerd/go-cni v1.1.6/go.mod h1:BWtoWl5ghVymxu6MBjg79W9NZrCRyHIdUtk4cauMe34= ->>>>>>> main 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= @@ -344,11 +331,6 @@ github.com/containerd/imgcrypt v1.0.1/go.mod h1:mdd8cEPW7TPgNG4FpuP3sGBiQ7Yi/zak 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= -<<<<<<< HEAD -======= -github.com/containerd/imgcrypt v1.1.3/go.mod h1:/TPA1GIDXMzbj01yd8pIbQiLdQxed5ue1wb8bP7PQu4= -github.com/containerd/imgcrypt v1.1.4/go.mod h1:LorQnPtzL/T0IyCeftcsMEO7AqxUDbdO8j/tSUpgxvo= ->>>>>>> main 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= @@ -371,25 +353,11 @@ github.com/containerd/zfs v1.0.0/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNR 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= -<<<<<<< HEAD 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/containernetworking/cni v1.0.1/go.mod h1:AKuhXbN5EzmD4yTNtfSsX3tPcmtrBI6QcRV0NiNt15Y= -github.com/containernetworking/cni v1.1.1/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw= -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/containernetworking/plugins v1.0.1/go.mod h1:QHCfGpaTwYTbbH+nZXKVTxNBDZcxSOplJT5ico8/FLE= -github.com/containernetworking/plugins v1.1.1/go.mod h1:Sr5TH/eBsGLXK/h71HeLfX19sZPp3ry5uHSkI4LPxV8= -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/containers/ocicrypt v1.1.2/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= -github.com/containers/ocicrypt v1.1.3/go.mod h1:xpdkbVAuaH3WzbEabUd5yDsl9SwJA5pABH85425Es2g= ->>>>>>> main 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= @@ -986,11 +954,6 @@ github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3N github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -<<<<<<< HEAD -======= -github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37/go.mod h1:dYWq+UWoFCDY1TndvFUQuhBbIYmZpjreC8adEAx93zE= ->>>>>>> main 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/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= @@ -1047,7 +1010,6 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW 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/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= -github.com/networkplumbing/go-nft v0.2.0/go.mod h1:HnnM+tYvlGAsMU7yoYwXEVLLiDW9gdMmb5HoGcwpuQs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= @@ -1087,7 +1049,6 @@ github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3I 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/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1 h1:9iFHD5Kt9hkOfeawBNiEeEaV7bmC4/Z5wJp8E9BptMs= github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1/go.mod h1:K/JAU0m27RFhDRX4PcFdIKntROP6y5Ed6O91aZYDQfs= github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= @@ -1096,11 +1057,6 @@ github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h 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/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= -<<<<<<< HEAD -======= -github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= -github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= ->>>>>>> main 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= @@ -1111,11 +1067,6 @@ github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mo 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/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= -<<<<<<< HEAD -======= -github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= -github.com/opencontainers/selinux v1.10.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= ->>>>>>> main github.com/openshift/api v0.0.0-20211209135129-c58d9f695577 h1:NUe82M8wMYXbd5s+WBAJ2QAZZivs+nhZ3zYgZFwKfqw= github.com/openshift/api v0.0.0-20211209135129-c58d9f695577/go.mod h1:DoslCwtqUpr3d/gsbq4ZlkaMEdYqKxuypsDjorcHhME= github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= @@ -1159,7 +1110,6 @@ github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQ github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= 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.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= From dcbc7abc21936a04402dde880ad4f6d4dc3a186d Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Thu, 7 Jul 2022 16:49:15 -0400 Subject: [PATCH 11/14] remove alpha1 versioning Signed-off-by: Jonathan Marcantonio --- pkg/controller/mcmhub/hub.go | 44 ++++++++++++++++++------------------ pkg/utils/gitrepo_test.go | 38 +++++++++++++++---------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/pkg/controller/mcmhub/hub.go b/pkg/controller/mcmhub/hub.go index 3804c860..95d2dd98 100644 --- a/pkg/controller/mcmhub/hub.go +++ b/pkg/controller/mcmhub/hub.go @@ -31,10 +31,10 @@ import ( "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/client" - chnv1alpha1 "open-cluster-management.io/multicloud-operators-channel/pkg/apis/apps/v1" + chnv1 "open-cluster-management.io/multicloud-operators-channel/pkg/apis/apps/v1" "github.com/ghodss/yaml" - appv1alpha1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" + appv1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" appsubreportv1alpha1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1alpha1" helmops "open-cluster-management.io/multicloud-operators-subscription/pkg/subscriber/helmrepo" "open-cluster-management.io/multicloud-operators-subscription/pkg/utils" @@ -42,7 +42,7 @@ import ( ) // doMCMHubReconcile process Subscription on hub - distribute it via manifestWork -func (r *ReconcileSubscription) doMCMHubReconcile(sub *appv1alpha1.Subscription) error { +func (r *ReconcileSubscription) doMCMHubReconcile(sub *appv1.Subscription) error { substr := fmt.Sprintf("%v/%v", sub.GetNamespace(), sub.GetName()) klog.V(1).Infof("entry doMCMHubReconcile %v", substr) @@ -71,7 +71,7 @@ func (r *ReconcileSubscription) doMCMHubReconcile(sub *appv1alpha1.Subscription) chnAnnotations := primaryChannel.GetAnnotations() - if chnAnnotations[appv1alpha1.AnnotationResourceReconcileLevel] != "" { + if chnAnnotations[appv1.AnnotationResourceReconcileLevel] != "" { // When channel reconcile rate is changed, this label is used to trigger // managed cluster to pick up the channel change and adjust reconcile rate. sublabels := sub.GetLabels() @@ -80,8 +80,8 @@ func (r *ReconcileSubscription) doMCMHubReconcile(sub *appv1alpha1.Subscription) sublabels = make(map[string]string) } - sublabels[appv1alpha1.AnnotationResourceReconcileLevel] = chnAnnotations[appv1alpha1.AnnotationResourceReconcileLevel] - klog.Info("Adding subscription label ", appv1alpha1.AnnotationResourceReconcileLevel, ": ", chnAnnotations[appv1alpha1.AnnotationResourceReconcileLevel]) + sublabels[appv1.AnnotationResourceReconcileLevel] = chnAnnotations[appv1.AnnotationResourceReconcileLevel] + klog.Info("Adding subscription label ", appv1.AnnotationResourceReconcileLevel, ": ", chnAnnotations[appv1.AnnotationResourceReconcileLevel]) sub.SetLabels(sublabels) } @@ -96,9 +96,9 @@ func (r *ReconcileSubscription) doMCMHubReconcile(sub *appv1alpha1.Subscription) var resources []*v1.ObjectReference switch tp := strings.ToLower(string(primaryChannel.Spec.Type)); tp { - case chnv1alpha1.ChannelTypeGit, chnv1alpha1.ChannelTypeGitHub: + case chnv1.ChannelTypeGit, chnv1.ChannelTypeGitHub: resources, err = r.GetGitResources(sub, isAdmin) - case chnv1alpha1.ChannelTypeHelmRepo: + case chnv1.ChannelTypeHelmRepo: helmRls, err := helmops.GetSubscriptionChartsOnHub(r.Client, primaryChannel, secondaryChannel, sub) if err != nil { klog.Error("failed to get the chart index for helm subscription %v, err: %v", ObjectString(sub), err) @@ -107,7 +107,7 @@ func (r *ReconcileSubscription) doMCMHubReconcile(sub *appv1alpha1.Subscription) } resources = getHelmTopoResources(helmRls, r.Client, r.cfg, r.restMapper, sub, isAdmin) - case chnv1alpha1.ChannelTypeObjectBucket: + case chnv1.ChannelTypeObjectBucket: resources, err = r.getObjectBucketResources(sub, primaryChannel, secondaryChannel, isAdmin) } @@ -141,7 +141,7 @@ func (r *ReconcileSubscription) doMCMHubReconcile(sub *appv1alpha1.Subscription) return err } -func (r *ReconcileSubscription) AddAppLabels(s *appv1alpha1.Subscription) { +func (r *ReconcileSubscription) AddAppLabels(s *appv1.Subscription) { labels := s.GetLabels() if labels == nil { @@ -166,7 +166,7 @@ func (r *ReconcileSubscription) AddAppLabels(s *appv1alpha1.Subscription) { } //GetChannelNamespaceType get the channel namespace and channel type by the given subscription -func (r *ReconcileSubscription) GetChannelNamespaceType(s *appv1alpha1.Subscription) (string, string, string) { +func (r *ReconcileSubscription) GetChannelNamespaceType(s *appv1.Subscription) (string, string, string) { chNameSpace := "" chName := "" chType := "" @@ -182,7 +182,7 @@ func (r *ReconcileSubscription) GetChannelNamespaceType(s *appv1alpha1.Subscript } chkey := types.NamespacedName{Name: chName, Namespace: chNameSpace} - chobj := &chnv1alpha1.Channel{} + chobj := &chnv1.Channel{} err := r.Get(context.TODO(), chkey, chobj) if err == nil { @@ -192,7 +192,7 @@ func (r *ReconcileSubscription) GetChannelNamespaceType(s *appv1alpha1.Subscript return chNameSpace, chName, chType } -func GetSubscriptionRefChannel(clt client.Client, s *appv1alpha1.Subscription) (*chnv1alpha1.Channel, *chnv1alpha1.Channel, error) { +func GetSubscriptionRefChannel(clt client.Client, s *appv1.Subscription) (*chnv1.Channel, *chnv1.Channel, error) { primaryChannel, err := parseGetChannel(clt, s.Spec.Channel) if err != nil { @@ -214,7 +214,7 @@ func GetSubscriptionRefChannel(clt client.Client, s *appv1alpha1.Subscription) ( return primaryChannel, secondaryChannel, err } -func parseGetChannel(clt client.Client, channelName string) (*chnv1alpha1.Channel, error) { +func parseGetChannel(clt client.Client, channelName string) (*chnv1.Channel, error) { if channelName == "" { return nil, nil } @@ -229,7 +229,7 @@ func parseGetChannel(clt client.Client, channelName string) (*chnv1alpha1.Channe } chkey := types.NamespacedName{Name: chName, Namespace: chNameSpace} - channel := &chnv1alpha1.Channel{} + channel := &chnv1.Channel{} err := clt.Get(context.TODO(), chkey, channel) if err != nil { @@ -239,12 +239,12 @@ func parseGetChannel(clt client.Client, channelName string) (*chnv1alpha1.Channe return channel, nil } -func (r *ReconcileSubscription) getChannel(s *appv1alpha1.Subscription) (*chnv1alpha1.Channel, *chnv1alpha1.Channel, error) { +func (r *ReconcileSubscription) getChannel(s *appv1.Subscription) (*chnv1.Channel, *chnv1.Channel, error) { return GetSubscriptionRefChannel(r.Client, s) } // GetChannelGeneration get the channel generation -func (r *ReconcileSubscription) GetChannelGeneration(s *appv1alpha1.Subscription) (string, error) { +func (r *ReconcileSubscription) GetChannelGeneration(s *appv1.Subscription) (string, error) { chNameSpace := "" chName := "" @@ -259,7 +259,7 @@ func (r *ReconcileSubscription) GetChannelGeneration(s *appv1alpha1.Subscription } chkey := types.NamespacedName{Name: chName, Namespace: chNameSpace} - chobj := &chnv1alpha1.Channel{} + chobj := &chnv1.Channel{} err := r.Get(context.TODO(), chkey, chobj) if err != nil { @@ -295,7 +295,7 @@ func (r *ReconcileSubscription) IsNamespacedResource(group, version, kind string return isNamespaced } -func (r *ReconcileSubscription) createAppAppsubReport(sub *appv1alpha1.Subscription, resources []*v1.ObjectReference, +func (r *ReconcileSubscription) createAppAppsubReport(sub *appv1.Subscription, resources []*v1.ObjectReference, propagationFailedCount, clusterCount int) error { // remove resource.namespace if the resource is cluster scoped for _, resource := range resources { @@ -403,7 +403,7 @@ func (r *ReconcileSubscription) createAppAppsubReport(sub *appv1alpha1.Subscript return nil } -func (r *ReconcileSubscription) initObjectStore(channel *chnv1alpha1.Channel) (*awsutils.Handler, string, error) { +func (r *ReconcileSubscription) initObjectStore(channel *chnv1.Channel) (*awsutils.Handler, string, error) { var err error awshandler := &awsutils.Handler{} @@ -484,7 +484,7 @@ func (r *ReconcileSubscription) initObjectStore(channel *chnv1alpha1.Channel) (* return awshandler, bucket, nil } -func (r *ReconcileSubscription) getObjectBucketResources(sub *appv1alpha1.Subscription, channel, secondaryChannel *chnv1alpha1.Channel, +func (r *ReconcileSubscription) getObjectBucketResources(sub *appv1.Subscription, channel, secondaryChannel *chnv1.Channel, isAdmin bool) ([]*v1.ObjectReference, error) { awsHandler, bucket, err := r.initObjectStore(channel) if err != nil { @@ -510,7 +510,7 @@ func (r *ReconcileSubscription) getObjectBucketResources(sub *appv1alpha1.Subscr var folderName *string annotations := sub.GetAnnotations() - bucketPath := annotations[appv1alpha1.AnnotationBucketPath] + bucketPath := annotations[appv1.AnnotationBucketPath] if bucketPath != "" { folderName = &bucketPath diff --git a/pkg/utils/gitrepo_test.go b/pkg/utils/gitrepo_test.go index 530dacf6..f7f5f3ea 100644 --- a/pkg/utils/gitrepo_test.go +++ b/pkg/utils/gitrepo_test.go @@ -37,7 +37,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" chnv1 "open-cluster-management.io/multicloud-operators-channel/pkg/apis/apps/v1" - appv1alpha1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" + appv1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" ) var ( @@ -57,12 +57,12 @@ var ( }, } - githubsub = &appv1alpha1.Subscription{ + githubsub = &appv1.Subscription{ ObjectMeta: metav1.ObjectMeta{ Name: sharedkey.Name, Namespace: sharedkey.Namespace, }, - Spec: appv1alpha1.SubscriptionSpec{ + Spec: appv1.SubscriptionSpec{ Channel: sharedkey.String(), }, } @@ -281,7 +281,7 @@ func TestGetSubscriptionBranch(t *testing.T) { g.Expect(branch.Short()).To(gomega.Equal("")) subanno := make(map[string]string) - subanno[appv1alpha1.AnnotationGitBranch] = "notmaster" + subanno[appv1.AnnotationGitBranch] = "notmaster" githubsub.SetAnnotations(subanno) branchRef := plumbing.NewBranchReferenceName("notmaster") @@ -411,7 +411,7 @@ spec: - deployment.yaml - configMap.yaml` - subscription := &appv1alpha1.Subscription{} + subscription := &appv1.Subscription{} err = yaml.Unmarshal([]byte(subscriptionYAML), &subscription) g.Expect(err).NotTo(gomega.HaveOccurred()) @@ -483,7 +483,7 @@ spec: - deployment.yaml - configMap.yaml` - subscription := &appv1alpha1.Subscription{} + subscription := &appv1.Subscription{} err = yaml.Unmarshal([]byte(subscriptionYAML), &subscription) g.Expect(err).NotTo(gomega.HaveOccurred()) @@ -528,7 +528,7 @@ spec: packageOverrides: - packageName: kustomize/overlays/production/kustomization.yaml` - subscription := &appv1alpha1.Subscription{} + subscription := &appv1.Subscription{} err := yaml.Unmarshal([]byte(subscriptionYAML), &subscription) g.Expect(err).NotTo(gomega.HaveOccurred()) @@ -625,7 +625,7 @@ spec: placement: local: true` - subscription := &appv1alpha1.Subscription{} + subscription := &appv1.Subscription{} err = yaml.Unmarshal([]byte(subscriptionYAML), &subscription) g.Expect(err).NotTo(gomega.HaveOccurred()) @@ -643,7 +643,7 @@ spec: placement: local: true` - subscription = &appv1alpha1.Subscription{} + subscription = &appv1.Subscription{} err = yaml.Unmarshal([]byte(subscriptionYAML), &subscription) g.Expect(err).NotTo(gomega.HaveOccurred()) @@ -662,7 +662,7 @@ spec: placement: local: true` - subscription = &appv1alpha1.Subscription{} + subscription = &appv1.Subscription{} err = yaml.Unmarshal([]byte(subscriptionYAML), &subscription) g.Expect(err).NotTo(gomega.HaveOccurred()) @@ -681,7 +681,7 @@ spec: placement: local: true` - subscription = &appv1alpha1.Subscription{} + subscription = &appv1.Subscription{} err = yaml.Unmarshal([]byte(subscriptionYAML), &subscription) g.Expect(err).NotTo(gomega.HaveOccurred()) @@ -699,7 +699,7 @@ spec: placement: local: true` - subscription = &appv1alpha1.Subscription{} + subscription = &appv1.Subscription{} err = yaml.Unmarshal([]byte(subscriptionYAML), &subscription) g.Expect(err).NotTo(gomega.HaveOccurred()) @@ -745,7 +745,7 @@ metadata: placement: local: true` - subscription = &appv1alpha1.Subscription{} + subscription = &appv1.Subscription{} err = yaml.Unmarshal([]byte(subscriptionYAML), &subscription) g.Expect(err).NotTo(gomega.HaveOccurred()) @@ -825,7 +825,7 @@ metadata: placementRef: name: dev-clusters` - subscription := &appv1alpha1.Subscription{} + subscription := &appv1.Subscription{} err = yaml.Unmarshal([]byte(subscriptionYAML), &subscription) g.Expect(err).NotTo(gomega.HaveOccurred()) @@ -848,7 +848,7 @@ metadata: placementRef: name: dev-clusters` - subscription = &appv1alpha1.Subscription{} + subscription = &appv1.Subscription{} err = yaml.Unmarshal([]byte(subscriptionYAML), &subscription) g.Expect(err).NotTo(gomega.HaveOccurred()) @@ -871,7 +871,7 @@ metadata: placementRef: name: dev-clusters` - subscription = &appv1alpha1.Subscription{} + subscription = &appv1.Subscription{} err = yaml.Unmarshal([]byte(subscriptionYAML), &subscription) g.Expect(err).NotTo(gomega.HaveOccurred()) @@ -894,7 +894,7 @@ metadata: placementRef: name: dev-clusters` - subscription = &appv1alpha1.Subscription{} + subscription = &appv1.Subscription{} err = yaml.Unmarshal([]byte(subscriptionYAML), &subscription) g.Expect(err).NotTo(gomega.HaveOccurred()) @@ -904,7 +904,7 @@ metadata: func subAdminClusterRole() *rbacv1.ClusterRole { return &rbacv1.ClusterRole{ ObjectMeta: metav1.ObjectMeta{ - Name: appv1alpha1.SubscriptionAdmin, + Name: appv1.SubscriptionAdmin, }, Rules: []rbacv1.PolicyRule{ { @@ -938,7 +938,7 @@ func subAdminClusterRoleBinding() *rbacv1.ClusterRoleBinding { }, RoleRef: rbacv1.RoleRef{ Kind: "ClusterRole", - Name: appv1alpha1.SubscriptionAdmin, + Name: appv1.SubscriptionAdmin, }, } } From 45209a8841ac33888f1d32b332d04f0aead0e837 Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Thu, 7 Jul 2022 16:51:21 -0400 Subject: [PATCH 12/14] remove alpha1 git Signed-off-by: Jonathan Marcantonio --- pkg/subscriber/git/git_subscriber_test.go | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkg/subscriber/git/git_subscriber_test.go b/pkg/subscriber/git/git_subscriber_test.go index af0139c7..46e445be 100644 --- a/pkg/subscriber/git/git_subscriber_test.go +++ b/pkg/subscriber/git/git_subscriber_test.go @@ -28,7 +28,7 @@ import ( chnv1alpha1 "open-cluster-management.io/multicloud-operators-channel/pkg/apis/apps/v1" - appv1alpha1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" + appv1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" testutils "open-cluster-management.io/multicloud-operators-subscription/pkg/utils" ) @@ -109,7 +109,7 @@ var ( Name: sharedkey.Name, Namespace: sharedkey.Namespace, Annotations: map[string]string{ - appv1alpha1.AnnotationGitBranch: "main", + appv1.AnnotationGitBranch: "main", }, }, Spec: chnv1alpha1.ChannelSpec{ @@ -117,19 +117,19 @@ var ( Pathname: "https://" + testutils.GetTestGitRepoURLFromEnvVar() + ".git", }, } - githubsub = &appv1alpha1.Subscription{ + githubsub = &appv1.Subscription{ ObjectMeta: metav1.ObjectMeta{ Name: sharedkey.Name, Namespace: sharedkey.Namespace, Annotations: map[string]string{ - appv1alpha1.AnnotationGitBranch: "main", + appv1.AnnotationGitBranch: "main", }, }, - Spec: appv1alpha1.SubscriptionSpec{ + Spec: appv1.SubscriptionSpec{ Channel: sharedkey.String(), }, } - subitem = &appv1alpha1.SubscriberItem{ + subitem = &appv1.SubscriberItem{ Subscription: githubsub, Channel: githubchn, } @@ -147,12 +147,12 @@ var ( Pathname: "https://bitbucket.org/ekdjbdfh/testrepo.git", }, } - bitbucketsub = &appv1alpha1.Subscription{ + bitbucketsub = &appv1.Subscription{ ObjectMeta: metav1.ObjectMeta{ Name: bitbucketsharedkey.Name, Namespace: bitbucketsharedkey.Namespace, }, - Spec: appv1alpha1.SubscriptionSpec{ + Spec: appv1.SubscriptionSpec{ Channel: bitbucketsharedkey.String(), }, } @@ -193,7 +193,7 @@ var _ = Describe("github subscriber reconcile logic", func() { matchLabels["environment"] = "dev" lblSelector := &metav1.LabelSelector{} lblSelector.MatchLabels = matchLabels - pkgFilter := &appv1alpha1.PackageFilter{} + pkgFilter := &appv1.PackageFilter{} pkgFilter.LabelSelector = lblSelector githubsub.Spec.PackageFilter = pkgFilter @@ -310,7 +310,7 @@ var _ = Describe("test subscribe invalid resource", func() { It("should clone the target repo", func() { subitem := &SubscriberItem{} subAnnotations := make(map[string]string) - subAnnotations[appv1alpha1.AnnotationGitBranch] = "main" + subAnnotations[appv1.AnnotationGitBranch] = "main" githubsub.SetAnnotations(subAnnotations) subitem.Subscription = githubsub subitem.Channel = githubchn @@ -369,7 +369,7 @@ data: filterRef := &corev1.LocalObjectReference{} filterRef.Name = "path-config-map" - packageFilter := &appv1alpha1.PackageFilter{} + packageFilter := &appv1.PackageFilter{} packageFilter.FilterRef = filterRef githubsub.Spec.PackageFilter = packageFilter @@ -417,14 +417,14 @@ data: filterRef := &corev1.LocalObjectReference{} filterRef.Name = "path-config-map" - packageFilter := &appv1alpha1.PackageFilter{} + packageFilter := &appv1.PackageFilter{} packageFilter.FilterRef = filterRef githubsub.Spec.PackageFilter = packageFilter subanno := make(map[string]string) - subanno[appv1alpha1.AnnotationGitPath] = "test/github/helmcharts" - subanno[appv1alpha1.AnnotationGitBranch] = "main" + subanno[appv1.AnnotationGitPath] = "test/github/helmcharts" + subanno[appv1.AnnotationGitBranch] = "main" githubsub.SetAnnotations(subanno) githubsub.Spec.Package = "chart1" @@ -534,9 +534,9 @@ var _ = Describe("github subscriber reconcile options", func() { "propagate them to the synchronizer", func() { subAnnotations := make(map[string]string) - subAnnotations[appv1alpha1.AnnotationClusterAdmin] = "true" - subAnnotations[appv1alpha1.AnnotationResourceReconcileOption] = "merge" - subAnnotations[appv1alpha1.AnnotationGitBranch] = "main" + subAnnotations[appv1.AnnotationClusterAdmin] = "true" + subAnnotations[appv1.AnnotationResourceReconcileOption] = "merge" + subAnnotations[appv1.AnnotationGitBranch] = "main" githubsub.SetAnnotations(subAnnotations) githubsub.Spec.PackageFilter = nil @@ -557,7 +557,7 @@ data: Expect(err).NotTo(HaveOccurred()) rscAnnotations := resource.GetAnnotations() - Expect(rscAnnotations[appv1alpha1.AnnotationClusterAdmin]).To(Equal("true")) - Expect(rscAnnotations[appv1alpha1.AnnotationResourceReconcileOption]).To(Equal("merge")) + Expect(rscAnnotations[appv1.AnnotationClusterAdmin]).To(Equal("true")) + Expect(rscAnnotations[appv1.AnnotationResourceReconcileOption]).To(Equal("merge")) }) }) From bc99490dbf8776a33f9c3a0ae57b2d04a5ec031d Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Thu, 7 Jul 2022 16:58:15 -0400 Subject: [PATCH 13/14] reverting return err Signed-off-by: Jonathan Marcantonio --- common/config/.golangci.yml | 1 + pkg/placementrule/utils/auth.go | 2 +- pkg/utils/gitrepo.go | 2 +- pkg/utils/reference.go | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/config/.golangci.yml b/common/config/.golangci.yml index 40214058..d6a5ce8d 100644 --- a/common/config/.golangci.yml +++ b/common/config/.golangci.yml @@ -63,6 +63,7 @@ linters: - maligned - nakedret - nestif + - nilerr - nilnil - nlreturn - noctx diff --git a/pkg/placementrule/utils/auth.go b/pkg/placementrule/utils/auth.go index 34ecbce6..304fd21d 100644 --- a/pkg/placementrule/utils/auth.go +++ b/pkg/placementrule/utils/auth.go @@ -44,7 +44,7 @@ var ( func FilteClustersByIdentity(authClient kubernetes.Interface, object runtime.Object, clmap map[string]*spokeClusterV1.ManagedCluster) error { objmeta, err := meta.Accessor(object) if err != nil { - return err + return nil } objanno := objmeta.GetAnnotations() diff --git a/pkg/utils/gitrepo.go b/pkg/utils/gitrepo.go index e052d7f5..bd99ad20 100644 --- a/pkg/utils/gitrepo.go +++ b/pkg/utils/gitrepo.go @@ -815,7 +815,7 @@ func sortKubeResource(crdsAndNamespaceFiles, rbacFiles, otherFiles []string, pat if err != nil { klog.Error(err, "Failed to read YAML file "+path) - return crdsAndNamespaceFiles, rbacFiles, otherFiles, err + return crdsAndNamespaceFiles, rbacFiles, otherFiles, nil } resources := ParseKubeResoures(file) diff --git a/pkg/utils/reference.go b/pkg/utils/reference.go index 9b4ff09a..3fa09553 100644 --- a/pkg/utils/reference.go +++ b/pkg/utils/reference.go @@ -212,7 +212,7 @@ func DeleteReferredObjects(clt client.Client, rq types.NamespacedName, gvk schem u.SetOwnerReferences(newOwers) err := clt.Update(context.TODO(), u) if err != nil { - return err + return nil } } } From c2bde740b313ae4f68c991810dc1ce3c6dd6c0c9 Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Fri, 8 Jul 2022 10:34:12 -0400 Subject: [PATCH 14/14] remove alpha1 helm Signed-off-by: Jonathan Marcantonio --- pkg/utils/gitrepo.go | 4 ++-- pkg/utils/helmrepo_test.go | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkg/utils/gitrepo.go b/pkg/utils/gitrepo.go index bd99ad20..107ed8ab 100644 --- a/pkg/utils/gitrepo.go +++ b/pkg/utils/gitrepo.go @@ -815,7 +815,7 @@ func sortKubeResource(crdsAndNamespaceFiles, rbacFiles, otherFiles []string, pat if err != nil { klog.Error(err, "Failed to read YAML file "+path) - return crdsAndNamespaceFiles, rbacFiles, otherFiles, nil + return crdsAndNamespaceFiles, rbacFiles, otherFiles, err } resources := ParseKubeResoures(file) @@ -827,7 +827,7 @@ func sortKubeResource(crdsAndNamespaceFiles, rbacFiles, otherFiles []string, pat if err != nil { klog.Warning("Failed to unmarshal YAML file") // Just ignore the YAML - return crdsAndNamespaceFiles, rbacFiles, otherFiles, err + return crdsAndNamespaceFiles, rbacFiles, otherFiles, nil } if t.APIVersion != "" && t.Kind != "" { diff --git a/pkg/utils/helmrepo_test.go b/pkg/utils/helmrepo_test.go index 8d4493de..abc64281 100644 --- a/pkg/utils/helmrepo_test.go +++ b/pkg/utils/helmrepo_test.go @@ -33,7 +33,7 @@ import ( chnv1 "open-cluster-management.io/multicloud-operators-channel/pkg/apis/apps/v1" releasev1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/helmrelease/v1" - appv1alpha1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" + appv1 "open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/v1" ) var ( @@ -53,12 +53,12 @@ var ( }, } - helmsub = &appv1alpha1.Subscription{ + helmsub = &appv1.Subscription{ ObjectMeta: metav1.ObjectMeta{ Name: helmkey.Name, Namespace: helmkey.Namespace, }, - Spec: appv1alpha1.SubscriptionSpec{ + Spec: appv1.SubscriptionSpec{ Channel: helmkey.String(), }, } @@ -70,14 +70,14 @@ func TestGetPackageAlias(t *testing.T) { pkgAlias := GetPackageAlias(githubsub, "") g.Expect(pkgAlias).To(gomega.Equal("")) - pkgOverrides1 := &appv1alpha1.Overrides{} + pkgOverrides1 := &appv1.Overrides{} pkgOverrides1.PackageName = "pkgName1" - pkgOverrides2 := &appv1alpha1.Overrides{} + pkgOverrides2 := &appv1.Overrides{} pkgOverrides2.PackageName = "pkgName2" pkgOverrides2.PackageAlias = "pkgName2Alias" - packageOverrides := make([]*appv1alpha1.Overrides, 0) + packageOverrides := make([]*appv1.Overrides, 0) packageOverrides = append(packageOverrides, pkgOverrides1, pkgOverrides2) githubsub.Spec.PackageOverrides = packageOverrides @@ -229,7 +229,7 @@ func TestCheckVersion(t *testing.T) { chartDirs := make(map[string]string) chartDirs["../../test/github/helmcharts/chart1/"] = "../../test/github/helmcharts/chart1/" - packageFilter := &appv1alpha1.PackageFilter{} + packageFilter := &appv1.PackageFilter{} packageFilter.Version = "1.1.1" githubsub.Spec.PackageFilter = packageFilter @@ -247,10 +247,10 @@ func TestCheckVersion(t *testing.T) { g.Expect(ret).To(gomega.BeTrue()) subanno := make(map[string]string) - subanno[appv1alpha1.AnnotationGitPath] = "test/github/helmcharts" + subanno[appv1.AnnotationGitPath] = "test/github/helmcharts" githubsub.SetAnnotations(subanno) - packageFilter = &appv1alpha1.PackageFilter{} + packageFilter = &appv1.PackageFilter{} packageFilter.Version = "2.0.0" githubsub.Spec.PackageFilter = packageFilter @@ -258,13 +258,13 @@ func TestCheckVersion(t *testing.T) { ret = checkVersion(githubsub, chartVersion) g.Expect(ret).To(gomega.BeFalse()) - packageFilter = &appv1alpha1.PackageFilter{} + packageFilter = &appv1.PackageFilter{} githubsub.Spec.PackageFilter = packageFilter ret = checkVersion(githubsub, chartVersion) g.Expect(ret).To(gomega.BeTrue()) - packageFilter = &appv1alpha1.PackageFilter{} + packageFilter = &appv1.PackageFilter{} packageFilter.Version = "v2.0.0" githubsub.Spec.PackageFilter = packageFilter @@ -272,7 +272,7 @@ func TestCheckVersion(t *testing.T) { ret = checkVersion(githubsub, chartVersion) g.Expect(ret).To(gomega.BeFalse()) - packageFilter = &appv1alpha1.PackageFilter{} + packageFilter = &appv1.PackageFilter{} githubsub.Spec.PackageFilter = packageFilter ret = checkVersion(githubsub, chartVersion) @@ -314,7 +314,7 @@ spec: persistence: enabled: false` - sub2 := &appv1alpha1.Subscription{} + sub2 := &appv1.Subscription{} err = yaml.Unmarshal([]byte(substr2), &sub2) g.Expect(err).NotTo(gomega.HaveOccurred()) @@ -359,7 +359,7 @@ func TestCreateHelmCRManifest(t *testing.T) { chartDirs["../../test/github/helmcharts/chart1Upgrade/"] = "../../test/github/helmcharts/chart1Upgrade/" chartDirs["../../test/github/helmcharts/chart2/"] = "../../test/github/helmcharts/chart2/" - packageFilter := &appv1alpha1.PackageFilter{} + packageFilter := &appv1.PackageFilter{} packageFilter.Version = "1.1.1" githubsub.Spec.PackageFilter = packageFilter