From 7487e5a001214d5769159b266b60a33b4a1b6e27 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Thu, 29 Sep 2022 18:35:35 +0000 Subject: [PATCH 001/235] fix: upgrade info.picocli:picocli from 4.3.2 to 4.6.3 Snyk has created this PR to upgrade info.picocli:picocli from 4.3.2 to 4.6.3. See this package in Maven Repository: https://mvnrepository.com/artifact/info.picocli/picocli/ See this project in Snyk: https://app.snyk.io/org/oswg/project/3650172a-cc57-4132-b6fd-0af0aa59b122?utm_source=github&utm_medium=referral&page=upgrade-pr --- server/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index e7975a232..1af037660 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -17,7 +17,7 @@ 1.1.1 1.28.0 0.2.3 - 4.3.2 + 4.6.3 2.8.9 2.7.9 4.1.82.Final From c9490ab8913175a207737949d087a898ae713566 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Mon, 3 Oct 2022 01:43:56 +0000 Subject: [PATCH 002/235] fix: java/app-encryption/pom.xml to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-3038424 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 718031171..e6943c05c 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -49,7 +49,7 @@ 1.11.2 0.8.8 1.15.0 - 2.13.3 + 2.13.4 1.9 4.0.3 ${project.basedir}/checkstyle.xml From 691e05b758eb71c530e9b4d123f10903a7a1c4f1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 22:36:15 +0000 Subject: [PATCH 003/235] Update module github.com/godaddy/asherah/go/appencryption to v0.2.4 --- go/appencryption/cmd/example/go.mod | 12 ++++++------ go/appencryption/cmd/example/go.sum | 8 ++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/go/appencryption/cmd/example/go.mod b/go/appencryption/cmd/example/go.mod index c6e1c2ce9..0211097f8 100644 --- a/go/appencryption/cmd/example/go.mod +++ b/go/appencryption/cmd/example/go.mod @@ -4,10 +4,10 @@ go 1.17 require ( github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 - github.com/aws/aws-sdk-go v1.43.7 + github.com/aws/aws-sdk-go v1.43.39 github.com/go-sql-driver/mysql v1.6.0 - github.com/godaddy/asherah/go/appencryption v0.2.3 - github.com/godaddy/asherah/go/securememory v0.1.2 + github.com/godaddy/asherah/go/appencryption v0.2.4 + github.com/godaddy/asherah/go/securememory v0.1.3 github.com/jessevdk/go-flags v1.5.0 github.com/logrusorgru/aurora v2.0.3+incompatible github.com/pkg/errors v0.9.1 @@ -16,15 +16,15 @@ require ( require ( github.com/awnumar/memcall v0.1.2 // indirect - github.com/awnumar/memguard v0.22.2 // indirect + github.com/awnumar/memguard v0.22.3 // indirect github.com/fatih/color v1.13.0 // indirect github.com/goburrow/cache v0.1.4 // indirect github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect - golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect - golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect + golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be // indirect + golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go/appencryption/cmd/example/go.sum b/go/appencryption/cmd/example/go.sum index 426f1a4a6..35e36bca2 100644 --- a/go/appencryption/cmd/example/go.sum +++ b/go/appencryption/cmd/example/go.sum @@ -115,9 +115,13 @@ github.com/awnumar/memcall v0.1.2/go.mod h1:S911igBPR9CThzd/hYQQmTc9SWNu3ZHIlCGa github.com/awnumar/memguard v0.20.1/go.mod h1:zUgDgwybACAn1kumjMVgFukFL5QMFfAIZNeAr3BR4Cw= github.com/awnumar/memguard v0.22.2 h1:tMxcq1WamhG13gigK8Yaj9i/CHNUO3fFlpS9ABBQAxw= github.com/awnumar/memguard v0.22.2/go.mod h1:33OwJBHC+T4eEfFcDrQb78TMlBMBvcOPCXWU9xE34gM= +github.com/awnumar/memguard v0.22.3 h1:b4sgUXtbUjhrGELPbuC62wU+BsPQy+8lkWed9Z+pj0Y= +github.com/awnumar/memguard v0.22.3/go.mod h1:mmGunnffnLHlxE5rRgQc3j+uwPZ27eYb61ccr8Clz2Y= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.43.7 h1:Gbs53KxXJWbO3txoVkevf56bhdDFqRisl7MQQ6581vc= github.com/aws/aws-sdk-go v1.43.7/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.43.39 h1:5W8pton/8OuS5hpbAkzfr7e+meAAFkK7LsUehB39L3I= +github.com/aws/aws-sdk-go v1.43.39/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -937,6 +941,8 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38= golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A= +golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1163,6 +1169,8 @@ golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI= +golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= From 06dab953ec28e355ba94249a0ffb1a143fcc0557 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 23:10:47 +0000 Subject: [PATCH 004/235] Update module github.com/awnumar/memguard to v0.22.3 --- go/securememory/go.mod | 3 +-- go/securememory/go.sum | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/go/securememory/go.mod b/go/securememory/go.mod index 4763cb1b3..88c3b55dd 100644 --- a/go/securememory/go.mod +++ b/go/securememory/go.mod @@ -4,10 +4,9 @@ go 1.13 require ( github.com/awnumar/memcall v0.1.2 - github.com/awnumar/memguard v0.22.2 + github.com/awnumar/memguard v0.22.3 github.com/pkg/errors v0.9.1 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 github.com/stretchr/testify v1.7.0 - golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec ) diff --git a/go/securememory/go.sum b/go/securememory/go.sum index d213c6c05..ce9b2425c 100644 --- a/go/securememory/go.sum +++ b/go/securememory/go.sum @@ -1,8 +1,11 @@ +github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= github.com/awnumar/memcall v0.0.0-20191004114545-73db50fd9f80/go.mod h1:S911igBPR9CThzd/hYQQmTc9SWNu3ZHIlCGaWsWsoJo= github.com/awnumar/memcall v0.1.2 h1:7gOfDTL+BJ6nnbtAp9+HQzUFjtP1hEseRQq8eP055QY= github.com/awnumar/memcall v0.1.2/go.mod h1:S911igBPR9CThzd/hYQQmTc9SWNu3ZHIlCGaWsWsoJo= github.com/awnumar/memguard v0.22.2 h1:tMxcq1WamhG13gigK8Yaj9i/CHNUO3fFlpS9ABBQAxw= github.com/awnumar/memguard v0.22.2/go.mod h1:33OwJBHC+T4eEfFcDrQb78TMlBMBvcOPCXWU9xE34gM= +github.com/awnumar/memguard v0.22.3 h1:b4sgUXtbUjhrGELPbuC62wU+BsPQy+8lkWed9Z+pj0Y= +github.com/awnumar/memguard v0.22.3/go.mod h1:mmGunnffnLHlxE5rRgQc3j+uwPZ27eYb61ccr8Clz2Y= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -19,10 +22,13 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38= golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -40,3 +46,4 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +lukechampine.com/frand v1.4.2/go.mod h1:4S/TM2ZgrKejMcKMbeLjISpJMO+/eZ1zu3vYX9dtj3s= From 02c4b73047714c83af9c71b22ba2c628147a0247 Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Tue, 4 Oct 2022 17:28:36 -0700 Subject: [PATCH 005/235] update go directive to 1.17, go mod tidy, dependency updates --- go/securememory/go.mod | 10 +++++++++- go/securememory/go.sum | 17 ++--------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/go/securememory/go.mod b/go/securememory/go.mod index 88c3b55dd..4d862f5cc 100644 --- a/go/securememory/go.mod +++ b/go/securememory/go.mod @@ -1,6 +1,6 @@ module github.com/godaddy/asherah/go/securememory -go 1.13 +go 1.17 require ( github.com/awnumar/memcall v0.1.2 @@ -10,3 +10,11 @@ require ( github.com/stretchr/testify v1.7.0 golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec ) + +require ( + github.com/davecgh/go-spew v1.1.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/stretchr/objx v0.1.0 // indirect + golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/go/securememory/go.sum b/go/securememory/go.sum index ce9b2425c..6dfa7b357 100644 --- a/go/securememory/go.sum +++ b/go/securememory/go.sum @@ -1,9 +1,6 @@ github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= -github.com/awnumar/memcall v0.0.0-20191004114545-73db50fd9f80/go.mod h1:S911igBPR9CThzd/hYQQmTc9SWNu3ZHIlCGaWsWsoJo= github.com/awnumar/memcall v0.1.2 h1:7gOfDTL+BJ6nnbtAp9+HQzUFjtP1hEseRQq8eP055QY= github.com/awnumar/memcall v0.1.2/go.mod h1:S911igBPR9CThzd/hYQQmTc9SWNu3ZHIlCGaWsWsoJo= -github.com/awnumar/memguard v0.22.2 h1:tMxcq1WamhG13gigK8Yaj9i/CHNUO3fFlpS9ABBQAxw= -github.com/awnumar/memguard v0.22.2/go.mod h1:33OwJBHC+T4eEfFcDrQb78TMlBMBvcOPCXWU9xE34gM= github.com/awnumar/memguard v0.22.3 h1:b4sgUXtbUjhrGELPbuC62wU+BsPQy+8lkWed9Z+pj0Y= github.com/awnumar/memguard v0.22.3/go.mod h1:mmGunnffnLHlxE5rRgQc3j+uwPZ27eYb61ccr8Clz2Y= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= @@ -18,32 +15,22 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38= -golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng= -golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI= golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= lukechampine.com/frand v1.4.2/go.mod h1:4S/TM2ZgrKejMcKMbeLjISpJMO+/eZ1zu3vYX9dtj3s= From 21f7dfc32cf1397e0e24008224f8c2f58eb950c0 Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Tue, 4 Oct 2022 17:36:32 -0700 Subject: [PATCH 006/235] upgrade golang.org/x/text to v0.3.7 --- go/securememory/go.mod | 1 + go/securememory/go.sum | 2 ++ 2 files changed, 3 insertions(+) diff --git a/go/securememory/go.mod b/go/securememory/go.mod index 4d862f5cc..305e31090 100644 --- a/go/securememory/go.mod +++ b/go/securememory/go.mod @@ -16,5 +16,6 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.1.0 // indirect golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect + golang.org/x/text v0.3.7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go/securememory/go.sum b/go/securememory/go.sum index 6dfa7b357..8ccf630f9 100644 --- a/go/securememory/go.sum +++ b/go/securememory/go.sum @@ -27,6 +27,8 @@ golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From f135adfe8bd5e9d70a83226e1fb9bbfebed59cdd Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Tue, 4 Oct 2022 17:38:25 -0700 Subject: [PATCH 007/235] update golang.org/x/net to v0.0.0-20221004154528-8021a29435af --- go/securememory/go.mod | 1 + go/securememory/go.sum | 2 ++ 2 files changed, 3 insertions(+) diff --git a/go/securememory/go.mod b/go/securememory/go.mod index 305e31090..332bba411 100644 --- a/go/securememory/go.mod +++ b/go/securememory/go.mod @@ -16,6 +16,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.1.0 // indirect golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect + golang.org/x/net v0.0.0-20221004154528-8021a29435af // indirect golang.org/x/text v0.3.7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go/securememory/go.sum b/go/securememory/go.sum index 8ccf630f9..983a928de 100644 --- a/go/securememory/go.sum +++ b/go/securememory/go.sum @@ -18,6 +18,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20221004154528-8021a29435af h1:wv66FM3rLZGPdxpYL+ApnDe2HzHcTFta3z5nsc13wI4= +golang.org/x/net v0.0.0-20221004154528-8021a29435af/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From 1a412f96fc2880c0f653cd916f425d1c8c97bd77 Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Wed, 5 Oct 2022 09:51:07 -0700 Subject: [PATCH 008/235] update golang.org/x/crypto --- go/securememory/go.mod | 2 +- go/securememory/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go/securememory/go.mod b/go/securememory/go.mod index 332bba411..d3e60dc0b 100644 --- a/go/securememory/go.mod +++ b/go/securememory/go.mod @@ -15,7 +15,7 @@ require ( github.com/davecgh/go-spew v1.1.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.1.0 // indirect - golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect + golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b // indirect golang.org/x/net v0.0.0-20221004154528-8021a29435af // indirect golang.org/x/text v0.3.7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go/securememory/go.sum b/go/securememory/go.sum index 983a928de..7360ddc39 100644 --- a/go/securememory/go.sum +++ b/go/securememory/go.sum @@ -17,6 +17,8 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b h1:huxqepDufQpLLIRXiVkTvnxrzJlpwmIWAObmcCcUFr0= +golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20221004154528-8021a29435af h1:wv66FM3rLZGPdxpYL+ApnDe2HzHcTFta3z5nsc13wI4= golang.org/x/net v0.0.0-20221004154528-8021a29435af/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= From 47658a63e46f3af7ba3c720cc4b383e1d0215f24 Mon Sep 17 00:00:00 2001 From: Jeremiah Gowdy Date: Wed, 5 Oct 2022 08:13:08 -0700 Subject: [PATCH 009/235] Update golang/x/crypto --- go/appencryption/go.mod | 2 +- go/appencryption/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go/appencryption/go.mod b/go/appencryption/go.mod index 792ac0554..f3089c329 100644 --- a/go/appencryption/go.mod +++ b/go/appencryption/go.mod @@ -45,7 +45,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.3.0 // indirect go.opencensus.io v0.23.0 // indirect - golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be // indirect + golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b // indirect golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect diff --git a/go/appencryption/go.sum b/go/appencryption/go.sum index ca094bb19..487edb637 100644 --- a/go/appencryption/go.sum +++ b/go/appencryption/go.sum @@ -941,6 +941,8 @@ golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJ golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A= golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b h1:huxqepDufQpLLIRXiVkTvnxrzJlpwmIWAObmcCcUFr0= +golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= From 6bd5ed08859fa95dc370920825a309f28c3f4f26 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 5 Oct 2022 19:33:20 +0000 Subject: [PATCH 010/235] Update actions/cache digest to 0f20846 --- .github/workflows/ci.yml | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28e8bc963..21cbd63f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a - name: Cache Java packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -75,7 +75,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Cache Java packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -105,7 +105,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a - name: Cache Java packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -147,7 +147,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Cache Java packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -177,7 +177,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a - name: Cache Java packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -199,7 +199,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a - name: Cache Java packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -225,7 +225,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a - name: Cache dotnet packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -262,7 +262,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -298,7 +298,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a - name: Cache dotnet packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -337,7 +337,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -382,7 +382,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a - name: Cache dotnet packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -425,7 +425,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -461,7 +461,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a - name: Cache dotnet packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -485,7 +485,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a - name: Cache Go packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -522,7 +522,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache Go packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -555,7 +555,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a - name: Cache Go packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -592,7 +592,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache Go packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -618,7 +618,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a - name: Cache Go packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -645,7 +645,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a - name: Cache Go packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -700,7 +700,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - name: Cache client packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: | ~/.cache @@ -769,7 +769,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - name: Cache client packages - uses: actions/cache@12681847c623a9274356751fdf0a63576ff3f846 + uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: path: | ~/.cache From d5045ae553fc74915fad400a81db574c47cff385 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Oct 2022 05:12:55 +0000 Subject: [PATCH 011/235] Update dependency xunit to v2.4.2 --- csharp/Logging/Logging.Tests/Logging.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csharp/Logging/Logging.Tests/Logging.Tests.csproj b/csharp/Logging/Logging.Tests/Logging.Tests.csproj index 26fd9e9f1..abd31ab03 100644 --- a/csharp/Logging/Logging.Tests/Logging.Tests.csproj +++ b/csharp/Logging/Logging.Tests/Logging.Tests.csproj @@ -12,7 +12,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive From cb2193a4da5857d79b5a9e7144d79d6314afed0c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Oct 2022 05:28:00 +0000 Subject: [PATCH 012/235] Update dependency xunit.runner.visualstudio to v2.4.5 --- csharp/Logging/Logging.Tests/Logging.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csharp/Logging/Logging.Tests/Logging.Tests.csproj b/csharp/Logging/Logging.Tests/Logging.Tests.csproj index abd31ab03..b2c2d2f8b 100644 --- a/csharp/Logging/Logging.Tests/Logging.Tests.csproj +++ b/csharp/Logging/Logging.Tests/Logging.Tests.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 6a1050977ec9a7c1eb286cb112bee5cd6efb6721 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Oct 2022 05:42:30 +0000 Subject: [PATCH 013/235] Update module github.com/aws/aws-xray-sdk-go to v1.7.1 --- samples/go/aws/lambda/function/go.mod | 2 +- samples/go/aws/lambda/function/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/samples/go/aws/lambda/function/go.mod b/samples/go/aws/lambda/function/go.mod index f58079a68..ee788e164 100644 --- a/samples/go/aws/lambda/function/go.mod +++ b/samples/go/aws/lambda/function/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/aws/aws-lambda-go v1.28.0 github.com/aws/aws-sdk-go v1.43.39 - github.com/aws/aws-xray-sdk-go v1.7.0 + github.com/aws/aws-xray-sdk-go v1.7.1 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 github.com/prometheus/procfs v0.7.3 diff --git a/samples/go/aws/lambda/function/go.sum b/samples/go/aws/lambda/function/go.sum index a0fc9823e..37f63f879 100644 --- a/samples/go/aws/lambda/function/go.sum +++ b/samples/go/aws/lambda/function/go.sum @@ -127,6 +127,8 @@ github.com/aws/aws-sdk-go-v2 v1.6.0/go.mod h1:tI4KhsR5VkzlUa2DZAdwx7wCAYGwkZZ1H3 github.com/aws/aws-sdk-go-v2/service/route53 v1.6.2/go.mod h1:ZnAMilx42P7DgIrdjlWCkNIGSBLzeyk6T31uB8oGTwY= github.com/aws/aws-xray-sdk-go v1.7.0 h1:mATj8779Kj8Ae8oyXZ3S4GeK9BDGHqlLAKGCUiE31o4= github.com/aws/aws-xray-sdk-go v1.7.0/go.mod h1:HbE8uL6SJPMGpkaNrG1ahpHXX6rpiswk6EcPiVA4wMU= +github.com/aws/aws-xray-sdk-go v1.7.1 h1:mji68Db4oWipJ6SiQQuFiWBYWI8sUvPfcv86mLFVKHQ= +github.com/aws/aws-xray-sdk-go v1.7.1/go.mod h1:aNQo1pqFaaeKaf18CSWCkoaXUI+PQZ7yfNE28YyE2CI= github.com/aws/smithy-go v1.4.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= From 276548c6af45763f13f30bd32fda5c6f6de28647 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Oct 2022 05:56:57 +0000 Subject: [PATCH 014/235] Update actions/setup-dotnet digest to 45c9f23 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21cbd63f7..cac744970 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -753,7 +753,7 @@ jobs: distribution: 'adopt' java-version: '11.0.4' - name: Set up C# - uses: actions/setup-dotnet@0705ef0281736c0ca177266c8d04eb08f72072de + uses: actions/setup-dotnet@45c9f236cf9a0c09d11298348f6ed06bd81914c0 with: dotnet-version: '3.1.x' - name: Set up Go 1.17 From 1137ab282e580bf0fde84c17dfd8b3b9508207b5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Oct 2022 06:17:03 +0000 Subject: [PATCH 015/235] Update dependency @grpc/proto-loader to ^0.7.0 --- server/samples/clients/node/package-lock.json | 116 +++++++++++++++--- server/samples/clients/node/package.json | 2 +- 2 files changed, 101 insertions(+), 17 deletions(-) diff --git a/server/samples/clients/node/package-lock.json b/server/samples/clients/node/package-lock.json index 09c9c4036..a38140b8d 100644 --- a/server/samples/clients/node/package-lock.json +++ b/server/samples/clients/node/package-lock.json @@ -158,17 +158,75 @@ "requires": { "@grpc/proto-loader": "^0.6.4", "@types/node": ">=12.12.47" + }, + "dependencies": { + "@grpc/proto-loader": { + "version": "0.6.13", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.13.tgz", + "integrity": "sha512-FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g==", + "requires": { + "@types/long": "^4.0.1", + "lodash.camelcase": "^4.3.0", + "long": "^4.0.0", + "protobufjs": "^6.11.3", + "yargs": "^16.2.0" + } + }, + "cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" + }, + "yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "requires": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + } + }, + "yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" + } } }, "@grpc/proto-loader": { - "version": "0.6.13", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.13.tgz", - "integrity": "sha512-FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.3.tgz", + "integrity": "sha512-5dAvoZwna2Py3Ef96Ux9jIkp3iZ62TUsV00p3wVBPNX5K178UbNi8Q7gQVqwXT1Yq9RejIGG9G2IPEo93T6RcA==", "requires": { "@types/long": "^4.0.1", "lodash.camelcase": "^4.3.0", "long": "^4.0.0", - "protobufjs": "^6.11.3", + "protobufjs": "^7.0.0", "yargs": "^16.2.0" }, "dependencies": { @@ -182,6 +240,32 @@ "wrap-ansi": "^7.0.0" } }, + "protobufjs": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.1.2.tgz", + "integrity": "sha512-4ZPTPkXCdel3+L81yw3dG6+Kq3umdWKh7Dc7GW/CpNk4SX3hK58iPCWeCyhVTDrbkNeKrYNZ7EojM5WDaEWTLQ==", + "requires": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/node": ">=13.7.0", + "long": "^5.0.0" + }, + "dependencies": { + "long": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.0.tgz", + "integrity": "sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w==" + } + } + }, "wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -238,7 +322,7 @@ "@protobufjs/aspromise": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", - "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=" + "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==" }, "@protobufjs/base64": { "version": "1.1.2", @@ -253,12 +337,12 @@ "@protobufjs/eventemitter": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", - "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=" + "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==" }, "@protobufjs/fetch": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", - "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", + "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", "requires": { "@protobufjs/aspromise": "^1.1.1", "@protobufjs/inquire": "^1.1.0" @@ -267,27 +351,27 @@ "@protobufjs/float": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", - "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=" + "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==" }, "@protobufjs/inquire": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", - "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=" + "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==" }, "@protobufjs/path": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", - "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=" + "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==" }, "@protobufjs/pool": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", - "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=" + "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==" }, "@protobufjs/utf8": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" + "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, "@types/color-name": { "version": "1.1.1", @@ -295,9 +379,9 @@ "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" }, "@types/long": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", - "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz", + "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==" }, "@types/node": { "version": "17.0.38", @@ -1172,7 +1256,7 @@ "lodash.camelcase": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=" + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" }, "lodash.clonedeep": { "version": "4.5.0", diff --git a/server/samples/clients/node/package.json b/server/samples/clients/node/package.json index d91c4b7a3..b91608871 100644 --- a/server/samples/clients/node/package.json +++ b/server/samples/clients/node/package.json @@ -5,7 +5,7 @@ "main": "appencryption_client.js", "dependencies": { "@grpc/grpc-js": "^1.6.7", - "@grpc/proto-loader": "^0.6.13", + "@grpc/proto-loader": "^0.7.0", "sleep": "^6.3.0", "winston": "^3.3.3", "yargs": "^15.4.1" From 515fa66b32f8b7b4aa846e520ad55aea3d4f1128 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Oct 2022 06:47:51 +0000 Subject: [PATCH 016/235] Update actions/checkout digest to 8230315 --- .github/workflows/ci.yml | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cac744970..620436517 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 - name: Cache Java packages uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: @@ -59,7 +59,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags @@ -103,7 +103,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 - name: Cache Java packages uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: @@ -131,7 +131,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags @@ -175,7 +175,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 - name: Cache Java packages uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: @@ -197,7 +197,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 - name: Cache Java packages uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: @@ -223,7 +223,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 - name: Cache dotnet packages uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: @@ -256,7 +256,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags @@ -296,7 +296,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 - name: Cache dotnet packages uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: @@ -331,7 +331,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags @@ -380,7 +380,7 @@ jobs: MYSQL_ROOT_PASSWORD: ${{ env.MYSQL_PASSWORD }} steps: - name: Checkout the repository - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 - name: Cache dotnet packages uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: @@ -419,7 +419,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags @@ -459,7 +459,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 - name: Cache dotnet packages uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: @@ -483,7 +483,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 - name: Cache Go packages uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: @@ -516,7 +516,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags @@ -553,7 +553,7 @@ jobs: MYSQL_ROOT_PASSWORD: Password123 steps: - name: Checkout the repository - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 - name: Cache Go packages uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: @@ -586,7 +586,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags @@ -616,7 +616,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 - name: Cache Go packages uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: @@ -643,7 +643,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 - name: Cache Go packages uses: actions/cache@0f20846208ed4e2be4e84eecef2d1eb1bb617786 with: @@ -672,7 +672,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the repository - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 - name: Install build tools run: | sudo apt-get update @@ -737,7 +737,7 @@ jobs: options: --health-cmd "mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 10 steps: - name: Checkout the repository - uses: actions/checkout@e6d535c99c374d0c3f6d8cd8086a57b43c6c700a + uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445 - name: Initialize RDBMS based metastore run: | mysql -h 127.0.0.1 -P${{ job.services.mysql.ports[3306] }} -u ${{ env.MYSQL_USERNAME }} -p${{ env.MYSQL_PASSWORD }} -e "CREATE TABLE ${{ env.MYSQL_DATABASE }}.encryption_key ( From ff411ae2e780773d4d9be5b3a225f46d3791874b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Oct 2022 16:45:56 +0000 Subject: [PATCH 017/235] Update actions/setup-node digest to c81d8ad --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 620436517..2ee081984 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -692,7 +692,7 @@ jobs: with: python-version: 3.7 - name: Set up NodeJS 13 - uses: actions/setup-node@969bd2663942d722d85b6a8626225850c2f7be4b + uses: actions/setup-node@c81d8ad96dab0a834a87f7a0300b154386f2e26a with: node-version: 13.x - name: Extract branch name From c716f0d996fd55eedbfb93d3cb6f7891f8c1d1b4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Oct 2022 17:08:12 +0000 Subject: [PATCH 018/235] Update aws-java-sdk monorepo to v1.12.317 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index e6943c05c..ae8b9cfe2 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -40,7 +40,7 @@ UTF-8 1.7.36 30.1.1-jre - 1.12.312 + 1.12.317 1.9.4 3.1.1 5.7.0 From c08c31531128304bc452b8e6440176bb574e1661 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Oct 2022 20:09:49 +0000 Subject: [PATCH 019/235] Update dependency com.godaddy.asherah:appencryption to v0.2.3 --- samples/java/reference-app/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/java/reference-app/pom.xml b/samples/java/reference-app/pom.xml index e003a9556..9661eedc0 100644 --- a/samples/java/reference-app/pom.xml +++ b/samples/java/reference-app/pom.xml @@ -12,7 +12,7 @@ 1.8 UTF-8 - 0.1.4 + 0.2.3 5.7.0 1.7.0 0.8.8 From 95852e4a6ee53267661accbc62c1157d462a6321 Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Thu, 6 Oct 2022 17:59:17 -0700 Subject: [PATCH 020/235] dependency updates and fixes - added missing dependencies - org.apache.commons:commons-lang3 - com.fasterxml.jackson.core:jackson-databind - org.checkerframework:checker-qual - com.amazonaws:aws-java-sdk-core - org.junit.jupiter:junit-jupiter-api - org.mockito:mockito-core - moved com.fasterxml.jackson.dataformat:jackson-dataformat-cbor to dependency management --- java/app-encryption/pom.xml | 52 ++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index ae8b9cfe2..187621f2f 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -40,6 +40,7 @@ UTF-8 1.7.36 30.1.1-jre + 3.8.0 1.12.317 1.9.4 3.1.1 @@ -50,7 +51,7 @@ 0.8.8 1.15.0 2.13.4 - 1.9 + 3.8.1 4.0.3 ${project.basedir}/checkstyle.xml ${skipTests} @@ -223,6 +224,11 @@ commons-codec 1.15 + + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + ${jackson.version} + @@ -246,6 +252,12 @@ ${guava.version} + + org.checkerframework + checker-qual + ${checkerframework.version} + + com.github.ben-manes.caffeine caffeine @@ -266,13 +278,10 @@ 1.70 - - com.fasterxml.jackson.dataformat - jackson-dataformat-cbor - ${jackson.version} - jar - compile + com.amazonaws + aws-java-sdk-core + ${aws.sdk.version} @@ -305,23 +314,22 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api ${junit.jupiter.version} test - - org.junit.platform - junit-platform-runner - ${junit.platform.version} + org.junit.jupiter + junit-jupiter-params + ${junit.jupiter.version} test - org.junit.jupiter - junit-jupiter-params - ${junit.jupiter.version} + org.mockito + mockito-core + ${mockito.core.version} test @@ -346,6 +354,13 @@ test + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + test + + com.fasterxml.jackson.dataformat jackson-dataformat-yaml @@ -356,6 +371,13 @@ org.apache.commons commons-text + 1.10.0 + test + + + + org.apache.commons + commons-lang3 ${apache.commons.version} test From e1ca15eb0b3952e28afaf2bff49dc4bf1b438305 Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Thu, 6 Oct 2022 18:10:19 -0700 Subject: [PATCH 021/235] bump version --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 187621f2f..4a551b448 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -4,7 +4,7 @@ com.godaddy.asherah appencryption - 0.2.3 + 0.2.4 Asherah An application-layer encryption SDK that provides advanced encryption features and in depth defense against From 953ebe250fd8c99a3d413934dd61c722c5f7e387 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 7 Oct 2022 16:49:25 +0000 Subject: [PATCH 022/235] Update dependency GoDaddy.Asherah.AppEncryption to v0.2.9 --- samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj | 2 +- samples/csharp/aws/ecs/myapp/myapp.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj index 003e9b31c..a30692d8e 100644 --- a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj +++ b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj @@ -18,7 +18,7 @@ - + diff --git a/samples/csharp/aws/ecs/myapp/myapp.csproj b/samples/csharp/aws/ecs/myapp/myapp.csproj index 459c5654d..954b0acd4 100644 --- a/samples/csharp/aws/ecs/myapp/myapp.csproj +++ b/samples/csharp/aws/ecs/myapp/myapp.csproj @@ -5,7 +5,7 @@ - + From 612ac0e466f19083a81f6db43648f02ec7866fc8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 21:49:14 +0000 Subject: [PATCH 023/235] Update aws-sdk-net monorepo --- csharp/AppEncryption/AppEncryption/AppEncryption.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj index 750ee542a..6ca399bd8 100644 --- a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj +++ b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj @@ -23,8 +23,8 @@ - - + + From 25969597f61c135d1e17ebb731f19365ebe1a2cd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Oct 2022 03:00:23 +0000 Subject: [PATCH 024/235] Update dependency App.Metrics.Reporting.Console to v3.2.0 --- samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj index a30692d8e..6e652336b 100644 --- a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj +++ b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj @@ -22,7 +22,7 @@ - + - - + + From cf5bdc8e80c643324de46827ae7e468fbf4d5803 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 01:28:17 +0000 Subject: [PATCH 040/235] Update actions/setup-python digest to 8bcd256 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec9f307a1..d64e420af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -688,7 +688,7 @@ jobs: with: go-version: '1.17' - name: Set up Python 3.7 - uses: actions/setup-python@13a464fa1180c0025831475fa35bb1878b1a4728 + uses: actions/setup-python@8bcd2560e267a43fbd8ff66c50da8a61825a0782 with: python-version: 3.7 - name: Set up NodeJS 13 @@ -761,7 +761,7 @@ jobs: with: go-version: '1.17' - name: Set up Python 3.8 - uses: actions/setup-python@13a464fa1180c0025831475fa35bb1878b1a4728 + uses: actions/setup-python@8bcd2560e267a43fbd8ff66c50da8a61825a0782 with: python-version: 3.8 - name: Extract branch name From 2913c23595baa0a029a8c43ef196d185a6e6b316 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 01:39:47 +0000 Subject: [PATCH 041/235] Update dependency com.google.code.gson:gson to v2.9.1 --- server/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index 1af037660..f96bbab79 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -18,7 +18,7 @@ 1.28.0 0.2.3 4.6.3 - 2.8.9 + 2.9.1 2.7.9 4.1.82.Final 3.10 From 498012ae15e96ba2df3bbbee6192881eed324deb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 01:50:54 +0000 Subject: [PATCH 042/235] Update dependency io.micrometer:micrometer-core to v1.9.5 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index bad8262cc..dafa3a0ee 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -42,7 +42,7 @@ 30.1.1-jre 3.8.0 1.12.323 - 1.9.4 + 1.9.5 3.1.1 5.7.0 1.7.0 From f896dc99156bdb2b4deef052bda76732efa06b97 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 02:01:44 +0000 Subject: [PATCH 043/235] Update dependency io.micrometer:micrometer-registry-cloudwatch to v1.9.5 --- samples/java/reference-app/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/java/reference-app/pom.xml b/samples/java/reference-app/pom.xml index 9d98814d8..85352d15e 100644 --- a/samples/java/reference-app/pom.xml +++ b/samples/java/reference-app/pom.xml @@ -145,7 +145,7 @@ io.micrometer micrometer-registry-cloudwatch - 1.9.4 + 1.9.5 From 6f80db38922ef1cc7a9c601f55b7c4edb84accff Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 02:12:22 +0000 Subject: [PATCH 044/235] Update dependency grpcio to v1.50.0 --- server/samples/clients/python/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/samples/clients/python/requirements.txt b/server/samples/clients/python/requirements.txt index 07650fa71..61a171a5f 100644 --- a/server/samples/clients/python/requirements.txt +++ b/server/samples/clients/python/requirements.txt @@ -1,2 +1,2 @@ -grpcio==1.49.1 +grpcio==1.50.0 grpcio-tools==1.49.1 From 562e71c2beb6487b3fa0106c45f891b902eb350e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 03:21:40 +0000 Subject: [PATCH 045/235] Update dependency io.netty:netty-all to v4.1.84.Final --- server/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index f96bbab79..17d03e7cd 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -20,7 +20,7 @@ 4.6.3 2.9.1 2.7.9 - 4.1.82.Final + 4.1.84.Final 3.10 1.7.36 0.8.8 From cc869da3b5edbb4042434f3be5bc4a62aa77b71a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 03:33:06 +0000 Subject: [PATCH 046/235] Update dependency com.fasterxml.jackson.core:jackson-databind to v2.13.4.2 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index dafa3a0ee..8bbdcb830 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -357,7 +357,7 @@ com.fasterxml.jackson.core jackson-databind - 2.13.4.1 + 2.13.4.2 test From fecf1e64cb3ba824faa337cd697f0c20471ad713 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 03:42:52 +0000 Subject: [PATCH 047/235] Update dependency grpcio-tools to v1.50.0 --- server/samples/clients/python/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/samples/clients/python/requirements.txt b/server/samples/clients/python/requirements.txt index 61a171a5f..c922215ed 100644 --- a/server/samples/clients/python/requirements.txt +++ b/server/samples/clients/python/requirements.txt @@ -1,2 +1,2 @@ grpcio==1.50.0 -grpcio-tools==1.49.1 +grpcio-tools==1.50.0 From 15d09a117e9595521827e8a01ed62d2dd8747606 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 03:53:10 +0000 Subject: [PATCH 048/235] Update dependency info.picocli:picocli to v4.6.3 --- samples/java/reference-app/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/java/reference-app/pom.xml b/samples/java/reference-app/pom.xml index 85352d15e..20c70ba50 100644 --- a/samples/java/reference-app/pom.xml +++ b/samples/java/reference-app/pom.xml @@ -133,7 +133,7 @@ info.picocli picocli - 4.5.1 + 4.6.3 From ea966fecaa7fcee6ff1a9f6e3d95056c3c00d897 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 05:45:58 +0000 Subject: [PATCH 049/235] Update dependency net.java.dev.jna:jna-platform to v5.12.1 --- java/secure-memory/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/secure-memory/pom.xml b/java/secure-memory/pom.xml index 2000b2111..ed5c45719 100644 --- a/java/secure-memory/pom.xml +++ b/java/secure-memory/pom.xml @@ -139,7 +139,7 @@ net.java.dev.jna jna-platform - 5.10.0 + 5.12.1 From b78a0d10b6eb865489ddf62c87b2934870f5c46c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 05:56:15 +0000 Subject: [PATCH 050/235] Update dependency net.java.dev.jna:jna to v5.12.1 --- java/secure-memory/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/secure-memory/pom.xml b/java/secure-memory/pom.xml index ed5c45719..2a3383f3f 100644 --- a/java/secure-memory/pom.xml +++ b/java/secure-memory/pom.xml @@ -133,7 +133,7 @@ net.java.dev.jna jna - 5.10.0 + 5.12.1 From 3f3c91180168a820de2c5eaa9c972918d0eaac66 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 06:06:38 +0000 Subject: [PATCH 051/235] Update dependency kr.motd.maven:os-maven-plugin to v1.7.0 --- server/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index 17d03e7cd..a674b0f77 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -125,7 +125,7 @@ kr.motd.maven os-maven-plugin - 1.6.2 + 1.7.0 From fd74e45773daa655d1a57af16fbf32ed39660474 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 06:17:03 +0000 Subject: [PATCH 052/235] Update dependency org.apache.commons:commons-lang3 to v3.12.0 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 8bbdcb830..004ee2630 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -51,7 +51,7 @@ 0.8.8 1.20.0 2.13.4 - 3.8.1 + 3.12.0 4.0.3 ${project.basedir}/checkstyle.xml ${skipTests} From 6c9dc43378311b80ba2340230d44c8f1cbad3a8d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 17:17:44 +0000 Subject: [PATCH 053/235] Update dependency AWSSDK.DynamoDBv2 to v3.7.5.18 --- csharp/AppEncryption/AppEncryption/AppEncryption.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj index 04476479a..0cd18e8b4 100644 --- a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj +++ b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj @@ -23,7 +23,7 @@ - + From 4e02a6874dd99eac13e351d4e42f6072af76efd0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 17:31:48 +0000 Subject: [PATCH 054/235] Update dependency org.apache.maven.plugins:maven-scm-plugin to v1.13.0 --- java/app-encryption/pom.xml | 2 +- java/secure-memory/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 004ee2630..4060ae525 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-scm-plugin - 1.11.2 + 1.13.0 developerConnection diff --git a/java/secure-memory/pom.xml b/java/secure-memory/pom.xml index 2a3383f3f..cd8fd31b5 100644 --- a/java/secure-memory/pom.xml +++ b/java/secure-memory/pom.xml @@ -120,7 +120,7 @@ org.apache.maven.plugins maven-scm-plugin - 1.11.2 + 1.13.0 developerConnection From 4af9e3ada701f1b85b4447a64810ca1bd7462554 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 17:44:14 +0000 Subject: [PATCH 055/235] Update dependency org.apache.commons:commons-lang3 to v3.12.0 --- server/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index a674b0f77..b56315994 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -21,7 +21,7 @@ 2.9.1 2.7.9 4.1.84.Final - 3.10 + 3.12.0 1.7.36 0.8.8 ${project.basedir}/checkstyle.xml From d9bd322de8fe1a42ae88d4e49883cad0026a2921 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 17:56:43 +0000 Subject: [PATCH 056/235] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v2.22.2 --- server/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index b56315994..d30b86302 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -182,7 +182,7 @@ maven-surefire-plugin - 2.19.1 + 2.22.2 false From 8f737823c8e9d3d24152c8fb77cfb62224fec935 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 18:08:30 +0000 Subject: [PATCH 057/235] Update dependency mysql:mysql-connector-java to v8.0.31 --- samples/java/reference-app/pom.xml | 2 +- server/java/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/java/reference-app/pom.xml b/samples/java/reference-app/pom.xml index 20c70ba50..d0d2ccd71 100644 --- a/samples/java/reference-app/pom.xml +++ b/samples/java/reference-app/pom.xml @@ -115,7 +115,7 @@ mysql mysql-connector-java - 8.0.30 + 8.0.31 diff --git a/server/java/pom.xml b/server/java/pom.xml index d30b86302..c5490bd98 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -48,7 +48,7 @@ mysql mysql-connector-java - 8.0.30 + 8.0.31 From 15da9d51e6f4f341747c896fc72f8377a3bef648 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 18:22:28 +0000 Subject: [PATCH 058/235] Update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.3.0 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 4060ae525..fffd14e51 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -192,7 +192,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.2 + 3.3.0 copy From cbbf7a5397653e3d36fb95442cfe289272c7d7e5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 18:35:23 +0000 Subject: [PATCH 059/235] Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.10.1 --- java/app-encryption/pom.xml | 2 +- java/secure-memory/pom.xml | 2 +- samples/java/reference-app/pom.xml | 2 +- server/java/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index fffd14e51..5da0c447d 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -83,7 +83,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 8 diff --git a/java/secure-memory/pom.xml b/java/secure-memory/pom.xml index cd8fd31b5..cdd231c26 100644 --- a/java/secure-memory/pom.xml +++ b/java/secure-memory/pom.xml @@ -68,7 +68,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 8 diff --git a/samples/java/reference-app/pom.xml b/samples/java/reference-app/pom.xml index d0d2ccd71..9e78a8276 100644 --- a/samples/java/reference-app/pom.xml +++ b/samples/java/reference-app/pom.xml @@ -45,7 +45,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 8 diff --git a/server/java/pom.xml b/server/java/pom.xml index c5490bd98..285e39750 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -152,7 +152,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 8 8 From 188965a4e805d1212619780a962be50018ab0968 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 18:48:12 +0000 Subject: [PATCH 060/235] Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.4.1 --- java/app-encryption/pom.xml | 2 +- java/secure-memory/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 5da0c447d..10407d96b 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -104,7 +104,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.4.1 attach-javadocs diff --git a/java/secure-memory/pom.xml b/java/secure-memory/pom.xml index cdd231c26..b99ac4eb3 100644 --- a/java/secure-memory/pom.xml +++ b/java/secure-memory/pom.xml @@ -223,7 +223,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.4.1 attach-javadocs From f6598faa6777099c420d2d82c2da7c6ddd5cc7d9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 19:00:16 +0000 Subject: [PATCH 061/235] Update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.2.0 --- java/app-encryption/pom.xml | 2 +- java/secure-memory/pom.xml | 2 +- samples/java/reference-app/pom.xml | 2 +- server/java/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 10407d96b..d4edb5e22 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -62,7 +62,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 + 3.2.0 validate diff --git a/java/secure-memory/pom.xml b/java/secure-memory/pom.xml index b99ac4eb3..de62884bf 100644 --- a/java/secure-memory/pom.xml +++ b/java/secure-memory/pom.xml @@ -47,7 +47,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 + 3.2.0 validate diff --git a/samples/java/reference-app/pom.xml b/samples/java/reference-app/pom.xml index 9e78a8276..dde5dc068 100644 --- a/samples/java/reference-app/pom.xml +++ b/samples/java/reference-app/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 + 3.2.0 validate diff --git a/server/java/pom.xml b/server/java/pom.xml index 285e39750..34df8e200 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -161,7 +161,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 + 3.2.0 validate From 232f70648ac4df0488aff7c67e7e9968f5a434ed Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Wed, 19 Oct 2022 12:49:03 -0700 Subject: [PATCH 062/235] use accessModifiers, scope has been removed --- java/app-encryption/checkstyle.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/checkstyle.xml b/java/app-encryption/checkstyle.xml index b136c4179..1f42f8654 100644 --- a/java/app-encryption/checkstyle.xml +++ b/java/app-encryption/checkstyle.xml @@ -95,7 +95,7 @@ - + From c6a7d57ed0ffa0691cd02cb16d0b5ca897477f83 Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Wed, 19 Oct 2022 12:50:19 -0700 Subject: [PATCH 063/235] style fix --- .../appencryption/envelope/EnvelopeEncryptionJsonImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/src/main/java/com/godaddy/asherah/appencryption/envelope/EnvelopeEncryptionJsonImpl.java b/java/app-encryption/src/main/java/com/godaddy/asherah/appencryption/envelope/EnvelopeEncryptionJsonImpl.java index 0eb33d1a4..df3d125ba 100644 --- a/java/app-encryption/src/main/java/com/godaddy/asherah/appencryption/envelope/EnvelopeEncryptionJsonImpl.java +++ b/java/app-encryption/src/main/java/com/godaddy/asherah/appencryption/envelope/EnvelopeEncryptionJsonImpl.java @@ -303,7 +303,7 @@ CryptoKey getLatestOrCreateIntermediateKey() { try { EnvelopeKeyRecord newIntermediateKeyRecord = withSystemKeyForWrite( (systemCryptoKey) -> new EnvelopeKeyRecord(intermediateKey.getCreated(), - new KeyMeta(partition.getSystemKeyId(), systemCryptoKey.getCreated()), + new KeyMeta(partition.getSystemKeyId(), systemCryptoKey.getCreated()), crypto.encryptKey(intermediateKey, systemCryptoKey), false)); logger.debug("attempting to store new IK {} for created {}", From 0a4773e4621adb95a60f897250c681a02dc0fee1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 20:04:56 +0000 Subject: [PATCH 064/235] Update dependency org.checkerframework:checker-qual to v3.26.0 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index d4edb5e22..4237a3a06 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -40,7 +40,7 @@ UTF-8 1.7.36 30.1.1-jre - 3.8.0 + 3.26.0 1.12.323 1.9.5 3.1.1 From c0dac8f11af82cc6ede6a527cac0ab962a08a524 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 20:32:14 +0000 Subject: [PATCH 065/235] Update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.3.0 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 4237a3a06..ec2e28d96 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -173,7 +173,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + 3.3.0 add-test-source From 0fdf76e09aad082cae9eeb3003fe8bbe8a658444 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 21:21:53 +0000 Subject: [PATCH 066/235] Update devmasx/merge-branch action to v1.4.0 --- .github/workflows/sync-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-release.yml b/.github/workflows/sync-release.yml index 0292095ee..ecac06f57 100644 --- a/.github/workflows/sync-release.yml +++ b/.github/workflows/sync-release.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: Merge master -> {RELEASE_TARGET} - uses: devmasx/merge-branch@v1.3.0 + uses: devmasx/merge-branch@v1.4.0 with: type: now head_to_merge: master From 2ba5f9f13fb2e69835de92bfe773df6ca8b29c8e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 23:51:38 +0000 Subject: [PATCH 067/235] Update dotnet monorepo --- csharp/Logging/Logging.Tests/Logging.Tests.csproj | 2 +- csharp/Logging/Logging/Logging.csproj | 4 ++-- samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/csharp/Logging/Logging.Tests/Logging.Tests.csproj b/csharp/Logging/Logging.Tests/Logging.Tests.csproj index d468ff76d..43748f2fd 100644 --- a/csharp/Logging/Logging.Tests/Logging.Tests.csproj +++ b/csharp/Logging/Logging.Tests/Logging.Tests.csproj @@ -17,7 +17,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/csharp/Logging/Logging/Logging.csproj b/csharp/Logging/Logging/Logging.csproj index 72465fe2b..fdcd82b15 100644 --- a/csharp/Logging/Logging/Logging.csproj +++ b/csharp/Logging/Logging/Logging.csproj @@ -22,9 +22,9 @@ - + - + diff --git a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj index 30a088e1b..ab3f04cdb 100644 --- a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj +++ b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj @@ -21,7 +21,7 @@ - + - - + + From 919b136533a0ba81bbe24af71ebce5c311879e7e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 01:54:30 +0000 Subject: [PATCH 071/235] Update module github.com/testcontainers/testcontainers-go to v0.14.0 --- go/appencryption/go.mod | 36 +++++++++---------- go/appencryption/go.sum | 80 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 18 deletions(-) diff --git a/go/appencryption/go.mod b/go/appencryption/go.mod index f3089c329..e84146a06 100644 --- a/go/appencryption/go.mod +++ b/go/appencryption/go.mod @@ -11,46 +11,46 @@ require ( github.com/google/uuid v1.3.0 github.com/pkg/errors v0.9.1 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 - github.com/stretchr/testify v1.7.0 - github.com/testcontainers/testcontainers-go v0.13.0 + github.com/stretchr/testify v1.8.0 + github.com/testcontainers/testcontainers-go v0.14.0 ) require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect - github.com/Microsoft/hcsshim v0.9.2 // indirect + github.com/Microsoft/hcsshim v0.9.4 // indirect github.com/awnumar/memcall v0.1.2 // indirect github.com/awnumar/memguard v0.22.3 // indirect - github.com/cenkalti/backoff/v4 v4.1.2 // indirect - github.com/containerd/cgroups v1.0.3 // indirect - github.com/containerd/containerd v1.6.2 // indirect + github.com/cenkalti/backoff/v4 v4.1.3 // indirect + github.com/containerd/cgroups v1.0.4 // indirect + github.com/containerd/containerd v1.6.8 // indirect github.com/containerd/continuity v0.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/distribution v2.8.1+incompatible // indirect - github.com/docker/docker v20.10.11+incompatible // indirect - github.com/docker/go-units v0.4.0 // indirect + github.com/docker/docker v20.10.17+incompatible // indirect + github.com/docker/go-units v0.5.0 // 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.2 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect - github.com/magiconair/properties v1.8.5 // indirect - github.com/moby/sys/mount v0.2.0 // indirect - github.com/moby/sys/mountinfo v0.6.1 // indirect + github.com/magiconair/properties v1.8.6 // indirect + github.com/moby/sys/mount v0.3.3 // indirect + github.com/moby/sys/mountinfo v0.6.2 // indirect github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect github.com/morikuni/aec v1.0.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.0.2 // indirect - github.com/opencontainers/runc v1.1.1 // indirect + github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect + github.com/opencontainers/runc v1.1.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - github.com/stretchr/objx v0.3.0 // indirect + github.com/stretchr/objx v0.4.0 // indirect go.opencensus.io v0.23.0 // indirect golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b // indirect - golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect + golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect - google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect - google.golang.org/grpc v1.45.0 // indirect + google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad // indirect + google.golang.org/grpc v1.47.0 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go/appencryption/go.sum b/go/appencryption/go.sum index 487edb637..ad4b30ca0 100644 --- a/go/appencryption/go.sum +++ b/go/appencryption/go.sum @@ -83,6 +83,8 @@ github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwT github.com/Microsoft/hcsshim v0.8.23/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg= github.com/Microsoft/hcsshim v0.9.2 h1:wB06W5aYFfUB3IvootYAY2WnOmIdgPGfqSI6tufQNnY= github.com/Microsoft/hcsshim v0.9.2/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= +github.com/Microsoft/hcsshim v0.9.4 h1:mnUj0ivWy6UzbB1uLFqKR6F+ZyiDc7j4iGgHTpO+5+I= +github.com/Microsoft/hcsshim v0.9.4/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU= github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= @@ -142,6 +144,8 @@ github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3k github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo= github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= +github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= +github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= @@ -168,6 +172,7 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= @@ -189,6 +194,8 @@ github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTF github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= github.com/containerd/cgroups v1.0.3 h1:ADZftAkglvCiD44c77s5YmMqaP2pzVCFZvBmAlBdAP4= github.com/containerd/cgroups v1.0.3/go.mod h1:/ofk34relqNjSGyqPrmEULrO4Sc8LJhvJmWbUCUKqj8= +github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= +github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= @@ -212,8 +219,11 @@ github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTV github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c= github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s= github.com/containerd/containerd v1.5.9/go.mod h1:fvQqCfadDGga5HZyn3j4+dx56qj2I9YwBrlSdalvJYQ= +github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE= github.com/containerd/containerd v1.6.2 h1:pcaPUGbYW8kBw6OgIZwIVIeEhdWVrBzsoCfVJ5BjrLU= github.com/containerd/containerd v1.6.2/go.mod h1:sidY30/InSE1j2vdD1ihtKoJz+lWdaXMdiAeIupaf+s= +github.com/containerd/containerd v1.6.8 h1:h4dOFDwzHmqFEP754PgfgTeVXFnLiRc6kiqC7tplDJs= +github.com/containerd/containerd v1.6.8/go.mod h1:By6p5KqPK0/7/CgO/A6t/Gz+CUYUu2zf1hUaaymVXB0= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= @@ -234,6 +244,7 @@ github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZH github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk= github.com/containerd/go-cni v1.1.0/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= github.com/containerd/go-cni v1.1.3/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= +github.com/containerd/go-cni v1.1.6/go.mod h1:BWtoWl5ghVymxu6MBjg79W9NZrCRyHIdUtk4cauMe34= github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g= @@ -244,6 +255,7 @@ github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod h1:6T github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod h1:5AZJNI6sLHJljKuI9IHnw1pWqo/F0nGDOuR9zgTs7ow= github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJrXQb0Dpc4ms= github.com/containerd/imgcrypt v1.1.3/go.mod h1:/TPA1GIDXMzbj01yd8pIbQiLdQxed5ue1wb8bP7PQu4= +github.com/containerd/imgcrypt v1.1.4/go.mod h1:LorQnPtzL/T0IyCeftcsMEO7AqxUDbdO8j/tSUpgxvo= github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c= github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= @@ -267,13 +279,16 @@ github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= github.com/containernetworking/cni v1.0.1/go.mod h1:AKuhXbN5EzmD4yTNtfSsX3tPcmtrBI6QcRV0NiNt15Y= +github.com/containernetworking/cni v1.1.1/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw= github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM= github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8= github.com/containernetworking/plugins v1.0.1/go.mod h1:QHCfGpaTwYTbbH+nZXKVTxNBDZcxSOplJT5ico8/FLE= +github.com/containernetworking/plugins v1.1.1/go.mod h1:Sr5TH/eBsGLXK/h71HeLfX19sZPp3ry5uHSkI4LPxV8= github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc= github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4= github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= github.com/containers/ocicrypt v1.1.2/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= +github.com/containers/ocicrypt v1.1.3/go.mod h1:xpdkbVAuaH3WzbEabUd5yDsl9SwJA5pABH85425Es2g= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -309,6 +324,7 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE= @@ -321,6 +337,8 @@ github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.11+incompatible h1:OqzI/g/W54LczvhnccGqniFoQghHx3pklbLuhfXpqGo= github.com/docker/docker v20.10.11+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE= +github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= @@ -330,6 +348,8 @@ github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= @@ -346,17 +366,20 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m 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/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= @@ -396,6 +419,7 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= +github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= @@ -472,6 +496,7 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -490,6 +515,7 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -600,6 +626,8 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/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= @@ -608,9 +636,12 @@ github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= @@ -620,6 +651,7 @@ github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182aff github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= +github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -634,11 +666,15 @@ github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQ github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/sys/mount v0.2.0 h1:WhCW5B355jtxndN5ovugJlMFJawbUODuW8fSnEH6SSM= github.com/moby/sys/mount v0.2.0/go.mod h1:aAivFE2LB3W4bACsUXChRHQ0qKWsetY4Y9V7sxOougM= +github.com/moby/sys/mount v0.3.3 h1:fX1SVkXFJ47XWDoeFW4Sq7PdQJnV2QIDZAqjNqgEjUs= +github.com/moby/sys/mount v0.3.3/go.mod h1:PBaEorSNTLG5t/+4EgukEQVlAvVEc6ZjTySwKdqp5K0= github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= github.com/moby/sys/mountinfo v0.6.1 h1:+H/KnGEAGRpTrEAqNVQ2AM3SiwMgJUt/TXj+Z8cmCIc= github.com/moby/sys/mountinfo v0.6.1/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= +github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78= +github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= github.com/moby/sys/signal v0.6.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg= github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs= @@ -661,6 +697,7 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= +github.com/networkplumbing/go-nft v0.2.0/go.mod h1:HnnM+tYvlGAsMU7yoYwXEVLLiDW9gdMmb5HoGcwpuQs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -678,6 +715,9 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -687,6 +727,8 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -698,6 +740,8 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec= +github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= @@ -707,6 +751,9 @@ github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04s github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= github.com/opencontainers/runc v1.1.1 h1:PJ9DSs2sVwE0iVr++pAHE6QkS9tzcVWozlPifdwMgrU= github.com/opencontainers/runc v1.1.1/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= +github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= +github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= +github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= @@ -718,6 +765,7 @@ github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqi github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= +github.com/opencontainers/selinux v1.10.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= @@ -740,6 +788,7 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn 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.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= 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= @@ -782,6 +831,7 @@ github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= +github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= @@ -821,6 +871,8 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As= github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -829,6 +881,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= 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 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= @@ -836,6 +891,8 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/testcontainers/testcontainers-go v0.13.0 h1:OUujSlEGsXVo/ykPVZk3KanBNGN0TYb/7oKIPVn15JA= github.com/testcontainers/testcontainers-go v0.13.0/go.mod h1:z1abufU633Eb/FmSBTzV6ntZAC1eZBYPtaFsn4nPuDk= +github.com/testcontainers/testcontainers-go v0.14.0 h1:h0D5GaYG9mhOWr2qHdEKDXpkce/VlvaYOCzTRi6UBi8= +github.com/testcontainers/testcontainers-go v0.14.0/go.mod h1:hSRGJ1G8Q5Bw2gXgPulJOLlEBaYJHeBSOkQM5JLG+JQ= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -865,6 +922,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= @@ -937,6 +995,7 @@ golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38= golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A= @@ -978,6 +1037,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1032,6 +1092,7 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211108170745-6635138e15ea/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -1039,6 +1100,8 @@ golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4= golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 h1:Yqz/iviulwKwAREEeUd3nbBFn0XuyJqkoft2IlrvOhc= +golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1063,6 +1126,7 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1155,10 +1219,13 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc 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= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1167,6 +1234,8 @@ golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/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-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI= golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -1174,6 +1243,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1256,7 +1326,9 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= 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= @@ -1343,6 +1415,8 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac h1:qSNTkEN+L2mvWcLgJOR+8bdHX9rN/IdU3A1Ghpfb1Rg= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad h1:kqrS+lhvaMHCxul6sKQvKJ8nAAhlVItmZV822hYFH/U= +google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -1373,6 +1447,8 @@ google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ5 google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= +google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1423,12 +1499,16 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/gotestsum v1.7.0/go.mod h1:V1m4Jw3eBerhI/A6qCxUE07RnCg7ACkKj9BYcAm09V8= +gotest.tools/gotestsum v1.8.2/go.mod h1:6JHCiN6TEjA7Kaz23q1bH0e2Dc3YJjDUZ0DmctFZf+w= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= +gotest.tools/v3 v3.3.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 611d3d53c28e467afa2c746c065f4467da0efde2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 02:44:05 +0000 Subject: [PATCH 072/235] Update module github.com/prometheus/procfs to v0.8.0 --- samples/go/aws/lambda/function/go.mod | 6 +++--- samples/go/aws/lambda/function/go.sum | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/samples/go/aws/lambda/function/go.mod b/samples/go/aws/lambda/function/go.mod index ee788e164..03d2a7e53 100644 --- a/samples/go/aws/lambda/function/go.mod +++ b/samples/go/aws/lambda/function/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-xray-sdk-go v1.7.1 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 - github.com/prometheus/procfs v0.7.3 + github.com/prometheus/procfs v0.8.0 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 ) @@ -18,7 +18,7 @@ require ( github.com/awnumar/memguard v0.22.2 // indirect github.com/goburrow/cache v0.1.4 // indirect github.com/golang/protobuf v1.5.2 // indirect - github.com/google/go-cmp v0.5.6 // indirect + github.com/google/go-cmp v0.5.8 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/klauspost/compress v1.15.1 // indirect github.com/pkg/errors v0.9.1 // indirect @@ -26,7 +26,7 @@ require ( github.com/valyala/fasthttp v1.35.0 // indirect golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect - golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect golang.org/x/text v0.3.7 // indirect google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9 // indirect google.golang.org/grpc v1.45.0 // indirect diff --git a/samples/go/aws/lambda/function/go.sum b/samples/go/aws/lambda/function/go.sum index 37f63f879..f90bbcff3 100644 --- a/samples/go/aws/lambda/function/go.sum +++ b/samples/go/aws/lambda/function/go.sum @@ -479,6 +479,7 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -775,6 +776,8 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= 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/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= @@ -1184,6 +1187,8 @@ golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= From b4666d70dccca7d2db833921657d9c8e606849bf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 04:19:02 +0000 Subject: [PATCH 073/235] Update mockito monorepo to v3.12.4 --- java/app-encryption/pom.xml | 2 +- java/secure-memory/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 7c82e1310..491dff598 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -46,7 +46,7 @@ 3.1.1 5.7.0 1.7.0 - 3.8.0 + 3.12.4 1.11.2 0.8.8 1.20.0 diff --git a/java/secure-memory/pom.xml b/java/secure-memory/pom.xml index de62884bf..0a49052cb 100644 --- a/java/secure-memory/pom.xml +++ b/java/secure-memory/pom.xml @@ -37,7 +37,7 @@ 1.7.36 5.7.0 1.7.0 - 3.5.13 + 3.12.4 0.8.8 ${project.basedir}/checkstyle.xml From d0122fd80211879b421b5d95ab6cd36fbb4822c4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 04:34:10 +0000 Subject: [PATCH 074/235] Update module github.com/aws/aws-lambda-go to v1.34.1 --- samples/go/aws/lambda/function/go.mod | 2 +- samples/go/aws/lambda/function/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/samples/go/aws/lambda/function/go.mod b/samples/go/aws/lambda/function/go.mod index 03d2a7e53..6c090129a 100644 --- a/samples/go/aws/lambda/function/go.mod +++ b/samples/go/aws/lambda/function/go.mod @@ -3,7 +3,7 @@ module github.com/godaddy/asherah/samples/aws/lambda go 1.17 require ( - github.com/aws/aws-lambda-go v1.28.0 + github.com/aws/aws-lambda-go v1.34.1 github.com/aws/aws-sdk-go v1.43.39 github.com/aws/aws-xray-sdk-go v1.7.1 github.com/godaddy/asherah/go/appencryption v0.2.4 diff --git a/samples/go/aws/lambda/function/go.sum b/samples/go/aws/lambda/function/go.sum index f90bbcff3..c950baf96 100644 --- a/samples/go/aws/lambda/function/go.sum +++ b/samples/go/aws/lambda/function/go.sum @@ -119,6 +119,8 @@ github.com/awnumar/memguard v0.22.2 h1:tMxcq1WamhG13gigK8Yaj9i/CHNUO3fFlpS9ABBQA github.com/awnumar/memguard v0.22.2/go.mod h1:33OwJBHC+T4eEfFcDrQb78TMlBMBvcOPCXWU9xE34gM= github.com/aws/aws-lambda-go v1.28.0 h1:fZiik1PZqW2IyAN4rj+Y0UBaO1IDFlsNo9Zz/XnArK4= github.com/aws/aws-lambda-go v1.28.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU= +github.com/aws/aws-lambda-go v1.34.1 h1:M3a/uFYBjii+tDcOJ0wL/WyFi2550FHoECdPf27zvOs= +github.com/aws/aws-lambda-go v1.34.1/go.mod h1:jwFe2KmMsHmffA1X2R09hH6lFzJQxzI8qK17ewzbQMM= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.17.12/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.43.39 h1:5W8pton/8OuS5hpbAkzfr7e+meAAFkK7LsUehB39L3I= From 03f6bbc31669f1d950f14de794fb55df4de8abde Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 04:49:44 +0000 Subject: [PATCH 075/235] Update module github.com/stretchr/testify to v1.8.0 --- go/securememory/go.mod | 6 +++--- go/securememory/go.sum | 7 +++++++ server/go/go.mod | 6 +++--- server/go/go.sum | 7 +++++++ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/go/securememory/go.mod b/go/securememory/go.mod index d3e60dc0b..e3b1e6b62 100644 --- a/go/securememory/go.mod +++ b/go/securememory/go.mod @@ -7,14 +7,14 @@ require ( github.com/awnumar/memguard v0.22.3 github.com/pkg/errors v0.9.1 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 - github.com/stretchr/testify v1.7.0 + github.com/stretchr/testify v1.8.0 golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec ) require ( - github.com/davecgh/go-spew v1.1.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/stretchr/objx v0.1.0 // indirect + github.com/stretchr/objx v0.4.0 // indirect golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b // indirect golang.org/x/net v0.0.0-20221004154528-8021a29435af // indirect golang.org/x/text v0.3.7 // indirect diff --git a/go/securememory/go.sum b/go/securememory/go.sum index 7360ddc39..4ee4f2998 100644 --- a/go/securememory/go.sum +++ b/go/securememory/go.sum @@ -5,6 +5,8 @@ github.com/awnumar/memguard v0.22.3 h1:b4sgUXtbUjhrGELPbuC62wU+BsPQy+8lkWed9Z+pj github.com/awnumar/memguard v0.22.3/go.mod h1:mmGunnffnLHlxE5rRgQc3j+uwPZ27eYb61ccr8Clz2Y= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -13,8 +15,13 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5X github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +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/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= 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 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b h1:huxqepDufQpLLIRXiVkTvnxrzJlpwmIWAObmcCcUFr0= diff --git a/server/go/go.mod b/server/go/go.mod index 7bb41868d..43645a5b1 100644 --- a/server/go/go.mod +++ b/server/go/go.mod @@ -9,7 +9,7 @@ require ( github.com/godaddy/asherah/go/securememory v0.1.3 github.com/golang/protobuf v1.5.2 github.com/jessevdk/go-flags v1.5.0 - github.com/stretchr/testify v1.7.0 + github.com/stretchr/testify v1.8.0 google.golang.org/grpc v1.45.0 ) @@ -25,7 +25,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/stretchr/objx v0.3.0 // indirect + github.com/stretchr/objx v0.4.0 // indirect golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect @@ -33,5 +33,5 @@ require ( google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/server/go/go.sum b/server/go/go.sum index 93747e16a..3e61a351d 100644 --- a/server/go/go.sum +++ b/server/go/go.sum @@ -815,6 +815,8 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As= github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -823,6 +825,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= 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 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= @@ -1411,6 +1416,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/gotestsum v1.7.0/go.mod h1:V1m4Jw3eBerhI/A6qCxUE07RnCg7ACkKj9BYcAm09V8= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= From 30cd877f8567adc3b76c04b4aada5ab2cf14a934 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 05:02:48 +0000 Subject: [PATCH 076/235] Update module github.com/aws/aws-sdk-go to v1.44.119 --- go/appencryption/cmd/example/go.mod | 4 ++-- go/appencryption/cmd/example/go.sum | 4 ++++ go/appencryption/go.mod | 2 +- go/appencryption/go.sum | 2 ++ samples/go/aws/lambda/function/go.mod | 2 +- samples/go/aws/lambda/function/go.sum | 2 ++ samples/go/referenceapp/go.mod | 2 +- samples/go/referenceapp/go.sum | 2 ++ server/go/go.mod | 2 +- server/go/go.sum | 2 ++ 10 files changed, 18 insertions(+), 6 deletions(-) diff --git a/go/appencryption/cmd/example/go.mod b/go/appencryption/cmd/example/go.mod index 0211097f8..28f9dfd38 100644 --- a/go/appencryption/cmd/example/go.mod +++ b/go/appencryption/cmd/example/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 - github.com/aws/aws-sdk-go v1.43.39 + github.com/aws/aws-sdk-go v1.44.119 github.com/go-sql-driver/mysql v1.6.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 @@ -23,7 +23,7 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect - golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be // indirect + golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b // indirect golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go/appencryption/cmd/example/go.sum b/go/appencryption/cmd/example/go.sum index 35e36bca2..0442d5505 100644 --- a/go/appencryption/cmd/example/go.sum +++ b/go/appencryption/cmd/example/go.sum @@ -122,6 +122,8 @@ github.com/aws/aws-sdk-go v1.43.7 h1:Gbs53KxXJWbO3txoVkevf56bhdDFqRisl7MQQ6581vc github.com/aws/aws-sdk-go v1.43.7/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.43.39 h1:5W8pton/8OuS5hpbAkzfr7e+meAAFkK7LsUehB39L3I= github.com/aws/aws-sdk-go v1.43.39/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.119 h1:TPkpDsanBMcZaF5wHwpKhjkapRV/b7d2qdC+a+IPbmY= +github.com/aws/aws-sdk-go v1.44.119/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -943,6 +945,8 @@ golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJ golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A= golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b h1:huxqepDufQpLLIRXiVkTvnxrzJlpwmIWAObmcCcUFr0= +golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= diff --git a/go/appencryption/go.mod b/go/appencryption/go.mod index e84146a06..b24bea746 100644 --- a/go/appencryption/go.mod +++ b/go/appencryption/go.mod @@ -3,7 +3,7 @@ module github.com/godaddy/asherah/go/appencryption go 1.17 require ( - github.com/aws/aws-sdk-go v1.43.39 + github.com/aws/aws-sdk-go v1.44.119 github.com/docker/go-connections v0.4.0 github.com/go-sql-driver/mysql v1.6.0 github.com/goburrow/cache v0.1.4 diff --git a/go/appencryption/go.sum b/go/appencryption/go.sum index ad4b30ca0..95cb4e4a8 100644 --- a/go/appencryption/go.sum +++ b/go/appencryption/go.sum @@ -123,6 +123,8 @@ github.com/aws/aws-sdk-go v1.43.7 h1:Gbs53KxXJWbO3txoVkevf56bhdDFqRisl7MQQ6581vc github.com/aws/aws-sdk-go v1.43.7/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.43.39 h1:5W8pton/8OuS5hpbAkzfr7e+meAAFkK7LsUehB39L3I= github.com/aws/aws-sdk-go v1.43.39/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.119 h1:TPkpDsanBMcZaF5wHwpKhjkapRV/b7d2qdC+a+IPbmY= +github.com/aws/aws-sdk-go v1.44.119/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/samples/go/aws/lambda/function/go.mod b/samples/go/aws/lambda/function/go.mod index 6c090129a..4240b8cc7 100644 --- a/samples/go/aws/lambda/function/go.mod +++ b/samples/go/aws/lambda/function/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/aws/aws-lambda-go v1.34.1 - github.com/aws/aws-sdk-go v1.43.39 + github.com/aws/aws-sdk-go v1.44.119 github.com/aws/aws-xray-sdk-go v1.7.1 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 diff --git a/samples/go/aws/lambda/function/go.sum b/samples/go/aws/lambda/function/go.sum index c950baf96..c3abaeb91 100644 --- a/samples/go/aws/lambda/function/go.sum +++ b/samples/go/aws/lambda/function/go.sum @@ -125,6 +125,8 @@ github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZo github.com/aws/aws-sdk-go v1.17.12/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.43.39 h1:5W8pton/8OuS5hpbAkzfr7e+meAAFkK7LsUehB39L3I= github.com/aws/aws-sdk-go v1.43.39/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.119 h1:TPkpDsanBMcZaF5wHwpKhjkapRV/b7d2qdC+a+IPbmY= +github.com/aws/aws-sdk-go v1.44.119/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go-v2 v1.6.0/go.mod h1:tI4KhsR5VkzlUa2DZAdwx7wCAYGwkZZ1H31PYrBFx1w= github.com/aws/aws-sdk-go-v2/service/route53 v1.6.2/go.mod h1:ZnAMilx42P7DgIrdjlWCkNIGSBLzeyk6T31uB8oGTwY= github.com/aws/aws-xray-sdk-go v1.7.0 h1:mATj8779Kj8Ae8oyXZ3S4GeK9BDGHqlLAKGCUiE31o4= diff --git a/samples/go/referenceapp/go.mod b/samples/go/referenceapp/go.mod index 89bfcd77b..6c23c6f6f 100644 --- a/samples/go/referenceapp/go.mod +++ b/samples/go/referenceapp/go.mod @@ -3,7 +3,7 @@ module referenceapp go 1.17 require ( - github.com/aws/aws-sdk-go v1.43.39 + github.com/aws/aws-sdk-go v1.44.119 github.com/go-sql-driver/mysql v1.6.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/google/logger v1.1.1 diff --git a/samples/go/referenceapp/go.sum b/samples/go/referenceapp/go.sum index fd4a23e58..c2d1b2eb9 100644 --- a/samples/go/referenceapp/go.sum +++ b/samples/go/referenceapp/go.sum @@ -116,6 +116,8 @@ github.com/awnumar/memguard v0.22.2/go.mod h1:33OwJBHC+T4eEfFcDrQb78TMlBMBvcOPCX github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.43.39 h1:5W8pton/8OuS5hpbAkzfr7e+meAAFkK7LsUehB39L3I= github.com/aws/aws-sdk-go v1.43.39/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.119 h1:TPkpDsanBMcZaF5wHwpKhjkapRV/b7d2qdC+a+IPbmY= +github.com/aws/aws-sdk-go v1.44.119/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/server/go/go.mod b/server/go/go.mod index 43645a5b1..563972983 100644 --- a/server/go/go.mod +++ b/server/go/go.mod @@ -3,7 +3,7 @@ module github.com/godaddy/asherah/server/go go 1.17 require ( - github.com/aws/aws-sdk-go v1.43.39 + github.com/aws/aws-sdk-go v1.44.119 github.com/go-sql-driver/mysql v1.6.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 diff --git a/server/go/go.sum b/server/go/go.sum index 3e61a351d..3c2dd381c 100644 --- a/server/go/go.sum +++ b/server/go/go.sum @@ -116,6 +116,8 @@ github.com/awnumar/memguard v0.22.2/go.mod h1:33OwJBHC+T4eEfFcDrQb78TMlBMBvcOPCX github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.43.39 h1:5W8pton/8OuS5hpbAkzfr7e+meAAFkK7LsUehB39L3I= github.com/aws/aws-sdk-go v1.43.39/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.119 h1:TPkpDsanBMcZaF5wHwpKhjkapRV/b7d2qdC+a+IPbmY= +github.com/aws/aws-sdk-go v1.44.119/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= From 279dcc379eebcfd7aa75694dc36287597ee33d47 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 05:17:37 +0000 Subject: [PATCH 077/235] Update module golang.org/x/sys to v0.1.0 --- go/securememory/go.mod | 2 +- go/securememory/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go/securememory/go.mod b/go/securememory/go.mod index e3b1e6b62..c8c59fc23 100644 --- a/go/securememory/go.mod +++ b/go/securememory/go.mod @@ -8,7 +8,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 github.com/stretchr/testify v1.8.0 - golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec + golang.org/x/sys v0.1.0 ) require ( diff --git a/go/securememory/go.sum b/go/securememory/go.sum index 4ee4f2998..e786d6756 100644 --- a/go/securememory/go.sum +++ b/go/securememory/go.sum @@ -36,6 +36,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI= golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= From 22ceb563f1cd85542115c7c4e230a3861d7dd7a8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 05:31:12 +0000 Subject: [PATCH 078/235] Update python Docker tag to v3.10 --- server/samples/clients/python/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/samples/clients/python/Dockerfile b/server/samples/clients/python/Dockerfile index 32d729da7..f0cd4186f 100644 --- a/server/samples/clients/python/Dockerfile +++ b/server/samples/clients/python/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.7-alpine as base +FROM python:3.10-alpine as base FROM base as builder From d51a11cbab503ab5d59382e55953a5ace3f385bd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 05:59:45 +0000 Subject: [PATCH 079/235] Update Node.js to v19 --- server/samples/clients/node/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/samples/clients/node/Dockerfile b/server/samples/clients/node/Dockerfile index 955cc5a1a..ac218f0f3 100644 --- a/server/samples/clients/node/Dockerfile +++ b/server/samples/clients/node/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16 as base +FROM node:19 as base FROM base as builder From 06bd980f65b62af64611e682dbc348bd64ee171e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 06:12:14 +0000 Subject: [PATCH 080/235] Update module google.golang.org/grpc to v1.50.1 --- server/go/go.mod | 2 +- server/go/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/go/go.mod b/server/go/go.mod index 563972983..664a732c8 100644 --- a/server/go/go.mod +++ b/server/go/go.mod @@ -10,7 +10,7 @@ require ( github.com/golang/protobuf v1.5.2 github.com/jessevdk/go-flags v1.5.0 github.com/stretchr/testify v1.8.0 - google.golang.org/grpc v1.45.0 + google.golang.org/grpc v1.50.1 ) require ( diff --git a/server/go/go.sum b/server/go/go.sum index 3c2dd381c..8e9760be6 100644 --- a/server/go/go.sum +++ b/server/go/go.sum @@ -1368,6 +1368,8 @@ google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ5 google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= +google.golang.org/grpc v1.50.1 h1:DS/BukOZWp8s6p4Dt/tOaJaTQyPyOoCcrjroHuCeLzY= +google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From b0909dc823c83ef93c9c20e1f8a2693b58c78034 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 16:35:28 +0000 Subject: [PATCH 081/235] Update module go to 1.19 --- go/appencryption/cmd/example/go.mod | 4 ++-- go/appencryption/cmd/example/go.sum | 2 ++ go/appencryption/go.mod | 2 +- go/securememory/go.mod | 2 +- samples/go/aws/lambda/function/go.mod | 2 +- samples/go/referenceapp/go.mod | 2 +- server/go/go.mod | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/go/appencryption/cmd/example/go.mod b/go/appencryption/cmd/example/go.mod index 28f9dfd38..92b0bb3fd 100644 --- a/go/appencryption/cmd/example/go.mod +++ b/go/appencryption/cmd/example/go.mod @@ -1,6 +1,6 @@ module github.com/godaddy/asherah/go/appencryption/cmd/example -go 1.17 +go 1.19 require ( github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 @@ -24,7 +24,7 @@ require ( github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b // indirect - golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect + golang.org/x/sys v0.1.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go/appencryption/cmd/example/go.sum b/go/appencryption/cmd/example/go.sum index 0442d5505..76ecff514 100644 --- a/go/appencryption/cmd/example/go.sum +++ b/go/appencryption/cmd/example/go.sum @@ -1175,6 +1175,8 @@ golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI= golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/go/appencryption/go.mod b/go/appencryption/go.mod index b24bea746..48db2487b 100644 --- a/go/appencryption/go.mod +++ b/go/appencryption/go.mod @@ -1,6 +1,6 @@ module github.com/godaddy/asherah/go/appencryption -go 1.17 +go 1.19 require ( github.com/aws/aws-sdk-go v1.44.119 diff --git a/go/securememory/go.mod b/go/securememory/go.mod index c8c59fc23..b93c4a29e 100644 --- a/go/securememory/go.mod +++ b/go/securememory/go.mod @@ -1,6 +1,6 @@ module github.com/godaddy/asherah/go/securememory -go 1.17 +go 1.19 require ( github.com/awnumar/memcall v0.1.2 diff --git a/samples/go/aws/lambda/function/go.mod b/samples/go/aws/lambda/function/go.mod index 4240b8cc7..324aa353d 100644 --- a/samples/go/aws/lambda/function/go.mod +++ b/samples/go/aws/lambda/function/go.mod @@ -1,6 +1,6 @@ module github.com/godaddy/asherah/samples/aws/lambda -go 1.17 +go 1.19 require ( github.com/aws/aws-lambda-go v1.34.1 diff --git a/samples/go/referenceapp/go.mod b/samples/go/referenceapp/go.mod index 6c23c6f6f..502e43b91 100644 --- a/samples/go/referenceapp/go.mod +++ b/samples/go/referenceapp/go.mod @@ -1,6 +1,6 @@ module referenceapp -go 1.17 +go 1.19 require ( github.com/aws/aws-sdk-go v1.44.119 diff --git a/server/go/go.mod b/server/go/go.mod index 664a732c8..f9b91da96 100644 --- a/server/go/go.mod +++ b/server/go/go.mod @@ -1,6 +1,6 @@ module github.com/godaddy/asherah/server/go -go 1.17 +go 1.19 require ( github.com/aws/aws-sdk-go v1.44.119 From b6595cec8f48ee1ae71d0c2f6a7e7910f2ed8417 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 5 Nov 2022 02:49:54 +0000 Subject: [PATCH 082/235] fix: java/app-encryption/pom.xml to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-3038424 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 491dff598..7462d66e4 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -41,7 +41,7 @@ 1.7.36 30.1.1-jre 3.26.0 - 1.12.324 + 1.12.336 1.9.5 3.1.1 5.7.0 From ae3f051d193cd8a950a94c6cda5e41574e6fadb8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Nov 2022 05:22:34 +0000 Subject: [PATCH 083/235] build(deps): bump minimatch in /server/samples/clients/node Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] --- server/samples/clients/node/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/samples/clients/node/package-lock.json b/server/samples/clients/node/package-lock.json index a38140b8d..4321686c1 100644 --- a/server/samples/clients/node/package-lock.json +++ b/server/samples/clients/node/package-lock.json @@ -1303,9 +1303,9 @@ } }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "requires": { "brace-expansion": "^1.1.7" From 397e12b23cc2f8f7900db55346a4a60ced9ce7ec Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Nov 2022 05:46:13 +0000 Subject: [PATCH 084/235] Update aws-java-sdk monorepo to v1.12.339 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 7462d66e4..3fdaf6181 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -41,7 +41,7 @@ 1.7.36 30.1.1-jre 3.26.0 - 1.12.336 + 1.12.339 1.9.5 3.1.1 5.7.0 From 1b15704f2d7907fb59f87f793e6e154c6fa3d8c5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Nov 2022 06:06:02 +0000 Subject: [PATCH 085/235] Update dependency com.zaxxer:HikariCP to v5 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 3fdaf6181..a83a684be 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -52,7 +52,7 @@ 1.20.0 2.13.4 3.12.0 - 4.0.3 + 5.0.1 ${project.basedir}/checkstyle.xml ${skipTests} From 18cd22effdf83f835b61ff27f09ef529e6b96133 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Nov 2022 06:23:11 +0000 Subject: [PATCH 086/235] Update dependency com.zaxxer:HikariCP to v5 --- samples/java/reference-app/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/java/reference-app/pom.xml b/samples/java/reference-app/pom.xml index dde5dc068..54097af2f 100644 --- a/samples/java/reference-app/pom.xml +++ b/samples/java/reference-app/pom.xml @@ -121,7 +121,7 @@ com.zaxxer HikariCP - 3.4.5 + 5.0.1 From eaef02fff03ae931634095d5848cb5a9a25f2e97 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Nov 2022 06:40:02 +0000 Subject: [PATCH 087/235] Update dependency com.zaxxer:HikariCP to v5 --- server/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index c1b2df0f9..fe8e141a5 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -19,7 +19,7 @@ 0.2.3 4.6.3 2.9.1 - 2.7.9 + 5.0.1 4.1.84.Final 3.12.0 1.7.36 From 5b449060324f3eb096744cad267df75610086bb5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Nov 2022 06:53:03 +0000 Subject: [PATCH 088/235] Update actions/cache digest to 9a6a4f6 --- .github/workflows/ci.yml | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d64e420af..ae4588757 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 - name: Cache Java packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -75,7 +75,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Cache Java packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -105,7 +105,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 - name: Cache Java packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -147,7 +147,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Cache Java packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -177,7 +177,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 - name: Cache Java packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -199,7 +199,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 - name: Cache Java packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -225,7 +225,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 - name: Cache dotnet packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -262,7 +262,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -298,7 +298,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 - name: Cache dotnet packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -337,7 +337,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -382,7 +382,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 - name: Cache dotnet packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -425,7 +425,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -461,7 +461,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 - name: Cache dotnet packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -485,7 +485,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 - name: Cache Go packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -522,7 +522,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache Go packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -555,7 +555,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 - name: Cache Go packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -592,7 +592,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache Go packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -618,7 +618,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 - name: Cache Go packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -645,7 +645,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 - name: Cache Go packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -700,7 +700,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - name: Cache client packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: | ~/.cache @@ -769,7 +769,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - name: Cache client packages - uses: actions/cache@4fe9c4bd54cc7f1a32249072c2256c718ea68a5b + uses: actions/cache@9a6a4f6079716b44e70b2e883cfdd6fb7d6ff5d9 with: path: | ~/.cache From d5cc3be9e4821eb7edd4db0e052f231fddf5f24e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Nov 2022 07:05:30 +0000 Subject: [PATCH 089/235] Update actions/download-artifact digest to 9782bd6 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae4588757..82e7c04d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -269,7 +269,7 @@ jobs: restore-keys: | ${{ runner.os }}-nuget- - name: Download artifact - uses: actions/download-artifact@076f0f7dd036d87e8e04f5f00d614e790308961b + uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 with: name: csharp-logging path: ${{ github.workspace }}/csharp/Logging/Logging @@ -344,7 +344,7 @@ jobs: restore-keys: | ${{ runner.os }}-nuget- - name: Download artifact - uses: actions/download-artifact@076f0f7dd036d87e8e04f5f00d614e790308961b + uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 with: name: csharp-secure-memory path: | @@ -432,7 +432,7 @@ jobs: restore-keys: | ${{ runner.os }}-nuget- - name: Download artifact - uses: actions/download-artifact@076f0f7dd036d87e8e04f5f00d614e790308961b + uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 with: name: csharp-app-encryption path: ${{ github.workspace }}/csharp/AppEncryption/AppEncryption From b52de67ff077f551ce49bb306263149eb92ed6db Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Nov 2022 07:21:56 +0000 Subject: [PATCH 090/235] Update dependency App.Metrics.Reporting.Console to v4 --- samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj index ab3f04cdb..9aab672dd 100644 --- a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj +++ b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj @@ -22,7 +22,7 @@ - + - - + + From fb0b17f20563762f3a392f5f49544d2adf74ec52 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 00:28:43 +0000 Subject: [PATCH 103/235] Update actions/checkout digest to bf08527 --- .github/workflows/ci.yml | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a327439bc..57b4e3ba3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 with: @@ -59,7 +59,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags @@ -103,7 +103,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 with: @@ -131,7 +131,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags @@ -175,7 +175,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 with: @@ -197,7 +197,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 with: @@ -223,7 +223,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 with: @@ -256,7 +256,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags @@ -296,7 +296,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 with: @@ -331,7 +331,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags @@ -380,7 +380,7 @@ jobs: MYSQL_ROOT_PASSWORD: ${{ env.MYSQL_PASSWORD }} steps: - name: Checkout the repository - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 with: @@ -419,7 +419,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags @@ -459,7 +459,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 with: @@ -483,7 +483,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 with: @@ -516,7 +516,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags @@ -553,7 +553,7 @@ jobs: MYSQL_ROOT_PASSWORD: Password123 steps: - name: Checkout the repository - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 with: @@ -586,7 +586,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags @@ -616,7 +616,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 with: @@ -643,7 +643,7 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 with: @@ -672,7 +672,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the repository - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Install build tools run: | sudo apt-get update @@ -737,7 +737,7 @@ jobs: options: --health-cmd "mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 10 steps: - name: Checkout the repository - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 + uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Initialize RDBMS based metastore run: | mysql -h 127.0.0.1 -P${{ job.services.mysql.ports[3306] }} -u ${{ env.MYSQL_USERNAME }} -p${{ env.MYSQL_PASSWORD }} -e "CREATE TABLE ${{ env.MYSQL_DATABASE }}.encryption_key ( From a86f54df0e6e4f3b37cb7c752f30272ab3122ead Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 00:42:00 +0000 Subject: [PATCH 104/235] Update aws-java-sdk monorepo to v1.12.344 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 14960f091..fc908e5c0 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -41,7 +41,7 @@ 1.7.36 31.1-jre 3.26.0 - 1.12.339 + 1.12.344 1.9.5 3.1.1 5.7.0 From 4009b9379227ba402fb03fe8f4c8265cf7244743 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 00:53:44 +0000 Subject: [PATCH 105/235] Update eclipse-temurin Docker tag to v17.0.5_8-jre-alpine --- server/java/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/java/Dockerfile b/server/java/Dockerfile index 952eca033..08c32f060 100644 --- a/server/java/Dockerfile +++ b/server/java/Dockerfile @@ -10,7 +10,7 @@ COPY ./java/src /usr/src/server/java/src RUN mvn clean install -DskipTests -FROM --platform=${PLATFORM} eclipse-temurin:17-jre-alpine +FROM --platform=${PLATFORM} eclipse-temurin:17.0.5_8-jre-alpine # jna native lib install to support RO filesystems RUN apk add --no-cache java-jna-native From 1bcc29dd964d16d472e23cf3a5a540a483bbe78d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 01:04:59 +0000 Subject: [PATCH 106/235] Update dotnet monorepo --- csharp/AppEncryption/AppEncryption/AppEncryption.csproj | 2 +- csharp/Logging/Logging.Tests/Logging.Tests.csproj | 2 +- csharp/Logging/Logging/Logging.csproj | 2 +- samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj index 9e9a8b0fe..d38bfd960 100644 --- a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj +++ b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj @@ -31,7 +31,7 @@ - + diff --git a/csharp/Logging/Logging.Tests/Logging.Tests.csproj b/csharp/Logging/Logging.Tests/Logging.Tests.csproj index 43748f2fd..9d2aee5c0 100644 --- a/csharp/Logging/Logging.Tests/Logging.Tests.csproj +++ b/csharp/Logging/Logging.Tests/Logging.Tests.csproj @@ -17,7 +17,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/csharp/Logging/Logging/Logging.csproj b/csharp/Logging/Logging/Logging.csproj index fdcd82b15..01846764f 100644 --- a/csharp/Logging/Logging/Logging.csproj +++ b/csharp/Logging/Logging/Logging.csproj @@ -25,6 +25,6 @@ - + diff --git a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj index 9aab672dd..beecfbcbd 100644 --- a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj +++ b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj @@ -21,7 +21,7 @@ - + From e6612d697df7814d1bc124ac3fa3a7682eda2943 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 21:56:33 +0000 Subject: [PATCH 123/235] Update jackson.version to v2.14.0 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 9ec915ba3..a283df6a2 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -50,7 +50,7 @@ 1.11.2 0.8.8 1.20.0 - 2.13.4 + 2.14.0 3.12.0 5.0.1 ${project.basedir}/checkstyle.xml From 782beddb773836aa9285bf82cca2a24d817747bc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 22:26:45 +0000 Subject: [PATCH 124/235] Update module github.com/aws/aws-lambda-go to v1.35.0 --- samples/go/aws/lambda/function/go.mod | 2 +- samples/go/aws/lambda/function/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/samples/go/aws/lambda/function/go.mod b/samples/go/aws/lambda/function/go.mod index 319b96646..5fa763608 100644 --- a/samples/go/aws/lambda/function/go.mod +++ b/samples/go/aws/lambda/function/go.mod @@ -3,7 +3,7 @@ module github.com/godaddy/asherah/samples/aws/lambda go 1.19 require ( - github.com/aws/aws-lambda-go v1.34.1 + github.com/aws/aws-lambda-go v1.35.0 github.com/aws/aws-sdk-go v1.44.140 github.com/aws/aws-xray-sdk-go v1.7.1 github.com/godaddy/asherah/go/appencryption v0.2.4 diff --git a/samples/go/aws/lambda/function/go.sum b/samples/go/aws/lambda/function/go.sum index 73176553f..f5aa39e28 100644 --- a/samples/go/aws/lambda/function/go.sum +++ b/samples/go/aws/lambda/function/go.sum @@ -121,6 +121,8 @@ github.com/aws/aws-lambda-go v1.28.0 h1:fZiik1PZqW2IyAN4rj+Y0UBaO1IDFlsNo9Zz/XnA github.com/aws/aws-lambda-go v1.28.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU= github.com/aws/aws-lambda-go v1.34.1 h1:M3a/uFYBjii+tDcOJ0wL/WyFi2550FHoECdPf27zvOs= github.com/aws/aws-lambda-go v1.34.1/go.mod h1:jwFe2KmMsHmffA1X2R09hH6lFzJQxzI8qK17ewzbQMM= +github.com/aws/aws-lambda-go v1.35.0 h1:iocVDy5Cw5SCRrKOPHwarkdFwwy48OkfmHoE6SJ3ATg= +github.com/aws/aws-lambda-go v1.35.0/go.mod h1:jwFe2KmMsHmffA1X2R09hH6lFzJQxzI8qK17ewzbQMM= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.17.12/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.43.39 h1:5W8pton/8OuS5hpbAkzfr7e+meAAFkK7LsUehB39L3I= From f597924a1d2278fe6e251be5fc940fd06be8bea4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 22:41:09 +0000 Subject: [PATCH 125/235] Update module github.com/aws/aws-xray-sdk-go to v1.8.0 --- samples/go/aws/lambda/function/go.mod | 2 +- samples/go/aws/lambda/function/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/samples/go/aws/lambda/function/go.mod b/samples/go/aws/lambda/function/go.mod index 5fa763608..51090555f 100644 --- a/samples/go/aws/lambda/function/go.mod +++ b/samples/go/aws/lambda/function/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/aws/aws-lambda-go v1.35.0 github.com/aws/aws-sdk-go v1.44.140 - github.com/aws/aws-xray-sdk-go v1.7.1 + github.com/aws/aws-xray-sdk-go v1.8.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 github.com/prometheus/procfs v0.8.0 diff --git a/samples/go/aws/lambda/function/go.sum b/samples/go/aws/lambda/function/go.sum index f5aa39e28..f49ed1df1 100644 --- a/samples/go/aws/lambda/function/go.sum +++ b/samples/go/aws/lambda/function/go.sum @@ -141,6 +141,8 @@ github.com/aws/aws-xray-sdk-go v1.7.0 h1:mATj8779Kj8Ae8oyXZ3S4GeK9BDGHqlLAKGCUiE github.com/aws/aws-xray-sdk-go v1.7.0/go.mod h1:HbE8uL6SJPMGpkaNrG1ahpHXX6rpiswk6EcPiVA4wMU= github.com/aws/aws-xray-sdk-go v1.7.1 h1:mji68Db4oWipJ6SiQQuFiWBYWI8sUvPfcv86mLFVKHQ= github.com/aws/aws-xray-sdk-go v1.7.1/go.mod h1:aNQo1pqFaaeKaf18CSWCkoaXUI+PQZ7yfNE28YyE2CI= +github.com/aws/aws-xray-sdk-go v1.8.0 h1:0xncHZ588wB/geLjbM/esoW3FOEThWy2TJyb4VXfLFY= +github.com/aws/aws-xray-sdk-go v1.8.0/go.mod h1:7LKe47H+j3evfvS1+q0wzpoaGXGrF3mUsfM+thqVO+A= github.com/aws/smithy-go v1.4.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= From 8a0f51d54c7c19d441f5c960a835e2f46fdaf5a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 22:54:19 +0000 Subject: [PATCH 126/235] Update module github.com/testcontainers/testcontainers-go to v0.15.0 --- go/appencryption/go.mod | 2 +- go/appencryption/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go/appencryption/go.mod b/go/appencryption/go.mod index 04f569175..0fc64b0c1 100644 --- a/go/appencryption/go.mod +++ b/go/appencryption/go.mod @@ -12,7 +12,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 github.com/stretchr/testify v1.8.1 - github.com/testcontainers/testcontainers-go v0.14.0 + github.com/testcontainers/testcontainers-go v0.15.0 ) require ( diff --git a/go/appencryption/go.sum b/go/appencryption/go.sum index 933be434b..b1e703011 100644 --- a/go/appencryption/go.sum +++ b/go/appencryption/go.sum @@ -905,6 +905,8 @@ github.com/testcontainers/testcontainers-go v0.13.0 h1:OUujSlEGsXVo/ykPVZk3KanBN github.com/testcontainers/testcontainers-go v0.13.0/go.mod h1:z1abufU633Eb/FmSBTzV6ntZAC1eZBYPtaFsn4nPuDk= github.com/testcontainers/testcontainers-go v0.14.0 h1:h0D5GaYG9mhOWr2qHdEKDXpkce/VlvaYOCzTRi6UBi8= github.com/testcontainers/testcontainers-go v0.14.0/go.mod h1:hSRGJ1G8Q5Bw2gXgPulJOLlEBaYJHeBSOkQM5JLG+JQ= +github.com/testcontainers/testcontainers-go v0.15.0 h1:3Ex7PUGFv0b2bBsdOv6R42+SK2qoZnWBd21LvZYhUtQ= +github.com/testcontainers/testcontainers-go v0.15.0/go.mod h1:PkohMRH2X8Hib0IWtifVexDfLPVT+tb5E9hsf7cW12w= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= From 6d0b9d544b79e1f269c21be980e26ef348e7ee36 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 23:06:22 +0000 Subject: [PATCH 127/235] Update aws-java-sdk monorepo to v1.12.345 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index a283df6a2..ebbfdc136 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -41,7 +41,7 @@ 1.7.36 31.1-jre 3.27.0 - 1.12.344 + 1.12.345 1.10.1 3.1.1 5.7.0 From aec444c821894ad665506fbe6be86321a3f2cb10 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 06:04:24 +0000 Subject: [PATCH 128/235] Update module golang.org/x/sys to v0.2.0 --- go/securememory/go.mod | 2 +- go/securememory/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go/securememory/go.mod b/go/securememory/go.mod index c06e2fa3a..69509e342 100644 --- a/go/securememory/go.mod +++ b/go/securememory/go.mod @@ -8,7 +8,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 github.com/stretchr/testify v1.8.1 - golang.org/x/sys v0.1.0 + golang.org/x/sys v0.2.0 ) require ( diff --git a/go/securememory/go.sum b/go/securememory/go.sum index 8004724e6..8ec724e39 100644 --- a/go/securememory/go.sum +++ b/go/securememory/go.sum @@ -42,6 +42,8 @@ golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= From 4f2ed0c941749792ce844ed637de17f1c9d341e4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 06:19:05 +0000 Subject: [PATCH 129/235] Update dependency eslint to v8 --- server/samples/clients/node/package-lock.json | 659 ++++++++---------- server/samples/clients/node/package.json | 2 +- 2 files changed, 275 insertions(+), 386 deletions(-) diff --git a/server/samples/clients/node/package-lock.json b/server/samples/clients/node/package-lock.json index 4321686c1..345291fa8 100644 --- a/server/samples/clients/node/package-lock.json +++ b/server/samples/clients/node/package-lock.json @@ -135,20 +135,31 @@ } }, "@eslint/eslintrc": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", - "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz", + "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==", "dev": true, "requires": { "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^13.9.0", - "ignore": "^4.0.6", + "debug": "^4.3.2", + "espree": "^9.4.0", + "globals": "^13.15.0", + "ignore": "^5.2.0", "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + } } }, "@grpc/grpc-js": { @@ -303,22 +314,54 @@ } }, "@humanwhocodes/config-array": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", - "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", + "version": "0.11.7", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz", + "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==", "dev": true, "requires": { - "@humanwhocodes/object-schema": "^1.2.0", + "@humanwhocodes/object-schema": "^1.2.1", "debug": "^4.1.1", - "minimatch": "^3.0.4" + "minimatch": "^3.0.5" } }, + "@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true + }, "@humanwhocodes/object-schema": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz", - "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + } + }, + "@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true + }, + "@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "requires": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + } + }, "@protobufjs/aspromise": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", @@ -389,9 +432,9 @@ "integrity": "sha512-5jY9RhV7c0Z4Jy09G+NIDTsCZ5G0L5n+Z+p+Y7t5VJHM30bgwzSjVtlcBxqAj+6L/swIlvtOSzr8rBk/aNyV2g==" }, "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", + "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", "dev": true }, "acorn-jsx": { @@ -412,12 +455,6 @@ "uri-js": "^4.2.2" } }, - "ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true - }, "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -433,18 +470,9 @@ } }, "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, "async": { @@ -603,7 +631,7 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "dev": true }, "core-util-is": { @@ -661,15 +689,6 @@ "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==" }, - "enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "dev": true, - "requires": { - "ansi-colors": "^4.1.1" - } - }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -682,107 +701,52 @@ "dev": true }, "eslint": { - "version": "7.32.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", - "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", + "version": "8.27.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.27.0.tgz", + "integrity": "sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ==", "dev": true, "requires": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.3", - "@humanwhocodes/config-array": "^0.5.0", + "@eslint/eslintrc": "^1.3.3", + "@humanwhocodes/config-array": "^0.11.6", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", - "debug": "^4.0.1", + "debug": "^4.3.2", "doctrine": "^3.0.0", - "enquirer": "^2.3.5", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", + "eslint-scope": "^7.1.1", + "eslint-utils": "^3.0.0", + "eslint-visitor-keys": "^3.3.0", + "espree": "^9.4.0", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.1.2", - "globals": "^13.6.0", - "ignore": "^4.0.6", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.15.0", + "grapheme-splitter": "^1.0.4", + "ignore": "^5.2.0", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", + "is-path-inside": "^3.0.3", + "js-sdsl": "^4.1.4", + "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.1", - "progress": "^2.0.0", - "regexpp": "^3.1.0", - "semver": "^7.2.1", - "strip-ansi": "^6.0.0", + "regexpp": "^3.2.0", + "strip-ansi": "^6.0.1", "strip-json-comments": "^3.1.0", - "table": "^6.0.9", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" + "text-table": "^0.2.0" }, "dependencies": { - "@babel/code-frame": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", - "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, - "requires": { - "@babel/highlight": "^7.10.4" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.15.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz", - "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==", - "dev": true - }, - "@babel/highlight": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", - "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.5", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - } - } - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, "chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -791,75 +755,106 @@ "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } } }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { - "color-name": "1.1.3" + "ms": "2.1.2" } }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true }, + "eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^2.0.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true + } + } + }, "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", "dev": true }, + "find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "requires": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + } + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true + }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" + } + }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, @@ -894,13 +889,13 @@ } }, "eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", + "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", "dev": true, "requires": { "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" + "estraverse": "^5.2.0" } }, "eslint-utils": { @@ -919,30 +914,24 @@ "dev": true }, "espree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", - "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz", + "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==", "dev": true, "requires": { - "acorn": "^7.4.0", - "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" + "acorn": "^8.8.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.3.0" }, "dependencies": { "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", "dev": true } } }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, "esquery": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", @@ -950,14 +939,6 @@ "dev": true, "requires": { "estraverse": "^5.1.0" - }, - "dependencies": { - "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", - "dev": true - } } }, "esrecurse": { @@ -967,20 +948,12 @@ "dev": true, "requires": { "estraverse": "^5.2.0" - }, - "dependencies": { - "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", - "dev": true - } } }, "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true }, "esutils": { @@ -1004,9 +977,18 @@ "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true }, + "fastq": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", + "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "dev": true, + "requires": { + "reusify": "^1.0.4" + } + }, "fecha": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz", @@ -1041,9 +1023,9 @@ } }, "flatted": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", - "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", + "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", "dev": true }, "fn.name": { @@ -1054,13 +1036,7 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, "get-caller-file": { @@ -1069,37 +1045,43 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^3.0.4", + "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, "requires": { - "is-glob": "^4.0.1" + "is-glob": "^4.0.3" } }, "globals": { - "version": "13.11.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", - "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", + "version": "13.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz", + "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==", "dev": true, "requires": { "type-fest": "^0.20.2" } }, + "grapheme-splitter": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", + "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "dev": true + }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -1107,9 +1089,9 @@ "dev": true }, "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", "dev": true }, "import-fresh": { @@ -1125,13 +1107,13 @@ "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "dev": true, "requires": { "once": "^1.3.0", @@ -1151,7 +1133,7 @@ "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true }, "is-fullwidth-code-point": { @@ -1168,6 +1150,12 @@ "is-extglob": "^2.1.1" } }, + "is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true + }, "is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", @@ -1181,7 +1169,13 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "js-sdsl": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz", + "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==", "dev": true }, "js-tokens": { @@ -1191,13 +1185,12 @@ "dev": true }, "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "^2.0.1" } }, "jsesc": { @@ -1215,7 +1208,7 @@ "json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", "dev": true }, "jsonc-parser": { @@ -1258,24 +1251,12 @@ "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", - "dev": true - }, "logform": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/logform/-/logform-2.3.0.tgz", @@ -1293,15 +1274,6 @@ "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, "minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -1324,13 +1296,13 @@ "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, "requires": { "wrappy": "1" @@ -1396,7 +1368,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true }, "path-key": { @@ -1422,12 +1394,6 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, - "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true - }, "protobufjs": { "version": "6.11.3", "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz", @@ -1454,6 +1420,12 @@ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, + "queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true + }, "ramda": { "version": "0.27.2", "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.2.tgz", @@ -1481,12 +1453,6 @@ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true - }, "require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", @@ -1507,6 +1473,12 @@ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true }, + "reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true + }, "rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -1516,6 +1488,15 @@ "glob": "^7.1.3" } }, + "run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "requires": { + "queue-microtask": "^1.2.2" + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -1526,15 +1507,6 @@ "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz", "integrity": "sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw==" }, - "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -1571,29 +1543,12 @@ "nan": "^2.14.1" } }, - "slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - } - }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, "stack-trace": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", @@ -1640,66 +1595,6 @@ "has-flag": "^3.0.0" } }, - "table": { - "version": "6.7.2", - "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz", - "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==", - "dev": true, - "requires": { - "ajv": "^8.0.1", - "lodash.clonedeep": "^4.5.0", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1" - }, - "dependencies": { - "ajv": { - "version": "8.6.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz", - "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - } - } - }, "text-hex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", @@ -1708,7 +1603,7 @@ "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "dev": true }, "to-fast-properties": { @@ -1751,12 +1646,6 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, - "v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", - "dev": true - }, "vscode-json-languageservice": { "version": "3.11.0", "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.11.0.tgz", @@ -1881,7 +1770,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true }, "y18n": { @@ -1889,12 +1778,6 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "yargs": { "version": "15.4.1", "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", @@ -1921,6 +1804,12 @@ "camelcase": "^5.0.0", "decamelize": "^1.2.0" } + }, + "yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true } } } diff --git a/server/samples/clients/node/package.json b/server/samples/clients/node/package.json index b91608871..2dc0b9d3f 100644 --- a/server/samples/clients/node/package.json +++ b/server/samples/clients/node/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "babel-eslint": "10.1.0", - "eslint": "7.32.0", + "eslint": "8.27.0", "eslint-config-godaddy": "5.0.1" }, "author": "Asherah Developers", From e836021b375be9badc8746576d424c1f5295b308 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 06:34:22 +0000 Subject: [PATCH 130/235] Update aws-sdk-net monorepo to v3.7.100.20 --- csharp/AppEncryption/AppEncryption/AppEncryption.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj index d8dec872d..e670bddc0 100644 --- a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj +++ b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj @@ -23,8 +23,8 @@ - - + + From ab2e7b7e60810b5e9924fa1b5e9253ca1d1f869d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 06:49:30 +0000 Subject: [PATCH 131/235] Update dependency eslint-config-godaddy to v6 --- server/samples/clients/node/package-lock.json | 78 ++++++++++--------- server/samples/clients/node/package.json | 2 +- 2 files changed, 44 insertions(+), 36 deletions(-) diff --git a/server/samples/clients/node/package-lock.json b/server/samples/clients/node/package-lock.json index 345291fa8..db5f963a6 100644 --- a/server/samples/clients/node/package-lock.json +++ b/server/samples/clients/node/package-lock.json @@ -859,33 +859,33 @@ } }, "eslint-config-godaddy": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eslint-config-godaddy/-/eslint-config-godaddy-5.0.1.tgz", - "integrity": "sha512-/Ak7PTD6jxouj5TViLFIGRRsDd67qIa8fswTj+aAoHKjXCyJHJdnf7MSvrMBnfOSt1HJzCQoBzZh3deXE7jsGw==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-godaddy/-/eslint-config-godaddy-6.1.0.tgz", + "integrity": "sha512-hO2r+TA9yBz7mPUEeKv/wpEnPQ1Wjo5niP8Pc3tL9tVzsJsoA3YnWzQAac53yIHjUDGmkQL1e6YIiA8KQefwVA==", "dev": true, "requires": { - "eslint-plugin-json": "^2.0.1", - "eslint-plugin-mocha": "^6.2.2" + "eslint-plugin-json": "^3.1.0", + "eslint-plugin-mocha": "^10.0.3" } }, "eslint-plugin-json": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-json/-/eslint-plugin-json-2.1.2.tgz", - "integrity": "sha512-isM/fsUxS4wN1+nLsWoV5T4gLgBQnsql3nMTr8u+cEls1bL8rRQO5CP5GtxJxaOfbcKqnz401styw+H/P+e78Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-json/-/eslint-plugin-json-3.1.0.tgz", + "integrity": "sha512-MrlG2ynFEHe7wDGwbUuFPsaT2b1uhuEFhJ+W1f1u+1C2EkXmTYJp4B1aAdQQ8M+CC3t//N/oRKiIVw14L2HR1g==", "dev": true, "requires": { - "lodash": "^4.17.19", - "vscode-json-languageservice": "^3.7.0" + "lodash": "^4.17.21", + "vscode-json-languageservice": "^4.1.6" } }, "eslint-plugin-mocha": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-6.3.0.tgz", - "integrity": "sha512-Cd2roo8caAyG21oKaaNTj7cqeYRWW1I2B5SfpKRp0Ip1gkfwoR1Ow0IGlPWnNjzywdF4n+kHL8/9vM6zCJUxdg==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.1.0.tgz", + "integrity": "sha512-xLqqWUF17llsogVOC+8C6/jvQ+4IoOREbN7ZCHuOHuD6cT5cDD4h7f2LgsZuzMAiwswWE21tO7ExaknHVDrSkw==", "dev": true, "requires": { - "eslint-utils": "^2.0.0", - "ramda": "^0.27.0" + "eslint-utils": "^3.0.0", + "rambda": "^7.1.0" } }, "eslint-scope": { @@ -899,12 +899,20 @@ } }, "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", "dev": true, "requires": { - "eslint-visitor-keys": "^1.1.0" + "eslint-visitor-keys": "^2.0.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true + } } }, "eslint-visitor-keys": { @@ -1426,10 +1434,10 @@ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true }, - "ramda": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.2.tgz", - "integrity": "sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA==", + "rambda": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/rambda/-/rambda-7.3.0.tgz", + "integrity": "sha512-RFVofZYaG2TaVcxjnM0ejdVWf/59rFq1f57OGnjP3GT/bthzFw0GVr5rkP9PKbVlEuF/Y7bOVPLfiiYfxq/EWQ==", "dev": true }, "readable-stream": { @@ -1647,16 +1655,16 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "vscode-json-languageservice": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.11.0.tgz", - "integrity": "sha512-QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.2.1.tgz", + "integrity": "sha512-xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA==", "dev": true, "requires": { "jsonc-parser": "^3.0.0", - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-languageserver-types": "3.16.0-next.2", + "vscode-languageserver-textdocument": "^1.0.3", + "vscode-languageserver-types": "^3.16.0", "vscode-nls": "^5.0.0", - "vscode-uri": "^2.1.2" + "vscode-uri": "^3.0.3" } }, "vscode-languageserver-textdocument": { @@ -1666,9 +1674,9 @@ "dev": true }, "vscode-languageserver-types": { - "version": "3.16.0-next.2", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz", - "integrity": "sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz", + "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==", "dev": true }, "vscode-nls": { @@ -1678,9 +1686,9 @@ "dev": true }, "vscode-uri": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz", - "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.6.tgz", + "integrity": "sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ==", "dev": true }, "which": { diff --git a/server/samples/clients/node/package.json b/server/samples/clients/node/package.json index 2dc0b9d3f..b216736d0 100644 --- a/server/samples/clients/node/package.json +++ b/server/samples/clients/node/package.json @@ -13,7 +13,7 @@ "devDependencies": { "babel-eslint": "10.1.0", "eslint": "8.27.0", - "eslint-config-godaddy": "5.0.1" + "eslint-config-godaddy": "6.1.0" }, "author": "Asherah Developers", "license": "MIT", From c2ab4a7cbcefc7d4d4d8c61458fcd9c8736507b4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 07:02:20 +0000 Subject: [PATCH 132/235] Update python Docker tag to v3.11 --- server/samples/clients/python/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/samples/clients/python/Dockerfile b/server/samples/clients/python/Dockerfile index f0cd4186f..9085624d5 100644 --- a/server/samples/clients/python/Dockerfile +++ b/server/samples/clients/python/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-alpine as base +FROM python:3.11-alpine as base FROM base as builder From a5f869d4f5f9dd4832a64337713d1635649383a1 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 23 Nov 2022 00:52:37 +0000 Subject: [PATCH 133/235] fix: java/app-encryption/pom.xml to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-3038424 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index ebbfdc136..77bd13d2c 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -41,7 +41,7 @@ 1.7.36 31.1-jre 3.27.0 - 1.12.345 + 1.12.348 1.10.1 3.1.1 5.7.0 From e2451b2f84960d31d89aff245c7ba96614ddec87 Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Thu, 1 Dec 2022 23:50:38 +0000 Subject: [PATCH 134/235] java server dependency updates grpc -> 1.51.0 protobuf -> 3.21.7 netty -> 4.1.85.Final junit -> 5.9.1 + added explicit declarations for missing dependencies --- server/java/pom.xml | 120 +- .../asherah/grpc/AppEncryptionGrpc.java | 22 +- .../asherah/grpc/AppEncryptionProtos.java | 1601 ++++++++--------- 3 files changed, 803 insertions(+), 940 deletions(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index 6e2f23680..edc79fe91 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -13,12 +13,15 @@ UTF-8 - 5.8.2 - 1.1.1 - 1.50.1 + 5.9.1 + 5.9.1 + 1.51.0 + 3.21.7 + 3.21.7 0.2.3 4.7.0 2.10 + 20201115 5.0.1 4.1.85.Final 3.12.0 @@ -29,6 +32,20 @@ + + + io.grpc + grpc-core + ${io.grpc.version} + + + io.grpc + grpc-api + ${io.grpc.version} + io.grpc grpc-netty @@ -44,6 +61,42 @@ grpc-stub ${io.grpc.version} + + io.netty + netty-all + ${io.netty.version} + + + io.netty + netty-codec-http2 + ${io.netty.version} + + + io.netty + netty-handler-proxy + ${io.netty.version} + + + io.netty + netty-transport-native-unix-common + ${io.netty.version} + + + org.apache.tomcat + annotations-api + 6.0.53 + provided + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + com.google.protobuf + protobuf-java-util + ${protobuf.version} + mysql @@ -63,32 +116,41 @@ 1.3.2 - info.picocli picocli ${info.picocli.version} + com.zaxxer HikariCP ${hikaricp.version} + com.google.code.gson gson - ${gson.version} - - - io.netty - netty-all - ${io.netty.version} + ${gson.version} + org.apache.commons commons-lang3 ${commons.lang3.version} + + + org.json + json + ${json.version} + + + + org.slf4j + slf4j-api + ${slf4j.version} + org.slf4j slf4j-simple @@ -96,15 +158,17 @@ - - org.junit.platform - junit-platform-surefire-provider - ${junit.platform.version} - org.junit.jupiter junit-jupiter-engine ${junit.jupiter.version} + test + + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.api.version} + test io.grpc @@ -115,7 +179,7 @@ org.mockito mockito-core - 2.28.2 + 4.9.0 test @@ -134,10 +198,10 @@ protobuf-maven-plugin 0.6.1 - ../protos/ - com.google.protobuf:protoc:3.11.0:exe:${os.detected.classifier} + ${project.basedir}/../protos/ + com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:1.28.0:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier} true @@ -181,24 +245,12 @@ + org.apache.maven.plugins maven-surefire-plugin - 2.22.2 - + 3.0.0-M7 false - - - org.junit.platform - junit-platform-surefire-provider - ${junit.platform.version} - - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - - org.jacoco @@ -219,7 +271,7 @@ - + maven-assembly-plugin diff --git a/server/java/target/generated-sources/protobuf/grpc-java/com/godaddy/asherah/grpc/AppEncryptionGrpc.java b/server/java/target/generated-sources/protobuf/grpc-java/com/godaddy/asherah/grpc/AppEncryptionGrpc.java index 0e1dce587..537847b79 100644 --- a/server/java/target/generated-sources/protobuf/grpc-java/com/godaddy/asherah/grpc/AppEncryptionGrpc.java +++ b/server/java/target/generated-sources/protobuf/grpc-java/com/godaddy/asherah/grpc/AppEncryptionGrpc.java @@ -1,25 +1,13 @@ package com.godaddy.asherah.grpc; import static io.grpc.MethodDescriptor.generateFullMethodName; -import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall; -import static io.grpc.stub.ClientCalls.asyncClientStreamingCall; -import static io.grpc.stub.ClientCalls.asyncServerStreamingCall; -import static io.grpc.stub.ClientCalls.asyncUnaryCall; -import static io.grpc.stub.ClientCalls.blockingServerStreamingCall; -import static io.grpc.stub.ClientCalls.blockingUnaryCall; -import static io.grpc.stub.ClientCalls.futureUnaryCall; -import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall; -import static io.grpc.stub.ServerCalls.asyncClientStreamingCall; -import static io.grpc.stub.ServerCalls.asyncServerStreamingCall; -import static io.grpc.stub.ServerCalls.asyncUnaryCall; -import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; -import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.28.0)", + value = "by gRPC proto compiler (version 1.51.0)", comments = "Source: appencryption.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class AppEncryptionGrpc { private AppEncryptionGrpc() {} @@ -115,14 +103,14 @@ public static abstract class AppEncryptionImplBase implements io.grpc.BindableSe */ public io.grpc.stub.StreamObserver session( io.grpc.stub.StreamObserver responseObserver) { - return asyncUnimplementedStreamingCall(getSessionMethod(), responseObserver); + return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getSessionMethod(), responseObserver); } @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( getSessionMethod(), - asyncBidiStreamingCall( + io.grpc.stub.ServerCalls.asyncBidiStreamingCall( new MethodHandlers< com.godaddy.asherah.grpc.AppEncryptionProtos.SessionRequest, com.godaddy.asherah.grpc.AppEncryptionProtos.SessionResponse>( @@ -154,7 +142,7 @@ protected AppEncryptionStub build( */ public io.grpc.stub.StreamObserver session( io.grpc.stub.StreamObserver responseObserver) { - return asyncBidiStreamingCall( + return io.grpc.stub.ClientCalls.asyncBidiStreamingCall( getChannel().newCall(getSessionMethod(), getCallOptions()), responseObserver); } } diff --git a/server/java/target/generated-sources/protobuf/java/com/godaddy/asherah/grpc/AppEncryptionProtos.java b/server/java/target/generated-sources/protobuf/java/com/godaddy/asherah/grpc/AppEncryptionProtos.java index 065eb755a..d99486db8 100644 --- a/server/java/target/generated-sources/protobuf/java/com/godaddy/asherah/grpc/AppEncryptionProtos.java +++ b/server/java/target/generated-sources/protobuf/java/com/godaddy/asherah/grpc/AppEncryptionProtos.java @@ -72,7 +72,7 @@ public interface SessionRequestOrBuilder extends * * Protobuf type {@code asherah.apps.server.SessionRequest} */ - public static final class SessionRequest extends + public static final class SessionRequest extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:asherah.apps.server.SessionRequest) SessionRequestOrBuilder { @@ -96,85 +96,6 @@ protected java.lang.Object newInstance( getUnknownFields() { return this.unknownFields; } - private SessionRequest( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt.Builder subBuilder = null; - if (requestCase_ == 1) { - subBuilder = ((com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt) request_).toBuilder(); - } - request_ = - input.readMessage(com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt) request_); - request_ = subBuilder.buildPartial(); - } - requestCase_ = 1; - break; - } - case 18: { - com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt.Builder subBuilder = null; - if (requestCase_ == 2) { - subBuilder = ((com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt) request_).toBuilder(); - } - request_ = - input.readMessage(com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt) request_); - request_ = subBuilder.buildPartial(); - } - requestCase_ = 2; - break; - } - case 26: { - com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession.Builder subBuilder = null; - if (requestCase_ == 3) { - subBuilder = ((com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession) request_).toBuilder(); - } - request_ = - input.readMessage(com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession) request_); - request_ = subBuilder.buildPartial(); - } - requestCase_ = 3; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.godaddy.asherah.grpc.AppEncryptionProtos.internal_static_asherah_apps_server_SessionRequest_descriptor; @@ -236,6 +157,7 @@ public int getNumber() { * .asherah.apps.server.Encrypt encrypt = 1; * @return Whether the encrypt field is set. */ + @java.lang.Override public boolean hasEncrypt() { return requestCase_ == 1; } @@ -243,6 +165,7 @@ public boolean hasEncrypt() { * .asherah.apps.server.Encrypt encrypt = 1; * @return The encrypt. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt getEncrypt() { if (requestCase_ == 1) { return (com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt) request_; @@ -252,6 +175,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt getEncrypt() { /** * .asherah.apps.server.Encrypt encrypt = 1; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptOrBuilder getEncryptOrBuilder() { if (requestCase_ == 1) { return (com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt) request_; @@ -264,6 +188,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptOrBuilder getEncryptO * .asherah.apps.server.Decrypt decrypt = 2; * @return Whether the decrypt field is set. */ + @java.lang.Override public boolean hasDecrypt() { return requestCase_ == 2; } @@ -271,6 +196,7 @@ public boolean hasDecrypt() { * .asherah.apps.server.Decrypt decrypt = 2; * @return The decrypt. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt getDecrypt() { if (requestCase_ == 2) { return (com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt) request_; @@ -280,6 +206,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt getDecrypt() { /** * .asherah.apps.server.Decrypt decrypt = 2; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptOrBuilder getDecryptOrBuilder() { if (requestCase_ == 2) { return (com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt) request_; @@ -292,6 +219,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptOrBuilder getDecryptO * .asherah.apps.server.GetSession get_session = 3; * @return Whether the getSession field is set. */ + @java.lang.Override public boolean hasGetSession() { return requestCase_ == 3; } @@ -299,6 +227,7 @@ public boolean hasGetSession() { * .asherah.apps.server.GetSession get_session = 3; * @return The getSession. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession getGetSession() { if (requestCase_ == 3) { return (com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession) request_; @@ -308,6 +237,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession getGetSession() { /** * .asherah.apps.server.GetSession get_session = 3; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.GetSessionOrBuilder getGetSessionOrBuilder() { if (requestCase_ == 3) { return (com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession) request_; @@ -338,7 +268,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (requestCase_ == 3) { output.writeMessage(3, (com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession) request_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -359,7 +289,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, (com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession) request_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -391,7 +321,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -418,7 +348,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -539,22 +469,26 @@ public static final class Builder extends // Construct using com.godaddy.asherah.grpc.AppEncryptionProtos.SessionRequest.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + if (encryptBuilder_ != null) { + encryptBuilder_.clear(); + } + if (decryptBuilder_ != null) { + decryptBuilder_.clear(); + } + if (getSessionBuilder_ != null) { + getSessionBuilder_.clear(); + } requestCase_ = 0; request_ = null; return this; @@ -670,7 +604,7 @@ public Builder mergeFrom(com.godaddy.asherah.grpc.AppEncryptionProtos.SessionReq break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -685,17 +619,51 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.godaddy.asherah.grpc.AppEncryptionProtos.SessionRequest parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getEncryptFieldBuilder().getBuilder(), + extensionRegistry); + requestCase_ = 1; + break; + } // case 10 + case 18: { + input.readMessage( + getDecryptFieldBuilder().getBuilder(), + extensionRegistry); + requestCase_ = 2; + break; + } // case 18 + case 26: { + input.readMessage( + getGetSessionFieldBuilder().getBuilder(), + extensionRegistry); + requestCase_ = 3; + break; + } // case 26 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.godaddy.asherah.grpc.AppEncryptionProtos.SessionRequest) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int requestCase_ = 0; @@ -720,6 +688,7 @@ public Builder clearRequest() { * .asherah.apps.server.Encrypt encrypt = 1; * @return Whether the encrypt field is set. */ + @java.lang.Override public boolean hasEncrypt() { return requestCase_ == 1; } @@ -727,6 +696,7 @@ public boolean hasEncrypt() { * .asherah.apps.server.Encrypt encrypt = 1; * @return The encrypt. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt getEncrypt() { if (encryptBuilder_ == null) { if (requestCase_ == 1) { @@ -786,8 +756,9 @@ public Builder mergeEncrypt(com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt } else { if (requestCase_ == 1) { encryptBuilder_.mergeFrom(value); + } else { + encryptBuilder_.setMessage(value); } - encryptBuilder_.setMessage(value); } requestCase_ = 1; return this; @@ -820,6 +791,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt.Builder getEncryptBu /** * .asherah.apps.server.Encrypt encrypt = 1; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptOrBuilder getEncryptOrBuilder() { if ((requestCase_ == 1) && (encryptBuilder_ != null)) { return encryptBuilder_.getMessageOrBuilder(); @@ -834,7 +806,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptOrBuilder getEncryptO * .asherah.apps.server.Encrypt encrypt = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt, com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptOrBuilder> + com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt, com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptOrBuilder> getEncryptFieldBuilder() { if (encryptBuilder_ == null) { if (!(requestCase_ == 1)) { @@ -858,6 +830,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptOrBuilder getEncryptO * .asherah.apps.server.Decrypt decrypt = 2; * @return Whether the decrypt field is set. */ + @java.lang.Override public boolean hasDecrypt() { return requestCase_ == 2; } @@ -865,6 +838,7 @@ public boolean hasDecrypt() { * .asherah.apps.server.Decrypt decrypt = 2; * @return The decrypt. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt getDecrypt() { if (decryptBuilder_ == null) { if (requestCase_ == 2) { @@ -924,8 +898,9 @@ public Builder mergeDecrypt(com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt } else { if (requestCase_ == 2) { decryptBuilder_.mergeFrom(value); + } else { + decryptBuilder_.setMessage(value); } - decryptBuilder_.setMessage(value); } requestCase_ = 2; return this; @@ -958,6 +933,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt.Builder getDecryptBu /** * .asherah.apps.server.Decrypt decrypt = 2; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptOrBuilder getDecryptOrBuilder() { if ((requestCase_ == 2) && (decryptBuilder_ != null)) { return decryptBuilder_.getMessageOrBuilder(); @@ -972,7 +948,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptOrBuilder getDecryptO * .asherah.apps.server.Decrypt decrypt = 2; */ private com.google.protobuf.SingleFieldBuilderV3< - com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt, com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptOrBuilder> + com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt, com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptOrBuilder> getDecryptFieldBuilder() { if (decryptBuilder_ == null) { if (!(requestCase_ == 2)) { @@ -996,6 +972,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptOrBuilder getDecryptO * .asherah.apps.server.GetSession get_session = 3; * @return Whether the getSession field is set. */ + @java.lang.Override public boolean hasGetSession() { return requestCase_ == 3; } @@ -1003,6 +980,7 @@ public boolean hasGetSession() { * .asherah.apps.server.GetSession get_session = 3; * @return The getSession. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession getGetSession() { if (getSessionBuilder_ == null) { if (requestCase_ == 3) { @@ -1062,8 +1040,9 @@ public Builder mergeGetSession(com.godaddy.asherah.grpc.AppEncryptionProtos.GetS } else { if (requestCase_ == 3) { getSessionBuilder_.mergeFrom(value); + } else { + getSessionBuilder_.setMessage(value); } - getSessionBuilder_.setMessage(value); } requestCase_ = 3; return this; @@ -1096,6 +1075,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession.Builder getGetSes /** * .asherah.apps.server.GetSession get_session = 3; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.GetSessionOrBuilder getGetSessionOrBuilder() { if ((requestCase_ == 3) && (getSessionBuilder_ != null)) { return getSessionBuilder_.getMessageOrBuilder(); @@ -1110,7 +1090,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.GetSessionOrBuilder getGetSe * .asherah.apps.server.GetSession get_session = 3; */ private com.google.protobuf.SingleFieldBuilderV3< - com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession, com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.GetSessionOrBuilder> + com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession, com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.GetSessionOrBuilder> getGetSessionFieldBuilder() { if (getSessionBuilder_ == null) { if (!(requestCase_ == 3)) { @@ -1160,7 +1140,18 @@ public SessionRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SessionRequest(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1193,7 +1184,7 @@ public interface EncryptOrBuilder extends /** * Protobuf type {@code asherah.apps.server.Encrypt} */ - public static final class Encrypt extends + public static final class Encrypt extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:asherah.apps.server.Encrypt) EncryptOrBuilder { @@ -1218,48 +1209,6 @@ protected java.lang.Object newInstance( getUnknownFields() { return this.unknownFields; } - private Encrypt( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - - data_ = input.readBytes(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.godaddy.asherah.grpc.AppEncryptionProtos.internal_static_asherah_apps_server_Encrypt_descriptor; @@ -1279,6 +1228,7 @@ private Encrypt( * bytes data = 1; * @return The data. */ + @java.lang.Override public com.google.protobuf.ByteString getData() { return data_; } @@ -1300,7 +1250,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!data_.isEmpty()) { output.writeBytes(1, data_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1313,7 +1263,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBytesSize(1, data_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1330,7 +1280,7 @@ public boolean equals(final java.lang.Object obj) { if (!getData() .equals(other.getData())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1343,7 +1293,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + DATA_FIELD_NUMBER; hash = (53 * hash) + getData().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1460,18 +1410,13 @@ public static final class Builder extends // Construct using com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { @@ -1556,7 +1501,7 @@ public Builder mergeFrom(com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt ot if (other.getData() != com.google.protobuf.ByteString.EMPTY) { setData(other.getData()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -1571,17 +1516,35 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + data_ = input.readBytes(); + + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.godaddy.asherah.grpc.AppEncryptionProtos.Encrypt) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -1590,6 +1553,7 @@ public Builder mergeFrom( * bytes data = 1; * @return The data. */ + @java.lang.Override public com.google.protobuf.ByteString getData() { return data_; } @@ -1602,7 +1566,7 @@ public Builder setData(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - + data_ = value; onChanged(); return this; @@ -1612,7 +1576,7 @@ public Builder setData(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearData() { - + data_ = getDefaultInstance().getData(); onChanged(); return this; @@ -1650,7 +1614,18 @@ public Encrypt parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Encrypt(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -1692,7 +1667,7 @@ public interface DecryptOrBuilder extends /** * Protobuf type {@code asherah.apps.server.Decrypt} */ - public static final class Decrypt extends + public static final class Decrypt extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:asherah.apps.server.Decrypt) DecryptOrBuilder { @@ -1716,56 +1691,6 @@ protected java.lang.Object newInstance( getUnknownFields() { return this.unknownFields; } - private Decrypt( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord.Builder subBuilder = null; - if (dataRowRecord_ != null) { - subBuilder = dataRowRecord_.toBuilder(); - } - dataRowRecord_ = input.readMessage(com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(dataRowRecord_); - dataRowRecord_ = subBuilder.buildPartial(); - } - - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.godaddy.asherah.grpc.AppEncryptionProtos.internal_static_asherah_apps_server_Decrypt_descriptor; @@ -1785,6 +1710,7 @@ private Decrypt( * .asherah.apps.server.DataRowRecord data_row_record = 1; * @return Whether the dataRowRecord field is set. */ + @java.lang.Override public boolean hasDataRowRecord() { return dataRowRecord_ != null; } @@ -1792,12 +1718,14 @@ public boolean hasDataRowRecord() { * .asherah.apps.server.DataRowRecord data_row_record = 1; * @return The dataRowRecord. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord getDataRowRecord() { return dataRowRecord_ == null ? com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord.getDefaultInstance() : dataRowRecord_; } /** * .asherah.apps.server.DataRowRecord data_row_record = 1; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecordOrBuilder getDataRowRecordOrBuilder() { return getDataRowRecord(); } @@ -1819,7 +1747,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (dataRowRecord_ != null) { output.writeMessage(1, getDataRowRecord()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -1832,7 +1760,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getDataRowRecord()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -1852,7 +1780,7 @@ public boolean equals(final java.lang.Object obj) { if (!getDataRowRecord() .equals(other.getDataRowRecord())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -1867,7 +1795,7 @@ public int hashCode() { hash = (37 * hash) + DATA_ROW_RECORD_FIELD_NUMBER; hash = (53 * hash) + getDataRowRecord().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -1984,18 +1912,13 @@ public static final class Builder extends // Construct using com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { @@ -2088,7 +2011,7 @@ public Builder mergeFrom(com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt ot if (other.hasDataRowRecord()) { mergeDataRowRecord(other.getDataRowRecord()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2103,17 +2026,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getDataRowRecordFieldBuilder().getBuilder(), + extensionRegistry); + + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.godaddy.asherah.grpc.AppEncryptionProtos.Decrypt) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2204,7 +2147,7 @@ public Builder clearDataRowRecord() { * .asherah.apps.server.DataRowRecord data_row_record = 1; */ public com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord.Builder getDataRowRecordBuilder() { - + onChanged(); return getDataRowRecordFieldBuilder().getBuilder(); } @@ -2223,7 +2166,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecordOrBuilder getDa * .asherah.apps.server.DataRowRecord data_row_record = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord, com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecordOrBuilder> + com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord, com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecordOrBuilder> getDataRowRecordFieldBuilder() { if (dataRowRecordBuilder_ == null) { dataRowRecordBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -2268,7 +2211,18 @@ public Decrypt parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Decrypt(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -2321,7 +2275,7 @@ public interface DataRowRecordOrBuilder extends * * Protobuf type {@code asherah.apps.server.DataRowRecord} */ - public static final class DataRowRecord extends + public static final class DataRowRecord extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:asherah.apps.server.DataRowRecord) DataRowRecordOrBuilder { @@ -2346,61 +2300,6 @@ protected java.lang.Object newInstance( getUnknownFields() { return this.unknownFields; } - private DataRowRecord( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecord.Builder subBuilder = null; - if (key_ != null) { - subBuilder = key_.toBuilder(); - } - key_ = input.readMessage(com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecord.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(key_); - key_ = subBuilder.buildPartial(); - } - - break; - } - case 18: { - - data_ = input.readBytes(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.godaddy.asherah.grpc.AppEncryptionProtos.internal_static_asherah_apps_server_DataRowRecord_descriptor; @@ -2420,6 +2319,7 @@ private DataRowRecord( * .asherah.apps.server.EnvelopeKeyRecord key = 1; * @return Whether the key field is set. */ + @java.lang.Override public boolean hasKey() { return key_ != null; } @@ -2427,12 +2327,14 @@ public boolean hasKey() { * .asherah.apps.server.EnvelopeKeyRecord key = 1; * @return The key. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecord getKey() { return key_ == null ? com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecord.getDefaultInstance() : key_; } /** * .asherah.apps.server.EnvelopeKeyRecord key = 1; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecordOrBuilder getKeyOrBuilder() { return getKey(); } @@ -2443,6 +2345,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecordOrBuilder g * bytes data = 2; * @return The data. */ + @java.lang.Override public com.google.protobuf.ByteString getData() { return data_; } @@ -2467,7 +2370,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!data_.isEmpty()) { output.writeBytes(2, data_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -2484,7 +2387,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBytesSize(2, data_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -2506,7 +2409,7 @@ public boolean equals(final java.lang.Object obj) { } if (!getData() .equals(other.getData())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -2523,7 +2426,7 @@ public int hashCode() { } hash = (37 * hash) + DATA_FIELD_NUMBER; hash = (53 * hash) + getData().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -2645,18 +2548,13 @@ public static final class Builder extends // Construct using com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { @@ -2755,7 +2653,7 @@ public Builder mergeFrom(com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRec if (other.getData() != com.google.protobuf.ByteString.EMPTY) { setData(other.getData()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -2770,17 +2668,42 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getKeyFieldBuilder().getBuilder(), + extensionRegistry); + + break; + } // case 10 + case 18: { + data_ = input.readBytes(); + + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -2871,7 +2794,7 @@ public Builder clearKey() { * .asherah.apps.server.EnvelopeKeyRecord key = 1; */ public com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecord.Builder getKeyBuilder() { - + onChanged(); return getKeyFieldBuilder().getBuilder(); } @@ -2890,7 +2813,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecordOrBuilder g * .asherah.apps.server.EnvelopeKeyRecord key = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecord, com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecord.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecordOrBuilder> + com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecord, com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecord.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecordOrBuilder> getKeyFieldBuilder() { if (keyBuilder_ == null) { keyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -2908,6 +2831,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecordOrBuilder g * bytes data = 2; * @return The data. */ + @java.lang.Override public com.google.protobuf.ByteString getData() { return data_; } @@ -2920,7 +2844,7 @@ public Builder setData(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - + data_ = value; onChanged(); return this; @@ -2930,7 +2854,7 @@ public Builder setData(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearData() { - + data_ = getDefaultInstance().getData(); onChanged(); return this; @@ -2968,7 +2892,18 @@ public DataRowRecord parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DataRowRecord(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -3022,7 +2957,7 @@ public interface EnvelopeKeyRecordOrBuilder extends /** * Protobuf type {@code asherah.apps.server.EnvelopeKeyRecord} */ - public static final class EnvelopeKeyRecord extends + public static final class EnvelopeKeyRecord extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:asherah.apps.server.EnvelopeKeyRecord) EnvelopeKeyRecordOrBuilder { @@ -3047,66 +2982,6 @@ protected java.lang.Object newInstance( getUnknownFields() { return this.unknownFields; } - private EnvelopeKeyRecord( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: { - - created_ = input.readInt64(); - break; - } - case 18: { - - key_ = input.readBytes(); - break; - } - case 26: { - com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMeta.Builder subBuilder = null; - if (parentKeyMeta_ != null) { - subBuilder = parentKeyMeta_.toBuilder(); - } - parentKeyMeta_ = input.readMessage(com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMeta.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(parentKeyMeta_); - parentKeyMeta_ = subBuilder.buildPartial(); - } - - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.godaddy.asherah.grpc.AppEncryptionProtos.internal_static_asherah_apps_server_EnvelopeKeyRecord_descriptor; @@ -3126,6 +3001,7 @@ private EnvelopeKeyRecord( * int64 created = 1; * @return The created. */ + @java.lang.Override public long getCreated() { return created_; } @@ -3136,6 +3012,7 @@ public long getCreated() { * bytes key = 2; * @return The key. */ + @java.lang.Override public com.google.protobuf.ByteString getKey() { return key_; } @@ -3146,6 +3023,7 @@ public com.google.protobuf.ByteString getKey() { * .asherah.apps.server.KeyMeta parent_key_meta = 3; * @return Whether the parentKeyMeta field is set. */ + @java.lang.Override public boolean hasParentKeyMeta() { return parentKeyMeta_ != null; } @@ -3153,12 +3031,14 @@ public boolean hasParentKeyMeta() { * .asherah.apps.server.KeyMeta parent_key_meta = 3; * @return The parentKeyMeta. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMeta getParentKeyMeta() { return parentKeyMeta_ == null ? com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMeta.getDefaultInstance() : parentKeyMeta_; } /** * .asherah.apps.server.KeyMeta parent_key_meta = 3; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMetaOrBuilder getParentKeyMetaOrBuilder() { return getParentKeyMeta(); } @@ -3186,7 +3066,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (parentKeyMeta_ != null) { output.writeMessage(3, getParentKeyMeta()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -3207,7 +3087,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, getParentKeyMeta()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -3231,7 +3111,7 @@ public boolean equals(final java.lang.Object obj) { if (!getParentKeyMeta() .equals(other.getParentKeyMeta())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -3251,7 +3131,7 @@ public int hashCode() { hash = (37 * hash) + PARENT_KEY_META_FIELD_NUMBER; hash = (53 * hash) + getParentKeyMeta().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -3368,18 +3248,13 @@ public static final class Builder extends // Construct using com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecord.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { @@ -3484,7 +3359,7 @@ public Builder mergeFrom(com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKe if (other.hasParentKeyMeta()) { mergeParentKeyMeta(other.getParentKeyMeta()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -3499,17 +3374,47 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecord parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + created_ = input.readInt64(); + + break; + } // case 8 + case 18: { + key_ = input.readBytes(); + + break; + } // case 18 + case 26: { + input.readMessage( + getParentKeyMetaFieldBuilder().getBuilder(), + extensionRegistry); + + break; + } // case 26 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.godaddy.asherah.grpc.AppEncryptionProtos.EnvelopeKeyRecord) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -3518,6 +3423,7 @@ public Builder mergeFrom( * int64 created = 1; * @return The created. */ + @java.lang.Override public long getCreated() { return created_; } @@ -3527,7 +3433,7 @@ public long getCreated() { * @return This builder for chaining. */ public Builder setCreated(long value) { - + created_ = value; onChanged(); return this; @@ -3537,7 +3443,7 @@ public Builder setCreated(long value) { * @return This builder for chaining. */ public Builder clearCreated() { - + created_ = 0L; onChanged(); return this; @@ -3548,6 +3454,7 @@ public Builder clearCreated() { * bytes key = 2; * @return The key. */ + @java.lang.Override public com.google.protobuf.ByteString getKey() { return key_; } @@ -3560,7 +3467,7 @@ public Builder setKey(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - + key_ = value; onChanged(); return this; @@ -3570,7 +3477,7 @@ public Builder setKey(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearKey() { - + key_ = getDefaultInstance().getKey(); onChanged(); return this; @@ -3663,7 +3570,7 @@ public Builder clearParentKeyMeta() { * .asherah.apps.server.KeyMeta parent_key_meta = 3; */ public com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMeta.Builder getParentKeyMetaBuilder() { - + onChanged(); return getParentKeyMetaFieldBuilder().getBuilder(); } @@ -3682,7 +3589,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMetaOrBuilder getParentKe * .asherah.apps.server.KeyMeta parent_key_meta = 3; */ private com.google.protobuf.SingleFieldBuilderV3< - com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMeta, com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMeta.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMetaOrBuilder> + com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMeta, com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMeta.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMetaOrBuilder> getParentKeyMetaFieldBuilder() { if (parentKeyMetaBuilder_ == null) { parentKeyMetaBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -3727,7 +3634,18 @@ public EnvelopeKeyRecord parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EnvelopeKeyRecord(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -3772,7 +3690,7 @@ public interface KeyMetaOrBuilder extends /** * Protobuf type {@code asherah.apps.server.KeyMeta} */ - public static final class KeyMeta extends + public static final class KeyMeta extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:asherah.apps.server.KeyMeta) KeyMetaOrBuilder { @@ -3797,54 +3715,6 @@ protected java.lang.Object newInstance( getUnknownFields() { return this.unknownFields; } - private KeyMeta( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 8: { - - created_ = input.readInt64(); - break; - } - case 18: { - java.lang.String s = input.readStringRequireUtf8(); - - keyId_ = s; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.godaddy.asherah.grpc.AppEncryptionProtos.internal_static_asherah_apps_server_KeyMeta_descriptor; @@ -3864,6 +3734,7 @@ private KeyMeta( * int64 created = 1; * @return The created. */ + @java.lang.Override public long getCreated() { return created_; } @@ -3874,12 +3745,13 @@ public long getCreated() { * string key_id = 2; * @return The keyId. */ + @java.lang.Override public java.lang.String getKeyId() { java.lang.Object ref = keyId_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); keyId_ = s; @@ -3890,11 +3762,12 @@ public java.lang.String getKeyId() { * string key_id = 2; * @return The bytes for keyId. */ + @java.lang.Override public com.google.protobuf.ByteString getKeyIdBytes() { java.lang.Object ref = keyId_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); keyId_ = b; @@ -3921,10 +3794,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (created_ != 0L) { output.writeInt64(1, created_); } - if (!getKeyIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(keyId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, keyId_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -3937,10 +3810,10 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeInt64Size(1, created_); } - if (!getKeyIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(keyId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, keyId_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -3959,7 +3832,7 @@ public boolean equals(final java.lang.Object obj) { != other.getCreated()) return false; if (!getKeyId() .equals(other.getKeyId())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -3975,7 +3848,7 @@ public int hashCode() { getCreated()); hash = (37 * hash) + KEY_ID_FIELD_NUMBER; hash = (53 * hash) + getKeyId().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -4092,18 +3965,13 @@ public static final class Builder extends // Construct using com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMeta.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { @@ -4195,7 +4063,7 @@ public Builder mergeFrom(com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMeta ot keyId_ = other.keyId_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -4210,17 +4078,40 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMeta parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + created_ = input.readInt64(); + + break; + } // case 8 + case 18: { + keyId_ = input.readStringRequireUtf8(); + + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.godaddy.asherah.grpc.AppEncryptionProtos.KeyMeta) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -4229,6 +4120,7 @@ public Builder mergeFrom( * int64 created = 1; * @return The created. */ + @java.lang.Override public long getCreated() { return created_; } @@ -4238,7 +4130,7 @@ public long getCreated() { * @return This builder for chaining. */ public Builder setCreated(long value) { - + created_ = value; onChanged(); return this; @@ -4248,7 +4140,7 @@ public Builder setCreated(long value) { * @return This builder for chaining. */ public Builder clearCreated() { - + created_ = 0L; onChanged(); return this; @@ -4279,7 +4171,7 @@ public java.lang.String getKeyId() { getKeyIdBytes() { java.lang.Object ref = keyId_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); keyId_ = b; @@ -4298,7 +4190,7 @@ public Builder setKeyId( if (value == null) { throw new NullPointerException(); } - + keyId_ = value; onChanged(); return this; @@ -4308,7 +4200,7 @@ public Builder setKeyId( * @return This builder for chaining. */ public Builder clearKeyId() { - + keyId_ = getDefaultInstance().getKeyId(); onChanged(); return this; @@ -4324,7 +4216,7 @@ public Builder setKeyIdBytes( throw new NullPointerException(); } checkByteStringIsUtf8(value); - + keyId_ = value; onChanged(); return this; @@ -4362,7 +4254,18 @@ public KeyMeta parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new KeyMeta(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -4401,7 +4304,7 @@ public interface GetSessionOrBuilder extends /** * Protobuf type {@code asherah.apps.server.GetSession} */ - public static final class GetSession extends + public static final class GetSession extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:asherah.apps.server.GetSession) GetSessionOrBuilder { @@ -4426,49 +4329,6 @@ protected java.lang.Object newInstance( getUnknownFields() { return this.unknownFields; } - private GetSession( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - partitionId_ = s; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.godaddy.asherah.grpc.AppEncryptionProtos.internal_static_asherah_apps_server_GetSession_descriptor; @@ -4488,12 +4348,13 @@ private GetSession( * string partition_id = 1; * @return The partitionId. */ + @java.lang.Override public java.lang.String getPartitionId() { java.lang.Object ref = partitionId_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); partitionId_ = s; @@ -4504,11 +4365,12 @@ public java.lang.String getPartitionId() { * string partition_id = 1; * @return The bytes for partitionId. */ + @java.lang.Override public com.google.protobuf.ByteString getPartitionIdBytes() { java.lang.Object ref = partitionId_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); partitionId_ = b; @@ -4532,10 +4394,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getPartitionIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(partitionId_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, partitionId_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -4544,10 +4406,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getPartitionIdBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(partitionId_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, partitionId_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -4564,7 +4426,7 @@ public boolean equals(final java.lang.Object obj) { if (!getPartitionId() .equals(other.getPartitionId())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -4577,7 +4439,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + PARTITION_ID_FIELD_NUMBER; hash = (53 * hash) + getPartitionId().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -4694,18 +4556,13 @@ public static final class Builder extends // Construct using com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { @@ -4791,7 +4648,7 @@ public Builder mergeFrom(com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession partitionId_ = other.partitionId_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -4806,17 +4663,35 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + partitionId_ = input.readStringRequireUtf8(); + + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.godaddy.asherah.grpc.AppEncryptionProtos.GetSession) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -4845,7 +4720,7 @@ public java.lang.String getPartitionId() { getPartitionIdBytes() { java.lang.Object ref = partitionId_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); partitionId_ = b; @@ -4864,7 +4739,7 @@ public Builder setPartitionId( if (value == null) { throw new NullPointerException(); } - + partitionId_ = value; onChanged(); return this; @@ -4874,7 +4749,7 @@ public Builder setPartitionId( * @return This builder for chaining. */ public Builder clearPartitionId() { - + partitionId_ = getDefaultInstance().getPartitionId(); onChanged(); return this; @@ -4890,7 +4765,7 @@ public Builder setPartitionIdBytes( throw new NullPointerException(); } checkByteStringIsUtf8(value); - + partitionId_ = value; onChanged(); return this; @@ -4928,7 +4803,18 @@ public GetSession parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new GetSession(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -4967,7 +4853,7 @@ public interface ErrorResponseOrBuilder extends /** * Protobuf type {@code asherah.apps.server.ErrorResponse} */ - public static final class ErrorResponse extends + public static final class ErrorResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:asherah.apps.server.ErrorResponse) ErrorResponseOrBuilder { @@ -4992,49 +4878,6 @@ protected java.lang.Object newInstance( getUnknownFields() { return this.unknownFields; } - private ErrorResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - message_ = s; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.godaddy.asherah.grpc.AppEncryptionProtos.internal_static_asherah_apps_server_ErrorResponse_descriptor; @@ -5054,12 +4897,13 @@ private ErrorResponse( * string message = 1; * @return The message. */ + @java.lang.Override public java.lang.String getMessage() { java.lang.Object ref = message_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); message_ = s; @@ -5070,11 +4914,12 @@ public java.lang.String getMessage() { * string message = 1; * @return The bytes for message. */ + @java.lang.Override public com.google.protobuf.ByteString getMessageBytes() { java.lang.Object ref = message_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); message_ = b; @@ -5098,10 +4943,10 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getMessageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(message_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, message_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -5110,10 +4955,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getMessageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(message_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, message_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -5130,7 +4975,7 @@ public boolean equals(final java.lang.Object obj) { if (!getMessage() .equals(other.getMessage())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -5143,7 +4988,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + MESSAGE_FIELD_NUMBER; hash = (53 * hash) + getMessage().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -5260,18 +5105,13 @@ public static final class Builder extends // Construct using com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { @@ -5357,7 +5197,7 @@ public Builder mergeFrom(com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorRespo message_ = other.message_; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -5372,17 +5212,35 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + message_ = input.readStringRequireUtf8(); + + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -5411,7 +5269,7 @@ public java.lang.String getMessage() { getMessageBytes() { java.lang.Object ref = message_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); message_ = b; @@ -5430,7 +5288,7 @@ public Builder setMessage( if (value == null) { throw new NullPointerException(); } - + message_ = value; onChanged(); return this; @@ -5440,7 +5298,7 @@ public Builder setMessage( * @return This builder for chaining. */ public Builder clearMessage() { - + message_ = getDefaultInstance().getMessage(); onChanged(); return this; @@ -5456,7 +5314,7 @@ public Builder setMessageBytes( throw new NullPointerException(); } checkByteStringIsUtf8(value); - + message_ = value; onChanged(); return this; @@ -5494,7 +5352,18 @@ public ErrorResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ErrorResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -5536,7 +5405,7 @@ public interface EncryptResponseOrBuilder extends /** * Protobuf type {@code asherah.apps.server.EncryptResponse} */ - public static final class EncryptResponse extends + public static final class EncryptResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:asherah.apps.server.EncryptResponse) EncryptResponseOrBuilder { @@ -5560,56 +5429,6 @@ protected java.lang.Object newInstance( getUnknownFields() { return this.unknownFields; } - private EncryptResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord.Builder subBuilder = null; - if (dataRowRecord_ != null) { - subBuilder = dataRowRecord_.toBuilder(); - } - dataRowRecord_ = input.readMessage(com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(dataRowRecord_); - dataRowRecord_ = subBuilder.buildPartial(); - } - - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.godaddy.asherah.grpc.AppEncryptionProtos.internal_static_asherah_apps_server_EncryptResponse_descriptor; @@ -5629,6 +5448,7 @@ private EncryptResponse( * .asherah.apps.server.DataRowRecord data_row_record = 1; * @return Whether the dataRowRecord field is set. */ + @java.lang.Override public boolean hasDataRowRecord() { return dataRowRecord_ != null; } @@ -5636,12 +5456,14 @@ public boolean hasDataRowRecord() { * .asherah.apps.server.DataRowRecord data_row_record = 1; * @return The dataRowRecord. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord getDataRowRecord() { return dataRowRecord_ == null ? com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord.getDefaultInstance() : dataRowRecord_; } /** * .asherah.apps.server.DataRowRecord data_row_record = 1; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecordOrBuilder getDataRowRecordOrBuilder() { return getDataRowRecord(); } @@ -5663,7 +5485,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (dataRowRecord_ != null) { output.writeMessage(1, getDataRowRecord()); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -5676,7 +5498,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getDataRowRecord()); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -5696,7 +5518,7 @@ public boolean equals(final java.lang.Object obj) { if (!getDataRowRecord() .equals(other.getDataRowRecord())) return false; } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -5711,7 +5533,7 @@ public int hashCode() { hash = (37 * hash) + DATA_ROW_RECORD_FIELD_NUMBER; hash = (53 * hash) + getDataRowRecord().hashCode(); } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -5828,18 +5650,13 @@ public static final class Builder extends // Construct using com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { @@ -5932,7 +5749,7 @@ public Builder mergeFrom(com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptRes if (other.hasDataRowRecord()) { mergeDataRowRecord(other.getDataRowRecord()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -5947,17 +5764,37 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getDataRowRecordFieldBuilder().getBuilder(), + extensionRegistry); + + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -6048,7 +5885,7 @@ public Builder clearDataRowRecord() { * .asherah.apps.server.DataRowRecord data_row_record = 1; */ public com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord.Builder getDataRowRecordBuilder() { - + onChanged(); return getDataRowRecordFieldBuilder().getBuilder(); } @@ -6067,7 +5904,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecordOrBuilder getDa * .asherah.apps.server.DataRowRecord data_row_record = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord, com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecordOrBuilder> + com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord, com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecord.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.DataRowRecordOrBuilder> getDataRowRecordFieldBuilder() { if (dataRowRecordBuilder_ == null) { dataRowRecordBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -6112,7 +5949,18 @@ public EncryptResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new EncryptResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -6145,7 +5993,7 @@ public interface DecryptResponseOrBuilder extends /** * Protobuf type {@code asherah.apps.server.DecryptResponse} */ - public static final class DecryptResponse extends + public static final class DecryptResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:asherah.apps.server.DecryptResponse) DecryptResponseOrBuilder { @@ -6170,48 +6018,6 @@ protected java.lang.Object newInstance( getUnknownFields() { return this.unknownFields; } - private DecryptResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - - data_ = input.readBytes(); - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.godaddy.asherah.grpc.AppEncryptionProtos.internal_static_asherah_apps_server_DecryptResponse_descriptor; @@ -6231,6 +6037,7 @@ private DecryptResponse( * bytes data = 1; * @return The data. */ + @java.lang.Override public com.google.protobuf.ByteString getData() { return data_; } @@ -6252,7 +6059,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!data_.isEmpty()) { output.writeBytes(1, data_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -6265,7 +6072,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBytesSize(1, data_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -6282,7 +6089,7 @@ public boolean equals(final java.lang.Object obj) { if (!getData() .equals(other.getData())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -6295,7 +6102,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + DATA_FIELD_NUMBER; hash = (53 * hash) + getData().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -6412,18 +6219,13 @@ public static final class Builder extends // Construct using com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { @@ -6508,7 +6310,7 @@ public Builder mergeFrom(com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptRes if (other.getData() != com.google.protobuf.ByteString.EMPTY) { setData(other.getData()); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -6523,17 +6325,35 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + data_ = input.readBytes(); + + break; + } // case 10 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } @@ -6542,6 +6362,7 @@ public Builder mergeFrom( * bytes data = 1; * @return The data. */ + @java.lang.Override public com.google.protobuf.ByteString getData() { return data_; } @@ -6554,7 +6375,7 @@ public Builder setData(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - + data_ = value; onChanged(); return this; @@ -6564,7 +6385,7 @@ public Builder setData(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearData() { - + data_ = getDefaultInstance().getData(); onChanged(); return this; @@ -6602,7 +6423,18 @@ public DecryptResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new DecryptResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -6676,7 +6508,7 @@ public interface SessionResponseOrBuilder extends /** * Protobuf type {@code asherah.apps.server.SessionResponse} */ - public static final class SessionResponse extends + public static final class SessionResponse extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:asherah.apps.server.SessionResponse) SessionResponseOrBuilder { @@ -6700,85 +6532,6 @@ protected java.lang.Object newInstance( getUnknownFields() { return this.unknownFields; } - private SessionResponse( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse.Builder subBuilder = null; - if (responseCase_ == 1) { - subBuilder = ((com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse) response_).toBuilder(); - } - response_ = - input.readMessage(com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse) response_); - response_ = subBuilder.buildPartial(); - } - responseCase_ = 1; - break; - } - case 18: { - com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse.Builder subBuilder = null; - if (responseCase_ == 2) { - subBuilder = ((com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse) response_).toBuilder(); - } - response_ = - input.readMessage(com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse) response_); - response_ = subBuilder.buildPartial(); - } - responseCase_ = 2; - break; - } - case 26: { - com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse.Builder subBuilder = null; - if (responseCase_ == 3) { - subBuilder = ((com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse) response_).toBuilder(); - } - response_ = - input.readMessage(com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse) response_); - response_ = subBuilder.buildPartial(); - } - responseCase_ = 3; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return com.godaddy.asherah.grpc.AppEncryptionProtos.internal_static_asherah_apps_server_SessionResponse_descriptor; @@ -6840,6 +6593,7 @@ public int getNumber() { * .asherah.apps.server.EncryptResponse encrypt_response = 1; * @return Whether the encryptResponse field is set. */ + @java.lang.Override public boolean hasEncryptResponse() { return responseCase_ == 1; } @@ -6847,6 +6601,7 @@ public boolean hasEncryptResponse() { * .asherah.apps.server.EncryptResponse encrypt_response = 1; * @return The encryptResponse. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse getEncryptResponse() { if (responseCase_ == 1) { return (com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse) response_; @@ -6856,6 +6611,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse getEncryptRe /** * .asherah.apps.server.EncryptResponse encrypt_response = 1; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponseOrBuilder getEncryptResponseOrBuilder() { if (responseCase_ == 1) { return (com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse) response_; @@ -6868,6 +6624,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponseOrBuilder get * .asherah.apps.server.DecryptResponse decrypt_response = 2; * @return Whether the decryptResponse field is set. */ + @java.lang.Override public boolean hasDecryptResponse() { return responseCase_ == 2; } @@ -6875,6 +6632,7 @@ public boolean hasDecryptResponse() { * .asherah.apps.server.DecryptResponse decrypt_response = 2; * @return The decryptResponse. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse getDecryptResponse() { if (responseCase_ == 2) { return (com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse) response_; @@ -6884,6 +6642,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse getDecryptRe /** * .asherah.apps.server.DecryptResponse decrypt_response = 2; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponseOrBuilder getDecryptResponseOrBuilder() { if (responseCase_ == 2) { return (com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse) response_; @@ -6896,6 +6655,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponseOrBuilder get * .asherah.apps.server.ErrorResponse error_response = 3; * @return Whether the errorResponse field is set. */ + @java.lang.Override public boolean hasErrorResponse() { return responseCase_ == 3; } @@ -6903,6 +6663,7 @@ public boolean hasErrorResponse() { * .asherah.apps.server.ErrorResponse error_response = 3; * @return The errorResponse. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse getErrorResponse() { if (responseCase_ == 3) { return (com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse) response_; @@ -6912,6 +6673,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse getErrorRespon /** * .asherah.apps.server.ErrorResponse error_response = 3; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponseOrBuilder getErrorResponseOrBuilder() { if (responseCase_ == 3) { return (com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse) response_; @@ -6942,7 +6704,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (responseCase_ == 3) { output.writeMessage(3, (com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse) response_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -6963,7 +6725,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, (com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse) response_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -6995,7 +6757,7 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -7022,7 +6784,7 @@ public int hashCode() { case 0: default: } - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } @@ -7139,22 +6901,26 @@ public static final class Builder extends // Construct using com.godaddy.asherah.grpc.AppEncryptionProtos.SessionResponse.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - } + } @java.lang.Override public Builder clear() { super.clear(); + if (encryptResponseBuilder_ != null) { + encryptResponseBuilder_.clear(); + } + if (decryptResponseBuilder_ != null) { + decryptResponseBuilder_.clear(); + } + if (errorResponseBuilder_ != null) { + errorResponseBuilder_.clear(); + } responseCase_ = 0; response_ = null; return this; @@ -7270,7 +7036,7 @@ public Builder mergeFrom(com.godaddy.asherah.grpc.AppEncryptionProtos.SessionRes break; } } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -7285,17 +7051,51 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - com.godaddy.asherah.grpc.AppEncryptionProtos.SessionResponse parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getEncryptResponseFieldBuilder().getBuilder(), + extensionRegistry); + responseCase_ = 1; + break; + } // case 10 + case 18: { + input.readMessage( + getDecryptResponseFieldBuilder().getBuilder(), + extensionRegistry); + responseCase_ = 2; + break; + } // case 18 + case 26: { + input.readMessage( + getErrorResponseFieldBuilder().getBuilder(), + extensionRegistry); + responseCase_ = 3; + break; + } // case 26 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (com.godaddy.asherah.grpc.AppEncryptionProtos.SessionResponse) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } private int responseCase_ = 0; @@ -7320,6 +7120,7 @@ public Builder clearResponse() { * .asherah.apps.server.EncryptResponse encrypt_response = 1; * @return Whether the encryptResponse field is set. */ + @java.lang.Override public boolean hasEncryptResponse() { return responseCase_ == 1; } @@ -7327,6 +7128,7 @@ public boolean hasEncryptResponse() { * .asherah.apps.server.EncryptResponse encrypt_response = 1; * @return The encryptResponse. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse getEncryptResponse() { if (encryptResponseBuilder_ == null) { if (responseCase_ == 1) { @@ -7386,8 +7188,9 @@ public Builder mergeEncryptResponse(com.godaddy.asherah.grpc.AppEncryptionProtos } else { if (responseCase_ == 1) { encryptResponseBuilder_.mergeFrom(value); + } else { + encryptResponseBuilder_.setMessage(value); } - encryptResponseBuilder_.setMessage(value); } responseCase_ = 1; return this; @@ -7420,6 +7223,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse.Builder getE /** * .asherah.apps.server.EncryptResponse encrypt_response = 1; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponseOrBuilder getEncryptResponseOrBuilder() { if ((responseCase_ == 1) && (encryptResponseBuilder_ != null)) { return encryptResponseBuilder_.getMessageOrBuilder(); @@ -7434,7 +7238,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponseOrBuilder get * .asherah.apps.server.EncryptResponse encrypt_response = 1; */ private com.google.protobuf.SingleFieldBuilderV3< - com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse, com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponseOrBuilder> + com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse, com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponse.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponseOrBuilder> getEncryptResponseFieldBuilder() { if (encryptResponseBuilder_ == null) { if (!(responseCase_ == 1)) { @@ -7458,6 +7262,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.EncryptResponseOrBuilder get * .asherah.apps.server.DecryptResponse decrypt_response = 2; * @return Whether the decryptResponse field is set. */ + @java.lang.Override public boolean hasDecryptResponse() { return responseCase_ == 2; } @@ -7465,6 +7270,7 @@ public boolean hasDecryptResponse() { * .asherah.apps.server.DecryptResponse decrypt_response = 2; * @return The decryptResponse. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse getDecryptResponse() { if (decryptResponseBuilder_ == null) { if (responseCase_ == 2) { @@ -7524,8 +7330,9 @@ public Builder mergeDecryptResponse(com.godaddy.asherah.grpc.AppEncryptionProtos } else { if (responseCase_ == 2) { decryptResponseBuilder_.mergeFrom(value); + } else { + decryptResponseBuilder_.setMessage(value); } - decryptResponseBuilder_.setMessage(value); } responseCase_ = 2; return this; @@ -7558,6 +7365,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse.Builder getD /** * .asherah.apps.server.DecryptResponse decrypt_response = 2; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponseOrBuilder getDecryptResponseOrBuilder() { if ((responseCase_ == 2) && (decryptResponseBuilder_ != null)) { return decryptResponseBuilder_.getMessageOrBuilder(); @@ -7572,7 +7380,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponseOrBuilder get * .asherah.apps.server.DecryptResponse decrypt_response = 2; */ private com.google.protobuf.SingleFieldBuilderV3< - com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse, com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponseOrBuilder> + com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse, com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponse.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponseOrBuilder> getDecryptResponseFieldBuilder() { if (decryptResponseBuilder_ == null) { if (!(responseCase_ == 2)) { @@ -7596,6 +7404,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.DecryptResponseOrBuilder get * .asherah.apps.server.ErrorResponse error_response = 3; * @return Whether the errorResponse field is set. */ + @java.lang.Override public boolean hasErrorResponse() { return responseCase_ == 3; } @@ -7603,6 +7412,7 @@ public boolean hasErrorResponse() { * .asherah.apps.server.ErrorResponse error_response = 3; * @return The errorResponse. */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse getErrorResponse() { if (errorResponseBuilder_ == null) { if (responseCase_ == 3) { @@ -7662,8 +7472,9 @@ public Builder mergeErrorResponse(com.godaddy.asherah.grpc.AppEncryptionProtos.E } else { if (responseCase_ == 3) { errorResponseBuilder_.mergeFrom(value); + } else { + errorResponseBuilder_.setMessage(value); } - errorResponseBuilder_.setMessage(value); } responseCase_ = 3; return this; @@ -7696,6 +7507,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse.Builder getErr /** * .asherah.apps.server.ErrorResponse error_response = 3; */ + @java.lang.Override public com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponseOrBuilder getErrorResponseOrBuilder() { if ((responseCase_ == 3) && (errorResponseBuilder_ != null)) { return errorResponseBuilder_.getMessageOrBuilder(); @@ -7710,7 +7522,7 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponseOrBuilder getEr * .asherah.apps.server.ErrorResponse error_response = 3; */ private com.google.protobuf.SingleFieldBuilderV3< - com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse, com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponseOrBuilder> + com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse, com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponse.Builder, com.godaddy.asherah.grpc.AppEncryptionProtos.ErrorResponseOrBuilder> getErrorResponseFieldBuilder() { if (errorResponseBuilder_ == null) { if (!(responseCase_ == 3)) { @@ -7760,7 +7572,18 @@ public SessionResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new SessionResponse(input, extensionRegistry); + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); } }; @@ -7782,57 +7605,57 @@ public com.godaddy.asherah.grpc.AppEncryptionProtos.SessionResponse getDefaultIn private static final com.google.protobuf.Descriptors.Descriptor internal_static_asherah_apps_server_SessionRequest_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_asherah_apps_server_SessionRequest_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_asherah_apps_server_Encrypt_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_asherah_apps_server_Encrypt_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_asherah_apps_server_Decrypt_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_asherah_apps_server_Decrypt_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_asherah_apps_server_DataRowRecord_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_asherah_apps_server_DataRowRecord_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_asherah_apps_server_EnvelopeKeyRecord_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_asherah_apps_server_EnvelopeKeyRecord_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_asherah_apps_server_KeyMeta_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_asherah_apps_server_KeyMeta_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_asherah_apps_server_GetSession_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_asherah_apps_server_GetSession_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_asherah_apps_server_ErrorResponse_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_asherah_apps_server_ErrorResponse_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_asherah_apps_server_EncryptResponse_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_asherah_apps_server_EncryptResponse_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_asherah_apps_server_DecryptResponse_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_asherah_apps_server_DecryptResponse_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_asherah_apps_server_SessionResponse_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_asherah_apps_server_SessionResponse_fieldAccessorTable; From 54304d752c7b0bd126c23e059da7285e2e3ff4b4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 19:11:02 +0000 Subject: [PATCH 135/235] Update junit5 monorepo --- java/app-encryption/pom.xml | 2 +- java/secure-memory/pom.xml | 4 ++-- samples/java/reference-app/pom.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index ebbfdc136..870b265ca 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -44,7 +44,7 @@ 1.12.345 1.10.1 3.1.1 - 5.7.0 + 5.9.1 1.7.0 3.12.4 1.11.2 diff --git a/java/secure-memory/pom.xml b/java/secure-memory/pom.xml index 0a49052cb..5d97dfdbf 100644 --- a/java/secure-memory/pom.xml +++ b/java/secure-memory/pom.xml @@ -35,8 +35,8 @@ 1.8 UTF-8 1.7.36 - 5.7.0 - 1.7.0 + 5.9.1 + 1.9.1 3.12.4 0.8.8 ${project.basedir}/checkstyle.xml diff --git a/samples/java/reference-app/pom.xml b/samples/java/reference-app/pom.xml index 1b3321319..db7b7331c 100644 --- a/samples/java/reference-app/pom.xml +++ b/samples/java/reference-app/pom.xml @@ -13,8 +13,8 @@ 1.8 UTF-8 0.2.3 - 5.7.0 - 1.7.0 + 5.9.1 + 1.9.1 0.8.8 ${project.basedir}/checkstyle.xml From 78ea9e3807d4f89e6960eec8028937e42a1e4be6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 19:24:22 +0000 Subject: [PATCH 136/235] Update dependency org.apache.maven.plugins:maven-gpg-plugin to v3 --- java/app-encryption/pom.xml | 2 +- java/secure-memory/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 870b265ca..048f1cf51 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -434,7 +434,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 diff --git a/java/secure-memory/pom.xml b/java/secure-memory/pom.xml index 5d97dfdbf..210f242d3 100644 --- a/java/secure-memory/pom.xml +++ b/java/secure-memory/pom.xml @@ -236,7 +236,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 From b5a2b77d3ab930a7ede56623b3bae2864381100d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 20:03:53 +0000 Subject: [PATCH 137/235] Update dotnet monorepo to v7 --- .../AppEncryption.IntegrationTests.csproj | 2 +- .../AppEncryption.Tests/AppEncryption.Tests.csproj | 2 +- csharp/AppEncryption/AppEncryption/AppEncryption.csproj | 6 +++--- csharp/Logging/Logging.Tests/Logging.Tests.csproj | 2 +- csharp/Logging/Logging/Logging.csproj | 4 ++-- .../SecureMemory.Tests/SecureMemory.Tests.csproj | 2 +- csharp/SecureMemory/SecureMemory/SecureMemory.csproj | 6 +++--- .../csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj b/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj index a6d369863..62413f242 100644 --- a/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj +++ b/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj @@ -12,7 +12,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj b/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj index 3b882fff9..eafc041ca 100644 --- a/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj +++ b/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj @@ -11,7 +11,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj index e670bddc0..5a9ab29fd 100644 --- a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj +++ b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj @@ -26,12 +26,12 @@ - + - - + + diff --git a/csharp/Logging/Logging.Tests/Logging.Tests.csproj b/csharp/Logging/Logging.Tests/Logging.Tests.csproj index 99c40d678..ad78d021d 100644 --- a/csharp/Logging/Logging.Tests/Logging.Tests.csproj +++ b/csharp/Logging/Logging.Tests/Logging.Tests.csproj @@ -17,7 +17,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/csharp/Logging/Logging/Logging.csproj b/csharp/Logging/Logging/Logging.csproj index 01846764f..d5038ee47 100644 --- a/csharp/Logging/Logging/Logging.csproj +++ b/csharp/Logging/Logging/Logging.csproj @@ -22,9 +22,9 @@ - + - + diff --git a/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj b/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj index da2c79dce..5f8b38e6f 100644 --- a/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj +++ b/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/csharp/SecureMemory/SecureMemory/SecureMemory.csproj b/csharp/SecureMemory/SecureMemory/SecureMemory.csproj index db2adeaba..8dcb0f333 100644 --- a/csharp/SecureMemory/SecureMemory/SecureMemory.csproj +++ b/csharp/SecureMemory/SecureMemory/SecureMemory.csproj @@ -19,15 +19,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj index beecfbcbd..9842b975e 100644 --- a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj +++ b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj @@ -21,7 +21,7 @@ - + From 80eee790c8b53e8a3db8883eea9fa67efca1d0e9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 20:37:12 +0000 Subject: [PATCH 139/235] Update dependency yargs to v17 --- server/samples/clients/node/package-lock.json | 152 +++++++----------- server/samples/clients/node/package.json | 2 +- 2 files changed, 57 insertions(+), 97 deletions(-) diff --git a/server/samples/clients/node/package-lock.json b/server/samples/clients/node/package-lock.json index db5f963a6..31fe6e6ca 100644 --- a/server/samples/clients/node/package-lock.json +++ b/server/samples/clients/node/package-lock.json @@ -516,11 +516,6 @@ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" - }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -559,13 +554,23 @@ } }, "cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "requires": { "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "requires": { + "ansi-regex": "^5.0.1" + } + } } }, "color": { @@ -659,11 +664,6 @@ "ms": "^2.1.1" } }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, "deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", @@ -1011,15 +1011,6 @@ "flat-cache": "^3.0.4" } }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, "flat-cache": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", @@ -1240,14 +1231,6 @@ "type-check": "~0.4.0" } }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "requires": { - "p-locate": "^4.1.0" - } - }, "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", @@ -1338,27 +1321,6 @@ "word-wrap": "^1.2.3" } }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "requires": { - "p-limit": "^2.2.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -1371,7 +1333,8 @@ "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true }, "path-is-absolute": { "version": "1.0.1", @@ -1461,11 +1424,6 @@ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" - }, "resolve": { "version": "1.15.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", @@ -1515,11 +1473,6 @@ "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz", "integrity": "sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw==" }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" - }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -1700,11 +1653,6 @@ "isexe": "^2.0.0" } }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" - }, "winston": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz", @@ -1766,9 +1714,9 @@ "dev": true }, "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "requires": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -1782,36 +1730,48 @@ "dev": true }, "y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" }, "yargs": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", - "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", + "version": "17.6.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", + "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==", + "requires": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "dependencies": { + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "requires": { + "ansi-regex": "^5.0.1" + } + } } }, "yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==" }, "yocto-queue": { "version": "0.1.0", diff --git a/server/samples/clients/node/package.json b/server/samples/clients/node/package.json index b216736d0..e096f04d2 100644 --- a/server/samples/clients/node/package.json +++ b/server/samples/clients/node/package.json @@ -8,7 +8,7 @@ "@grpc/proto-loader": "^0.7.0", "sleep": "^6.3.0", "winston": "^3.3.3", - "yargs": "^15.4.1" + "yargs": "^17.0.0" }, "devDependencies": { "babel-eslint": "10.1.0", From 4e48f35aeb3391d9e650b43e78d58d2e9202620a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 20:51:31 +0000 Subject: [PATCH 140/235] Update actions/setup-dotnet digest to 09d024b --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1bc681405..443ea8eb7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -753,7 +753,7 @@ jobs: distribution: 'adopt' java-version: '11.0.4' - name: Set up C# - uses: actions/setup-dotnet@069c35efca5966fbcb51c534522f71f964632c72 + uses: actions/setup-dotnet@09d024bd0207f89ac22acd11bbc262fc9e869ae7 with: dotnet-version: '3.1.x' - name: Set up Go 1.17 From 42bd638480397b5bc7ecc14b9d7191182c255aa6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 21:04:34 +0000 Subject: [PATCH 141/235] Update actions/cache digest to a2f324e --- .github/workflows/ci.yml | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 443ea8eb7..9af47ebd6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -75,7 +75,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Cache Java packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -105,7 +105,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -147,7 +147,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Cache Java packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -177,7 +177,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -199,7 +199,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -225,7 +225,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -262,7 +262,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -298,7 +298,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -337,7 +337,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -382,7 +382,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -425,7 +425,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -461,7 +461,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -485,7 +485,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -522,7 +522,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache Go packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -555,7 +555,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -592,7 +592,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache Go packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -618,7 +618,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -645,7 +645,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -700,7 +700,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - name: Cache client packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: | ~/.cache @@ -769,7 +769,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - name: Cache client packages - uses: actions/cache@5c79b3fd6c0e87c9444fe7b18edafe7d9ba61531 + uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 with: path: | ~/.cache From 4cecb189c72977328a46912d3c422c36a1ced5f1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 21:18:55 +0000 Subject: [PATCH 142/235] Update actions/setup-java digest to 19eeec5 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9af47ebd6..66623e2f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Set up Maven Central Repository - uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc + uses: actions/setup-java@19eeec562b37d29a1ad055b7de9c280bd0906d8d with: java-version: '11' distribution: 'adopt' @@ -137,7 +137,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Set up Maven Central Repository - uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc + uses: actions/setup-java@19eeec562b37d29a1ad055b7de9c280bd0906d8d with: java-version: '11' distribution: 'adopt' @@ -679,7 +679,7 @@ jobs: sudo apt-get -y upgrade --fix-missing sudo apt-get install -y build-essential - name: Set up JDK 11 - uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc + uses: actions/setup-java@19eeec562b37d29a1ad055b7de9c280bd0906d8d with: distribution: 'adopt' java-version: '11' @@ -748,7 +748,7 @@ jobs: INDEX (created) );" - name: Set up JDK 11 - uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc + uses: actions/setup-java@19eeec562b37d29a1ad055b7de9c280bd0906d8d with: distribution: 'adopt' java-version: '11.0.4' From 4901bf6b7fa543997afc98c457a319bb696290d0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 21:32:14 +0000 Subject: [PATCH 143/235] Update actions/setup-python digest to 1aafadc --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 66623e2f1..90e6c45e7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -688,7 +688,7 @@ jobs: with: go-version: '1.17' - name: Set up Python 3.7 - uses: actions/setup-python@47c4a7af1d72897a511c975c95a5335bb6329dec + uses: actions/setup-python@1aafadcfb96443dc8b2c66d464369fad6ead5571 with: python-version: 3.7 - name: Set up NodeJS 13 @@ -761,7 +761,7 @@ jobs: with: go-version: '1.17' - name: Set up Python 3.8 - uses: actions/setup-python@47c4a7af1d72897a511c975c95a5335bb6329dec + uses: actions/setup-python@1aafadcfb96443dc8b2c66d464369fad6ead5571 with: python-version: 3.8 - name: Extract branch name From b5d6398858143a5ff6fca6b5d30e0b3a2c2c83c2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 21:44:56 +0000 Subject: [PATCH 144/235] Update mcr.microsoft.com/dotnet/sdk Docker tag to v7 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90e6c45e7..b3050b25b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -219,7 +219,7 @@ jobs: name: Build C# Logging runs-on: ubuntu-latest container: - image: mcr.microsoft.com/dotnet/sdk:6.0 + image: mcr.microsoft.com/dotnet/sdk:7.0 options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository @@ -292,7 +292,7 @@ jobs: needs: csharp-logging runs-on: ubuntu-latest container: - image: mcr.microsoft.com/dotnet/sdk:6.0 + image: mcr.microsoft.com/dotnet/sdk:7.0 options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository @@ -369,7 +369,7 @@ jobs: needs: csharp-secure-memory runs-on: ubuntu-latest container: - image: mcr.microsoft.com/dotnet/sdk:6.0 + image: mcr.microsoft.com/dotnet/sdk:7.0 options: --ulimit core=-1 --ulimit memlock=-1:-1 services: dynamodb: @@ -455,7 +455,7 @@ jobs: needs: csharp-app-encryption runs-on: ubuntu-latest container: - image: mcr.microsoft.com/dotnet/sdk:6.0 + image: mcr.microsoft.com/dotnet/sdk:7.0 options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository From 6b8425315eed2ae9a5ccdbeb45251747b6367220 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 21:55:54 +0000 Subject: [PATCH 145/235] Update actions/setup-go digest to d0a58c1 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b3050b25b..094af5a9b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -684,7 +684,7 @@ jobs: distribution: 'adopt' java-version: '11' - name: Set up Go 1.17 - uses: actions/setup-go@e983b65a44843e966b4f802da5afe51c501fed7c + uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613 with: go-version: '1.17' - name: Set up Python 3.7 @@ -757,7 +757,7 @@ jobs: with: dotnet-version: '3.1.x' - name: Set up Go 1.17 - uses: actions/setup-go@e983b65a44843e966b4f802da5afe51c501fed7c + uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613 with: go-version: '1.17' - name: Set up Python 3.8 From 021a1b45fa5af190cbc0fddcdd334bda0160f2eb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 22:06:38 +0000 Subject: [PATCH 146/235] Update actions/setup-node digest to 3ae886e --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 094af5a9b..33d6f61d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -692,7 +692,7 @@ jobs: with: python-version: 3.7 - name: Set up NodeJS 13 - uses: actions/setup-node@41acaa2e85a9c20b0bcaff1397645d5f33cab6ac + uses: actions/setup-node@3ae886ede4e5ed7ca0b68ff6124d681158afe891 with: node-version: 13.x - name: Extract branch name From 4b526598c3edaa66258e491de2868dacaa42c8cf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 22:18:40 +0000 Subject: [PATCH 147/235] Update mockito monorepo to v4 --- java/app-encryption/pom.xml | 2 +- java/secure-memory/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 69fea75ae..3707fad40 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -46,7 +46,7 @@ 3.1.1 5.9.1 1.7.0 - 3.12.4 + 4.9.0 1.11.2 0.8.8 1.20.0 diff --git a/java/secure-memory/pom.xml b/java/secure-memory/pom.xml index 210f242d3..141176363 100644 --- a/java/secure-memory/pom.xml +++ b/java/secure-memory/pom.xml @@ -37,7 +37,7 @@ 1.7.36 5.9.1 1.9.1 - 3.12.4 + 4.9.0 0.8.8 ${project.basedir}/checkstyle.xml From 2a38304a890d3e88219bf92d7cc3beb8174cd1dc Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 3 Dec 2022 17:56:53 +0000 Subject: [PATCH 148/235] fix: upgrade com.google.protobuf:protobuf-java from 3.21.7 to 3.21.9 Snyk has created this PR to upgrade com.google.protobuf:protobuf-java from 3.21.7 to 3.21.9. See this package in Maven Repository: https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java/ See this project in Snyk: https://app.snyk.io/org/oswg/project/3650172a-cc57-4132-b6fd-0af0aa59b122?utm_source=github&utm_medium=referral&page=upgrade-pr --- server/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index edc79fe91..a79e929fb 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -16,7 +16,7 @@ 5.9.1 5.9.1 1.51.0 - 3.21.7 + 3.21.9 3.21.7 0.2.3 4.7.0 From db8d4a7790263cd07912a502807ddfe27e177ba5 Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Mon, 5 Dec 2022 13:59:36 -0700 Subject: [PATCH 149/235] remove redundant `protoc.version` property --- server/java/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index a79e929fb..97ebc0e09 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -17,7 +17,6 @@ 5.9.1 1.51.0 3.21.9 - 3.21.7 0.2.3 4.7.0 2.10 @@ -199,7 +198,7 @@ 0.6.1 ${project.basedir}/../protos/ - com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} grpc-java io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier} true From 582a16fb36d48e18ac7784e9b0949e6de2212227 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 21:55:57 +0000 Subject: [PATCH 150/235] Update aws-java-sdk monorepo --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 183f047d1..221b9fea5 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -41,7 +41,7 @@ 1.7.36 31.1-jre 3.27.0 - 1.12.348 + 1.12.357 1.10.1 3.1.1 5.9.1 From f4f284d841d215514e28f60de1f59785cc075cb0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 22:09:23 +0000 Subject: [PATCH 151/235] Update aws-sdk-net monorepo --- csharp/AppEncryption/AppEncryption/AppEncryption.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj index 5a9ab29fd..eec3fb352 100644 --- a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj +++ b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj @@ -23,8 +23,8 @@ - - + + From 29708628e1185d1463b3c734dabe5d0072ab0571 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 22:24:45 +0000 Subject: [PATCH 152/235] Update dependency Newtonsoft.Json to v13.0.2 --- csharp/AppEncryption/AppEncryption/AppEncryption.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj index eec3fb352..49838c89c 100644 --- a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj +++ b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj @@ -27,7 +27,7 @@ - + From 743af2f0c275a1dfa94d75e2c5bff556b243c1ab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 22:39:14 +0000 Subject: [PATCH 153/235] Update dependency com.fasterxml.jackson.core:jackson-databind to v2.14.1 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 221b9fea5..e9d0ade12 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -357,7 +357,7 @@ com.fasterxml.jackson.core jackson-databind - 2.14.0 + 2.14.1 test From a7dfabcd64a50cb285e19788666a28a382b69076 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 22:53:31 +0000 Subject: [PATCH 154/235] Update dependency io.dropwizard.metrics:metrics-core to v4.2.13 --- samples/java/reference-app/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/java/reference-app/pom.xml b/samples/java/reference-app/pom.xml index db7b7331c..2412db928 100644 --- a/samples/java/reference-app/pom.xml +++ b/samples/java/reference-app/pom.xml @@ -139,7 +139,7 @@ io.dropwizard.metrics metrics-core - 4.2.12 + 4.2.13 From e77ae1246d0d3d13c203acf8556c9e4535e2eb00 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 23:06:59 +0000 Subject: [PATCH 155/235] Update dependency ch.qos.logback:logback-classic to v1.4.5 --- java/app-encryption/pom.xml | 2 +- java/secure-memory/pom.xml | 2 +- samples/java/reference-app/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index e9d0ade12..d1045f312 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -307,7 +307,7 @@ ch.qos.logback logback-classic - 1.4.4 + 1.4.5 test diff --git a/java/secure-memory/pom.xml b/java/secure-memory/pom.xml index 141176363..f44e261f2 100644 --- a/java/secure-memory/pom.xml +++ b/java/secure-memory/pom.xml @@ -153,7 +153,7 @@ ch.qos.logback logback-classic - 1.4.4 + 1.4.5 test diff --git a/samples/java/reference-app/pom.xml b/samples/java/reference-app/pom.xml index 2412db928..e8d6ecef2 100644 --- a/samples/java/reference-app/pom.xml +++ b/samples/java/reference-app/pom.xml @@ -127,7 +127,7 @@ ch.qos.logback logback-classic - 1.4.4 + 1.4.5 From 505ef04213a197d36672fdef22913345d2e785cf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 23:21:20 +0000 Subject: [PATCH 156/235] Update actions/cache digest to a57932f --- .github/workflows/ci.yml | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33d6f61d8..816abb23e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -75,7 +75,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Cache Java packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -105,7 +105,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -147,7 +147,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Cache Java packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -177,7 +177,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -199,7 +199,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -225,7 +225,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -262,7 +262,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -298,7 +298,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -337,7 +337,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -382,7 +382,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -425,7 +425,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -461,7 +461,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -485,7 +485,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -522,7 +522,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache Go packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -555,7 +555,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -592,7 +592,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache Go packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -618,7 +618,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -645,7 +645,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -700,7 +700,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - name: Cache client packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: | ~/.cache @@ -769,7 +769,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - name: Cache client packages - uses: actions/cache@a2f324eeb7ff7262f2967515621d3bdf4a6f8649 + uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e with: path: | ~/.cache From 5a75be6cbffd4342f8668bbeeac8788b6627f3c2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 23:35:00 +0000 Subject: [PATCH 157/235] Update dependency io.micrometer:micrometer-core to v1.10.2 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index d1045f312..c8ef3ab4a 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -42,7 +42,7 @@ 31.1-jre 3.27.0 1.12.357 - 1.10.1 + 1.10.2 3.1.1 5.9.1 1.7.0 From 72a14d62f65622ffb3017d86760159ecaf461627 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 23:47:53 +0000 Subject: [PATCH 158/235] Update dependency io.micrometer:micrometer-registry-cloudwatch to v1.10.2 --- samples/java/reference-app/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/java/reference-app/pom.xml b/samples/java/reference-app/pom.xml index e8d6ecef2..7a238bc65 100644 --- a/samples/java/reference-app/pom.xml +++ b/samples/java/reference-app/pom.xml @@ -145,7 +145,7 @@ io.micrometer micrometer-registry-cloudwatch - 1.10.1 + 1.10.2 From 2e162f5119860b90cde32ddff006a5c5890d0fa6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 23:59:28 +0000 Subject: [PATCH 159/235] Update dependency com.github.ben-manes.caffeine:caffeine to v3.1.2 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index c8ef3ab4a..3ed8179c4 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -43,7 +43,7 @@ 3.27.0 1.12.357 1.10.2 - 3.1.1 + 3.1.2 5.9.1 1.7.0 4.9.0 From 0158493cc62909cd6888aef156ccd41b6a0d66ab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 00:10:09 +0000 Subject: [PATCH 160/235] Update actions/setup-java digest to c3ac5dd --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 816abb23e..e16c26498 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Set up Maven Central Repository - uses: actions/setup-java@19eeec562b37d29a1ad055b7de9c280bd0906d8d + uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c with: java-version: '11' distribution: 'adopt' @@ -137,7 +137,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Set up Maven Central Repository - uses: actions/setup-java@19eeec562b37d29a1ad055b7de9c280bd0906d8d + uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c with: java-version: '11' distribution: 'adopt' @@ -679,7 +679,7 @@ jobs: sudo apt-get -y upgrade --fix-missing sudo apt-get install -y build-essential - name: Set up JDK 11 - uses: actions/setup-java@19eeec562b37d29a1ad055b7de9c280bd0906d8d + uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c with: distribution: 'adopt' java-version: '11' @@ -748,7 +748,7 @@ jobs: INDEX (created) );" - name: Set up JDK 11 - uses: actions/setup-java@19eeec562b37d29a1ad055b7de9c280bd0906d8d + uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c with: distribution: 'adopt' java-version: '11.0.4' From a536d4d6a4a3f29f97c9009c038f68b96d8e1530 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 00:22:09 +0000 Subject: [PATCH 161/235] Update jackson.version to v2.14.1 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 3ed8179c4..533f90a02 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -50,7 +50,7 @@ 1.11.2 0.8.8 1.20.0 - 2.14.0 + 2.14.1 3.12.0 5.0.1 ${project.basedir}/checkstyle.xml From 8ef9e4ad267afa189e992c0c7ea33e01fe010d1d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 03:52:33 +0000 Subject: [PATCH 162/235] Update dependency grpcio to v1.51.1 --- server/samples/clients/python/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/samples/clients/python/requirements.txt b/server/samples/clients/python/requirements.txt index c922215ed..6fcb5b92f 100644 --- a/server/samples/clients/python/requirements.txt +++ b/server/samples/clients/python/requirements.txt @@ -1,2 +1,2 @@ -grpcio==1.50.0 +grpcio==1.51.1 grpcio-tools==1.50.0 From c0f4bb40c03212b7e735ba1e2aa37e1dfc03c71f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 03:25:20 +0000 Subject: [PATCH 163/235] Update golang Docker tag to v1.19 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e16c26498..eef96ab3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -479,7 +479,7 @@ jobs: name: Build Go Secure Memory runs-on: ubuntu-latest container: - image: golang:1.17 + image: golang:1.19 options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository @@ -542,7 +542,7 @@ jobs: needs: go-secure-memory runs-on: ubuntu-latest container: - image: golang:1.17 + image: golang:1.19 options: --ulimit core=-1 --ulimit memlock=-1:-1 services: dynamodb: @@ -612,7 +612,7 @@ jobs: needs: go-app-encryption runs-on: ubuntu-latest container: - image: golang:1.17 + image: golang:1.19 options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository @@ -639,7 +639,7 @@ jobs: needs: go-app-encryption runs-on: ubuntu-latest container: - image: golang:1.17 + image: golang:1.19 options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository From f5da17d2b77cd959cd0036174377b930f339d6eb Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Tue, 6 Dec 2022 20:37:44 -0700 Subject: [PATCH 164/235] replace `go get` with `go install` --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eef96ab3f..49629e70c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -491,7 +491,7 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 restore-keys: ${{ runner.os }}-go- - name: Install gotestsum - run: go get gotest.tools/gotestsum + run: go install gotest.tools/gotestsum@v1.8.2 - name: Build run: | cd go/securememory @@ -561,7 +561,7 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 restore-keys: ${{ runner.os }}-go- - name: Install gotestsum - run: go get gotest.tools/gotestsum + run: go install gotest.tools/gotestsum@v1.8.2 - name: Build run: | cd go/appencryption @@ -624,7 +624,7 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 restore-keys: ${{ runner.os }}-go- - name: Install gotestsum - run: go get gotest.tools/gotestsum + run: go install gotest.tools/gotestsum@v1.8.2 - name: Build run: | cd samples/go/referenceapp @@ -651,7 +651,7 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 restore-keys: ${{ runner.os }}-go- - name: Install gotestsum - run: go get gotest.tools/gotestsum + run: go install gotest.tools/gotestsum@v1.8.2 - name: Build run: | cd server/go From 1f5b3f4c5452df5774f9e7317108cbe207c02ad3 Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Tue, 6 Dec 2022 21:03:16 -0700 Subject: [PATCH 165/235] setup-go 1.19 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49629e70c..408af0aed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -683,10 +683,10 @@ jobs: with: distribution: 'adopt' java-version: '11' - - name: Set up Go 1.17 + - name: Set up Go 1.19 uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613 with: - go-version: '1.17' + go-version: '1.19' - name: Set up Python 3.7 uses: actions/setup-python@1aafadcfb96443dc8b2c66d464369fad6ead5571 with: @@ -756,10 +756,10 @@ jobs: uses: actions/setup-dotnet@09d024bd0207f89ac22acd11bbc262fc9e869ae7 with: dotnet-version: '3.1.x' - - name: Set up Go 1.17 + - name: Set up Go 1.19 uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613 with: - go-version: '1.17' + go-version: '1.19' - name: Set up Python 3.8 uses: actions/setup-python@1aafadcfb96443dc8b2c66d464369fad6ead5571 with: From 7cc5945cd69959cca276ca6ff6016fc87b2c1e47 Mon Sep 17 00:00:00 2001 From: Bo Thompson Date: Wed, 7 Dec 2022 13:40:16 -0700 Subject: [PATCH 166/235] do not modify PATH GOROOT is unset, so `${GOROOT}/bin` resolves to `/bin` which is not what we want. Added `which go` to assist debugging --- tests/cross-language/scripts/decrypt_all.sh | 2 +- tests/cross-language/scripts/encrypt_all.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cross-language/scripts/decrypt_all.sh b/tests/cross-language/scripts/decrypt_all.sh index dbe2694f0..26ca18ec8 100755 --- a/tests/cross-language/scripts/decrypt_all.sh +++ b/tests/cross-language/scripts/decrypt_all.sh @@ -2,7 +2,7 @@ set -ex -export PATH=${GOROOT}/bin:${PATH} +which go go version TEST_DB_PORT="${TEST_DB_PORT:-3306}" diff --git a/tests/cross-language/scripts/encrypt_all.sh b/tests/cross-language/scripts/encrypt_all.sh index a5d815bba..26aaf706e 100755 --- a/tests/cross-language/scripts/encrypt_all.sh +++ b/tests/cross-language/scripts/encrypt_all.sh @@ -2,7 +2,7 @@ set -ex -export PATH=${GOROOT}/bin:${PATH} +which go go version TEST_DB_PORT="${TEST_DB_PORT:-3306}" From 06bb791b832b0f7380504ac78102145f32df31d8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 20:58:39 +0000 Subject: [PATCH 167/235] Update dependency grpcio-tools to v1.51.1 --- server/samples/clients/python/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/samples/clients/python/requirements.txt b/server/samples/clients/python/requirements.txt index 6fcb5b92f..8371247f6 100644 --- a/server/samples/clients/python/requirements.txt +++ b/server/samples/clients/python/requirements.txt @@ -1,2 +1,2 @@ grpcio==1.51.1 -grpcio-tools==1.50.0 +grpcio-tools==1.51.1 From 14e700a0283285da4b08d0ea941ec5f2afad27c8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 21:19:23 +0000 Subject: [PATCH 168/235] Update actions/setup-node digest to d1b197b --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 408af0aed..5cb28cdab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -692,7 +692,7 @@ jobs: with: python-version: 3.7 - name: Set up NodeJS 13 - uses: actions/setup-node@3ae886ede4e5ed7ca0b68ff6124d681158afe891 + uses: actions/setup-node@d1b197b965eb46e1a1878caad41c4ab3efae133f with: node-version: 13.x - name: Extract branch name From 127f895695041e858d0eb102f21950d7f78ef22c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 21:31:13 +0000 Subject: [PATCH 169/235] Update aws-java-sdk monorepo to v1.12.359 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 533f90a02..0098921fc 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -41,7 +41,7 @@ 1.7.36 31.1-jre 3.27.0 - 1.12.357 + 1.12.359 1.10.2 3.1.2 5.9.1 From 4a3bbeba1609c6c680c9bb881e8a498d9d7f22c7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 21:46:10 +0000 Subject: [PATCH 170/235] Update dependency Moq to v4.18.3 --- .../AppEncryption.IntegrationTests.csproj | 2 +- .../AppEncryption.Tests/AppEncryption.Tests.csproj | 2 +- .../SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj b/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj index 62413f242..dbaebd829 100644 --- a/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj +++ b/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj @@ -14,7 +14,7 @@ - + all diff --git a/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj b/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj index eafc041ca..84551244d 100644 --- a/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj +++ b/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj b/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj index 5f8b38e6f..f985a27aa 100644 --- a/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj +++ b/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj @@ -11,7 +11,7 @@ - + all From f37af11bdb5a5d5d9f3ee57a88583c529624da5b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 22:04:04 +0000 Subject: [PATCH 171/235] Update protobuf.version to v3.21.10 --- server/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index 97ebc0e09..dae4a2967 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -16,7 +16,7 @@ 5.9.1 5.9.1 1.51.0 - 3.21.9 + 3.21.10 0.2.3 4.7.0 2.10 From 6b32d0307d26a5051184f49da628995216fe4943 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 22:20:16 +0000 Subject: [PATCH 172/235] Update module github.com/aws/aws-sdk-go to v1.44.155 --- go/appencryption/cmd/example/go.mod | 4 ++-- go/appencryption/cmd/example/go.sum | 4 ++++ go/appencryption/go.mod | 2 +- go/appencryption/go.sum | 2 ++ samples/go/aws/lambda/function/go.mod | 2 +- samples/go/aws/lambda/function/go.sum | 2 ++ samples/go/referenceapp/go.mod | 2 +- samples/go/referenceapp/go.sum | 2 ++ server/go/go.mod | 2 +- server/go/go.sum | 2 ++ 10 files changed, 18 insertions(+), 6 deletions(-) diff --git a/go/appencryption/cmd/example/go.mod b/go/appencryption/cmd/example/go.mod index 3bbb24124..e6836ff0e 100644 --- a/go/appencryption/cmd/example/go.mod +++ b/go/appencryption/cmd/example/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 - github.com/aws/aws-sdk-go v1.44.140 + github.com/aws/aws-sdk-go v1.44.155 github.com/go-sql-driver/mysql v1.6.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 @@ -24,7 +24,7 @@ require ( github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b // indirect - golang.org/x/sys v0.1.0 // indirect + golang.org/x/sys v0.2.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go/appencryption/cmd/example/go.sum b/go/appencryption/cmd/example/go.sum index d04c7605d..18e66d026 100644 --- a/go/appencryption/cmd/example/go.sum +++ b/go/appencryption/cmd/example/go.sum @@ -130,6 +130,8 @@ github.com/aws/aws-sdk-go v1.44.139 h1:Mj/OZBy9RTbzJ8pfgK6rOL8xgUEAIn8pfIN6qWFtp github.com/aws/aws-sdk-go v1.44.139/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.140 h1:6MxVSiAORc6AG+oh6401TEgWHb1ZzFL8y6+eBLoJtdU= github.com/aws/aws-sdk-go v1.44.140/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr2s= +github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -1191,6 +1193,8 @@ golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/go/appencryption/go.mod b/go/appencryption/go.mod index 0fc64b0c1..8e61f781d 100644 --- a/go/appencryption/go.mod +++ b/go/appencryption/go.mod @@ -3,7 +3,7 @@ module github.com/godaddy/asherah/go/appencryption go 1.19 require ( - github.com/aws/aws-sdk-go v1.44.140 + github.com/aws/aws-sdk-go v1.44.155 github.com/docker/go-connections v0.4.0 github.com/go-sql-driver/mysql v1.6.0 github.com/goburrow/cache v0.1.4 diff --git a/go/appencryption/go.sum b/go/appencryption/go.sum index b1e703011..59e945667 100644 --- a/go/appencryption/go.sum +++ b/go/appencryption/go.sum @@ -131,6 +131,8 @@ github.com/aws/aws-sdk-go v1.44.139 h1:Mj/OZBy9RTbzJ8pfgK6rOL8xgUEAIn8pfIN6qWFtp github.com/aws/aws-sdk-go v1.44.139/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.140 h1:6MxVSiAORc6AG+oh6401TEgWHb1ZzFL8y6+eBLoJtdU= github.com/aws/aws-sdk-go v1.44.140/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr2s= +github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/samples/go/aws/lambda/function/go.mod b/samples/go/aws/lambda/function/go.mod index 51090555f..07367e072 100644 --- a/samples/go/aws/lambda/function/go.mod +++ b/samples/go/aws/lambda/function/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/aws/aws-lambda-go v1.35.0 - github.com/aws/aws-sdk-go v1.44.140 + github.com/aws/aws-sdk-go v1.44.155 github.com/aws/aws-xray-sdk-go v1.8.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 diff --git a/samples/go/aws/lambda/function/go.sum b/samples/go/aws/lambda/function/go.sum index f49ed1df1..7738f1f43 100644 --- a/samples/go/aws/lambda/function/go.sum +++ b/samples/go/aws/lambda/function/go.sum @@ -135,6 +135,8 @@ github.com/aws/aws-sdk-go v1.44.139 h1:Mj/OZBy9RTbzJ8pfgK6rOL8xgUEAIn8pfIN6qWFtp github.com/aws/aws-sdk-go v1.44.139/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.140 h1:6MxVSiAORc6AG+oh6401TEgWHb1ZzFL8y6+eBLoJtdU= github.com/aws/aws-sdk-go v1.44.140/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr2s= +github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.6.0/go.mod h1:tI4KhsR5VkzlUa2DZAdwx7wCAYGwkZZ1H31PYrBFx1w= github.com/aws/aws-sdk-go-v2/service/route53 v1.6.2/go.mod h1:ZnAMilx42P7DgIrdjlWCkNIGSBLzeyk6T31uB8oGTwY= github.com/aws/aws-xray-sdk-go v1.7.0 h1:mATj8779Kj8Ae8oyXZ3S4GeK9BDGHqlLAKGCUiE31o4= diff --git a/samples/go/referenceapp/go.mod b/samples/go/referenceapp/go.mod index 37b2176a4..97f51c07f 100644 --- a/samples/go/referenceapp/go.mod +++ b/samples/go/referenceapp/go.mod @@ -3,7 +3,7 @@ module referenceapp go 1.19 require ( - github.com/aws/aws-sdk-go v1.44.140 + github.com/aws/aws-sdk-go v1.44.155 github.com/go-sql-driver/mysql v1.6.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/google/logger v1.1.1 diff --git a/samples/go/referenceapp/go.sum b/samples/go/referenceapp/go.sum index 433ae34ca..2014d1a16 100644 --- a/samples/go/referenceapp/go.sum +++ b/samples/go/referenceapp/go.sum @@ -124,6 +124,8 @@ github.com/aws/aws-sdk-go v1.44.139 h1:Mj/OZBy9RTbzJ8pfgK6rOL8xgUEAIn8pfIN6qWFtp github.com/aws/aws-sdk-go v1.44.139/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.140 h1:6MxVSiAORc6AG+oh6401TEgWHb1ZzFL8y6+eBLoJtdU= github.com/aws/aws-sdk-go v1.44.140/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr2s= +github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/server/go/go.mod b/server/go/go.mod index 824d96146..294227298 100644 --- a/server/go/go.mod +++ b/server/go/go.mod @@ -3,7 +3,7 @@ module github.com/godaddy/asherah/server/go go 1.19 require ( - github.com/aws/aws-sdk-go v1.44.140 + github.com/aws/aws-sdk-go v1.44.155 github.com/go-sql-driver/mysql v1.6.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 diff --git a/server/go/go.sum b/server/go/go.sum index 8f62742e3..771f5c7a8 100644 --- a/server/go/go.sum +++ b/server/go/go.sum @@ -124,6 +124,8 @@ github.com/aws/aws-sdk-go v1.44.139 h1:Mj/OZBy9RTbzJ8pfgK6rOL8xgUEAIn8pfIN6qWFtp github.com/aws/aws-sdk-go v1.44.139/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.140 h1:6MxVSiAORc6AG+oh6401TEgWHb1ZzFL8y6+eBLoJtdU= github.com/aws/aws-sdk-go v1.44.140/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr2s= +github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= From 34f8243566bea0946f122464b29f3300f5559ca8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 22:35:44 +0000 Subject: [PATCH 173/235] Update dependency org.checkerframework:checker-qual to v3.28.0 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 0098921fc..90d80184b 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -40,7 +40,7 @@ UTF-8 1.7.36 31.1-jre - 3.27.0 + 3.28.0 1.12.359 1.10.2 3.1.2 From e34eb1f9d1d5277655d85e41e9bd31258ad03d86 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 22:49:55 +0000 Subject: [PATCH 174/235] Update dependency eslint to v8.29.0 --- server/samples/clients/node/package-lock.json | 115 ++++++++---------- server/samples/clients/node/package.json | 2 +- 2 files changed, 50 insertions(+), 67 deletions(-) diff --git a/server/samples/clients/node/package-lock.json b/server/samples/clients/node/package-lock.json index 31fe6e6ca..1cd62a53e 100644 --- a/server/samples/clients/node/package-lock.json +++ b/server/samples/clients/node/package-lock.json @@ -701,9 +701,9 @@ "dev": true }, "eslint": { - "version": "8.27.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.27.0.tgz", - "integrity": "sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.29.0.tgz", + "integrity": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==", "dev": true, "requires": { "@eslint/eslintrc": "^1.3.3", @@ -772,72 +772,18 @@ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true }, - "eslint-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^2.0.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true - } - } - }, "eslint-visitor-keys": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", "dev": true }, - "find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "requires": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - } - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "requires": { - "p-locate": "^5.0.0" - } - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "requires": { - "p-limit": "^3.0.2" - } - }, "strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -989,9 +935,9 @@ "dev": true }, "fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz", + "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==", "dev": true, "requires": { "reusify": "^1.0.4" @@ -1011,6 +957,16 @@ "flat-cache": "^3.0.4" } }, + "find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "requires": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + } + }, "flat-cache": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", @@ -1088,9 +1044,9 @@ "dev": true }, "ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz", + "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==", "dev": true }, "import-fresh": { @@ -1172,9 +1128,9 @@ "dev": true }, "js-sdsl": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz", - "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", + "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==", "dev": true }, "js-tokens": { @@ -1231,6 +1187,15 @@ "type-check": "~0.4.0" } }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" + } + }, "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", @@ -1321,6 +1286,24 @@ "word-wrap": "^1.2.3" } }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" + } + }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", diff --git a/server/samples/clients/node/package.json b/server/samples/clients/node/package.json index e096f04d2..984967455 100644 --- a/server/samples/clients/node/package.json +++ b/server/samples/clients/node/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "babel-eslint": "10.1.0", - "eslint": "8.27.0", + "eslint": "8.29.0", "eslint-config-godaddy": "6.1.0" }, "author": "Asherah Developers", From ec9054da9604bca10ef5fa829b581d9d91957ebf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 23:02:41 +0000 Subject: [PATCH 175/235] Update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.4.0 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 90d80184b..860152b70 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -192,7 +192,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.3.0 + 3.4.0 copy From f9ccc5fa82c350d0a3cb05d1c77084effddaddbd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 23:17:25 +0000 Subject: [PATCH 176/235] Update module github.com/aws/aws-lambda-go to v1.36.0 --- samples/go/aws/lambda/function/go.mod | 2 +- samples/go/aws/lambda/function/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/samples/go/aws/lambda/function/go.mod b/samples/go/aws/lambda/function/go.mod index 07367e072..2efda01d1 100644 --- a/samples/go/aws/lambda/function/go.mod +++ b/samples/go/aws/lambda/function/go.mod @@ -3,7 +3,7 @@ module github.com/godaddy/asherah/samples/aws/lambda go 1.19 require ( - github.com/aws/aws-lambda-go v1.35.0 + github.com/aws/aws-lambda-go v1.36.0 github.com/aws/aws-sdk-go v1.44.155 github.com/aws/aws-xray-sdk-go v1.8.0 github.com/godaddy/asherah/go/appencryption v0.2.4 diff --git a/samples/go/aws/lambda/function/go.sum b/samples/go/aws/lambda/function/go.sum index 7738f1f43..44996b816 100644 --- a/samples/go/aws/lambda/function/go.sum +++ b/samples/go/aws/lambda/function/go.sum @@ -123,6 +123,8 @@ github.com/aws/aws-lambda-go v1.34.1 h1:M3a/uFYBjii+tDcOJ0wL/WyFi2550FHoECdPf27z github.com/aws/aws-lambda-go v1.34.1/go.mod h1:jwFe2KmMsHmffA1X2R09hH6lFzJQxzI8qK17ewzbQMM= github.com/aws/aws-lambda-go v1.35.0 h1:iocVDy5Cw5SCRrKOPHwarkdFwwy48OkfmHoE6SJ3ATg= github.com/aws/aws-lambda-go v1.35.0/go.mod h1:jwFe2KmMsHmffA1X2R09hH6lFzJQxzI8qK17ewzbQMM= +github.com/aws/aws-lambda-go v1.36.0 h1:NWBWBJgavrQOjF1uKDG5D7Qs5y5o75HcrjfA16Hwfak= +github.com/aws/aws-lambda-go v1.36.0/go.mod h1:jwFe2KmMsHmffA1X2R09hH6lFzJQxzI8qK17ewzbQMM= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.17.12/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.43.39 h1:5W8pton/8OuS5hpbAkzfr7e+meAAFkK7LsUehB39L3I= From e84ebaf5703690779c90d90d9559bc22a5d1bbcd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 23:28:53 +0000 Subject: [PATCH 177/235] Update actions/cache digest to fb86cbf --- .github/workflows/ci.yml | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5cb28cdab..96ac6fd75 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -75,7 +75,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Cache Java packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -105,7 +105,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -147,7 +147,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Cache Java packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -177,7 +177,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -199,7 +199,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Java packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -225,7 +225,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -262,7 +262,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -298,7 +298,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -337,7 +337,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -382,7 +382,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -425,7 +425,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -461,7 +461,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache dotnet packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -485,7 +485,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -522,7 +522,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache Go packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -555,7 +555,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -592,7 +592,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache Go packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -618,7 +618,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -645,7 +645,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 - name: Cache Go packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -700,7 +700,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - name: Cache client packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: | ~/.cache @@ -769,7 +769,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - name: Cache client packages - uses: actions/cache@a57932fabab4f6bf947b8737560e8f0dca92bc6e + uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 with: path: | ~/.cache From 2adaeeafa1303079d61146534dfb79c0116b3e25 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 00:08:36 +0000 Subject: [PATCH 178/235] Update aws-java-sdk monorepo to v1.12.360 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 860152b70..5ab0eea02 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -41,7 +41,7 @@ 1.7.36 31.1-jre 3.28.0 - 1.12.359 + 1.12.360 1.10.2 3.1.2 5.9.1 From eb2a58fb9e1f60e1fed84ac18630ad30d9995ae7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 00:20:13 +0000 Subject: [PATCH 179/235] Update aws-sdk-net monorepo --- csharp/AppEncryption/AppEncryption/AppEncryption.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj index 49838c89c..c7672d7db 100644 --- a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj +++ b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj @@ -23,8 +23,8 @@ - - + + From 3715b4c83fe47669a92811f3c0545394c7fc94b2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 00:31:29 +0000 Subject: [PATCH 180/235] Update actions/setup-go digest to 30c39bf --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 96ac6fd75..89c496415 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -684,7 +684,7 @@ jobs: distribution: 'adopt' java-version: '11' - name: Set up Go 1.19 - uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613 + uses: actions/setup-go@30c39bfe0c7338d0d8e99486938f1066b2f92108 with: go-version: '1.19' - name: Set up Python 3.7 @@ -757,7 +757,7 @@ jobs: with: dotnet-version: '3.1.x' - name: Set up Go 1.19 - uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613 + uses: actions/setup-go@30c39bfe0c7338d0d8e99486938f1066b2f92108 with: go-version: '1.19' - name: Set up Python 3.8 From ff0c6e6c5849c7767a8bff9c0b47b6189e5e2982 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 00:42:07 +0000 Subject: [PATCH 181/235] Update actions/setup-python digest to 2c3dd9e --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89c496415..5884b1026 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -688,7 +688,7 @@ jobs: with: go-version: '1.19' - name: Set up Python 3.7 - uses: actions/setup-python@1aafadcfb96443dc8b2c66d464369fad6ead5571 + uses: actions/setup-python@2c3dd9e7e29afd70cc0950079bde6c979d1f69f9 with: python-version: 3.7 - name: Set up NodeJS 13 @@ -761,7 +761,7 @@ jobs: with: go-version: '1.19' - name: Set up Python 3.8 - uses: actions/setup-python@1aafadcfb96443dc8b2c66d464369fad6ead5571 + uses: actions/setup-python@2c3dd9e7e29afd70cc0950079bde6c979d1f69f9 with: python-version: 3.8 - name: Extract branch name From 0832e4d67a6d17069b3f60d7b4d9942d174226b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 00:55:10 +0000 Subject: [PATCH 182/235] Update module github.com/go-sql-driver/mysql to v1.7.0 --- go/appencryption/cmd/example/go.mod | 2 +- go/appencryption/cmd/example/go.sum | 2 ++ go/appencryption/go.mod | 2 +- go/appencryption/go.sum | 2 ++ samples/go/referenceapp/go.mod | 2 +- samples/go/referenceapp/go.sum | 2 ++ server/go/go.mod | 2 +- server/go/go.sum | 2 ++ 8 files changed, 12 insertions(+), 4 deletions(-) diff --git a/go/appencryption/cmd/example/go.mod b/go/appencryption/cmd/example/go.mod index e6836ff0e..09c878972 100644 --- a/go/appencryption/cmd/example/go.mod +++ b/go/appencryption/cmd/example/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 github.com/aws/aws-sdk-go v1.44.155 - github.com/go-sql-driver/mysql v1.6.0 + github.com/go-sql-driver/mysql v1.7.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 github.com/jessevdk/go-flags v1.5.0 diff --git a/go/appencryption/cmd/example/go.sum b/go/appencryption/cmd/example/go.sum index 18e66d026..0255f170a 100644 --- a/go/appencryption/cmd/example/go.sum +++ b/go/appencryption/cmd/example/go.sum @@ -408,6 +408,8 @@ github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/ github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= +github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/goburrow/cache v0.1.4 h1:As4KzO3hgmzPlnaMniZU9+VmoNYseUhuELbxy9mRBfw= diff --git a/go/appencryption/go.mod b/go/appencryption/go.mod index 8e61f781d..b6b00290a 100644 --- a/go/appencryption/go.mod +++ b/go/appencryption/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/aws/aws-sdk-go v1.44.155 github.com/docker/go-connections v0.4.0 - github.com/go-sql-driver/mysql v1.6.0 + github.com/go-sql-driver/mysql v1.7.0 github.com/goburrow/cache v0.1.4 github.com/godaddy/asherah/go/securememory v0.1.3 github.com/google/uuid v1.3.0 diff --git a/go/appencryption/go.sum b/go/appencryption/go.sum index 59e945667..9ff99148a 100644 --- a/go/appencryption/go.sum +++ b/go/appencryption/go.sum @@ -432,6 +432,8 @@ github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8w github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= +github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/goburrow/cache v0.1.4 h1:As4KzO3hgmzPlnaMniZU9+VmoNYseUhuELbxy9mRBfw= diff --git a/samples/go/referenceapp/go.mod b/samples/go/referenceapp/go.mod index 97f51c07f..e43579210 100644 --- a/samples/go/referenceapp/go.mod +++ b/samples/go/referenceapp/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/aws/aws-sdk-go v1.44.155 - github.com/go-sql-driver/mysql v1.6.0 + github.com/go-sql-driver/mysql v1.7.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/google/logger v1.1.1 github.com/jessevdk/go-flags v1.5.0 diff --git a/samples/go/referenceapp/go.sum b/samples/go/referenceapp/go.sum index 2014d1a16..57c0ad81b 100644 --- a/samples/go/referenceapp/go.sum +++ b/samples/go/referenceapp/go.sum @@ -400,6 +400,8 @@ github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/ github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= +github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/goburrow/cache v0.1.4 h1:As4KzO3hgmzPlnaMniZU9+VmoNYseUhuELbxy9mRBfw= diff --git a/server/go/go.mod b/server/go/go.mod index 294227298..ff7d432b3 100644 --- a/server/go/go.mod +++ b/server/go/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/aws/aws-sdk-go v1.44.155 - github.com/go-sql-driver/mysql v1.6.0 + github.com/go-sql-driver/mysql v1.7.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 github.com/golang/protobuf v1.5.2 diff --git a/server/go/go.sum b/server/go/go.sum index 771f5c7a8..bd05a0161 100644 --- a/server/go/go.sum +++ b/server/go/go.sum @@ -400,6 +400,8 @@ github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/ github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= +github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/goburrow/cache v0.1.4 h1:As4KzO3hgmzPlnaMniZU9+VmoNYseUhuELbxy9mRBfw= From d8a20ab43b46ac834f21ac4c1354e9ceefd4f367 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 01:08:44 +0000 Subject: [PATCH 183/235] Update module golang.org/x/sys to v0.3.0 --- go/securememory/go.mod | 2 +- go/securememory/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go/securememory/go.mod b/go/securememory/go.mod index 69509e342..e6488044f 100644 --- a/go/securememory/go.mod +++ b/go/securememory/go.mod @@ -8,7 +8,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 github.com/stretchr/testify v1.8.1 - golang.org/x/sys v0.2.0 + golang.org/x/sys v0.3.0 ) require ( diff --git a/go/securememory/go.sum b/go/securememory/go.sum index 8ec724e39..4ac32c4df 100644 --- a/go/securememory/go.sum +++ b/go/securememory/go.sum @@ -44,6 +44,8 @@ golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= From 7b4255652363908ab1f2cd123fd456bbf8476009 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 05:04:05 +0000 Subject: [PATCH 184/235] Update aws-java-sdk monorepo to v1.12.361 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 5ab0eea02..cfa8e0003 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -41,7 +41,7 @@ 1.7.36 31.1-jre 3.28.0 - 1.12.360 + 1.12.361 1.10.2 3.1.2 5.9.1 From fbb6eff786ef6797259bb6ea00f7c51fdbfb36aa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 05:30:06 +0000 Subject: [PATCH 185/235] Update aws-sdk-net monorepo --- csharp/AppEncryption/AppEncryption/AppEncryption.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj index c7672d7db..9f6a09e07 100644 --- a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj +++ b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj @@ -23,8 +23,8 @@ - - + + From 77556e15ab841b035922cb7da6ed94d02589b104 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 12:02:34 +0000 Subject: [PATCH 186/235] Update protobuf.version to v3.21.11 --- server/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index dae4a2967..d10c76409 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -16,7 +16,7 @@ 5.9.1 5.9.1 1.51.0 - 3.21.10 + 3.21.11 0.2.3 4.7.0 2.10 From a742117da2ecd607bc2b75168d769ce419aaf460 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 12:16:12 +0000 Subject: [PATCH 187/235] Update module github.com/aws/aws-sdk-go to v1.44.156 --- go/appencryption/cmd/example/go.mod | 4 ++-- go/appencryption/cmd/example/go.sum | 4 ++++ go/appencryption/go.mod | 2 +- go/appencryption/go.sum | 2 ++ samples/go/aws/lambda/function/go.mod | 2 +- samples/go/aws/lambda/function/go.sum | 2 ++ samples/go/referenceapp/go.mod | 2 +- samples/go/referenceapp/go.sum | 2 ++ server/go/go.mod | 2 +- server/go/go.sum | 2 ++ 10 files changed, 18 insertions(+), 6 deletions(-) diff --git a/go/appencryption/cmd/example/go.mod b/go/appencryption/cmd/example/go.mod index 09c878972..6c15675a9 100644 --- a/go/appencryption/cmd/example/go.mod +++ b/go/appencryption/cmd/example/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 - github.com/aws/aws-sdk-go v1.44.155 + github.com/aws/aws-sdk-go v1.44.156 github.com/go-sql-driver/mysql v1.7.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 @@ -24,7 +24,7 @@ require ( github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b // indirect - golang.org/x/sys v0.2.0 // indirect + golang.org/x/sys v0.3.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go/appencryption/cmd/example/go.sum b/go/appencryption/cmd/example/go.sum index 0255f170a..1a8cb562e 100644 --- a/go/appencryption/cmd/example/go.sum +++ b/go/appencryption/cmd/example/go.sum @@ -132,6 +132,8 @@ github.com/aws/aws-sdk-go v1.44.140 h1:6MxVSiAORc6AG+oh6401TEgWHb1ZzFL8y6+eBLoJt github.com/aws/aws-sdk-go v1.44.140/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr2s= github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.156 h1:3RhbBTZ87HoI5OP2JjcKdd5qOnyo9YOAW8+Bb/h0vSE= +github.com/aws/aws-sdk-go v1.44.156/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -1197,6 +1199,8 @@ golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/go/appencryption/go.mod b/go/appencryption/go.mod index b6b00290a..e462aeb89 100644 --- a/go/appencryption/go.mod +++ b/go/appencryption/go.mod @@ -3,7 +3,7 @@ module github.com/godaddy/asherah/go/appencryption go 1.19 require ( - github.com/aws/aws-sdk-go v1.44.155 + github.com/aws/aws-sdk-go v1.44.156 github.com/docker/go-connections v0.4.0 github.com/go-sql-driver/mysql v1.7.0 github.com/goburrow/cache v0.1.4 diff --git a/go/appencryption/go.sum b/go/appencryption/go.sum index 9ff99148a..1f3e21e79 100644 --- a/go/appencryption/go.sum +++ b/go/appencryption/go.sum @@ -133,6 +133,8 @@ github.com/aws/aws-sdk-go v1.44.140 h1:6MxVSiAORc6AG+oh6401TEgWHb1ZzFL8y6+eBLoJt github.com/aws/aws-sdk-go v1.44.140/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr2s= github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.156 h1:3RhbBTZ87HoI5OP2JjcKdd5qOnyo9YOAW8+Bb/h0vSE= +github.com/aws/aws-sdk-go v1.44.156/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/samples/go/aws/lambda/function/go.mod b/samples/go/aws/lambda/function/go.mod index 2efda01d1..153b288bc 100644 --- a/samples/go/aws/lambda/function/go.mod +++ b/samples/go/aws/lambda/function/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/aws/aws-lambda-go v1.36.0 - github.com/aws/aws-sdk-go v1.44.155 + github.com/aws/aws-sdk-go v1.44.156 github.com/aws/aws-xray-sdk-go v1.8.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 diff --git a/samples/go/aws/lambda/function/go.sum b/samples/go/aws/lambda/function/go.sum index 44996b816..877aa1490 100644 --- a/samples/go/aws/lambda/function/go.sum +++ b/samples/go/aws/lambda/function/go.sum @@ -139,6 +139,8 @@ github.com/aws/aws-sdk-go v1.44.140 h1:6MxVSiAORc6AG+oh6401TEgWHb1ZzFL8y6+eBLoJt github.com/aws/aws-sdk-go v1.44.140/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr2s= github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.156 h1:3RhbBTZ87HoI5OP2JjcKdd5qOnyo9YOAW8+Bb/h0vSE= +github.com/aws/aws-sdk-go v1.44.156/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.6.0/go.mod h1:tI4KhsR5VkzlUa2DZAdwx7wCAYGwkZZ1H31PYrBFx1w= github.com/aws/aws-sdk-go-v2/service/route53 v1.6.2/go.mod h1:ZnAMilx42P7DgIrdjlWCkNIGSBLzeyk6T31uB8oGTwY= github.com/aws/aws-xray-sdk-go v1.7.0 h1:mATj8779Kj8Ae8oyXZ3S4GeK9BDGHqlLAKGCUiE31o4= diff --git a/samples/go/referenceapp/go.mod b/samples/go/referenceapp/go.mod index e43579210..da1056d62 100644 --- a/samples/go/referenceapp/go.mod +++ b/samples/go/referenceapp/go.mod @@ -3,7 +3,7 @@ module referenceapp go 1.19 require ( - github.com/aws/aws-sdk-go v1.44.155 + github.com/aws/aws-sdk-go v1.44.156 github.com/go-sql-driver/mysql v1.7.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/google/logger v1.1.1 diff --git a/samples/go/referenceapp/go.sum b/samples/go/referenceapp/go.sum index 57c0ad81b..fdaad4dd1 100644 --- a/samples/go/referenceapp/go.sum +++ b/samples/go/referenceapp/go.sum @@ -126,6 +126,8 @@ github.com/aws/aws-sdk-go v1.44.140 h1:6MxVSiAORc6AG+oh6401TEgWHb1ZzFL8y6+eBLoJt github.com/aws/aws-sdk-go v1.44.140/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr2s= github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.156 h1:3RhbBTZ87HoI5OP2JjcKdd5qOnyo9YOAW8+Bb/h0vSE= +github.com/aws/aws-sdk-go v1.44.156/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/server/go/go.mod b/server/go/go.mod index ff7d432b3..b57fcfaae 100644 --- a/server/go/go.mod +++ b/server/go/go.mod @@ -3,7 +3,7 @@ module github.com/godaddy/asherah/server/go go 1.19 require ( - github.com/aws/aws-sdk-go v1.44.155 + github.com/aws/aws-sdk-go v1.44.156 github.com/go-sql-driver/mysql v1.7.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 diff --git a/server/go/go.sum b/server/go/go.sum index bd05a0161..925579c14 100644 --- a/server/go/go.sum +++ b/server/go/go.sum @@ -126,6 +126,8 @@ github.com/aws/aws-sdk-go v1.44.140 h1:6MxVSiAORc6AG+oh6401TEgWHb1ZzFL8y6+eBLoJt github.com/aws/aws-sdk-go v1.44.140/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr2s= github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.156 h1:3RhbBTZ87HoI5OP2JjcKdd5qOnyo9YOAW8+Bb/h0vSE= +github.com/aws/aws-sdk-go v1.44.156/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= From f61fb3db753ca4605ee719f8a7041a16398be1bf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 12:29:07 +0000 Subject: [PATCH 188/235] Update dependency org.json:json to v20220924 --- server/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index d10c76409..41b8c34e0 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -20,7 +20,7 @@ 0.2.3 4.7.0 2.10 - 20201115 + 20220924 5.0.1 4.1.85.Final 3.12.0 From dd8d4c2be98a1eedc0804d1cce9f02fc20711b1a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 12:42:21 +0000 Subject: [PATCH 189/235] Update slf4j.version to v2 --- java/app-encryption/pom.xml | 2 +- java/secure-memory/pom.xml | 2 +- server/java/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index cfa8e0003..1d9b19109 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -38,7 +38,7 @@ 1.8 UTF-8 UTF-8 - 1.7.36 + 2.0.5 31.1-jre 3.28.0 1.12.361 diff --git a/java/secure-memory/pom.xml b/java/secure-memory/pom.xml index f44e261f2..4ce0597d7 100644 --- a/java/secure-memory/pom.xml +++ b/java/secure-memory/pom.xml @@ -34,7 +34,7 @@ 1.8 UTF-8 - 1.7.36 + 2.0.5 5.9.1 1.9.1 4.9.0 diff --git a/server/java/pom.xml b/server/java/pom.xml index 41b8c34e0..1cade6851 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -24,7 +24,7 @@ 5.0.1 4.1.85.Final 3.12.0 - 1.7.36 + 2.0.5 0.8.8 ${project.basedir}/checkstyle.xml ${project.basedir}/suppressions.xml From d83c2fa29181b285d293194961d701ec8268f457 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 12:55:22 +0000 Subject: [PATCH 190/235] Update module google.golang.org/grpc to v1.51.0 --- server/go/go.mod | 2 +- server/go/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/go/go.mod b/server/go/go.mod index b57fcfaae..e71f09feb 100644 --- a/server/go/go.mod +++ b/server/go/go.mod @@ -10,7 +10,7 @@ require ( github.com/golang/protobuf v1.5.2 github.com/jessevdk/go-flags v1.5.0 github.com/stretchr/testify v1.8.1 - google.golang.org/grpc v1.50.1 + google.golang.org/grpc v1.51.0 ) require ( diff --git a/server/go/go.sum b/server/go/go.sum index 925579c14..909334f58 100644 --- a/server/go/go.sum +++ b/server/go/go.sum @@ -1401,6 +1401,8 @@ google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.50.1 h1:DS/BukOZWp8s6p4Dt/tOaJaTQyPyOoCcrjroHuCeLzY= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= +google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From 4ee04e66d1017c347e3010c3bb8c575158726200 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sun, 18 Dec 2022 17:57:17 +0000 Subject: [PATCH 191/235] fix: server/java/pom.xml to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JAVA-IONETTY-3167773 - https://snyk.io/vuln/SNYK-JAVA-IONETTY-3167776 --- server/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index 1cade6851..357eabd04 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -22,7 +22,7 @@ 2.10 20220924 5.0.1 - 4.1.85.Final + 4.1.86.Final 3.12.0 2.0.5 0.8.8 From e12c264eed78070b047231658cc4b68b1161835c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 4 Jan 2023 19:54:32 +0000 Subject: [PATCH 192/235] Update module github.com/aws/aws-sdk-go to v1.44.173 --- go/appencryption/cmd/example/go.mod | 2 +- go/appencryption/cmd/example/go.sum | 2 ++ go/appencryption/go.mod | 2 +- go/appencryption/go.sum | 2 ++ samples/go/aws/lambda/function/go.mod | 2 +- samples/go/aws/lambda/function/go.sum | 2 ++ samples/go/referenceapp/go.mod | 2 +- samples/go/referenceapp/go.sum | 2 ++ server/go/go.mod | 2 +- server/go/go.sum | 2 ++ 10 files changed, 15 insertions(+), 5 deletions(-) diff --git a/go/appencryption/cmd/example/go.mod b/go/appencryption/cmd/example/go.mod index 6c15675a9..1ccc13f3e 100644 --- a/go/appencryption/cmd/example/go.mod +++ b/go/appencryption/cmd/example/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 - github.com/aws/aws-sdk-go v1.44.156 + github.com/aws/aws-sdk-go v1.44.173 github.com/go-sql-driver/mysql v1.7.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 diff --git a/go/appencryption/cmd/example/go.sum b/go/appencryption/cmd/example/go.sum index 1a8cb562e..7c1fcf27f 100644 --- a/go/appencryption/cmd/example/go.sum +++ b/go/appencryption/cmd/example/go.sum @@ -134,6 +134,8 @@ github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.156 h1:3RhbBTZ87HoI5OP2JjcKdd5qOnyo9YOAW8+Bb/h0vSE= github.com/aws/aws-sdk-go v1.44.156/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.173 h1:8kXIxvQnBpGhmR3Eof6SnCKgR0q5/L/3Qbv9vAC5wic= +github.com/aws/aws-sdk-go v1.44.173/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/go/appencryption/go.mod b/go/appencryption/go.mod index e462aeb89..78597c441 100644 --- a/go/appencryption/go.mod +++ b/go/appencryption/go.mod @@ -3,7 +3,7 @@ module github.com/godaddy/asherah/go/appencryption go 1.19 require ( - github.com/aws/aws-sdk-go v1.44.156 + github.com/aws/aws-sdk-go v1.44.173 github.com/docker/go-connections v0.4.0 github.com/go-sql-driver/mysql v1.7.0 github.com/goburrow/cache v0.1.4 diff --git a/go/appencryption/go.sum b/go/appencryption/go.sum index 1f3e21e79..8f24905f0 100644 --- a/go/appencryption/go.sum +++ b/go/appencryption/go.sum @@ -135,6 +135,8 @@ github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.156 h1:3RhbBTZ87HoI5OP2JjcKdd5qOnyo9YOAW8+Bb/h0vSE= github.com/aws/aws-sdk-go v1.44.156/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.173 h1:8kXIxvQnBpGhmR3Eof6SnCKgR0q5/L/3Qbv9vAC5wic= +github.com/aws/aws-sdk-go v1.44.173/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/samples/go/aws/lambda/function/go.mod b/samples/go/aws/lambda/function/go.mod index 153b288bc..078929092 100644 --- a/samples/go/aws/lambda/function/go.mod +++ b/samples/go/aws/lambda/function/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/aws/aws-lambda-go v1.36.0 - github.com/aws/aws-sdk-go v1.44.156 + github.com/aws/aws-sdk-go v1.44.173 github.com/aws/aws-xray-sdk-go v1.8.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 diff --git a/samples/go/aws/lambda/function/go.sum b/samples/go/aws/lambda/function/go.sum index 877aa1490..6a108aa06 100644 --- a/samples/go/aws/lambda/function/go.sum +++ b/samples/go/aws/lambda/function/go.sum @@ -141,6 +141,8 @@ github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.156 h1:3RhbBTZ87HoI5OP2JjcKdd5qOnyo9YOAW8+Bb/h0vSE= github.com/aws/aws-sdk-go v1.44.156/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.173 h1:8kXIxvQnBpGhmR3Eof6SnCKgR0q5/L/3Qbv9vAC5wic= +github.com/aws/aws-sdk-go v1.44.173/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.6.0/go.mod h1:tI4KhsR5VkzlUa2DZAdwx7wCAYGwkZZ1H31PYrBFx1w= github.com/aws/aws-sdk-go-v2/service/route53 v1.6.2/go.mod h1:ZnAMilx42P7DgIrdjlWCkNIGSBLzeyk6T31uB8oGTwY= github.com/aws/aws-xray-sdk-go v1.7.0 h1:mATj8779Kj8Ae8oyXZ3S4GeK9BDGHqlLAKGCUiE31o4= diff --git a/samples/go/referenceapp/go.mod b/samples/go/referenceapp/go.mod index da1056d62..865130a9d 100644 --- a/samples/go/referenceapp/go.mod +++ b/samples/go/referenceapp/go.mod @@ -3,7 +3,7 @@ module referenceapp go 1.19 require ( - github.com/aws/aws-sdk-go v1.44.156 + github.com/aws/aws-sdk-go v1.44.173 github.com/go-sql-driver/mysql v1.7.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/google/logger v1.1.1 diff --git a/samples/go/referenceapp/go.sum b/samples/go/referenceapp/go.sum index fdaad4dd1..28bfc9fba 100644 --- a/samples/go/referenceapp/go.sum +++ b/samples/go/referenceapp/go.sum @@ -128,6 +128,8 @@ github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.156 h1:3RhbBTZ87HoI5OP2JjcKdd5qOnyo9YOAW8+Bb/h0vSE= github.com/aws/aws-sdk-go v1.44.156/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.173 h1:8kXIxvQnBpGhmR3Eof6SnCKgR0q5/L/3Qbv9vAC5wic= +github.com/aws/aws-sdk-go v1.44.173/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= diff --git a/server/go/go.mod b/server/go/go.mod index e71f09feb..4cbd2fa8c 100644 --- a/server/go/go.mod +++ b/server/go/go.mod @@ -3,7 +3,7 @@ module github.com/godaddy/asherah/server/go go 1.19 require ( - github.com/aws/aws-sdk-go v1.44.156 + github.com/aws/aws-sdk-go v1.44.173 github.com/go-sql-driver/mysql v1.7.0 github.com/godaddy/asherah/go/appencryption v0.2.4 github.com/godaddy/asherah/go/securememory v0.1.3 diff --git a/server/go/go.sum b/server/go/go.sum index 909334f58..8567c44a0 100644 --- a/server/go/go.sum +++ b/server/go/go.sum @@ -128,6 +128,8 @@ github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.156 h1:3RhbBTZ87HoI5OP2JjcKdd5qOnyo9YOAW8+Bb/h0vSE= github.com/aws/aws-sdk-go v1.44.156/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.173 h1:8kXIxvQnBpGhmR3Eof6SnCKgR0q5/L/3Qbv9vAC5wic= +github.com/aws/aws-sdk-go v1.44.173/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= From e6f96059a25663eb9580dd2f760e9929176be3d3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 4 Jan 2023 23:17:31 +0000 Subject: [PATCH 193/235] Update aws-java-sdk monorepo to v1.12.378 --- java/app-encryption/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 1d9b19109..e8b3f9cf3 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -41,7 +41,7 @@ 2.0.5 31.1-jre 3.28.0 - 1.12.361 + 1.12.378 1.10.2 3.1.2 5.9.1 From a751e47c9d99b111ca927d5de895da3b5968371b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 4 Jan 2023 23:44:05 +0000 Subject: [PATCH 194/235] Update actions/setup-go digest to fa319ab --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5884b1026..93fa4968d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -684,7 +684,7 @@ jobs: distribution: 'adopt' java-version: '11' - name: Set up Go 1.19 - uses: actions/setup-go@30c39bfe0c7338d0d8e99486938f1066b2f92108 + uses: actions/setup-go@fa319ab135f5f244f88130e2874b6782750e9ef8 with: go-version: '1.19' - name: Set up Python 3.7 @@ -757,7 +757,7 @@ jobs: with: dotnet-version: '3.1.x' - name: Set up Go 1.19 - uses: actions/setup-go@30c39bfe0c7338d0d8e99486938f1066b2f92108 + uses: actions/setup-go@fa319ab135f5f244f88130e2874b6782750e9ef8 with: go-version: '1.19' - name: Set up Python 3.8 From 3da33d10f25d592860e433782d41e9bc3009bf68 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 17:56:35 +0000 Subject: [PATCH 195/235] Update actions/setup-java digest to 308abcb --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93fa4968d..3dc3804e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Set up Maven Central Repository - uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c + uses: actions/setup-java@308abcba03229002f0055e17d79d00c32fca160f with: java-version: '11' distribution: 'adopt' @@ -137,7 +137,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Set up Maven Central Repository - uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c + uses: actions/setup-java@308abcba03229002f0055e17d79d00c32fca160f with: java-version: '11' distribution: 'adopt' @@ -679,7 +679,7 @@ jobs: sudo apt-get -y upgrade --fix-missing sudo apt-get install -y build-essential - name: Set up JDK 11 - uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c + uses: actions/setup-java@308abcba03229002f0055e17d79d00c32fca160f with: distribution: 'adopt' java-version: '11' @@ -748,7 +748,7 @@ jobs: INDEX (created) );" - name: Set up JDK 11 - uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c + uses: actions/setup-java@308abcba03229002f0055e17d79d00c32fca160f with: distribution: 'adopt' java-version: '11.0.4' From e6c4559ea226ff601bad5c3d371f04367e5920bc Mon Sep 17 00:00:00 2001 From: Sushant Mimani Date: Fri, 6 Jan 2023 15:31:54 -0800 Subject: [PATCH 196/235] Update GHA SHAs to latest version --- .github/workflows/ci.yml | 114 ++++++++++++++-------------- .github/workflows/draft-release.yml | 8 +- .github/workflows/run-wss-scans.yml | 2 +- .github/workflows/sync-release.yml | 4 +- tartufo.toml | 26 +++---- 5 files changed, 77 insertions(+), 77 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3dc3804e6..9de234f4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,9 +35,9 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Java packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -59,13 +59,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Set up Maven Central Repository - uses: actions/setup-java@308abcba03229002f0055e17d79d00c32fca160f + uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b with: java-version: '11' distribution: 'adopt' @@ -75,7 +75,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Cache Java packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -103,9 +103,9 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Java packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -131,13 +131,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Set up Maven Central Repository - uses: actions/setup-java@308abcba03229002f0055e17d79d00c32fca160f + uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b with: java-version: '11' distribution: 'adopt' @@ -147,7 +147,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Cache Java packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -175,9 +175,9 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Java packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -197,9 +197,9 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Java packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -223,9 +223,9 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache dotnet packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -242,7 +242,7 @@ jobs: cd csharp/Logging ./scripts/test.sh - name: Upload artifact - uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb + uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce with: name: csharp-logging path: | @@ -256,20 +256,20 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 restore-keys: | ${{ runner.os }}-nuget- - name: Download artifact - uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 + uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a with: name: csharp-logging path: ${{ github.workspace }}/csharp/Logging/Logging @@ -296,9 +296,9 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache dotnet packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -315,7 +315,7 @@ jobs: cd csharp/SecureMemory ./scripts/test.sh - name: Upload artifact - uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb + uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce with: name: csharp-secure-memory path: | @@ -331,20 +331,20 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 restore-keys: | ${{ runner.os }}-nuget- - name: Download artifact - uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 + uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a with: name: csharp-secure-memory path: | @@ -380,9 +380,9 @@ jobs: MYSQL_ROOT_PASSWORD: ${{ env.MYSQL_PASSWORD }} steps: - name: Checkout the repository - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache dotnet packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -403,7 +403,7 @@ jobs: cd csharp/AppEncryption ./scripts/integration_test.sh - name: Upload artifact - uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb + uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce with: name: csharp-app-encryption path: | @@ -419,20 +419,20 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 restore-keys: | ${{ runner.os }}-nuget- - name: Download artifact - uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 + uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a with: name: csharp-app-encryption path: ${{ github.workspace }}/csharp/AppEncryption/AppEncryption @@ -459,9 +459,9 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache dotnet packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -483,9 +483,9 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Go packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -516,13 +516,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache Go packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -553,9 +553,9 @@ jobs: MYSQL_ROOT_PASSWORD: Password123 steps: - name: Checkout the repository - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Go packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -586,13 +586,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: token: ${{ secrets.MERGE_TOKEN }} - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache Go packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -616,9 +616,9 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Go packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -643,9 +643,9 @@ jobs: options: --ulimit core=-1 --ulimit memlock=-1:-1 steps: - name: Checkout the repository - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Go packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -672,27 +672,27 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the repository - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Install build tools run: | sudo apt-get update sudo apt-get -y upgrade --fix-missing sudo apt-get install -y build-essential - name: Set up JDK 11 - uses: actions/setup-java@308abcba03229002f0055e17d79d00c32fca160f + uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b with: distribution: 'adopt' java-version: '11' - name: Set up Go 1.19 - uses: actions/setup-go@fa319ab135f5f244f88130e2874b6782750e9ef8 + uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 with: go-version: '1.19' - name: Set up Python 3.7 - uses: actions/setup-python@2c3dd9e7e29afd70cc0950079bde6c979d1f69f9 + uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 with: python-version: 3.7 - name: Set up NodeJS 13 - uses: actions/setup-node@d1b197b965eb46e1a1878caad41c4ab3efae133f + uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c with: node-version: 13.x - name: Extract branch name @@ -700,7 +700,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - name: Cache client packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: | ~/.cache @@ -737,7 +737,7 @@ jobs: options: --health-cmd "mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 10 steps: - name: Checkout the repository - uses: actions/checkout@bf085276cecdb0cc76fbbe0687a5a0e786646936 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Initialize RDBMS based metastore run: | mysql -h 127.0.0.1 -P${{ job.services.mysql.ports[3306] }} -u ${{ env.MYSQL_USERNAME }} -p${{ env.MYSQL_PASSWORD }} -e "CREATE TABLE ${{ env.MYSQL_DATABASE }}.encryption_key ( @@ -748,7 +748,7 @@ jobs: INDEX (created) );" - name: Set up JDK 11 - uses: actions/setup-java@308abcba03229002f0055e17d79d00c32fca160f + uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b with: distribution: 'adopt' java-version: '11.0.4' @@ -757,11 +757,11 @@ jobs: with: dotnet-version: '3.1.x' - name: Set up Go 1.19 - uses: actions/setup-go@fa319ab135f5f244f88130e2874b6782750e9ef8 + uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 with: go-version: '1.19' - name: Set up Python 3.8 - uses: actions/setup-python@2c3dd9e7e29afd70cc0950079bde6c979d1f69f9 + uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 with: python-version: 3.8 - name: Extract branch name @@ -769,7 +769,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - name: Cache client packages - uses: actions/cache@fb86cbf3602dbb739392ef1c5ea3cd590c6d85b4 + uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d with: path: | ~/.cache diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 02e3e3de0..84c343856 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Format release title id: format-release-title @@ -58,12 +58,12 @@ jobs: fi shell: bash - name: Create release - uses: actions/create-release@v1 + uses: ncipollo/release-action@a2e71bdd4e7dab70ca26a852f29600c98b33153e env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ github.ref }} - release_name: ${{ steps.format-release-title.outputs.release-title }} + tag: ${{ github.ref }} + name: ${{ steps.format-release-title.outputs.release-title }} body: | Changes in this Release - First Change diff --git a/.github/workflows/run-wss-scans.yml b/.github/workflows/run-wss-scans.yml index d30dede07..fd94935ad 100644 --- a/.github/workflows/run-wss-scans.yml +++ b/.github/workflows/run-wss-scans.yml @@ -15,7 +15,7 @@ jobs: run-wss-scans: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - uses: ./.github/actions/setup-wss-env diff --git a/.github/workflows/sync-release.yml b/.github/workflows/sync-release.yml index b90a39b91..258b279e1 100644 --- a/.github/workflows/sync-release.yml +++ b/.github/workflows/sync-release.yml @@ -12,10 +12,10 @@ jobs: sync-branch: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Merge master -> {RELEASE_TARGET} - uses: devmasx/merge-branch@v1.4.0 + uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f with: type: now head_to_merge: master diff --git a/tartufo.toml b/tartufo.toml index 8c40b1e94..36bee8b07 100644 --- a/tartufo.toml +++ b/tartufo.toml @@ -1,8 +1,8 @@ [tool.tartufo] -exclude-paths = ".tartufo-excludes" json = false regex = true entropy = true + exclude-signatures = [ # High entropy findings for images and keys used in documentation "13c9d46245326e1995825a10ef733a7971bff3d293d58afa9ab16fb3770be8fb", @@ -66,16 +66,16 @@ exclude-signatures = [ # High entropy findings in C# tutorial for Amazon ECS "8cde955170a11afe8859722e054a593c096c41c3d4941336f6ae116f6d71fcc9", "81cf261e99da4bff783e7fcddb2ed25d90fab710f8e52b2f35c289a5ecbcd2bd", - - # Commit SHAs pinned for GitHub Actions - "09890ca4a01205541d5d7736c9c0eb6d57f8d4bd5348f6e8b244a3221ba4fcbf", - "6d7eba1a5cf1844ccac6afc0a88c9121901566df40d05a4e176a52b7391fbbb5", - "70ab47252d065b887fbe8305ab1a20bc6c45aec91d0fc9a203ca8de52e795402", - "718d4b895807784fd2ecb539cffac13730a7fdc19cc90948c2f8e2205c3275a1", - "71d6f090aa2783a1ddb78a5d60503859aeb74a60903435581ac6f38087a096b1", - "8680b4614afea1f9304b803bd6247572e992ef8a832a94b80528c5870cd221aa", - "b43c8dab1f47704031581b6033a8289f79cebeba17442d9e4c84ce69e134691c", - "f83a6f17c3c86fe3535731a045ba44355b78203e93435c1715598227097e68db", - "35eeb17d0a4c30decc48e76a940e048ee65e4d52101b4ee43542ee59e40b960c", - "a6f8ac7c749e633826a416739e91d0582aeb115967c3f0f89770e642cccfc9eb", ] + +exclude-path-patterns = [ + {path-pattern = '.*/go.mod', reason = 'Exclude diagrams'}, + {path-pattern = '.*/go.sum', reason = 'Exclude poetry lock file'}, + {path-pattern = '.*/package.json', reason = 'Exclude toml file'}, + {path-pattern = '.*/package.lock.json', reason = 'Littered with alarming example data'}, + {path-pattern = 'tartufo.toml', reason = 'Ignore long parameter names in cached context info'}, +] + +exclude-entropy-patterns = [ + {path-pattern = '\.github/(workflows|actions)/.*\.yml$', pattern = 'uses: .*@[a-zA-Z0-9]{40}', reason = 'GitHub Actions'}, +] From 10afaccae4538bc1aea6740b3ef81a328984a342 Mon Sep 17 00:00:00 2001 From: Sushant Mimani Date: Fri, 6 Jan 2023 16:23:51 -0800 Subject: [PATCH 197/235] Update exclusion reasons --- .tartufo-excludes | 5 ----- tartufo.toml | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 .tartufo-excludes diff --git a/.tartufo-excludes b/.tartufo-excludes deleted file mode 100644 index 60c284e5d..000000000 --- a/.tartufo-excludes +++ /dev/null @@ -1,5 +0,0 @@ -.*/go.mod -.*/go.sum -.*/package.json -.*/package-lock.json -tartufo.toml diff --git a/tartufo.toml b/tartufo.toml index 36bee8b07..75bfd118a 100644 --- a/tartufo.toml +++ b/tartufo.toml @@ -69,11 +69,11 @@ exclude-signatures = [ ] exclude-path-patterns = [ - {path-pattern = '.*/go.mod', reason = 'Exclude diagrams'}, - {path-pattern = '.*/go.sum', reason = 'Exclude poetry lock file'}, - {path-pattern = '.*/package.json', reason = 'Exclude toml file'}, - {path-pattern = '.*/package.lock.json', reason = 'Littered with alarming example data'}, - {path-pattern = 'tartufo.toml', reason = 'Ignore long parameter names in cached context info'}, + {path-pattern = '.*/go.mod', reason = 'Exclude go.mod files'}, + {path-pattern = '.*/go.sum', reason = 'Exclude go.sum files'}, + {path-pattern = '.*/package.json', reason = 'Exclude node dependency files'}, + {path-pattern = '.*/package.lock.json', reason = 'Exclude node dependency files'}, + {path-pattern = 'tartufo.toml', reason = 'Exclude tartufo config file'}, ] exclude-entropy-patterns = [ From 0fbb17c724b425b070de7b052f29eac785e0276e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 00:34:14 +0000 Subject: [PATCH 198/235] Bump github.com/containerd/containerd in /go/appencryption Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.6.8 to 1.6.12. - [Release notes](https://github.com/containerd/containerd/releases) - [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md) - [Commits](https://github.com/containerd/containerd/compare/v1.6.8...v1.6.12) --- updated-dependencies: - dependency-name: github.com/containerd/containerd dependency-type: indirect ... Signed-off-by: dependabot[bot] --- go/appencryption/go.mod | 5 +- go/appencryption/go.sum | 488 +--------------------------------------- 2 files changed, 13 insertions(+), 480 deletions(-) diff --git a/go/appencryption/go.mod b/go/appencryption/go.mod index 78597c441..6a038896d 100644 --- a/go/appencryption/go.mod +++ b/go/appencryption/go.mod @@ -18,13 +18,12 @@ require ( require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect - github.com/Microsoft/hcsshim v0.9.4 // indirect + github.com/Microsoft/hcsshim v0.9.5 // indirect github.com/awnumar/memcall v0.1.2 // indirect github.com/awnumar/memguard v0.22.3 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/containerd/cgroups v1.0.4 // indirect - github.com/containerd/containerd v1.6.8 // indirect - github.com/containerd/continuity v0.3.0 // indirect + github.com/containerd/containerd v1.6.12 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/distribution v2.8.1+incompatible // indirect github.com/docker/docker v20.10.17+incompatible // indirect diff --git a/go/appencryption/go.sum b/go/appencryption/go.sum index 8f24905f0..d55cb3515 100644 --- a/go/appencryption/go.sum +++ b/go/appencryption/go.sum @@ -1,5 +1,4 @@ bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= -bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -11,52 +10,32 @@ cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6T cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= 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= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= -github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= -github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -68,7 +47,6 @@ github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugX github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= @@ -78,17 +56,12 @@ github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg3 github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg= github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00= github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600= -github.com/Microsoft/hcsshim v0.8.20/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= -github.com/Microsoft/hcsshim v0.8.23/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg= -github.com/Microsoft/hcsshim v0.9.2 h1:wB06W5aYFfUB3IvootYAY2WnOmIdgPGfqSI6tufQNnY= -github.com/Microsoft/hcsshim v0.9.2/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= -github.com/Microsoft/hcsshim v0.9.4 h1:mnUj0ivWy6UzbB1uLFqKR6F+ZyiDc7j4iGgHTpO+5+I= -github.com/Microsoft/hcsshim v0.9.4/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= +github.com/Microsoft/hcsshim v0.9.5 h1:AbV+VPfTrIVffukazHcpxmz/sRiE6YaMDzHWR9BXZHo= +github.com/Microsoft/hcsshim v0.9.5/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU= github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= @@ -99,45 +72,19 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy 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/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= -github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/awnumar/memcall v0.0.0-20190930130926-11bbaffc6c8f h1:nwtfNZ+KMrJaF3xB7wrJzcBSsFvBw229h+XPgXCdlzE= -github.com/awnumar/memcall v0.0.0-20190930130926-11bbaffc6c8f/go.mod h1:CszzLMKGwNr15cNA+0SuWkZLnPXGgUw+9kxRNbwUVnE= github.com/awnumar/memcall v0.0.0-20191004114545-73db50fd9f80/go.mod h1:S911igBPR9CThzd/hYQQmTc9SWNu3ZHIlCGaWsWsoJo= github.com/awnumar/memcall v0.1.2 h1:7gOfDTL+BJ6nnbtAp9+HQzUFjtP1hEseRQq8eP055QY= github.com/awnumar/memcall v0.1.2/go.mod h1:S911igBPR9CThzd/hYQQmTc9SWNu3ZHIlCGaWsWsoJo= -github.com/awnumar/memguard v0.20.1 h1:q73xiG0c30V9mv0Q0y8ROHMaBalY6VOYmdtieM1J5ko= -github.com/awnumar/memguard v0.20.1/go.mod h1:zUgDgwybACAn1kumjMVgFukFL5QMFfAIZNeAr3BR4Cw= github.com/awnumar/memguard v0.22.2/go.mod h1:33OwJBHC+T4eEfFcDrQb78TMlBMBvcOPCXWU9xE34gM= github.com/awnumar/memguard v0.22.3 h1:b4sgUXtbUjhrGELPbuC62wU+BsPQy+8lkWed9Z+pj0Y= github.com/awnumar/memguard v0.22.3/go.mod h1:mmGunnffnLHlxE5rRgQc3j+uwPZ27eYb61ccr8Clz2Y= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= -github.com/aws/aws-sdk-go v1.43.7 h1:Gbs53KxXJWbO3txoVkevf56bhdDFqRisl7MQQ6581vc= -github.com/aws/aws-sdk-go v1.43.7/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.43.39 h1:5W8pton/8OuS5hpbAkzfr7e+meAAFkK7LsUehB39L3I= -github.com/aws/aws-sdk-go v1.43.39/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.119 h1:TPkpDsanBMcZaF5wHwpKhjkapRV/b7d2qdC+a+IPbmY= -github.com/aws/aws-sdk-go v1.44.119/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.134 h1:TzFxjVHPPsibtkD7y6KHI4V00rEKg4yzNlMNGy2ZHeg= -github.com/aws/aws-sdk-go v1.44.134/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= -github.com/aws/aws-sdk-go v1.44.139 h1:Mj/OZBy9RTbzJ8pfgK6rOL8xgUEAIn8pfIN6qWFtpAk= -github.com/aws/aws-sdk-go v1.44.139/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= -github.com/aws/aws-sdk-go v1.44.140 h1:6MxVSiAORc6AG+oh6401TEgWHb1ZzFL8y6+eBLoJtdU= -github.com/aws/aws-sdk-go v1.44.140/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= -github.com/aws/aws-sdk-go v1.44.155 h1:PMHMuUS0atPD4LhiXuYrLasrlIm4u3lpNQBl9h+Lr2s= -github.com/aws/aws-sdk-go v1.44.155/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= -github.com/aws/aws-sdk-go v1.44.156 h1:3RhbBTZ87HoI5OP2JjcKdd5qOnyo9YOAW8+Bb/h0vSE= -github.com/aws/aws-sdk-go v1.44.156/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.173 h1:8kXIxvQnBpGhmR3Eof6SnCKgR0q5/L/3Qbv9vAC5wic= github.com/aws/aws-sdk-go v1.44.173/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= -github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -145,27 +92,22 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= -github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= -github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo= -github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= -github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= @@ -180,18 +122,13 @@ github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJ github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= 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/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= -github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= @@ -206,8 +143,6 @@ github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod h1:s5q4S github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= -github.com/containerd/cgroups v1.0.3 h1:ADZftAkglvCiD44c77s5YmMqaP2pzVCFZvBmAlBdAP4= -github.com/containerd/cgroups v1.0.3/go.mod h1:/ofk34relqNjSGyqPrmEULrO4Sc8LJhvJmWbUCUKqj8= github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= @@ -224,20 +159,14 @@ github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMX github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.9/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ= github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU= github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI= github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s= github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g= github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c= -github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s= -github.com/containerd/containerd v1.5.9/go.mod h1:fvQqCfadDGga5HZyn3j4+dx56qj2I9YwBrlSdalvJYQ= -github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE= -github.com/containerd/containerd v1.6.2 h1:pcaPUGbYW8kBw6OgIZwIVIeEhdWVrBzsoCfVJ5BjrLU= -github.com/containerd/containerd v1.6.2/go.mod h1:sidY30/InSE1j2vdD1ihtKoJz+lWdaXMdiAeIupaf+s= -github.com/containerd/containerd v1.6.8 h1:h4dOFDwzHmqFEP754PgfgTeVXFnLiRc6kiqC7tplDJs= -github.com/containerd/containerd v1.6.8/go.mod h1:By6p5KqPK0/7/CgO/A6t/Gz+CUYUu2zf1hUaaymVXB0= +github.com/containerd/containerd v1.6.12 h1:kJ9b3mOFKf8yqo05Ob+tMoxvt1pbVWhnB0re9Y+k+8c= +github.com/containerd/containerd v1.6.12/go.mod h1:K4Bw7gjgh4TnkmQY+py/PYQGp4e7xgnHAeg87VeWb3A= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= @@ -245,9 +174,7 @@ github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cE github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y= github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ= github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= -github.com/containerd/continuity v0.2.2/go.mod h1:pWygW9u7LtS1o4N/Tn0FoCFDIXZ7rxcMX7HX1Dmibvk= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= -github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= @@ -256,9 +183,6 @@ github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1S github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU= github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk= -github.com/containerd/go-cni v1.1.0/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= -github.com/containerd/go-cni v1.1.3/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= -github.com/containerd/go-cni v1.1.6/go.mod h1:BWtoWl5ghVymxu6MBjg79W9NZrCRyHIdUtk4cauMe34= github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g= @@ -268,8 +192,6 @@ github.com/containerd/imgcrypt v1.0.1/go.mod h1:mdd8cEPW7TPgNG4FpuP3sGBiQ7Yi/zak github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod h1:6TNsg0ctmizkrOgXRNQjAPFWpMYRWuiB6dSF4Pfa5SA= github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod h1:5AZJNI6sLHJljKuI9IHnw1pWqo/F0nGDOuR9zgTs7ow= github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJrXQb0Dpc4ms= -github.com/containerd/imgcrypt v1.1.3/go.mod h1:/TPA1GIDXMzbj01yd8pIbQiLdQxed5ue1wb8bP7PQu4= -github.com/containerd/imgcrypt v1.1.4/go.mod h1:LorQnPtzL/T0IyCeftcsMEO7AqxUDbdO8j/tSUpgxvo= github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c= github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= @@ -292,23 +214,15 @@ github.com/containerd/zfs v1.0.0/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNR github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -github.com/containernetworking/cni v1.0.1/go.mod h1:AKuhXbN5EzmD4yTNtfSsX3tPcmtrBI6QcRV0NiNt15Y= -github.com/containernetworking/cni v1.1.1/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw= github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM= github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8= -github.com/containernetworking/plugins v1.0.1/go.mod h1:QHCfGpaTwYTbbH+nZXKVTxNBDZcxSOplJT5ico8/FLE= -github.com/containernetworking/plugins v1.1.1/go.mod h1:Sr5TH/eBsGLXK/h71HeLfX19sZPp3ry5uHSkI4LPxV8= github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc= github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4= github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= -github.com/containers/ocicrypt v1.1.2/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= -github.com/containers/ocicrypt v1.1.3/go.mod h1:xpdkbVAuaH3WzbEabUd5yDsl9SwJA5pABH85425Es2g= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= -github.com/coreos/go-iptables v0.6.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -338,10 +252,9 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= -github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE= github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= @@ -349,8 +262,6 @@ github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.11+incompatible h1:OqzI/g/W54LczvhnccGqniFoQghHx3pklbLuhfXpqGo= -github.com/docker/docker v20.10.11+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE= github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= @@ -360,7 +271,6 @@ github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6Uezg github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI= github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= -github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= @@ -375,28 +285,18 @@ github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= -github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -405,45 +305,27 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2 github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-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-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI= -github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= 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/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= -github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= -github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= -github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= -github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/goburrow/cache v0.1.4 h1:As4KzO3hgmzPlnaMniZU9+VmoNYseUhuELbxy9mRBfw= github.com/goburrow/cache v0.1.4/go.mod h1:cDFesZDnIlrHoNlMYqqMpCRawuXulgx+y7mXU8HZ+/c= -github.com/godaddy/asherah/go/securememory v0.1.2 h1:B7zfZh6UovkDVbXVtHDrBbfJmpmJ0f534jvwgnHDotg= -github.com/godaddy/asherah/go/securememory v0.1.2/go.mod h1:N0mgZcRmF/RFjLQBac/LW2EgkBw4BOKHkIT8rO1pBRU= github.com/godaddy/asherah/go/securememory v0.1.3 h1:xh33EVTTjmVIrlqI1N1wjjWbmMLZyUxwgUoFCJxLy80= github.com/godaddy/asherah/go/securememory v0.1.3/go.mod h1:eZW2gslFOJO/NcXiv9b0FC3m1sejvSBhbcBHDt/Xbe4= github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= @@ -475,8 +357,6 @@ github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFU github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -493,47 +373,33 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= 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= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= 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= @@ -543,12 +409,9 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= -github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= -github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= @@ -556,47 +419,26 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= -github.com/j-keck/arping v1.0.2/go.mod h1:aJbELhR92bSk7tp79AWM/ftfc90EfEi2bQJrbBFOsPw= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -605,19 +447,13 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= -github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -639,84 +475,52 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/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/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= -github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= -github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= -github.com/moby/sys/mount v0.2.0 h1:WhCW5B355jtxndN5ovugJlMFJawbUODuW8fSnEH6SSM= -github.com/moby/sys/mount v0.2.0/go.mod h1:aAivFE2LB3W4bACsUXChRHQ0qKWsetY4Y9V7sxOougM= github.com/moby/sys/mount v0.3.3 h1:fX1SVkXFJ47XWDoeFW4Sq7PdQJnV2QIDZAqjNqgEjUs= github.com/moby/sys/mount v0.3.3/go.mod h1:PBaEorSNTLG5t/+4EgukEQVlAvVEc6ZjTySwKdqp5K0= github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= -github.com/moby/sys/mountinfo v0.6.1 h1:+H/KnGEAGRpTrEAqNVQ2AM3SiwMgJUt/TXj+Z8cmCIc= -github.com/moby/sys/mountinfo v0.6.1/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78= github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= -github.com/moby/sys/signal v0.6.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg= github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= -github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs= github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= -github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/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/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= -github.com/networkplumbing/go-nft v0.2.0/go.mod h1:HnnM+tYvlGAsMU7yoYwXEVLLiDW9gdMmb5HoGcwpuQs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -728,23 +532,13 @@ github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+ github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= -github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= -github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= -github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= -github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -753,9 +547,6 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= -github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec= github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= @@ -764,10 +555,6 @@ github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= -github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= -github.com/opencontainers/runc v1.1.1 h1:PJ9DSs2sVwE0iVr++pAHE6QkS9tzcVWozlPifdwMgrU= -github.com/opencontainers/runc v1.1.1/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= -github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= @@ -781,12 +568,8 @@ github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqi github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= -github.com/opencontainers/selinux v1.10.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -795,7 +578,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -803,8 +585,6 @@ github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDf 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.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= 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= @@ -816,8 +596,6 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 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.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= 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= @@ -829,24 +607,17 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= -github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= -github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= @@ -860,9 +631,7 @@ github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= 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= @@ -870,7 +639,6 @@ github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -878,16 +646,11 @@ github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= -github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As= -github.com/stretchr/objx v0.3.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= @@ -897,28 +660,19 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= 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 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= -github.com/testcontainers/testcontainers-go v0.13.0 h1:OUujSlEGsXVo/ykPVZk3KanBNGN0TYb/7oKIPVn15JA= -github.com/testcontainers/testcontainers-go v0.13.0/go.mod h1:z1abufU633Eb/FmSBTzV6ntZAC1eZBYPtaFsn4nPuDk= -github.com/testcontainers/testcontainers-go v0.14.0 h1:h0D5GaYG9mhOWr2qHdEKDXpkce/VlvaYOCzTRi6UBi8= -github.com/testcontainers/testcontainers-go v0.14.0/go.mod h1:hSRGJ1G8Q5Bw2gXgPulJOLlEBaYJHeBSOkQM5JLG+JQ= github.com/testcontainers/testcontainers-go v0.15.0 h1:3Ex7PUGFv0b2bBsdOv6R42+SK2qoZnWBd21LvZYhUtQ= github.com/testcontainers/testcontainers-go v0.15.0/go.mod h1:PkohMRH2X8Hib0IWtifVexDfLPVT+tb5E9hsf7cW12w= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= @@ -927,11 +681,9 @@ github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= -github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -939,12 +691,9 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1: github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= @@ -954,75 +703,34 @@ go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= -go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE= -go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= -go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= -go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= -go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0/go.mod h1:hO1KLR7jcKaDDKDkvI9dP/FIhpmna5lkqPUQdEjFAM8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0/go.mod h1:keUU7UfnwWTWpJ+FWnyqmogPa82nuU5VUANFq49hlMY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE= -go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= -go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= -go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= -go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= -go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= -go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38= golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A= -golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b h1:huxqepDufQpLLIRXiVkTvnxrzJlpwmIWAObmcCcUFr0= golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1047,8 +755,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -1057,17 +763,13 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.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/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1093,38 +795,16 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-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-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211108170745-6635138e15ea/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4= -golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 h1:Yqz/iviulwKwAREEeUd3nbBFn0XuyJqkoft2IlrvOhc= -golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= @@ -1133,14 +813,6 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1152,13 +824,10 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1178,11 +847,9 @@ golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190927073244-c990c680b611/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1194,7 +861,6 @@ golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1204,20 +870,11 @@ golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -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-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1228,52 +885,26 @@ golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-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= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0= -golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/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= -golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI= -golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1283,8 +914,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1292,9 +923,7 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs= -golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1317,8 +946,6 @@ golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDq golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1333,39 +960,18 @@ golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= @@ -1377,25 +983,14 @@ google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsb google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -1416,38 +1011,12 @@ google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvx google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac h1:qSNTkEN+L2mvWcLgJOR+8bdHX9rN/IdU3A1Ghpfb1Rg= -google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad h1:kqrS+lhvaMHCxul6sKQvKJ8nAAhlVItmZV822hYFH/U= google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= @@ -1462,24 +1031,12 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= -google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8= google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -1511,7 +1068,6 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.51.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= @@ -1529,78 +1085,56 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -gotest.tools/gotestsum v1.7.0/go.mod h1:V1m4Jw3eBerhI/A6qCxUE07RnCg7ACkKj9BYcAm09V8= -gotest.tools/gotestsum v1.8.2/go.mod h1:6JHCiN6TEjA7Kaz23q1bH0e2Dc3YJjDUZ0DmctFZf+w= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= -gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= -gotest.tools/v3 v3.3.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A= +gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= -k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= -k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= -k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= -k8s.io/apiserver v0.22.5/go.mod h1:s2WbtgZAkTKt679sYtSudEQrTGWUSQAPe6MupLnlmaQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= -k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y= k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.22.5/go.mod h1:VK3I+TjuF9eaa+Ln67dKxhGar5ynVbwnGrUiNF4MqCI= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= -k8s.io/cri-api v0.23.1/go.mod h1:REJE3PSU0h/LOV1APBrupxrEJqnoxZC8KWzkBUHwrK4= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= -k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= From 3776539b564555a4dabd64aaff9236591f96f8a7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 23:05:23 +0000 Subject: [PATCH 199/235] fix(deps): update netty monorepo to v4.1.87.final --- server/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index 357eabd04..e8eb1604d 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -22,7 +22,7 @@ 2.10 20220924 5.0.1 - 4.1.86.Final + 4.1.87.Final 3.12.0 2.0.5 0.8.8 From f0e7cb18e5efcb3a66c356bbf5beb029b8a1d77e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 17:13:04 +0000 Subject: [PATCH 200/235] chore(deps): update actions/setup-dotnet digest to 3cf27f1 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9de234f4e..e3201605a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -753,7 +753,7 @@ jobs: distribution: 'adopt' java-version: '11.0.4' - name: Set up C# - uses: actions/setup-dotnet@09d024bd0207f89ac22acd11bbc262fc9e869ae7 + uses: actions/setup-dotnet@3cf27f13bb648a0156dedfbc53faf98808a3deb3 with: dotnet-version: '3.1.x' - name: Set up Go 1.19 From 498ffaa71d11d77171db2712398583cf3c878a54 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 17:28:16 +0000 Subject: [PATCH 201/235] chore(deps): update actions/cache digest to 2b5a782 --- .github/workflows/ci.yml | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3201605a..1c6bd05f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Java packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -75,7 +75,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Cache Java packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -105,7 +105,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Java packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -147,7 +147,7 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Cache Java packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -177,7 +177,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Java packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -199,7 +199,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Java packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-v1 @@ -225,7 +225,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache dotnet packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -262,7 +262,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -298,7 +298,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache dotnet packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -337,7 +337,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -382,7 +382,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache dotnet packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -425,7 +425,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache dotnet packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -461,7 +461,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache dotnet packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}-v1 @@ -485,7 +485,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Go packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -522,7 +522,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache Go packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -555,7 +555,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Go packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -592,7 +592,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Cache Go packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -618,7 +618,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Go packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -645,7 +645,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Cache Go packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: /go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-v1 @@ -700,7 +700,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - name: Cache client packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: | ~/.cache @@ -769,7 +769,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - name: Cache client packages - uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d + uses: actions/cache@2b5a782c6414f96354f95902141714b127692d1e with: path: | ~/.cache From b1151f7399f6630dbd0f27639a9ca8279f282323 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 17:43:10 +0000 Subject: [PATCH 202/235] chore(deps): update actions/setup-go digest to 21459d0 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c6bd05f0..0ec37b7a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -684,7 +684,7 @@ jobs: distribution: 'adopt' java-version: '11' - name: Set up Go 1.19 - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 + uses: actions/setup-go@21459d0b7b1d63741429b748885bf5a4974593b4 with: go-version: '1.19' - name: Set up Python 3.7 @@ -757,7 +757,7 @@ jobs: with: dotnet-version: '3.1.x' - name: Set up Go 1.19 - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 + uses: actions/setup-go@21459d0b7b1d63741429b748885bf5a4974593b4 with: go-version: '1.19' - name: Set up Python 3.8 From 593e4b34fb46249cc50ca568e9ff3d949e68cffc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 17:57:25 +0000 Subject: [PATCH 203/235] chore(deps): update actions/setup-java digest to 8f12c5c --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ec37b7a3..311885aad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Set up Maven Central Repository - uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b + uses: actions/setup-java@8f12c5c4d1ebd18bf4b7a51a1b0b912633f0bc61 with: java-version: '11' distribution: 'adopt' @@ -137,7 +137,7 @@ jobs: - name: Fetch all tags run: git fetch --prune --unshallow --tags - name: Set up Maven Central Repository - uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b + uses: actions/setup-java@8f12c5c4d1ebd18bf4b7a51a1b0b912633f0bc61 with: java-version: '11' distribution: 'adopt' @@ -679,7 +679,7 @@ jobs: sudo apt-get -y upgrade --fix-missing sudo apt-get install -y build-essential - name: Set up JDK 11 - uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b + uses: actions/setup-java@8f12c5c4d1ebd18bf4b7a51a1b0b912633f0bc61 with: distribution: 'adopt' java-version: '11' @@ -748,7 +748,7 @@ jobs: INDEX (created) );" - name: Set up JDK 11 - uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b + uses: actions/setup-java@8f12c5c4d1ebd18bf4b7a51a1b0b912633f0bc61 with: distribution: 'adopt' java-version: '11.0.4' From 042016c682023c16033e9407432e0affd84b32b6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 18:11:05 +0000 Subject: [PATCH 204/235] chore(deps): update actions/download-artifact digest to e9ef242 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 311885aad..579d8e31c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -269,7 +269,7 @@ jobs: restore-keys: | ${{ runner.os }}-nuget- - name: Download artifact - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a + uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b with: name: csharp-logging path: ${{ github.workspace }}/csharp/Logging/Logging @@ -344,7 +344,7 @@ jobs: restore-keys: | ${{ runner.os }}-nuget- - name: Download artifact - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a + uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b with: name: csharp-secure-memory path: | @@ -432,7 +432,7 @@ jobs: restore-keys: | ${{ runner.os }}-nuget- - name: Download artifact - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a + uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b with: name: csharp-app-encryption path: ${{ github.workspace }}/csharp/AppEncryption/AppEncryption From 3b815a98f331b900a15bc20ed4ff2d0fc00ef55a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 18:26:09 +0000 Subject: [PATCH 205/235] chore(deps): update actions/setup-python digest to a6eba85 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 579d8e31c..e11793c3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -688,7 +688,7 @@ jobs: with: go-version: '1.19' - name: Set up Python 3.7 - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 + uses: actions/setup-python@a6eba85bba13ec8929458742a9c19803934c4340 with: python-version: 3.7 - name: Set up NodeJS 13 @@ -761,7 +761,7 @@ jobs: with: go-version: '1.19' - name: Set up Python 3.8 - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 + uses: actions/setup-python@a6eba85bba13ec8929458742a9c19803934c4340 with: python-version: 3.8 - name: Extract branch name From b310077a522bb81f4e42afd5887104e17dfb21b2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 18:39:05 +0000 Subject: [PATCH 206/235] chore(deps): update actions/upload-artifact digest to 65d8626 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e11793c3f..e6b663ed0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -242,7 +242,7 @@ jobs: cd csharp/Logging ./scripts/test.sh - name: Upload artifact - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce + uses: actions/upload-artifact@65d862660abb392b8c4a3d1195a2108db131dd05 with: name: csharp-logging path: | @@ -315,7 +315,7 @@ jobs: cd csharp/SecureMemory ./scripts/test.sh - name: Upload artifact - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce + uses: actions/upload-artifact@65d862660abb392b8c4a3d1195a2108db131dd05 with: name: csharp-secure-memory path: | @@ -403,7 +403,7 @@ jobs: cd csharp/AppEncryption ./scripts/integration_test.sh - name: Upload artifact - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce + uses: actions/upload-artifact@65d862660abb392b8c4a3d1195a2108db131dd05 with: name: csharp-app-encryption path: | From 8827cd527f8c49117bbac1d3fbdf170a1364ea1f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 18:50:28 +0000 Subject: [PATCH 207/235] chore(deps): update aws-sdk-net monorepo --- csharp/AppEncryption/AppEncryption/AppEncryption.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj index 9f6a09e07..44b1af561 100644 --- a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj +++ b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj @@ -23,8 +23,8 @@ - - + + From f9e7b6f29c667bae40a501a34f8a10943a3b8059 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 19:09:14 +0000 Subject: [PATCH 208/235] fix(deps): update slf4j.version to v2.0.6 --- java/app-encryption/pom.xml | 2 +- java/secure-memory/pom.xml | 2 +- server/java/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index e8b3f9cf3..5aa658142 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -38,7 +38,7 @@ 1.8 UTF-8 UTF-8 - 2.0.5 + 2.0.6 31.1-jre 3.28.0 1.12.378 diff --git a/java/secure-memory/pom.xml b/java/secure-memory/pom.xml index 4ce0597d7..1c4732906 100644 --- a/java/secure-memory/pom.xml +++ b/java/secure-memory/pom.xml @@ -34,7 +34,7 @@ 1.8 UTF-8 - 2.0.5 + 2.0.6 5.9.1 1.9.1 4.9.0 diff --git a/server/java/pom.xml b/server/java/pom.xml index e8eb1604d..d15761c0c 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -24,7 +24,7 @@ 5.0.1 4.1.87.Final 3.12.0 - 2.0.5 + 2.0.6 0.8.8 ${project.basedir}/checkstyle.xml ${project.basedir}/suppressions.xml From 30504d8e4bdbd009c44bc2386ce848ce02d4b5df Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 20:30:31 +0000 Subject: [PATCH 209/235] chore(deps): update io.grpc.version to v1.52.1 --- server/java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/java/pom.xml b/server/java/pom.xml index d15761c0c..cbb080cdf 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -15,7 +15,7 @@ UTF-8 5.9.1 5.9.1 - 1.51.0 + 1.52.1 3.21.11 0.2.3 4.7.0 From 5b461552bcd1dcf830ea350e19591eee12db4a44 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 20:45:17 +0000 Subject: [PATCH 210/235] fix(deps): update module google.golang.org/grpc to v1.52.3 --- server/go/go.mod | 14 +++++++------- server/go/go.sum | 13 +++++++++++++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/server/go/go.mod b/server/go/go.mod index 4cbd2fa8c..fd58ec317 100644 --- a/server/go/go.mod +++ b/server/go/go.mod @@ -10,7 +10,7 @@ require ( github.com/golang/protobuf v1.5.2 github.com/jessevdk/go-flags v1.5.0 github.com/stretchr/testify v1.8.1 - google.golang.org/grpc v1.51.0 + google.golang.org/grpc v1.52.3 ) require ( @@ -18,7 +18,7 @@ require ( github.com/awnumar/memguard v0.22.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/goburrow/cache v0.1.4 // indirect - github.com/google/go-cmp v0.5.6 // indirect + github.com/google/go-cmp v0.5.9 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/kr/pretty v0.2.1 // indirect github.com/kr/text v0.2.0 // indirect @@ -27,11 +27,11 @@ require ( github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/stretchr/objx v0.5.0 // indirect golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect - golang.org/x/net v0.1.0 // indirect - golang.org/x/sys v0.1.0 // indirect - golang.org/x/text v0.4.0 // indirect - google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect - google.golang.org/protobuf v1.28.0 // indirect + golang.org/x/net v0.4.0 // indirect + golang.org/x/sys v0.3.0 // indirect + golang.org/x/text v0.5.0 // indirect + google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 // indirect + google.golang.org/protobuf v1.28.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/server/go/go.sum b/server/go/go.sum index 8567c44a0..291022fbe 100644 --- a/server/go/go.sum +++ b/server/go/go.sum @@ -481,6 +481,7 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -1061,6 +1062,8 @@ golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= +golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1194,6 +1197,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -1212,6 +1217,8 @@ golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1371,6 +1378,8 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac h1:qSNTkEN+L2mvWcLgJOR+8bdHX9rN/IdU3A1Ghpfb1Rg= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 h1:a2S6M0+660BgMNl++4JPlcAO/CjkqYItDEZwkoDQK7c= +google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -1405,6 +1414,8 @@ google.golang.org/grpc v1.50.1 h1:DS/BukOZWp8s6p4Dt/tOaJaTQyPyOoCcrjroHuCeLzY= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= +google.golang.org/grpc v1.52.3 h1:pf7sOysg4LdgBqduXveGKrcEwbStiK2rtfghdzlUYDQ= +google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1420,6 +1431,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 9acb6e49d4b8eba3b921e48cc42d6b5d4fe092a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 21:01:29 +0000 Subject: [PATCH 211/235] chore(deps): update devmasx/merge-branch digest to 5db181c --- .github/workflows/sync-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-release.yml b/.github/workflows/sync-release.yml index 258b279e1..fa13f7063 100644 --- a/.github/workflows/sync-release.yml +++ b/.github/workflows/sync-release.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: Merge master -> {RELEASE_TARGET} - uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f + uses: devmasx/merge-branch@5db181cdddbc510e300b5ff615a18b6bddcfcb4b with: type: now head_to_merge: master From 963d7875a1e738086ba48d1ab33820da91de75d0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 21:16:16 +0000 Subject: [PATCH 212/235] chore(deps): update ncipollo/release-action digest to a5996b3 --- .github/workflows/draft-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 84c343856..2f4ee9247 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -58,7 +58,7 @@ jobs: fi shell: bash - name: Create release - uses: ncipollo/release-action@a2e71bdd4e7dab70ca26a852f29600c98b33153e + uses: ncipollo/release-action@a5996b3a733af99dce9d614dc1d70412e81735c7 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From 010490da70208fb13803ce49193156245ca078c4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 21:30:23 +0000 Subject: [PATCH 213/235] chore(deps): update dependency microsoft.net.test.sdk to v17.4.1 --- .../AppEncryption.IntegrationTests.csproj | 2 +- .../AppEncryption.Tests/AppEncryption.Tests.csproj | 2 +- csharp/Logging/Logging.Tests/Logging.Tests.csproj | 2 +- .../SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj b/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj index dbaebd829..9e4887752 100644 --- a/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj +++ b/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj @@ -13,7 +13,7 @@ - + diff --git a/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj b/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj index 84551244d..5cfe6a31f 100644 --- a/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj +++ b/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj @@ -12,7 +12,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/csharp/Logging/Logging.Tests/Logging.Tests.csproj b/csharp/Logging/Logging.Tests/Logging.Tests.csproj index ad78d021d..e1236dac7 100644 --- a/csharp/Logging/Logging.Tests/Logging.Tests.csproj +++ b/csharp/Logging/Logging.Tests/Logging.Tests.csproj @@ -11,7 +11,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all diff --git a/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj b/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj index f985a27aa..6327a98fa 100644 --- a/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj +++ b/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj @@ -10,7 +10,7 @@ - + From db62980ca271cc223aefb5980840e5dd15df16a2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 21:44:28 +0000 Subject: [PATCH 214/235] chore(deps): update dependency moq to v4.18.4 --- .../AppEncryption.IntegrationTests.csproj | 2 +- .../AppEncryption.Tests/AppEncryption.Tests.csproj | 2 +- .../SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj b/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj index 9e4887752..e8f2f420e 100644 --- a/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj +++ b/csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj @@ -14,7 +14,7 @@ - + all diff --git a/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj b/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj index 5cfe6a31f..d10528413 100644 --- a/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj +++ b/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj b/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj index 6327a98fa..c6e5575bb 100644 --- a/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj +++ b/csharp/SecureMemory/SecureMemory.Tests/SecureMemory.Tests.csproj @@ -11,7 +11,7 @@ - + all From e22484d9460da93c14cfa5d6bf84240afd6d312f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 21:57:25 +0000 Subject: [PATCH 215/235] chore(deps): update actions/setup-node digest to 3dbcda8 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e6b663ed0..886fe1ad8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -692,7 +692,7 @@ jobs: with: python-version: 3.7 - name: Set up NodeJS 13 - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c + uses: actions/setup-node@3dbcda8bc2eb5ec6aa3fbde01feaae3236952db8 with: node-version: 13.x - name: Extract branch name From 81e68d20a78d71725a5c384178424e63b6c4d9d1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 22:10:01 +0000 Subject: [PATCH 216/235] chore(deps): update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.2.1 --- java/app-encryption/pom.xml | 2 +- java/secure-memory/pom.xml | 2 +- samples/java/reference-app/pom.xml | 2 +- server/java/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 5aa658142..42a495144 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -62,7 +62,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.2.0 + 3.2.1 validate diff --git a/java/secure-memory/pom.xml b/java/secure-memory/pom.xml index 1c4732906..e253252f6 100644 --- a/java/secure-memory/pom.xml +++ b/java/secure-memory/pom.xml @@ -47,7 +47,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.2.0 + 3.2.1 validate diff --git a/samples/java/reference-app/pom.xml b/samples/java/reference-app/pom.xml index 7a238bc65..c008d6a80 100644 --- a/samples/java/reference-app/pom.xml +++ b/samples/java/reference-app/pom.xml @@ -24,7 +24,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.2.0 + 3.2.1 validate diff --git a/server/java/pom.xml b/server/java/pom.xml index cbb080cdf..bc6172595 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -224,7 +224,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.2.0 + 3.2.1 validate From c4af5548232b9ea3c9685e34e38ae6d76bc4b127 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 22:23:29 +0000 Subject: [PATCH 217/235] chore(deps): update aws-sdk-net monorepo --- csharp/AppEncryption/AppEncryption/AppEncryption.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj index 44b1af561..b3fcd91d1 100644 --- a/csharp/AppEncryption/AppEncryption/AppEncryption.csproj +++ b/csharp/AppEncryption/AppEncryption/AppEncryption.csproj @@ -23,8 +23,8 @@ - - + + From 64e751db7f766390bd5f82df1ed72ce4c8d46a31 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 22:35:28 +0000 Subject: [PATCH 218/235] chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-m8 --- java/app-encryption/pom.xml | 2 +- java/secure-memory/pom.xml | 2 +- samples/java/reference-app/pom.xml | 2 +- server/java/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/app-encryption/pom.xml b/java/app-encryption/pom.xml index 42a495144..badc4f648 100644 --- a/java/app-encryption/pom.xml +++ b/java/app-encryption/pom.xml @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M7 + 3.0.0-M8 diff --git a/java/secure-memory/pom.xml b/java/secure-memory/pom.xml index e253252f6..e8b3208f8 100644 --- a/java/secure-memory/pom.xml +++ b/java/secure-memory/pom.xml @@ -89,7 +89,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M7 + 3.0.0-M8 org.junit.jupiter diff --git a/samples/java/reference-app/pom.xml b/samples/java/reference-app/pom.xml index c008d6a80..835625894 100644 --- a/samples/java/reference-app/pom.xml +++ b/samples/java/reference-app/pom.xml @@ -57,7 +57,7 @@ maven-surefire-plugin - 3.0.0-M7 + 3.0.0-M8 org.jacoco diff --git a/server/java/pom.xml b/server/java/pom.xml index bc6172595..c3d01a867 100644 --- a/server/java/pom.xml +++ b/server/java/pom.xml @@ -246,7 +246,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M7 + 3.0.0-M8 false From e260f2de8f8f9d25b5a9311595b568e772123272 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 22:46:25 +0000 Subject: [PATCH 219/235] chore(deps): update dependency mysql.data to v8.0.32 --- samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj index 9842b975e..d24404858 100644 --- a/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj +++ b/samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj @@ -20,7 +20,7 @@ - +