diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 8bdd9a71b674..d540ad226556 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -32,7 +32,7 @@ updates: - "ok-to-test" # Release Go module - package-ecosystem: "gomod" - directory: "/release" + directory: "/release/cli" schedule: interval: "weekly" day: "tuesday" diff --git a/.github/workflows/vulnerability.yml b/.github/workflows/vulnerability.yml index 9c7b51f087a6..04b00a0d3269 100644 --- a/.github/workflows/vulnerability.yml +++ b/.github/workflows/vulnerability.yml @@ -44,5 +44,5 @@ jobs: check-latest: true repo-checkout: false cache: false # cache will be already setup by previous step - work-dir: release - go-version-file: release/go.mod + work-dir: release/cli + go-version-file: release/cli/go.mod diff --git a/Makefile b/Makefile index 5d28d866b75a..42f99a0be0e3 100644 --- a/Makefile +++ b/Makefile @@ -305,12 +305,6 @@ docgen: eks-a-tool ## generate eksctl anywhere commands doc from code .PHONY: eks-a-cluster-controller eks-a-cluster-controller: ## Build eks-a-cluster-controller CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GO) build -ldflags "-s -w -buildid='' -extldflags -static" -trimpath -o bin/manager github.com/aws/eks-anywhere/manager -# This target will copy LICENSE file from root to the release submodule -# when fetching licenses for cluster-controller -.PHONY: copy-license-cluster-controller -copy-license-cluster-controller: -copy-license-cluster-controller: - source scripts/attribution_helpers.sh && build::fix_licenses .PHONY: build-cluster-controller-binaries build-cluster-controller-binaries: eks-a-cluster-controller @@ -345,7 +339,6 @@ cluster-controller-binaries: $(OUTPUT_BIN_DIR) mkdir -p $(OUTPUT_BIN_DIR)/$(BINARY_NAME) $(GO) mod vendor $(MAKE) create-cluster-controller-binaries - $(MAKE) copy-license-cluster-controller $(MAKE) update-kustomization-yaml $(MAKE) release-manifests RELEASE_DIR=. source ./scripts/common.sh && build::gather_licenses $(OUTPUT_DIR) "./manager" diff --git a/go.mod b/go.mod index f44bfd20b603..d9ef246ac55d 100644 --- a/go.mod +++ b/go.mod @@ -10,13 +10,14 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.11.2 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.3 github.com/aws/aws-sdk-go-v2/service/ec2 v1.128.0 + github.com/aws/aws-sdk-go-v2/service/ecr v1.22.0 github.com/aws/eks-anywhere-packages v0.3.9 github.com/aws/eks-anywhere/internal/aws-sdk-go-v2/service/snowballdevice v0.0.0-00010101000000-000000000000 - github.com/aws/eks-anywhere/release v0.0.0-00010101000000-000000000000 github.com/aws/eks-distro-build-tooling/release v0.0.0-20211103003257-a7e2379eae5e github.com/aws/etcdadm-bootstrap-provider v1.0.7-rc3 github.com/aws/etcdadm-controller v1.0.6-rc3 github.com/aws/smithy-go v1.16.0 + github.com/bmc-toolbox/bmclib/v2 v2.1.0 github.com/docker/cli v24.0.6+incompatible github.com/go-git/go-git/v5 v5.4.2 github.com/go-jose/go-jose/v3 v3.0.0 @@ -41,7 +42,7 @@ require ( github.com/vmware/govmomi v0.29.0 go.uber.org/zap v1.24.0 golang.org/x/crypto v0.14.0 - golang.org/x/exp v0.0.0-20230127130021-4ca2cb1a16b7 + golang.org/x/exp v0.0.0-20231006140011-7918f672742d golang.org/x/net v0.17.0 golang.org/x/oauth2 v0.7.0 golang.org/x/sys v0.13.0 @@ -67,8 +68,6 @@ require ( sigs.k8s.io/yaml v1.3.0 ) -require github.com/Microsoft/hcsshim v0.11.0 // indirect - require ( dario.cat/mergo v1.0.0 // indirect github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect @@ -79,16 +78,16 @@ require ( github.com/Masterminds/semver v1.5.0 // indirect github.com/Masterminds/semver/v3 v3.2.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/Microsoft/hcsshim v0.11.0 // indirect github.com/PaesslerAG/gval v1.0.0 // indirect github.com/PaesslerAG/jsonpath v0.1.1 // indirect github.com/ProtonMail/go-crypto v0.0.0-20230619160724-3fbb1f12458c // indirect github.com/VictorLowther/simplexml v0.0.0-20180716164440-0bff93621230 // indirect github.com/VictorLowther/soap v0.0.0-20150314151524-8e36fca84b22 // indirect github.com/acomagu/bufpipe v1.0.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.1 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.1 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.10 // indirect - github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.11.3 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.16.3 // indirect @@ -97,7 +96,6 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver v3.5.1+incompatible // indirect github.com/blang/semver/v4 v4.0.0 // indirect - github.com/bmc-toolbox/bmclib/v2 v2.1.1-0.20231017114451-153e11d62a71 github.com/bmc-toolbox/common v0.0.0-20230220061748-93ff001f4a1d // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cloudflare/circl v1.3.3 // indirect @@ -149,7 +147,6 @@ require ( github.com/klauspost/compress v1.16.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect - github.com/matryer/is v1.4.0 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect @@ -182,11 +179,11 @@ require ( go.opentelemetry.io/otel/trace v1.14.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - golang.org/x/mod v0.12.0 // indirect + golang.org/x/mod v0.13.0 // indirect golang.org/x/sync v0.4.0 // indirect golang.org/x/term v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.12.0 // indirect + golang.org/x/tools v0.14.0 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect @@ -205,7 +202,6 @@ replace ( github.com/aws/eks-anywhere/internal/aws-sdk-go-v2/internal/configsources => ./internal/aws-sdk-go-v2/internal/configsources github.com/aws/eks-anywhere/internal/aws-sdk-go-v2/internal/endpoints/v2 => ./internal/aws-sdk-go-v2/internal/endpoints/v2 github.com/aws/eks-anywhere/internal/aws-sdk-go-v2/service/snowballdevice => ./internal/aws-sdk-go-v2/service/snowballdevice - github.com/aws/eks-anywhere/release => ./release // need the modifications eksa made to the capi api structs sigs.k8s.io/cluster-api => github.com/abhay-krishna/cluster-api v1.4.2-eksa.1 diff --git a/go.sum b/go.sum index fb563e283f9c..a33098b62e5b 100644 --- a/go.sum +++ b/go.sum @@ -527,7 +527,6 @@ github.com/aws/aws-sdk-go v1.38.40/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2z github.com/aws/aws-sdk-go v1.42.23 h1:V0V5hqMEyVelgpu1e4gMPVCJ+KhmscdNxP/NWP1iCOA= github.com/aws/aws-sdk-go v1.42.23/go.mod h1:gyRszuZ/icHmHAVE4gc/r+cfCmhA1AD+vqfWbgI+eHs= github.com/aws/aws-sdk-go-v2 v1.16.2/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU= -github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2 v1.22.1 h1:sjnni/AuoTXxHitsIdT0FwmqUuNUuHtufcVDErVFT9U= github.com/aws/aws-sdk-go-v2 v1.22.1/go.mod h1:Kd0OJtkW3Q0M0lUWGszapWjEvrXDzRW+D21JNsroB+c= @@ -538,19 +537,19 @@ github.com/aws/aws-sdk-go-v2/credentials v1.11.2/go.mod h1:j8YsY9TXTm31k4eFhspiQ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.3 h1:LWPg5zjHV9oz/myQr4wMs0gi4CjnDN/ILmyZUFYXZsU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.3/go.mod h1:uk1vhHHERfSVCUnqSqz8O48LBYDSC+k6brng09jcMOk= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.9/go.mod h1:AnVH5pvai0pAF4lXRq0bmhbes1u9R8wTE+g+183bZNM= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43/go.mod h1:auo+PiyLl0n1l8A0e8RIeR8tOzYPfZZH/JNlrJ8igTQ= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.1 h1:fi1ga6WysOyYb5PAf3Exd6B5GiSNpnZim4h1rhlBqx0= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.1/go.mod h1:V5CY8wNurvPUibTi9mwqUqpiFZ5LnioKWIFUDtIzdI8= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.3/go.mod h1:ssOhaLpRlh88H3UmEcsBoVKq309quMvm3Ds8e9d4eJM= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.1 h1:ZpaV/j48RlPc4AmOZuPv22pJliXjXq8/reL63YzyFnw= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.1/go.mod h1:R8aXraabD2e3qv1csxM14/X9WF4wFMIY0kH4YEtYD5M= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.10 h1:by9P+oy3P/CwggN4ClnW2D4oL91QV7pBzBICi1chZvQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.10/go.mod h1:8DcYQcz0+ZJaSxANlHIsbbi6S+zMwjwdDqwW3r9AzaE= github.com/aws/aws-sdk-go-v2/service/ec2 v1.128.0 h1:JCUTmTs7W1yvUCOdONMX7Hjgn7N9pj57y4/ibU4KFp4= github.com/aws/aws-sdk-go-v2/service/ec2 v1.128.0/go.mod h1:raUdIDoNuDPn9dMG3cCmIm8RoWOmZUqQPzuw8xpmB8Y= -github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 h1:Qw8H7V55d2P1d/a9+cLgAcdez4GtP6l30KQAeYqx9vY= -github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0/go.mod h1:pGwmNL8hN0jpBfKfTbmu+Rl0bJkDhaGl+9PQLrZ4KLo= +github.com/aws/aws-sdk-go-v2/service/ecr v1.22.0 h1:TA2V0OLAwEooOnCk2ZBgxTPAtb20Fgbkr7IrI/YxbAg= +github.com/aws/aws-sdk-go-v2/service/ecr v1.22.0/go.mod h1:/1jvJouA9LvRdzQmTFwlvf3RKFXQz3jgL4AcPuaaoO8= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.3/go.mod h1:wlY6SVjuwvh3TVRpTqdy4I1JpBFLX4UGeKZdWntaocw= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= @@ -567,7 +566,6 @@ github.com/aws/etcdadm-bootstrap-provider v1.0.7-rc3/go.mod h1:PN7CO02LPlWz02Bjs github.com/aws/etcdadm-controller v1.0.6-rc3 h1:hTu0pagWPU467scMtaR2rmaNIgMcFMNeGYZAJvFa8g0= github.com/aws/etcdadm-controller v1.0.6-rc3/go.mod h1:60QVQeYClyeV22MpI+SMBDx/dXVf/pZNdyiWDM2OBZc= github.com/aws/smithy-go v1.11.2/go.mod h1:3xHYmszWVx2c0kIwQeEVf9uSm4fYZt67FBJnwub1bgM= -github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.16.0 h1:gJZEH/Fqh+RsvlJ1Zt4tVAtV6bKkp3cC+R6FCZMNzik= github.com/aws/smithy-go v1.16.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= @@ -589,8 +587,8 @@ github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdn github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= -github.com/bmc-toolbox/bmclib/v2 v2.1.1-0.20231017114451-153e11d62a71 h1:Dd76cvKu9/bRl6MKFASf+UmqyqwTdApmvgCvdab078w= -github.com/bmc-toolbox/bmclib/v2 v2.1.1-0.20231017114451-153e11d62a71/go.mod h1:hRe0RhyHbyQDFULc6HQFBIwdBOFYnm+8rHeO9UBnxAU= +github.com/bmc-toolbox/bmclib/v2 v2.1.0 h1:4zC8/ODEeO8uWiBJGUO8u2HgGJWtoDZfSEBFYrd5RHA= +github.com/bmc-toolbox/bmclib/v2 v2.1.0/go.mod h1:hRe0RhyHbyQDFULc6HQFBIwdBOFYnm+8rHeO9UBnxAU= github.com/bmc-toolbox/common v0.0.0-20230220061748-93ff001f4a1d h1:cQ30Wa8mhLzK1TSOG+g3FlneIsXtFgun61mmPwVPmD0= github.com/bmc-toolbox/common v0.0.0-20230220061748-93ff001f4a1d/go.mod h1:SY//n1PJjZfbFbmAsB6GvEKbc7UXz3d30s3kWxfJQ/c= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= @@ -1335,9 +1333,8 @@ github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= +github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A= github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= -github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= -github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= github.com/matryer/moq v0.2.3/go.mod h1:9RtPYjTnH1bSBIkpvtHkFN7nbWAnO7oRpdJkEIn6UtE= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= @@ -1931,8 +1928,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230127130021-4ca2cb1a16b7 h1:o7Ps2IYdzLRolS9/nadqeMSHpa9k8pu8u+VKBFUG7cQ= -golang.org/x/exp v0.0.0-20230127130021-4ca2cb1a16b7/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1964,8 +1961,8 @@ golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= +golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= 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= @@ -2362,8 +2359,8 @@ golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= -golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= -golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= +golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= +golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkg/providers/tinkerbell/tinkerbell.go b/pkg/providers/tinkerbell/tinkerbell.go index d9cbf51478e3..91346476de76 100644 --- a/pkg/providers/tinkerbell/tinkerbell.go +++ b/pkg/providers/tinkerbell/tinkerbell.go @@ -8,6 +8,7 @@ import ( etcdv1 "github.com/aws/etcdadm-controller/api/v1beta1" tinkv1alpha1 "github.com/tinkerbell/tink/pkg/apis/core/v1alpha1" + "golang.org/x/exp/slices" corev1 "k8s.io/api/core/v1" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1" @@ -27,7 +28,6 @@ import ( "github.com/aws/eks-anywhere/pkg/retrier" "github.com/aws/eks-anywhere/pkg/types" releasev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/util/slices" ) const ( @@ -150,7 +150,7 @@ func NewProvider( // cluster's create and upgrade that too for the kind cluster. // GenerateNoProxyList is getting used by all the cluster operations. // Thus moving adding tinkerbell Local IP to here. - if !slices.SliceContains(proxyConfig.NoProxy, tinkerbellIP) { + if !slices.Contains(proxyConfig.NoProxy, tinkerbellIP) { proxyConfig.NoProxy = append(proxyConfig.NoProxy, tinkerbellIP) } } else { diff --git a/release/Makefile b/release/Makefile index a6984ec7b73b..9440ae186294 100644 --- a/release/Makefile +++ b/release/Makefile @@ -107,7 +107,7 @@ test: manifests generate fmt vet ## Run tests. ##@ Build build: clean fmt vet ## Build release binary. - $(GO) build -o bin/eks-anywhere-release main.go + $(GO) build -C cli -o $(REPO_ROOT)/release/bin/eks-anywhere-release github.com/aws/eks-anywhere/release/cli .PHONY: lint lint: bin/golangci-lint ## Run golangci-lint @@ -123,7 +123,7 @@ unit-test: ## Run go test against code. update-bundle-golden-files: ## Updates testdata files located under pkg/test/testdata $(GO) test -count=1 ./pkg/operations -update - $(eval DIFF_LINE_COUNT=$(shell git diff pkg/test/testdata | wc -l)) + $(eval DIFF_LINE_COUNT=$(shell git diff cli/pkg/test/testdata | wc -l)) @if [[ $(DIFF_LINE_COUNT) != 0 ]]; then \ printf "\n\033[33mWarning:\033[0m Testdata files have been updated! Ensure that these changes were intentional.\n"; \ fi diff --git a/release/api/v1alpha1/zz_generated.deepcopy.go b/release/api/v1alpha1/zz_generated.deepcopy.go index 3c17d629388b..25327000c383 100644 --- a/release/api/v1alpha1/zz_generated.deepcopy.go +++ b/release/api/v1alpha1/zz_generated.deepcopy.go @@ -734,6 +734,7 @@ func (in *PackageBundle) DeepCopyInto(out *PackageBundle) { *out = *in in.Controller.DeepCopyInto(&out.Controller) in.TokenRefresher.DeepCopyInto(&out.TokenRefresher) + in.CredentialProviderPackage.DeepCopyInto(&out.CredentialProviderPackage) in.HelmChart.DeepCopyInto(&out.HelmChart) } diff --git a/release/cmd/release.go b/release/cli/cmd/release.go similarity index 95% rename from release/cmd/release.go rename to release/cli/cmd/release.go index 9e78d8f3a897..2f74954b7a8e 100644 --- a/release/cmd/release.go +++ b/release/cli/cmd/release.go @@ -26,15 +26,15 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" - "github.com/aws/eks-anywhere/release/pkg/aws/s3" - "github.com/aws/eks-anywhere/release/pkg/bundles" - "github.com/aws/eks-anywhere/release/pkg/clients" - "github.com/aws/eks-anywhere/release/pkg/constants" - "github.com/aws/eks-anywhere/release/pkg/filereader" - "github.com/aws/eks-anywhere/release/pkg/operations" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - artifactutils "github.com/aws/eks-anywhere/release/pkg/util/artifacts" - releaseutils "github.com/aws/eks-anywhere/release/pkg/util/release" + "github.com/aws/eks-anywhere/release/cli/pkg/aws/s3" + "github.com/aws/eks-anywhere/release/cli/pkg/bundles" + "github.com/aws/eks-anywhere/release/cli/pkg/clients" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + "github.com/aws/eks-anywhere/release/cli/pkg/operations" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + artifactutils "github.com/aws/eks-anywhere/release/cli/pkg/util/artifacts" + releaseutils "github.com/aws/eks-anywhere/release/cli/pkg/util/release" ) var ( diff --git a/release/cmd/root.go b/release/cli/cmd/root.go similarity index 100% rename from release/cmd/root.go rename to release/cli/cmd/root.go diff --git a/release/designs/artifact-table-generation.md b/release/cli/designs/artifact-table-generation.md similarity index 100% rename from release/designs/artifact-table-generation.md rename to release/cli/designs/artifact-table-generation.md diff --git a/release/docs/assets.md b/release/cli/docs/assets.md similarity index 100% rename from release/docs/assets.md rename to release/cli/docs/assets.md diff --git a/release/docs/package_helm_chart.md b/release/cli/docs/package_helm_chart.md similarity index 100% rename from release/docs/package_helm_chart.md rename to release/cli/docs/package_helm_chart.md diff --git a/release/go.mod b/release/cli/go.mod similarity index 85% rename from release/go.mod rename to release/cli/go.mod index edbcb0c9c743..7cd5bd623cf6 100644 --- a/release/go.mod +++ b/release/cli/go.mod @@ -1,10 +1,11 @@ -module github.com/aws/eks-anywhere/release +module github.com/aws/eks-anywhere/release/cli go 1.20 require ( - github.com/aws/aws-sdk-go v1.38.40 + github.com/aws/aws-sdk-go v1.42.23 github.com/aws/aws-sdk-go-v2 v1.22.1 + github.com/aws/eks-anywhere v0.18.0 github.com/aws/eks-distro-build-tooling/release v0.0.0-20211103003257-a7e2379eae5e github.com/fsouza/go-dockerclient v1.10.0 github.com/ghodss/yaml v1.0.0 @@ -13,7 +14,7 @@ require ( github.com/onsi/gomega v1.29.0 github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.7.0 - github.com/spf13/viper v1.10.0 + github.com/spf13/viper v1.15.0 helm.sh/helm/v3 v3.11.3 k8s.io/apimachinery v0.26.10 k8s.io/helm v2.17.0+incompatible @@ -59,17 +60,17 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.20.0 // indirect - github.com/go-openapi/swag v0.19.14 // indirect + github.com/go-openapi/swag v0.22.3 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/btree v1.0.1 // indirect - github.com/google/gnostic v0.5.7-v3refs // indirect + github.com/google/gnostic v0.6.9 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.4.0 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/gosuri/uitable v0.0.4 // indirect github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect @@ -88,15 +89,15 @@ require ( github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect github.com/lib/pq v1.10.7 // indirect github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect - github.com/magiconair/properties v1.8.5 // indirect - github.com/mailru/easyjson v0.7.6 // indirect + github.com/magiconair/properties v1.8.7 // indirect + github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect github.com/mattn/go-runewidth v0.0.9 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-wordwrap v1.0.0 // indirect - github.com/mitchellh/mapstructure v1.4.3 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/moby/locker v1.0.1 // indirect github.com/moby/patternmatcher v0.6.0 // indirect @@ -111,21 +112,21 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc5 // indirect github.com/opencontainers/runc v1.1.5 // indirect - github.com/pelletier/go-toml v1.9.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect - github.com/prometheus/client_golang v1.14.0 // indirect + github.com/prometheus/client_golang v1.16.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.37.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect + github.com/prometheus/common v0.42.0 // indirect + github.com/prometheus/procfs v0.10.1 // indirect github.com/rubenv/sql-migrate v1.3.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect - github.com/spf13/afero v1.6.0 // indirect + github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/subosito/gotenv v1.2.0 // indirect + github.com/subosito/gotenv v1.4.2 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect @@ -134,37 +135,39 @@ require ( go.opentelemetry.io/otel/trace v1.14.0 // indirect go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect golang.org/x/crypto v0.14.0 // indirect - golang.org/x/mod v0.12.0 // indirect + golang.org/x/mod v0.13.0 // indirect golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.7.0 // indirect - golang.org/x/sync v0.3.0 // indirect + golang.org/x/sync v0.4.0 // indirect golang.org/x/sys v0.13.0 // indirect golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.12.0 // indirect + golang.org/x/tools v0.14.0 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect google.golang.org/grpc v1.56.3 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/ini.v1 v1.66.2 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.26.2 // indirect + k8s.io/api v0.26.10 // indirect k8s.io/apiextensions-apiserver v0.26.1 // indirect - k8s.io/apiserver v0.26.2 // indirect + k8s.io/apiserver v0.26.10 // indirect k8s.io/cli-runtime v0.26.0 // indirect - k8s.io/client-go v0.26.2 // indirect - k8s.io/component-base v0.26.2 // indirect + k8s.io/client-go v0.26.10 // indirect + k8s.io/component-base v0.26.10 // indirect k8s.io/klog/v2 v2.90.1 // indirect - k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect + k8s.io/kube-openapi v0.0.0-20221106113015-f73e7dbcfe29 // indirect k8s.io/kubectl v0.26.0 // indirect - k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect + k8s.io/utils v0.0.0-20230711102312-30195339c3c7 // indirect oras.land/oras-go v1.2.4 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/kustomize/api v0.12.1 // indirect sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) + +replace github.com/aws/eks-anywhere => ../../ diff --git a/release/go.sum b/release/cli/go.sum similarity index 94% rename from release/go.sum rename to release/cli/go.sum index bf8357312079..e87f2158a317 100644 --- a/release/go.sum +++ b/release/cli/go.sum @@ -3,6 +3,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -15,6 +16,7 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= @@ -36,6 +38,7 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= 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-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= @@ -83,10 +86,7 @@ github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/O github.com/a8m/expect v1.0.0/go.mod h1:4IwSCMumY49ScypDnjNbYEjgVeqy1/U2cEs3Lat96eA= github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -99,8 +99,9 @@ github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:l github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 h1:4daAzAu0S6Vi7/lbWECcX0j45yZReDZ56BQsrVBOEEY= github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= -github.com/aws/aws-sdk-go v1.38.40 h1:VVqBFV24tGgXR11tFXPjmR+0ItbnUepbuQjdmhgu3U0= github.com/aws/aws-sdk-go v1.38.40/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/aws/aws-sdk-go v1.42.23 h1:V0V5hqMEyVelgpu1e4gMPVCJ+KhmscdNxP/NWP1iCOA= +github.com/aws/aws-sdk-go v1.42.23/go.mod h1:gyRszuZ/icHmHAVE4gc/r+cfCmhA1AD+vqfWbgI+eHs= github.com/aws/aws-sdk-go-v2 v1.22.1 h1:sjnni/AuoTXxHitsIdT0FwmqUuNUuHtufcVDErVFT9U= github.com/aws/aws-sdk-go-v2 v1.22.1/go.mod h1:Kd0OJtkW3Q0M0lUWGszapWjEvrXDzRW+D21JNsroB+c= github.com/aws/eks-distro-build-tooling/release v0.0.0-20211103003257-a7e2379eae5e h1:GB6Cn9yKEt31mDF7RrVWyM9WoppNkGYth8zBPIJGJ+w= @@ -115,13 +116,12 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70= +github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd h1:rFt+Y/IK1aEZkEHchZRSq9OQbsSzIT/OrI8YFFmRIng= github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b h1:otBG+dV+YK+Soembjv71DPz3uX/V/6MMlSyD9JBQ6kQ= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk= @@ -135,6 +135,7 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= @@ -206,6 +207,7 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -221,6 +223,7 @@ github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= +github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= @@ -243,13 +246,9 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2 github.com/go-gorp/gorp/v3 v3.0.5 h1:PUjzYdYu3HBOh8LE+UUmRG2P0IRDak9XMeGNvaeq4Ow= github.com/go-gorp/gorp/v3 v3.0.5/go.mod h1:dLEjIyyRNiXvNZ8PSmzpt1GsWAUK8kjVhEpjH8TixEw= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -303,8 +302,8 @@ github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/ github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= -github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= +github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= 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= @@ -371,8 +370,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= -github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= +github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= +github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -403,6 +402,7 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/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 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= @@ -412,12 +412,14 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= +github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= @@ -488,12 +490,10 @@ github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Cc github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= @@ -501,7 +501,6 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw= github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= @@ -511,7 +510,6 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kortschak/utter v1.0.1/go.mod h1:vSmSjbyrlKjjsL71193LmzBOKgwePk9DH6uFaWHIInc= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -536,16 +534,17 @@ github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= -github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/markbates/errx v1.1.0 h1:QDFeR+UP95dO12JgW+tgi2UVfo0V8YBHiUIOaeBPiEI= github.com/markbates/errx v1.1.0/go.mod h1:PLa46Oex9KNbVDZhKel8v1OT7hD5JZ2eI7AHhA0wswc= github.com/markbates/oncer v1.0.0 h1:E83IaVAHygyndzPimgUYJjbshhDTALZyXxvk9FOlQRY= @@ -593,8 +592,8 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= @@ -627,11 +626,9 @@ github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8m github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/nelsam/hel/v2 v2.3.2/go.mod h1:1ZTGfU2PFTOd5mx22i5O0Lc2GY933lQ2wb/ggy+rL3w= github.com/nelsam/hel/v2 v2.3.3/go.mod h1:1ZTGfU2PFTOd5mx22i5O0Lc2GY933lQ2wb/ggy+rL3w= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= 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.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= @@ -658,8 +655,8 @@ github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FI github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= -github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= +github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 h1:Ii+DKncOVM8Cu1Hc+ETb5K+23HdAMvESYE3ZJ5b5cMI= @@ -669,6 +666,7 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= 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= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -682,35 +680,25 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= +github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= +github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= -github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= +github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= -github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= +github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= @@ -730,14 +718,13 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/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 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= @@ -747,8 +734,9 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= +github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= @@ -770,14 +758,15 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/spf13/viper v1.10.0 h1:mXH0UwHS4D2HwWZa75im4xIQynLfblmWV7qcWpfv0yk= -github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= +github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= +github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -787,9 +776,11 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= +github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -843,16 +834,17 @@ go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM= go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M= go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= 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 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= 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.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= @@ -872,7 +864,9 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U 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-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= @@ -915,8 +909,8 @@ 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.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= +golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= 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= @@ -965,10 +959,8 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-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-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= @@ -986,8 +978,6 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1002,8 +992,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1036,7 +1026,6 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1050,8 +1039,6 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1061,14 +1048,15 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1076,8 +1064,6 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/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-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1172,12 +1158,13 @@ golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= -golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= +golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= +golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1249,17 +1236,19 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -1284,6 +1273,7 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -1305,7 +1295,6 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= @@ -1314,8 +1303,8 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy 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.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= -gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= @@ -1325,7 +1314,6 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= @@ -1349,8 +1337,8 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.17.2/go.mod h1:BS9fjjLc4CMuqfSO8vgbHPKMt5+SF0ET6u/RVDihTo4= -k8s.io/api v0.26.2 h1:dM3cinp3PGB6asOySalOZxEG4CZ0IAdJsrYZXE/ovGQ= -k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU= +k8s.io/api v0.26.10 h1:skTnrDR0r8dg4MMLf6YZIzugxNM0BjFsWKPkNc5kOvk= +k8s.io/api v0.26.10/go.mod h1:ou/H3yviqrHtP/DSPVTfsc7qNfmU06OhajytJfYXkXw= k8s.io/apiextensions-apiserver v0.17.2/go.mod h1:4KdMpjkEjjDI2pPfBA15OscyNldHWdBCfsWMDWAmSTs= k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI= k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM= @@ -1358,17 +1346,17 @@ k8s.io/apimachinery v0.17.2/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZ k8s.io/apimachinery v0.26.10 h1:aE+J2KIbjctFqPp3Y0q4Wh2PD+l1p2g3Zp4UYjSvtGU= k8s.io/apimachinery v0.26.10/go.mod h1:iT1ZP4JBP34wwM+ZQ8ByPEQ81u043iqAcsJYftX9amM= k8s.io/apiserver v0.17.2/go.mod h1:lBmw/TtQdtxvrTk0e2cgtOxHizXI+d0mmGQURIHQZlo= -k8s.io/apiserver v0.26.2 h1:Pk8lmX4G14hYqJd1poHGC08G03nIHVqdJMR0SD3IH3o= -k8s.io/apiserver v0.26.2/go.mod h1:GHcozwXgXsPuOJ28EnQ/jXEM9QeG6HT22YxSNmpYNh8= +k8s.io/apiserver v0.26.10 h1:gradpIHygzZN87yK+o6V3gpbCSF78HZ0hejLZQQwdDs= +k8s.io/apiserver v0.26.10/go.mod h1:TGrQKQWUfQcotK3P4TtoVZxXOWklFF36QZlA5wufLs4= k8s.io/cli-runtime v0.26.0 h1:aQHa1SyUhpqxAw1fY21x2z2OS5RLtMJOCj7tN4oq8mw= k8s.io/cli-runtime v0.26.0/go.mod h1:o+4KmwHzO/UK0wepE1qpRk6l3o60/txUZ1fEXWGIKTY= k8s.io/client-go v0.17.2/go.mod h1:QAzRgsa0C2xl4/eVpeVAZMvikCn8Nm81yqVx3Kk9XYI= -k8s.io/client-go v0.26.2 h1:s1WkVujHX3kTp4Zn4yGNFK+dlDXy1bAAkIl+cFAiuYI= -k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU= +k8s.io/client-go v0.26.10 h1:4mDzl+1IrfRxh4Ro0s65JRGJp14w77gSMUTjACYWVRo= +k8s.io/client-go v0.26.10/go.mod h1:sh74ig838gCckU4ElYclWb24lTesPdEDPnlyg5vcbkA= k8s.io/code-generator v0.17.2/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= k8s.io/component-base v0.17.2/go.mod h1:zMPW3g5aH7cHJpKYQ/ZsGMcgbsA/VyhEugF3QT1awLs= -k8s.io/component-base v0.26.2 h1:IfWgCGUDzrD6wLLgXEstJKYZKAFS2kO+rBRi0p3LqcI= -k8s.io/component-base v0.26.2/go.mod h1:DxbuIe9M3IZPRxPIzhch2m1eT7uFrSBJUBuVCQEBivs= +k8s.io/component-base v0.26.10 h1:vl3Gfe5aC09mNxfnQtTng7u3rnBVrShOK3MAkqEleb0= +k8s.io/component-base v0.26.10/go.mod h1:/IDdENUHG5uGxqcofZajovYXE9KSPzJ4yQbkYQt7oN0= 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/helm v2.17.0+incompatible h1:Bpn6o1wKLYqKM3+Osh8e+1/K2g/GsQJ4F4yNF2+deao= @@ -1379,13 +1367,13 @@ k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= -k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= -k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= +k8s.io/kube-openapi v0.0.0-20221106113015-f73e7dbcfe29 h1:tya1+VIpw4iOtih5oB7B7nMINohQcyedmlTzdDwSHPA= +k8s.io/kube-openapi v0.0.0-20221106113015-f73e7dbcfe29/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/kubectl v0.26.0 h1:xmrzoKR9CyNdzxBmXV7jW9Ln8WMrwRK6hGbbf69o4T0= k8s.io/kubectl v0.26.0/go.mod h1:eInP0b+U9XUJWSYeU9XZnTA+cVYuWyl3iYPGtru0qhQ= k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 h1:kmDqav+P+/5e1i9tFfHq1qcF3sOrDp+YEkVDAHu7Jwk= -k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20230711102312-30195339c3c7 h1:ZgnF1KZsYxWIifwSNZFZgNtWE89WI5yiP5WwlfDoIyc= +k8s.io/utils v0.0.0-20230711102312-30195339c3c7/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= diff --git a/release/main.go b/release/cli/main.go similarity index 93% rename from release/main.go rename to release/cli/main.go index 64e52a43b997..76f0951eac5a 100644 --- a/release/main.go +++ b/release/cli/main.go @@ -15,7 +15,7 @@ package main import ( - "github.com/aws/eks-anywhere/release/cmd" + "github.com/aws/eks-anywhere/release/cli/cmd" ) func main() { diff --git a/release/pkg/assets/archives/archives.go b/release/cli/pkg/assets/archives/archives.go similarity index 95% rename from release/pkg/assets/archives/archives.go rename to release/cli/pkg/assets/archives/archives.go index 7f71793626f7..87a645a5d83e 100644 --- a/release/pkg/assets/archives/archives.go +++ b/release/cli/pkg/assets/archives/archives.go @@ -20,11 +20,11 @@ import ( "github.com/pkg/errors" - assettypes "github.com/aws/eks-anywhere/release/pkg/assets/types" - "github.com/aws/eks-anywhere/release/pkg/filereader" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - artifactutils "github.com/aws/eks-anywhere/release/pkg/util/artifacts" - sliceutils "github.com/aws/eks-anywhere/release/pkg/util/slices" + assettypes "github.com/aws/eks-anywhere/release/cli/pkg/assets/types" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + artifactutils "github.com/aws/eks-anywhere/release/cli/pkg/util/artifacts" + sliceutils "github.com/aws/eks-anywhere/release/cli/pkg/util/slices" ) func EksDistroArtifactPathGetter(rc *releasetypes.ReleaseConfig, archive *assettypes.Archive, projectPath, gitTag, eksDReleaseChannel, eksDReleaseNumber, kubeVersion, latestPath, arch string) (string, string, string, string, error) { diff --git a/release/pkg/assets/archives/archives_test.go b/release/cli/pkg/assets/archives/archives_test.go similarity index 97% rename from release/pkg/assets/archives/archives_test.go rename to release/cli/pkg/assets/archives/archives_test.go index 7419bd390237..de1dc99c094c 100644 --- a/release/pkg/assets/archives/archives_test.go +++ b/release/cli/pkg/assets/archives/archives_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - assettypes "github.com/aws/eks-anywhere/release/pkg/assets/types" - "github.com/aws/eks-anywhere/release/pkg/filereader" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + assettypes "github.com/aws/eks-anywhere/release/cli/pkg/assets/types" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) var releaseConfig = &releasetypes.ReleaseConfig{ diff --git a/release/pkg/assets/assets.go b/release/cli/pkg/assets/assets.go similarity index 87% rename from release/pkg/assets/assets.go rename to release/cli/pkg/assets/assets.go index 2e10f49f9c2f..a882aec95197 100644 --- a/release/pkg/assets/assets.go +++ b/release/cli/pkg/assets/assets.go @@ -21,16 +21,16 @@ import ( "github.com/pkg/errors" - "github.com/aws/eks-anywhere/release/pkg/assets/archives" - assetconfig "github.com/aws/eks-anywhere/release/pkg/assets/config" - "github.com/aws/eks-anywhere/release/pkg/assets/images" - "github.com/aws/eks-anywhere/release/pkg/assets/manifests" - "github.com/aws/eks-anywhere/release/pkg/assets/tagger" - assettypes "github.com/aws/eks-anywhere/release/pkg/assets/types" - "github.com/aws/eks-anywhere/release/pkg/filereader" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - bundleutils "github.com/aws/eks-anywhere/release/pkg/util/bundles" - sliceutils "github.com/aws/eks-anywhere/release/pkg/util/slices" + "github.com/aws/eks-anywhere/release/cli/pkg/assets/archives" + assetconfig "github.com/aws/eks-anywhere/release/cli/pkg/assets/config" + "github.com/aws/eks-anywhere/release/cli/pkg/assets/images" + "github.com/aws/eks-anywhere/release/cli/pkg/assets/manifests" + "github.com/aws/eks-anywhere/release/cli/pkg/assets/tagger" + assettypes "github.com/aws/eks-anywhere/release/cli/pkg/assets/types" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + bundleutils "github.com/aws/eks-anywhere/release/cli/pkg/util/bundles" + sliceutils "github.com/aws/eks-anywhere/release/cli/pkg/util/slices" ) func getAssetsFromConfig(ac *assettypes.AssetConfig, rc *releasetypes.ReleaseConfig, eksDReleaseChannel, eksDReleaseNumber, kubeVersion string) ([]releasetypes.Artifact, error) { diff --git a/release/pkg/assets/config/bundle_release.go b/release/cli/pkg/assets/config/bundle_release.go similarity index 99% rename from release/pkg/assets/config/bundle_release.go rename to release/cli/pkg/assets/config/bundle_release.go index 553ee31c1504..be76ee938124 100644 --- a/release/pkg/assets/config/bundle_release.go +++ b/release/cli/pkg/assets/config/bundle_release.go @@ -15,9 +15,9 @@ package config import ( - "github.com/aws/eks-anywhere/release/pkg/assets/archives" - "github.com/aws/eks-anywhere/release/pkg/assets/tagger" - assettypes "github.com/aws/eks-anywhere/release/pkg/assets/types" + "github.com/aws/eks-anywhere/release/cli/pkg/assets/archives" + "github.com/aws/eks-anywhere/release/cli/pkg/assets/tagger" + assettypes "github.com/aws/eks-anywhere/release/cli/pkg/assets/types" ) var bundleReleaseAssetsConfigMap = []assettypes.AssetConfig{ diff --git a/release/pkg/assets/images/images.go b/release/cli/pkg/assets/images/images.go similarity index 92% rename from release/pkg/assets/images/images.go rename to release/cli/pkg/assets/images/images.go index 0988eaff0376..7ce845a3213e 100644 --- a/release/pkg/assets/images/images.go +++ b/release/cli/pkg/assets/images/images.go @@ -20,10 +20,10 @@ import ( "github.com/pkg/errors" - "github.com/aws/eks-anywhere/release/pkg/assets/tagger" - assettypes "github.com/aws/eks-anywhere/release/pkg/assets/types" - "github.com/aws/eks-anywhere/release/pkg/images" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + "github.com/aws/eks-anywhere/release/cli/pkg/assets/tagger" + assettypes "github.com/aws/eks-anywhere/release/cli/pkg/assets/types" + "github.com/aws/eks-anywhere/release/cli/pkg/images" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) func GetImageAssets(rc *releasetypes.ReleaseConfig, ac *assettypes.AssetConfig, image *assettypes.Image, imageRepoPrefix string, imageTagOptions []string, gitTag, projectPath, gitTagPath, eksDReleaseChannel, eksDReleaseNumber, kubeVersion string) (*releasetypes.ImageArtifact, string, error) { diff --git a/release/pkg/assets/images/images_test.go b/release/cli/pkg/assets/images/images_test.go similarity index 97% rename from release/pkg/assets/images/images_test.go rename to release/cli/pkg/assets/images/images_test.go index f7885e2ac145..765296456491 100644 --- a/release/pkg/assets/images/images_test.go +++ b/release/cli/pkg/assets/images/images_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - assettypes "github.com/aws/eks-anywhere/release/pkg/assets/types" - "github.com/aws/eks-anywhere/release/pkg/filereader" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + assettypes "github.com/aws/eks-anywhere/release/cli/pkg/assets/types" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) var releaseConfig = &releasetypes.ReleaseConfig{ diff --git a/release/pkg/assets/manifests/manifests.go b/release/cli/pkg/assets/manifests/manifests.go similarity index 92% rename from release/pkg/assets/manifests/manifests.go rename to release/cli/pkg/assets/manifests/manifests.go index 659497406f72..253c74fc5ca7 100644 --- a/release/pkg/assets/manifests/manifests.go +++ b/release/cli/pkg/assets/manifests/manifests.go @@ -20,9 +20,9 @@ import ( "github.com/pkg/errors" - assettypes "github.com/aws/eks-anywhere/release/pkg/assets/types" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - artifactutils "github.com/aws/eks-anywhere/release/pkg/util/artifacts" + assettypes "github.com/aws/eks-anywhere/release/cli/pkg/assets/types" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + artifactutils "github.com/aws/eks-anywhere/release/cli/pkg/util/artifacts" ) func GetManifestAssets(rc *releasetypes.ReleaseConfig, manifestComponent *assettypes.ManifestComponent, manifestFile, projectName, projectPath, gitTag, sourcedFromBranch string, imageTagOverrides []releasetypes.ImageTagOverride) (*releasetypes.ManifestArtifact, error) { diff --git a/release/pkg/assets/manifests/manifests_test.go b/release/cli/pkg/assets/manifests/manifests_test.go similarity index 96% rename from release/pkg/assets/manifests/manifests_test.go rename to release/cli/pkg/assets/manifests/manifests_test.go index 40d78ff70e71..bdf2e5a7c41c 100644 --- a/release/pkg/assets/manifests/manifests_test.go +++ b/release/cli/pkg/assets/manifests/manifests_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - assettypes "github.com/aws/eks-anywhere/release/pkg/assets/types" - "github.com/aws/eks-anywhere/release/pkg/filereader" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + assettypes "github.com/aws/eks-anywhere/release/cli/pkg/assets/types" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) var releaseConfig = &releasetypes.ReleaseConfig{ diff --git a/release/pkg/assets/tagger/tagger.go b/release/cli/pkg/assets/tagger/tagger.go similarity index 88% rename from release/pkg/assets/tagger/tagger.go rename to release/cli/pkg/assets/tagger/tagger.go index 58e1236acae9..d116804b0eb2 100644 --- a/release/pkg/assets/tagger/tagger.go +++ b/release/cli/pkg/assets/tagger/tagger.go @@ -19,10 +19,10 @@ import ( "github.com/pkg/errors" - assettypes "github.com/aws/eks-anywhere/release/pkg/assets/types" - "github.com/aws/eks-anywhere/release/pkg/filereader" - "github.com/aws/eks-anywhere/release/pkg/git" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + assettypes "github.com/aws/eks-anywhere/release/cli/pkg/assets/types" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + "github.com/aws/eks-anywhere/release/cli/pkg/git" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) func BuildToolingGitTagAssigner(rc *releasetypes.ReleaseConfig, gitTagPath, overrideBranch string) (string, error) { diff --git a/release/pkg/assets/types/types.go b/release/cli/pkg/assets/types/types.go similarity index 97% rename from release/pkg/assets/types/types.go rename to release/cli/pkg/assets/types/types.go index 9d92e1fa7c03..413b7d3add35 100644 --- a/release/pkg/assets/types/types.go +++ b/release/cli/pkg/assets/types/types.go @@ -15,7 +15,7 @@ package types import ( - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) type ManifestComponent struct { diff --git a/release/pkg/aws/ecr/ecr.go b/release/cli/pkg/aws/ecr/ecr.go similarity index 98% rename from release/pkg/aws/ecr/ecr.go rename to release/cli/pkg/aws/ecr/ecr.go index fc4278ddf2f9..fad6af1d2135 100644 --- a/release/pkg/aws/ecr/ecr.go +++ b/release/cli/pkg/aws/ecr/ecr.go @@ -26,7 +26,7 @@ import ( docker "github.com/fsouza/go-dockerclient" "github.com/pkg/errors" - artifactutils "github.com/aws/eks-anywhere/release/pkg/util/artifacts" + artifactutils "github.com/aws/eks-anywhere/release/cli/pkg/util/artifacts" ) func GetImageDigest(imageUri, imageContainerRegistry string, ecrClient *ecr.ECR) (string, error) { diff --git a/release/pkg/aws/ecrpublic/ecrpublic.go b/release/cli/pkg/aws/ecrpublic/ecrpublic.go similarity index 97% rename from release/pkg/aws/ecrpublic/ecrpublic.go rename to release/cli/pkg/aws/ecrpublic/ecrpublic.go index 28bde8b4a8fc..c314d383df0f 100644 --- a/release/pkg/aws/ecrpublic/ecrpublic.go +++ b/release/cli/pkg/aws/ecrpublic/ecrpublic.go @@ -23,7 +23,7 @@ import ( docker "github.com/fsouza/go-dockerclient" "github.com/pkg/errors" - artifactutils "github.com/aws/eks-anywhere/release/pkg/util/artifacts" + artifactutils "github.com/aws/eks-anywhere/release/cli/pkg/util/artifacts" ) func GetImageDigest(imageUri, imageContainerRegistry string, ecrPublicClient *ecrpublic.ECRPublic) (string, error) { diff --git a/release/pkg/aws/s3/s3.go b/release/cli/pkg/aws/s3/s3.go similarity index 100% rename from release/pkg/aws/s3/s3.go rename to release/cli/pkg/aws/s3/s3.go diff --git a/release/pkg/bundles/bottlerocket.go b/release/cli/pkg/bundles/bottlerocket.go similarity index 96% rename from release/pkg/bundles/bottlerocket.go rename to release/cli/pkg/bundles/bottlerocket.go index 9366e045cf50..cbc7d664ef9d 100644 --- a/release/pkg/bundles/bottlerocket.go +++ b/release/cli/pkg/bundles/bottlerocket.go @@ -20,8 +20,8 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/filereader" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) func GetBottlerocketHostContainersBundle(r *releasetypes.ReleaseConfig, eksDReleaseChannel string, imageDigests map[string]string) (anywherev1alpha1.BottlerocketHostContainersBundle, error) { diff --git a/release/pkg/bundles/bundles.go b/release/cli/pkg/bundles/bundles.go similarity index 96% rename from release/pkg/bundles/bundles.go rename to release/cli/pkg/bundles/bundles.go index 0d35b612a0c0..9fe92e1b5dc7 100644 --- a/release/pkg/bundles/bundles.go +++ b/release/cli/pkg/bundles/bundles.go @@ -23,10 +23,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - "github.com/aws/eks-anywhere/release/pkg/filereader" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - sliceutils "github.com/aws/eks-anywhere/release/pkg/util/slices" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + sliceutils "github.com/aws/eks-anywhere/release/cli/pkg/util/slices" ) // NewBundlesName provides a strict format for bundle names, which is validated against in the Cluster webhook diff --git a/release/pkg/bundles/certmanager.go b/release/cli/pkg/bundles/certmanager.go similarity index 94% rename from release/pkg/bundles/certmanager.go rename to release/cli/pkg/bundles/certmanager.go index efccc3be3aa6..5e5c6bc1ad12 100644 --- a/release/pkg/bundles/certmanager.go +++ b/release/cli/pkg/bundles/certmanager.go @@ -20,9 +20,9 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - "github.com/aws/eks-anywhere/release/pkg/version" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + "github.com/aws/eks-anywhere/release/cli/pkg/version" ) func GetCertManagerBundle(r *releasetypes.ReleaseConfig, imageDigests map[string]string) (anywherev1alpha1.CertManagerBundle, error) { diff --git a/release/pkg/bundles/cilium.go b/release/cli/pkg/bundles/cilium.go similarity index 96% rename from release/pkg/bundles/cilium.go rename to release/cli/pkg/bundles/cilium.go index da03a1649b17..4cedd4943fa0 100644 --- a/release/pkg/bundles/cilium.go +++ b/release/cli/pkg/bundles/cilium.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - "github.com/aws/eks-anywhere/release/pkg/filereader" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) const ( diff --git a/release/pkg/bundles/cloudstack.go b/release/cli/pkg/bundles/cloudstack.go similarity index 95% rename from release/pkg/bundles/cloudstack.go rename to release/cli/pkg/bundles/cloudstack.go index 4888de9f2d7c..ad40832c3c0c 100644 --- a/release/pkg/bundles/cloudstack.go +++ b/release/cli/pkg/bundles/cloudstack.go @@ -20,9 +20,9 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - "github.com/aws/eks-anywhere/release/pkg/version" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + "github.com/aws/eks-anywhere/release/cli/pkg/version" ) func GetCloudStackBundle(r *releasetypes.ReleaseConfig, imageDigests map[string]string) (anywherev1alpha1.CloudStackBundle, error) { diff --git a/release/pkg/bundles/cluster-api-provider-docker.go b/release/cli/pkg/bundles/cluster-api-provider-docker.go similarity index 93% rename from release/pkg/bundles/cluster-api-provider-docker.go rename to release/cli/pkg/bundles/cluster-api-provider-docker.go index 6781b6003e7f..3f9cd2102906 100644 --- a/release/pkg/bundles/cluster-api-provider-docker.go +++ b/release/cli/pkg/bundles/cluster-api-provider-docker.go @@ -20,10 +20,10 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - bundleutils "github.com/aws/eks-anywhere/release/pkg/util/bundles" - "github.com/aws/eks-anywhere/release/pkg/version" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + bundleutils "github.com/aws/eks-anywhere/release/cli/pkg/util/bundles" + "github.com/aws/eks-anywhere/release/cli/pkg/version" ) func GetDockerBundle(r *releasetypes.ReleaseConfig, imageDigests map[string]string) (anywherev1alpha1.DockerBundle, error) { diff --git a/release/pkg/bundles/cluster-api.go b/release/cli/pkg/bundles/cluster-api.go similarity index 97% rename from release/pkg/bundles/cluster-api.go rename to release/cli/pkg/bundles/cluster-api.go index 126e37360fc3..be2478a9d4a6 100644 --- a/release/pkg/bundles/cluster-api.go +++ b/release/cli/pkg/bundles/cluster-api.go @@ -20,10 +20,10 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - bundleutils "github.com/aws/eks-anywhere/release/pkg/util/bundles" - "github.com/aws/eks-anywhere/release/pkg/version" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + bundleutils "github.com/aws/eks-anywhere/release/cli/pkg/util/bundles" + "github.com/aws/eks-anywhere/release/cli/pkg/version" ) func GetCoreClusterAPIBundle(r *releasetypes.ReleaseConfig, imageDigests map[string]string) (anywherev1alpha1.CoreClusterAPI, error) { diff --git a/release/pkg/bundles/eksa.go b/release/cli/pkg/bundles/eksa.go similarity index 94% rename from release/pkg/bundles/eksa.go rename to release/cli/pkg/bundles/eksa.go index dabec8eb5c3f..5f1bb0fdec29 100644 --- a/release/pkg/bundles/eksa.go +++ b/release/cli/pkg/bundles/eksa.go @@ -20,9 +20,9 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - bundleutils "github.com/aws/eks-anywhere/release/pkg/util/bundles" - "github.com/aws/eks-anywhere/release/pkg/version" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + bundleutils "github.com/aws/eks-anywhere/release/cli/pkg/util/bundles" + "github.com/aws/eks-anywhere/release/cli/pkg/version" ) func GetEksaBundle(r *releasetypes.ReleaseConfig, imageDigests map[string]string) (anywherev1alpha1.EksaBundle, error) { diff --git a/release/pkg/bundles/eksctl-anywhere.go b/release/cli/pkg/bundles/eksctl-anywhere.go similarity index 95% rename from release/pkg/bundles/eksctl-anywhere.go rename to release/cli/pkg/bundles/eksctl-anywhere.go index ad473654f7d6..0c596fa334d8 100644 --- a/release/pkg/bundles/eksctl-anywhere.go +++ b/release/cli/pkg/bundles/eksctl-anywhere.go @@ -22,10 +22,10 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - "github.com/aws/eks-anywhere/release/pkg/filereader" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - artifactutils "github.com/aws/eks-anywhere/release/pkg/util/artifacts" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + artifactutils "github.com/aws/eks-anywhere/release/cli/pkg/util/artifacts" ) // GetCliArtifacts returns the artifacts for eksctl-anywhere cli. diff --git a/release/pkg/bundles/eksd.go b/release/cli/pkg/bundles/eksd.go similarity index 96% rename from release/pkg/bundles/eksd.go rename to release/cli/pkg/bundles/eksd.go index 9e1fd00b4511..1e62e1dcf972 100644 --- a/release/pkg/bundles/eksd.go +++ b/release/cli/pkg/bundles/eksd.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - "github.com/aws/eks-anywhere/release/pkg/filereader" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) func GetEksDReleaseBundle(r *releasetypes.ReleaseConfig, eksDReleaseChannel, kubeVer, eksDReleaseNumber string, imageDigests map[string]string, dev bool) (anywherev1alpha1.EksDRelease, error) { diff --git a/release/pkg/bundles/etcdadm-bootstrap.go b/release/cli/pkg/bundles/etcdadm-bootstrap.go similarity index 93% rename from release/pkg/bundles/etcdadm-bootstrap.go rename to release/cli/pkg/bundles/etcdadm-bootstrap.go index 55626e00a126..cc4d9b6f36f2 100644 --- a/release/pkg/bundles/etcdadm-bootstrap.go +++ b/release/cli/pkg/bundles/etcdadm-bootstrap.go @@ -20,10 +20,10 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - bundleutils "github.com/aws/eks-anywhere/release/pkg/util/bundles" - "github.com/aws/eks-anywhere/release/pkg/version" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + bundleutils "github.com/aws/eks-anywhere/release/cli/pkg/util/bundles" + "github.com/aws/eks-anywhere/release/cli/pkg/version" ) func GetEtcdadmBootstrapBundle(r *releasetypes.ReleaseConfig, imageDigests map[string]string) (anywherev1alpha1.EtcdadmBootstrapBundle, error) { diff --git a/release/pkg/bundles/etcdadm-controller.go b/release/cli/pkg/bundles/etcdadm-controller.go similarity index 93% rename from release/pkg/bundles/etcdadm-controller.go rename to release/cli/pkg/bundles/etcdadm-controller.go index f5fc78a4f4b3..fb820569e13c 100644 --- a/release/pkg/bundles/etcdadm-controller.go +++ b/release/cli/pkg/bundles/etcdadm-controller.go @@ -20,10 +20,10 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - bundleutils "github.com/aws/eks-anywhere/release/pkg/util/bundles" - "github.com/aws/eks-anywhere/release/pkg/version" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + bundleutils "github.com/aws/eks-anywhere/release/cli/pkg/util/bundles" + "github.com/aws/eks-anywhere/release/cli/pkg/version" ) func GetEtcdadmControllerBundle(r *releasetypes.ReleaseConfig, imageDigests map[string]string) (anywherev1alpha1.EtcdadmControllerBundle, error) { diff --git a/release/pkg/bundles/flux.go b/release/cli/pkg/bundles/flux.go similarity index 92% rename from release/pkg/bundles/flux.go rename to release/cli/pkg/bundles/flux.go index 91649b2cf3c7..0aa2d314e93e 100644 --- a/release/pkg/bundles/flux.go +++ b/release/cli/pkg/bundles/flux.go @@ -20,10 +20,10 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - bundleutils "github.com/aws/eks-anywhere/release/pkg/util/bundles" - "github.com/aws/eks-anywhere/release/pkg/version" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + bundleutils "github.com/aws/eks-anywhere/release/cli/pkg/util/bundles" + "github.com/aws/eks-anywhere/release/cli/pkg/version" ) func GetFluxBundle(r *releasetypes.ReleaseConfig, imageDigests map[string]string) (anywherev1alpha1.FluxBundle, error) { diff --git a/release/pkg/bundles/haproxy.go b/release/cli/pkg/bundles/haproxy.go similarity index 95% rename from release/pkg/bundles/haproxy.go rename to release/cli/pkg/bundles/haproxy.go index bf814533be28..b45ebf517b12 100644 --- a/release/pkg/bundles/haproxy.go +++ b/release/cli/pkg/bundles/haproxy.go @@ -18,7 +18,7 @@ import ( "fmt" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) func GetHaproxyBundle(r *releasetypes.ReleaseConfig, imageDigests map[string]string) (anywherev1alpha1.HaproxyBundle, error) { diff --git a/release/pkg/bundles/kindnetd.go b/release/cli/pkg/bundles/kindnetd.go similarity index 92% rename from release/pkg/bundles/kindnetd.go rename to release/cli/pkg/bundles/kindnetd.go index 6586234d3e31..b4344be18c8b 100644 --- a/release/pkg/bundles/kindnetd.go +++ b/release/cli/pkg/bundles/kindnetd.go @@ -18,9 +18,9 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - "github.com/aws/eks-anywhere/release/pkg/version" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + "github.com/aws/eks-anywhere/release/cli/pkg/version" ) func GetKindnetdBundle(r *releasetypes.ReleaseConfig) (anywherev1alpha1.KindnetdBundle, error) { diff --git a/release/pkg/bundles/nutanix.go b/release/cli/pkg/bundles/nutanix.go similarity index 92% rename from release/pkg/bundles/nutanix.go rename to release/cli/pkg/bundles/nutanix.go index 2f008fba4a08..6ab0afa3903e 100644 --- a/release/pkg/bundles/nutanix.go +++ b/release/cli/pkg/bundles/nutanix.go @@ -6,10 +6,10 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - bundleutils "github.com/aws/eks-anywhere/release/pkg/util/bundles" - "github.com/aws/eks-anywhere/release/pkg/version" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + bundleutils "github.com/aws/eks-anywhere/release/cli/pkg/util/bundles" + "github.com/aws/eks-anywhere/release/cli/pkg/version" ) // GetNutanixBundle returns the bundle for Nutanix. diff --git a/release/pkg/bundles/package-controller.go b/release/cli/pkg/bundles/package-controller.go similarity index 95% rename from release/pkg/bundles/package-controller.go rename to release/cli/pkg/bundles/package-controller.go index 6fb493fb7bec..4d3022463e3c 100644 --- a/release/pkg/bundles/package-controller.go +++ b/release/cli/pkg/bundles/package-controller.go @@ -21,14 +21,14 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/aws/ecr" - "github.com/aws/eks-anywhere/release/pkg/aws/ecrpublic" - "github.com/aws/eks-anywhere/release/pkg/constants" - "github.com/aws/eks-anywhere/release/pkg/helm" - "github.com/aws/eks-anywhere/release/pkg/images" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - bundleutils "github.com/aws/eks-anywhere/release/pkg/util/bundles" - "github.com/aws/eks-anywhere/release/pkg/version" + "github.com/aws/eks-anywhere/release/cli/pkg/aws/ecr" + "github.com/aws/eks-anywhere/release/cli/pkg/aws/ecrpublic" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + "github.com/aws/eks-anywhere/release/cli/pkg/helm" + "github.com/aws/eks-anywhere/release/cli/pkg/images" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + bundleutils "github.com/aws/eks-anywhere/release/cli/pkg/util/bundles" + "github.com/aws/eks-anywhere/release/cli/pkg/version" ) func GetPackagesBundle(r *releasetypes.ReleaseConfig, imageDigests map[string]string) (anywherev1alpha1.PackageBundle, error) { diff --git a/release/pkg/bundles/snow.go b/release/cli/pkg/bundles/snow.go similarity index 93% rename from release/pkg/bundles/snow.go rename to release/cli/pkg/bundles/snow.go index 9d83b9a2eb31..7978a96dcda4 100644 --- a/release/pkg/bundles/snow.go +++ b/release/cli/pkg/bundles/snow.go @@ -20,10 +20,10 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - bundleutils "github.com/aws/eks-anywhere/release/pkg/util/bundles" - "github.com/aws/eks-anywhere/release/pkg/version" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + bundleutils "github.com/aws/eks-anywhere/release/cli/pkg/util/bundles" + "github.com/aws/eks-anywhere/release/cli/pkg/version" ) func GetSnowBundle(r *releasetypes.ReleaseConfig, eksDReleaseChannel string, imageDigests map[string]string) (anywherev1alpha1.SnowBundle, error) { diff --git a/release/pkg/bundles/tinkerbell.go b/release/cli/pkg/bundles/tinkerbell.go similarity index 96% rename from release/pkg/bundles/tinkerbell.go rename to release/cli/pkg/bundles/tinkerbell.go index fb1d47d1c764..9d1c4cc0f407 100644 --- a/release/pkg/bundles/tinkerbell.go +++ b/release/cli/pkg/bundles/tinkerbell.go @@ -21,10 +21,10 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - bundleutils "github.com/aws/eks-anywhere/release/pkg/util/bundles" - "github.com/aws/eks-anywhere/release/pkg/version" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + bundleutils "github.com/aws/eks-anywhere/release/cli/pkg/util/bundles" + "github.com/aws/eks-anywhere/release/cli/pkg/version" ) func GetTinkerbellBundle(r *releasetypes.ReleaseConfig, imageDigests map[string]string) (anywherev1alpha1.TinkerbellBundle, error) { diff --git a/release/pkg/bundles/vsphere.go b/release/cli/pkg/bundles/vsphere.go similarity index 94% rename from release/pkg/bundles/vsphere.go rename to release/cli/pkg/bundles/vsphere.go index 74b99229cbc5..f0df6f1bb846 100644 --- a/release/pkg/bundles/vsphere.go +++ b/release/cli/pkg/bundles/vsphere.go @@ -20,10 +20,10 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - bundleutils "github.com/aws/eks-anywhere/release/pkg/util/bundles" - "github.com/aws/eks-anywhere/release/pkg/version" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + bundleutils "github.com/aws/eks-anywhere/release/cli/pkg/util/bundles" + "github.com/aws/eks-anywhere/release/cli/pkg/version" ) func GetVsphereBundle(r *releasetypes.ReleaseConfig, eksDReleaseChannel string, imageDigests map[string]string) (anywherev1alpha1.VSphereBundle, error) { diff --git a/release/pkg/clients/clients.go b/release/cli/pkg/clients/clients.go similarity index 98% rename from release/pkg/clients/clients.go rename to release/cli/pkg/clients/clients.go index fd896cc9749a..ab22cda2d33c 100644 --- a/release/pkg/clients/clients.go +++ b/release/cli/pkg/clients/clients.go @@ -26,8 +26,8 @@ import ( docker "github.com/fsouza/go-dockerclient" "github.com/pkg/errors" - "github.com/aws/eks-anywhere/release/pkg/aws/ecr" - "github.com/aws/eks-anywhere/release/pkg/aws/ecrpublic" + "github.com/aws/eks-anywhere/release/cli/pkg/aws/ecr" + "github.com/aws/eks-anywhere/release/cli/pkg/aws/ecrpublic" ) type SourceClients struct { diff --git a/release/pkg/constants/constants.go b/release/cli/pkg/constants/constants.go similarity index 100% rename from release/pkg/constants/constants.go rename to release/cli/pkg/constants/constants.go diff --git a/release/pkg/filereader/file_reader.go b/release/cli/pkg/filereader/file_reader.go similarity index 97% rename from release/pkg/filereader/file_reader.go rename to release/cli/pkg/filereader/file_reader.go index a97851409241..96a6d0f85c5b 100644 --- a/release/pkg/filereader/file_reader.go +++ b/release/cli/pkg/filereader/file_reader.go @@ -29,11 +29,11 @@ import ( "github.com/pkg/errors" k8syaml "sigs.k8s.io/yaml" - "github.com/aws/eks-anywhere/release/pkg/aws/s3" - "github.com/aws/eks-anywhere/release/pkg/constants" - "github.com/aws/eks-anywhere/release/pkg/git" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - artifactutils "github.com/aws/eks-anywhere/release/pkg/util/artifacts" + "github.com/aws/eks-anywhere/release/cli/pkg/aws/s3" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + "github.com/aws/eks-anywhere/release/cli/pkg/git" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + artifactutils "github.com/aws/eks-anywhere/release/cli/pkg/util/artifacts" ) type EksDLatestRelease struct { diff --git a/release/pkg/filereader/file_reader_test.go b/release/cli/pkg/filereader/file_reader_test.go similarity index 100% rename from release/pkg/filereader/file_reader_test.go rename to release/cli/pkg/filereader/file_reader_test.go diff --git a/release/pkg/git/git.go b/release/cli/pkg/git/git.go similarity index 96% rename from release/pkg/git/git.go rename to release/cli/pkg/git/git.go index e5b608932802..556ec1cf84e5 100644 --- a/release/pkg/git/git.go +++ b/release/cli/pkg/git/git.go @@ -18,7 +18,7 @@ import ( "fmt" "os/exec" - commandutils "github.com/aws/eks-anywhere/release/pkg/util/command" + commandutils "github.com/aws/eks-anywhere/release/cli/pkg/util/command" ) func CloneRepo(cloneUrl, destination string) (string, error) { diff --git a/release/pkg/helm/helm.go b/release/cli/pkg/helm/helm.go similarity index 98% rename from release/pkg/helm/helm.go rename to release/cli/pkg/helm/helm.go index ed2e352e4331..3622dd4792e4 100644 --- a/release/pkg/helm/helm.go +++ b/release/cli/pkg/helm/helm.go @@ -33,9 +33,9 @@ import ( "sigs.k8s.io/yaml" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/constants" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - commandutils "github.com/aws/eks-anywhere/release/pkg/util/command" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + commandutils "github.com/aws/eks-anywhere/release/cli/pkg/util/command" ) var HelmLog = ctrl.Log.WithName("HelmLog") diff --git a/release/pkg/helm/helm_types.go b/release/cli/pkg/helm/helm_types.go similarity index 100% rename from release/pkg/helm/helm_types.go rename to release/cli/pkg/helm/helm_types.go diff --git a/release/pkg/images/images.go b/release/cli/pkg/images/images.go similarity index 95% rename from release/pkg/images/images.go rename to release/cli/pkg/images/images.go index 988dff84ec3b..00bab71ce910 100644 --- a/release/pkg/images/images.go +++ b/release/cli/pkg/images/images.go @@ -29,16 +29,16 @@ import ( "sigs.k8s.io/yaml" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - assettypes "github.com/aws/eks-anywhere/release/pkg/assets/types" - "github.com/aws/eks-anywhere/release/pkg/aws/ecr" - "github.com/aws/eks-anywhere/release/pkg/aws/ecrpublic" - "github.com/aws/eks-anywhere/release/pkg/aws/s3" - "github.com/aws/eks-anywhere/release/pkg/constants" - "github.com/aws/eks-anywhere/release/pkg/filereader" - "github.com/aws/eks-anywhere/release/pkg/retrier" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - artifactutils "github.com/aws/eks-anywhere/release/pkg/util/artifacts" - commandutils "github.com/aws/eks-anywhere/release/pkg/util/command" + assettypes "github.com/aws/eks-anywhere/release/cli/pkg/assets/types" + "github.com/aws/eks-anywhere/release/cli/pkg/aws/ecr" + "github.com/aws/eks-anywhere/release/cli/pkg/aws/ecrpublic" + "github.com/aws/eks-anywhere/release/cli/pkg/aws/s3" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + "github.com/aws/eks-anywhere/release/cli/pkg/retrier" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + artifactutils "github.com/aws/eks-anywhere/release/cli/pkg/util/artifacts" + commandutils "github.com/aws/eks-anywhere/release/cli/pkg/util/command" ) func PollForExistence(devRelease bool, authConfig *docker.AuthConfiguration, imageUri, imageContainerRegistry, releaseEnvironment, branchName string) error { diff --git a/release/pkg/operations/bundle_release.go b/release/cli/pkg/operations/bundle_release.go similarity index 90% rename from release/pkg/operations/bundle_release.go rename to release/cli/pkg/operations/bundle_release.go index d06d14f7282c..f4e2e58eec70 100644 --- a/release/pkg/operations/bundle_release.go +++ b/release/cli/pkg/operations/bundle_release.go @@ -20,13 +20,13 @@ import ( "github.com/pkg/errors" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/assets" - "github.com/aws/eks-anywhere/release/pkg/aws/ecrpublic" - "github.com/aws/eks-anywhere/release/pkg/bundles" - "github.com/aws/eks-anywhere/release/pkg/constants" - "github.com/aws/eks-anywhere/release/pkg/filereader" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - artifactutils "github.com/aws/eks-anywhere/release/pkg/util/artifacts" + "github.com/aws/eks-anywhere/release/cli/pkg/assets" + "github.com/aws/eks-anywhere/release/cli/pkg/aws/ecrpublic" + "github.com/aws/eks-anywhere/release/cli/pkg/bundles" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + artifactutils "github.com/aws/eks-anywhere/release/cli/pkg/util/artifacts" ) func GenerateBundleArtifactsTable(r *releasetypes.ReleaseConfig) (map[string][]releasetypes.Artifact, error) { diff --git a/release/pkg/operations/bundle_release_test.go b/release/cli/pkg/operations/bundle_release_test.go similarity index 95% rename from release/pkg/operations/bundle_release_test.go rename to release/cli/pkg/operations/bundle_release_test.go index 0626e6453ae9..d62985d04f07 100644 --- a/release/pkg/operations/bundle_release_test.go +++ b/release/cli/pkg/operations/bundle_release_test.go @@ -28,16 +28,16 @@ import ( "sigs.k8s.io/yaml" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/bundles" - "github.com/aws/eks-anywhere/release/pkg/filereader" - "github.com/aws/eks-anywhere/release/pkg/git" - "github.com/aws/eks-anywhere/release/pkg/test" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + "github.com/aws/eks-anywhere/release/cli/pkg/bundles" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + "github.com/aws/eks-anywhere/release/cli/pkg/git" + "github.com/aws/eks-anywhere/release/cli/pkg/test" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) const ( releaseFolder = "release" - testdataFolder = "pkg/test/testdata" + testdataFolder = "cli/pkg/test/testdata" generatedBundleFolder = "generated-bundles" ) diff --git a/release/pkg/operations/download.go b/release/cli/pkg/operations/download.go similarity index 95% rename from release/pkg/operations/download.go rename to release/cli/pkg/operations/download.go index 529dc6d4a05e..4196b29c7344 100644 --- a/release/pkg/operations/download.go +++ b/release/cli/pkg/operations/download.go @@ -22,12 +22,12 @@ import ( "github.com/pkg/errors" - "github.com/aws/eks-anywhere/release/pkg/aws/s3" - "github.com/aws/eks-anywhere/release/pkg/constants" - "github.com/aws/eks-anywhere/release/pkg/filereader" - "github.com/aws/eks-anywhere/release/pkg/retrier" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - artifactutils "github.com/aws/eks-anywhere/release/pkg/util/artifacts" + "github.com/aws/eks-anywhere/release/cli/pkg/aws/s3" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + "github.com/aws/eks-anywhere/release/cli/pkg/retrier" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + artifactutils "github.com/aws/eks-anywhere/release/cli/pkg/util/artifacts" ) func DownloadArtifacts(r *releasetypes.ReleaseConfig, eksArtifacts map[string][]releasetypes.Artifact) error { diff --git a/release/pkg/operations/eksa_release.go b/release/cli/pkg/operations/eksa_release.go similarity index 91% rename from release/pkg/operations/eksa_release.go rename to release/cli/pkg/operations/eksa_release.go index ec0b01ce68a5..5c8f6810ad91 100644 --- a/release/pkg/operations/eksa_release.go +++ b/release/cli/pkg/operations/eksa_release.go @@ -19,9 +19,9 @@ import ( "github.com/pkg/errors" - "github.com/aws/eks-anywhere/release/pkg/bundles" - "github.com/aws/eks-anywhere/release/pkg/constants" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + "github.com/aws/eks-anywhere/release/cli/pkg/bundles" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) func GenerateEksAArtifactsTable(r *releasetypes.ReleaseConfig) (map[string][]releasetypes.Artifact, error) { diff --git a/release/pkg/operations/rename.go b/release/cli/pkg/operations/rename.go similarity index 96% rename from release/pkg/operations/rename.go rename to release/cli/pkg/operations/rename.go index 87b5d7356ca4..a5a86bdb166a 100644 --- a/release/pkg/operations/rename.go +++ b/release/cli/pkg/operations/rename.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "github.com/aws/eks-anywhere/release/pkg/constants" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) func RenameArtifacts(r *releasetypes.ReleaseConfig, artifacts map[string][]releasetypes.Artifact) error { diff --git a/release/pkg/operations/setup.go b/release/cli/pkg/operations/setup.go similarity index 94% rename from release/pkg/operations/setup.go rename to release/cli/pkg/operations/setup.go index 2d2abcc597d9..74afd4e90628 100644 --- a/release/pkg/operations/setup.go +++ b/release/cli/pkg/operations/setup.go @@ -21,9 +21,9 @@ import ( "github.com/pkg/errors" - "github.com/aws/eks-anywhere/release/pkg/constants" - "github.com/aws/eks-anywhere/release/pkg/git" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + "github.com/aws/eks-anywhere/release/cli/pkg/git" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) func SetRepoHeads(r *releasetypes.ReleaseConfig) error { diff --git a/release/pkg/operations/upload.go b/release/cli/pkg/operations/upload.go similarity index 94% rename from release/pkg/operations/upload.go rename to release/cli/pkg/operations/upload.go index f0ee69dc06bf..3133a815905d 100644 --- a/release/pkg/operations/upload.go +++ b/release/cli/pkg/operations/upload.go @@ -22,11 +22,11 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/pkg/errors" - "github.com/aws/eks-anywhere/release/pkg/aws/s3" - "github.com/aws/eks-anywhere/release/pkg/constants" - "github.com/aws/eks-anywhere/release/pkg/helm" - "github.com/aws/eks-anywhere/release/pkg/images" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + "github.com/aws/eks-anywhere/release/cli/pkg/aws/s3" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + "github.com/aws/eks-anywhere/release/cli/pkg/helm" + "github.com/aws/eks-anywhere/release/cli/pkg/images" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) func UploadArtifacts(r *releasetypes.ReleaseConfig, eksArtifacts map[string][]releasetypes.Artifact) error { diff --git a/release/pkg/retrier/retrier.go b/release/cli/pkg/retrier/retrier.go similarity index 100% rename from release/pkg/retrier/retrier.go rename to release/cli/pkg/retrier/retrier.go diff --git a/release/pkg/test/files.go b/release/cli/pkg/test/files.go similarity index 96% rename from release/pkg/test/files.go rename to release/cli/pkg/test/files.go index f8e24573d404..408506393b22 100644 --- a/release/pkg/test/files.go +++ b/release/cli/pkg/test/files.go @@ -19,7 +19,7 @@ import ( "os/exec" "testing" - commandutils "github.com/aws/eks-anywhere/release/pkg/util/command" + commandutils "github.com/aws/eks-anywhere/release/cli/pkg/util/command" ) func CheckFilesEquals(t *testing.T, actualPath, expectedPath string, update bool) { diff --git a/release/pkg/test/testdata/main-bundle-release.yaml b/release/cli/pkg/test/testdata/main-bundle-release.yaml similarity index 100% rename from release/pkg/test/testdata/main-bundle-release.yaml rename to release/cli/pkg/test/testdata/main-bundle-release.yaml diff --git a/release/pkg/test/testdata/release-0.17-bundle-release.yaml b/release/cli/pkg/test/testdata/release-0.17-bundle-release.yaml similarity index 100% rename from release/pkg/test/testdata/release-0.17-bundle-release.yaml rename to release/cli/pkg/test/testdata/release-0.17-bundle-release.yaml diff --git a/release/pkg/types/types.go b/release/cli/pkg/types/types.go similarity index 98% rename from release/pkg/types/types.go rename to release/cli/pkg/types/types.go index dce2d585007b..f4fda986a33c 100644 --- a/release/pkg/types/types.go +++ b/release/cli/pkg/types/types.go @@ -17,7 +17,7 @@ package types import ( "time" - "github.com/aws/eks-anywhere/release/pkg/clients" + "github.com/aws/eks-anywhere/release/cli/pkg/clients" ) // ReleaseConfig contains metadata fields for a release. diff --git a/release/pkg/util/artifacts/artifacts.go b/release/cli/pkg/util/artifacts/artifacts.go similarity index 98% rename from release/pkg/util/artifacts/artifacts.go rename to release/cli/pkg/util/artifacts/artifacts.go index de9ea9f6c9a8..c56425daf4dd 100644 --- a/release/pkg/util/artifacts/artifacts.go +++ b/release/cli/pkg/util/artifacts/artifacts.go @@ -19,7 +19,7 @@ import ( "net/url" "strings" - "github.com/aws/eks-anywhere/release/pkg/constants" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" ) func IsObjectNotFoundError(err error) bool { diff --git a/release/pkg/util/bundles/bundles.go b/release/cli/pkg/util/bundles/bundles.go similarity index 86% rename from release/pkg/util/bundles/bundles.go rename to release/cli/pkg/util/bundles/bundles.go index 88dd2b6e603e..c4b1827298e5 100644 --- a/release/pkg/util/bundles/bundles.go +++ b/release/cli/pkg/util/bundles/bundles.go @@ -20,11 +20,11 @@ import ( "github.com/pkg/errors" - assettypes "github.com/aws/eks-anywhere/release/pkg/assets/types" - "github.com/aws/eks-anywhere/release/pkg/constants" - "github.com/aws/eks-anywhere/release/pkg/filereader" - "github.com/aws/eks-anywhere/release/pkg/images" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + assettypes "github.com/aws/eks-anywhere/release/cli/pkg/assets/types" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + "github.com/aws/eks-anywhere/release/cli/pkg/images" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) func SortArtifactsMap(m map[string][]releasetypes.Artifact) []string { diff --git a/release/pkg/util/command/command.go b/release/cli/pkg/util/command/command.go similarity index 100% rename from release/pkg/util/command/command.go rename to release/cli/pkg/util/command/command.go diff --git a/release/pkg/util/release/release.go b/release/cli/pkg/util/release/release.go similarity index 88% rename from release/pkg/util/release/release.go rename to release/cli/pkg/util/release/release.go index ab8db5efab26..178f255196af 100644 --- a/release/pkg/util/release/release.go +++ b/release/cli/pkg/util/release/release.go @@ -21,11 +21,11 @@ import ( "sigs.k8s.io/yaml" anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1" - "github.com/aws/eks-anywhere/release/pkg/aws/s3" - "github.com/aws/eks-anywhere/release/pkg/constants" - "github.com/aws/eks-anywhere/release/pkg/filereader" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" - artifactutils "github.com/aws/eks-anywhere/release/pkg/util/artifacts" + "github.com/aws/eks-anywhere/release/cli/pkg/aws/s3" + "github.com/aws/eks-anywhere/release/cli/pkg/constants" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" + artifactutils "github.com/aws/eks-anywhere/release/cli/pkg/util/artifacts" ) type EksAReleases []anywherev1alpha1.EksARelease diff --git a/release/pkg/util/slices/slices.go b/release/cli/pkg/util/slices/slices.go similarity index 100% rename from release/pkg/util/slices/slices.go rename to release/cli/pkg/util/slices/slices.go diff --git a/release/pkg/version/version.go b/release/cli/pkg/version/version.go similarity index 95% rename from release/pkg/version/version.go rename to release/cli/pkg/version/version.go index 0feb22662812..41eaa2a5a194 100644 --- a/release/pkg/version/version.go +++ b/release/cli/pkg/version/version.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" - "github.com/aws/eks-anywhere/release/pkg/filereader" - "github.com/aws/eks-anywhere/release/pkg/git" - releasetypes "github.com/aws/eks-anywhere/release/pkg/types" + "github.com/aws/eks-anywhere/release/cli/pkg/filereader" + "github.com/aws/eks-anywhere/release/cli/pkg/git" + releasetypes "github.com/aws/eks-anywhere/release/cli/pkg/types" ) const FakeComponentChecksum = "abcdef1" diff --git a/scripts/attribution_helpers.sh b/scripts/attribution_helpers.sh index f25f69802983..dc746e83dfdc 100755 --- a/scripts/attribution_helpers.sh +++ b/scripts/attribution_helpers.sh @@ -21,13 +21,6 @@ function build::create_git_tag(){ git rev-parse HEAD > GIT_TAG } -# The api/v1alpha1 package of the release submodule in the CLI repo does not have -# a license file. Hence we need to copy it into the vendor directory for go-licenses -# to pick up -function build::fix_licenses(){ - cp LICENSE ./vendor/github.com/aws/eks-anywhere/release/api/v1alpha1/LICENSE -} - # We only need to include dependencies outside of this repo function build::exclude_own(){ sed -i '/^github.com\/aws\/eks-anywhere/d' _output/attribution/go-license.csv diff --git a/scripts/golden_create_pr.sh b/scripts/golden_create_pr.sh index 2b5eebf3b036..4acbfb70f123 100755 --- a/scripts/golden_create_pr.sh +++ b/scripts/golden_create_pr.sh @@ -43,7 +43,7 @@ git remote add upstream git@github.com:${UPSTREAM_ORG}/${REPO}.git git checkout -b $PR_BRANCH git diff -git add release/pkg/test/testdata/*.yaml +git add release/cli/pkg/test/testdata/*.yaml # If some other files get modified, the changes should be ignored git restore . FILES_ADDED=$(git diff --staged --name-only) diff --git a/scripts/make_attribution.sh b/scripts/make_attribution.sh index 51e65a4b3d09..01d747a2dbbb 100755 --- a/scripts/make_attribution.sh +++ b/scripts/make_attribution.sh @@ -45,7 +45,6 @@ function build::attribution::generate(){ cd $REPO_ROOT $(build::common::get_go_path "$GOLANG_VERSION")/go mod vendor build::create_git_tag - build::fix_licenses build::gather_licenses _output "./cmd/eksctl-anywhere ./controllers" build::exclude_own build::generate_attribution $GOLANG_VERSION