From 65bc7036d5c44c5ce45b5da664baa1e487396914 Mon Sep 17 00:00:00 2001 From: Ratnakar Date: Wed, 7 Feb 2024 07:56:56 -0500 Subject: [PATCH] Updating fabric/fabric-ca deps to latest (#168) https://github.com/hyperledger-labs/fabric-operator/issues/164 --------- Signed-off-by: asararatnakar --- bundle.Dockerfile | 2 +- ...source-operator.clusterserviceversion.yaml | 9 +- bundle/metadata/annotations.yaml | 2 +- ...source-operator.clusterserviceversion.yaml | 5 - go.mod | 62 ++---- go.sum | 196 +++++------------- pkg/apis/ca/v1/ca.go | 28 +-- pkg/apis/common/common.go | 28 +-- pkg/certificate/reenroller/client_pkcs11.go | 25 +-- pkg/certificate/reenroller/reenroller.go | 2 +- pkg/initializer/ca/bccsp/config.go | 8 +- pkg/initializer/ca/bccsp/configpkcs11.go | 26 +-- pkg/initializer/ca/ca.go | 8 +- pkg/initializer/ca/ca_test.go | 8 +- pkg/initializer/ca/config/config.go | 2 +- pkg/initializer/ca/tls/tls_test.go | 2 +- .../common/enroller/client_pkcs11.go | 25 +-- .../orderer/config/v1/config_test.go | 34 +-- pkg/initializer/orderer/config/v1/orderer.go | 10 +- .../orderer/config/v2/config_test.go | 34 +-- pkg/initializer/orderer/config/v2/orderer.go | 10 +- .../orderer/config/v24/config_test.go | 34 +-- pkg/initializer/orderer/config/v24/orderer.go | 10 +- .../orderer/config/v25/config_test.go | 34 +-- pkg/initializer/orderer/config/v25/orderer.go | 10 +- pkg/initializer/orderer/configtx/configtx.go | 7 +- pkg/initializer/orderer/configtx/encoder.go | 6 +- pkg/initializer/orderer/configtx/profile.go | 14 +- pkg/initializer/peer/config/v1/config.go | 12 +- pkg/initializer/peer/config/v1/config_test.go | 40 ++-- pkg/initializer/peer/config/v2/config.go | 12 +- pkg/initializer/peer/config/v2/config_test.go | 24 +-- pkg/initializer/peer/config/v25/config.go | 12 +- .../peer/config/v25/config_test.go | 24 +-- pkg/initializer/peer/peer_test.go | 4 +- .../base/ca/override/deployment_test.go | 2 +- pkg/offering/base/orderer/node_test.go | 6 +- .../base/orderer/override/deployment_test.go | 2 +- .../base/peer/override/deployment_test.go | 2 +- pkg/offering/base/peer/peer_test.go | 4 +- 40 files changed, 329 insertions(+), 456 deletions(-) diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 34e109dd..4137c57e 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=fabric-opensource-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.24.1 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 diff --git a/bundle/manifests/fabric-opensource-operator.clusterserviceversion.yaml b/bundle/manifests/fabric-opensource-operator.clusterserviceversion.yaml index 3192d7c5..b36b41d1 100644 --- a/bundle/manifests/fabric-opensource-operator.clusterserviceversion.yaml +++ b/bundle/manifests/fabric-opensource-operator.clusterserviceversion.yaml @@ -7,13 +7,13 @@ metadata: categories: Database certified: "true" containerImage: todo:update - createdAt: "2020-07-14T00:00:00Z" + createdAt: "2024-02-06T14:36:39Z" description: TODO - operators.operatorframework.io/builder: operator-sdk-v1.24.1 + operators.operatorframework.io/builder: operator-sdk-v1.31.0 operators.operatorframework.io/internal-objects: '["ibpcas.ibp.com","ibppeers.ibp.com","ibporderers.ibp.com"]' operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: "" - name: fabric-opensource-operator.v1.0.0-9726bb6 + name: fabric-opensource-operator.v1.0.0-a427049 namespace: placeholder spec: apiservicedefinitions: {} @@ -1759,6 +1759,7 @@ spec: metadata: labels: control-plane: controller-manager + name: controller-manager spec: affinity: nodeAffinity: @@ -1869,4 +1870,4 @@ spec: maturity: alpha provider: name: Opensource - version: 1.0.0-9726bb6 + version: 1.0.0-a427049 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 9e837d2b..a154a401 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -5,6 +5,6 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: fabric-opensource-operator operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.24.1 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 diff --git a/config/manifests/bases/fabric-opensource-operator.clusterserviceversion.yaml b/config/manifests/bases/fabric-opensource-operator.clusterserviceversion.yaml index d1e8fe57..5c58efbf 100644 --- a/config/manifests/bases/fabric-opensource-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/fabric-opensource-operator.clusterserviceversion.yaml @@ -1481,11 +1481,6 @@ spec: path: resources.enroller x-descriptors: - urn:alm:descriptor:com.tectonic.ui:resourceRequirements - - description: FluentD (Optional) is the resources provided to the fluentd container - displayName: Fluent D - path: resources.fluentd - x-descriptors: - - urn:alm:descriptor:com.tectonic.ui:resourceRequirements - description: HSMDaemon (Optional) is the resources provided to the HSM Daemon container displayName: HSMDaemon diff --git a/go.mod b/go.mod index 1bd6d9a3..24ffb42b 100644 --- a/go.mod +++ b/go.mod @@ -4,13 +4,13 @@ go 1.20 require ( github.com/cloudflare/cfssl v1.4.1 - github.com/docker/docker v20.10.27+incompatible + github.com/docker/docker v24.0.7+incompatible github.com/go-logr/logr v0.4.0 github.com/go-test/deep v1.0.2 github.com/gogo/protobuf v1.3.2 - github.com/hyperledger/fabric v1.4.12 - github.com/hyperledger/fabric-ca v1.5.8 - github.com/hyperledger/fabric-protos-go v0.0.0-20210911123859-041d13f0980c + github.com/hyperledger/fabric v0.0.0-20240123171006-370ebe56cea8 + github.com/hyperledger/fabric-ca v1.5.9-0.20240123181634-abc987b6d0c4 + github.com/hyperledger/fabric-protos-go v0.3.3 github.com/imdario/mergo v0.3.12 github.com/lib/pq v1.8.0 github.com/maxbrunsfeld/counterfeiter/v6 v6.2.3 @@ -21,7 +21,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/spf13/viper v1.7.0 github.com/vrischmann/envconfig v1.3.0 - go.uber.org/zap v1.17.0 + go.uber.org/zap v1.19.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.21.5 k8s.io/apiextensions-apiserver v0.21.5 @@ -42,21 +42,18 @@ require ( ) require ( - cloud.google.com/go v0.59.0 // indirect + cloud.google.com/go/compute v1.19.1 // indirect + cloud.google.com/go/compute/metadata v0.2.3 // indirect github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect - github.com/Shopify/sarama v1.30.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.7.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/consensys/bavard v0.1.13 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/go-connections v0.4.0 // indirect - github.com/docker/go-units v0.4.0 // indirect - github.com/eapache/go-resiliency v1.2.0 // indirect - github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect - github.com/eapache/queue v1.1.0 // indirect + github.com/docker/go-units v0.5.0 // indirect github.com/emicklei/go-restful v2.16.0+incompatible // indirect github.com/evanphx/json-patch v4.11.0+incompatible // indirect github.com/felixge/httpsnoop v1.0.1 // indirect @@ -72,52 +69,41 @@ require ( github.com/go-stack/stack v1.8.1 // indirect github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/golang/snappy v0.0.4 // indirect github.com/google/certificate-transparency-go v1.0.21 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.1.0 // indirect - github.com/google/uuid v1.1.2 // indirect + github.com/google/uuid v1.3.0 // indirect github.com/googleapis/gnostic v0.5.5 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b // indirect - github.com/hashicorp/go-uuid v1.0.2 // indirect - github.com/hashicorp/go-version v1.2.0 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect github.com/hyperledger/fabric-lib-go v1.0.0 // indirect - github.com/jcmturner/aescts/v2 v2.0.0 // indirect - github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect - github.com/jcmturner/gofork v1.0.0 // indirect - github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect - github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548 // indirect github.com/jmoiron/sqlx v1.3.4 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kilic/bls12-381 v0.1.0 // indirect github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46 // indirect - github.com/klauspost/compress v1.13.6 // indirect github.com/magiconair/properties v1.8.1 // indirect github.com/mailru/easyjson v0.7.0 // indirect github.com/mattn/go-sqlite3 v1.14.18 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect - github.com/miekg/pkcs11 v1.0.3 // indirect - github.com/mitchellh/mapstructure v1.3.3 // indirect + github.com/miekg/pkcs11 v1.1.1 // indirect + github.com/mitchellh/mapstructure v1.4.3 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect - github.com/pelletier/go-toml v1.2.0 // indirect - github.com/pierrec/lz4 v2.6.1+incompatible // indirect + github.com/pelletier/go-toml v1.9.5 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.16.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.10.1 // indirect - github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/spf13/afero v1.2.2 // indirect + github.com/spf13/afero v1.3.1 // indirect github.com/spf13/cast v1.3.1 // indirect - github.com/spf13/jwalterweatherman v1.0.0 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.2 // indirect github.com/subosito/gotenv v1.2.0 // indirect @@ -127,20 +113,20 @@ require ( github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect - golang.org/x/crypto v0.14.0 // indirect + golang.org/x/crypto v0.18.0 // indirect golang.org/x/mod v0.10.0 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.5.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/term v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/net v0.20.0 // indirect + golang.org/x/oauth2 v0.7.0 // indirect + golang.org/x/sys v0.16.0 // indirect + golang.org/x/term v0.16.0 // indirect + golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect golang.org/x/tools v0.8.0 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect - google.golang.org/grpc v1.31.0 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect + google.golang.org/grpc v1.56.3 // indirect + google.golang.org/protobuf v1.32.0 // indirect gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.51.0 // indirect @@ -153,5 +139,3 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect ) - -replace github.com/hyperledger/fabric => github.com/hyperledger/fabric v0.0.0-20191027202024-115c7a2205a6 diff --git a/go.sum b/go.sum index cf51c1a2..38602d4f 100644 --- a/go.sum +++ b/go.sum @@ -10,27 +10,22 @@ 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.59.0 h1:BM3svUDU3itpc2m5cu5wCyThIYNDlFlts9GASw31GW8= -cloud.google.com/go v0.59.0/go.mod h1:qJxNOVCRTxHfwLhvDxxSI9vQc1zI59b9pEglp1Iv60E= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/compute v1.19.1 h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY= +cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE= +cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -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= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= @@ -40,7 +35,6 @@ github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSY 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/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0= @@ -59,12 +53,8 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/sarama v1.30.0 h1:TOZL6r37xJBDEMLx4yjB77jxbZYXPaDow08TSK6vIL0= -github.com/Shopify/sarama v1.30.0/go.mod h1:zujlQQx1kzHsh4jfV1USnptCQrHAEZ2Hk8fTKCulPVs= -github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/Shopify/toxiproxy/v2 v2.1.6-0.20210914104332-15ea381dcdae h1:ePgznFqEG1v3AjMklnK8H7BSc++FDSo7xfK9K7Af+0Y= -github.com/Shopify/toxiproxy/v2 v2.1.6-0.20210914104332-15ea381dcdae/go.mod h1:/cvHQkZ1fst0EmZnA5dFtiQdWCNCFYzb+uE2vqVgvx0= +github.com/SmartBFT-Go/consensus v0.0.0-20230907130931-31f018a899a6 h1:yfGSoZgsSZG1sygPBLz/KNk2rKGKOnd4+1LFMt7KXf0= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= @@ -85,6 +75,8 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:l github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -113,7 +105,6 @@ github.com/cloudflare/cfssl v1.4.1 h1:vScfU2DrIUI9VPHBVeeAQ0q5A+9yshO1Gz+3QoUQiK github.com/cloudflare/cfssl v1.4.1/go.mod h1:KManx/OJPb5QY+y0+o/898AMcM128sF0bURvoVUSjTo= github.com/cloudflare/go-metrics v0.0.0-20151117154305-6a9aea36fb41/go.mod h1:eaZPlJWD+G9wseg1BuRXlHnjntPMrywMsyxf+LTOdP4= github.com/cloudflare/redoctober v0.0.0-20171127175943-746a508df14c/go.mod h1:6Se34jNoqrd8bTxrmJB2Bg2aoZ2CdSXonils9NsiNgo= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= @@ -141,21 +132,17 @@ 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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/docker/docker v20.10.27+incompatible h1:Id/ZooynV4ZlD6xX20RCd3SR0Ikn7r4QZDa2ECK2TgA= -github.com/docker/docker v20.10.27+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= +github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -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/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-resiliency v1.2.0 h1:v7g92e/KSN71Rq7vSThKaWIq68fL4YHvWyiUKorFR1Q= -github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= @@ -164,9 +151,7 @@ github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT github.com/emicklei/go-restful v2.16.0+incompatible h1:rgqiKNjTnFQA6kkhFe16D8epTksy9HQ1MyrbDXSdYhM= github.com/emicklei/go-restful v2.16.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= -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/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -178,12 +163,8 @@ github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGE github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= 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/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY= -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 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -253,7 +234,6 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= 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/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -273,8 +253,6 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= 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/certificate-transparency-go v1.0.21 h1:Yf1aXowfZ2nuboBsg7iYGLmwsOARdV86pfH3g95wXmE= @@ -283,7 +261,6 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a 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.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -300,14 +277,13 @@ github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OI 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-20200507031123-427632fa3b1c/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= 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 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/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= @@ -322,8 +298,6 @@ github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= -github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= @@ -349,9 +323,6 @@ github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerX 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-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= -github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 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= @@ -366,34 +337,23 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p 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/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/hyperledger/fabric v0.0.0-20191027202024-115c7a2205a6 h1:Nsiq4GTvhs5tpMYt/9wv3Er0Se7oG0rZlI75+e4gvXc= -github.com/hyperledger/fabric v0.0.0-20191027202024-115c7a2205a6/go.mod h1:tGFAOCT696D3rG0Vofd2dyWYLySHlh0aQjf7Q1HAju0= +github.com/hyperledger/fabric v0.0.0-20240123171006-370ebe56cea8 h1:Dnb+AM2QOh0booZvj+dX7YQgvvT2LD30pjAFOBQiORk= +github.com/hyperledger/fabric v0.0.0-20240123171006-370ebe56cea8/go.mod h1:CWuR15Igz7KnQ9gP+mk5e8O4CBuEzd4BJyuwO0RrPio= github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 h1:B1Nt8hKb//KvgGRprk0h1t4lCnwhE9/ryb1WqfZbV+M= github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2/go.mod h1:X+DIyUsaTmalOpmpQfIvFZjKHQedrURQ5t4YqquX7lE= -github.com/hyperledger/fabric-ca v1.5.8 h1:2t2fj/J/hy0wN23bmBgvrwn1p1h2/mrd7i0+StvGLzo= -github.com/hyperledger/fabric-ca v1.5.8/go.mod h1:Hm00h46IG725obxABjUzGO3MY4+mFITlcn3YYtgUGpA= +github.com/hyperledger/fabric-ca v1.5.9-0.20240123181634-abc987b6d0c4 h1:x9MvR7WrORbD8/d7TznwIS9xer8uTJKESpS/7d/PE5g= +github.com/hyperledger/fabric-ca v1.5.9-0.20240123181634-abc987b6d0c4/go.mod h1:pYf1iFNbyRp4U1XVL1Hn0ZcBuEpO4zgxpPpzt8w0pA0= +github.com/hyperledger/fabric-config v0.2.1 h1:CsReuxvi5c5NUyKKQOIVbHux32o+XtmDNceYLYjycxo= github.com/hyperledger/fabric-lib-go v1.0.0 h1:UL1w7c9LvHZUSkIvHTDGklxFv2kTeva1QI2emOVc324= github.com/hyperledger/fabric-lib-go v1.0.0/go.mod h1:H362nMlunurmHwkYqR5uHL2UDWbQdbfz74n8kbCFsqc= -github.com/hyperledger/fabric-protos-go v0.0.0-20210911123859-041d13f0980c h1:QPhSriw6EzMOj/d7gcGiKEvozVvQ5HLk9UWie4KAvSs= -github.com/hyperledger/fabric-protos-go v0.0.0-20210911123859-041d13f0980c/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= +github.com/hyperledger/fabric-protos-go v0.3.3 h1:0nssqz8QWJNVNBVQz+IIfAd2j1ku7QPKFSM/1anKizI= +github.com/hyperledger/fabric-protos-go v0.3.3/go.mod h1:BPXse9gIOQwyAePQrwQVUcc44bTW4bB5V3tujuvyArk= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= -github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= -github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= -github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= -github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8= -github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= -github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= -github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= -github.com/jcmturner/gokrb5/v8 v8.4.2 h1:6ZIM6b/JJN0X8UM43ZOM6Z4SJzla+a/u7scXFJzodkA= -github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc= -github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= -github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg= github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= @@ -430,14 +390,12 @@ github.com/kisielk/sqlstruct v0.0.0-20150923205031-648daed35d49/go.mod h1:yyMNCy github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46 h1:veS9QfglfvqAw2e+eeNT/SbGySq8ajECXJ9e4fPoLhY= github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE= github.com/kisom/goutils v1.1.0/go.mod h1:+UBTfd78habUYWFbNWTJNG+jNG/i/lGURakr4A/yNRw= -github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= -github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= @@ -484,8 +442,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfr github.com/maxbrunsfeld/counterfeiter/v6 v6.2.3 h1:z1lXirM9f9WTcdmzSZahKh/t+LCqPiiwK2/DB1kLlI4= github.com/maxbrunsfeld/counterfeiter/v6 v6.2.3/go.mod h1:1ftk08SazyElaaNvmqAfZWGwJzshjCfBXDLoQtPAMNk= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/pkcs11 v1.0.3 h1:iMwmD7I5225wv84WxIG/bmxz9AXjWvTWIbM/TYHvWtw= -github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= +github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU= +github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37/go.mod h1:dYWq+UWoFCDY1TndvFUQuhBbIYmZpjreC8adEAx93zE= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -495,8 +453,8 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8= -github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= +github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU= github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU= @@ -569,19 +527,19 @@ github.com/operator-framework/operator-lib v0.8.0/go.mod h1:2Z32GTTJUz2/f+OKcoJX github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= -github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= @@ -624,8 +582,6 @@ github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+Pymzi github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/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/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= @@ -651,8 +607,9 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= 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 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/afero v1.3.1 h1:GPTpEAuNr98px18yNQ66JllNil98wfRZ/5Ukny8FeQA= +github.com/spf13/afero v1.3.1/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= @@ -660,8 +617,9 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= -github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -699,7 +657,6 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/vrischmann/envconfig v1.3.0 h1:4XIvQTXznxmWMnjouj0ST5lFo/WAYf5Exgl3x82crEk= @@ -707,12 +664,8 @@ github.com/vrischmann/envconfig v1.3.0/go.mod h1:bbvxFYJdRSpXrhS63mBFtKJzkDiNkyA github.com/weppos/publicsuffix-go v0.4.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k= github.com/weppos/publicsuffix-go v0.5.0 h1:rutRtjBJViU/YjcI5d80t4JAVvDltS6bciJg2K1HrLU= github.com/weppos/publicsuffix-go v0.5.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k= -github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= -github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= -github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= 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.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= @@ -739,8 +692,8 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= @@ -749,8 +702,9 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.12.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +go.uber.org/zap v1.19.0 h1:mZQZefskPPCMIBCSEH0v2/iUqqLrYtaeqwD6FUGUnFE= +go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/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= @@ -758,14 +712,13 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/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-20210920023735-84f357641f63/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= 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= @@ -787,7 +740,6 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= 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 h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/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= @@ -830,34 +782,27 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= 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-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-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-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= -golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= +golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= +golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -902,11 +847,6 @@ golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/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-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -922,25 +862,22 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w 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.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= +golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= 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= @@ -987,17 +924,10 @@ 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-20200301222351-066e0c02454c/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-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/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= @@ -1020,18 +950,13 @@ 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/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -1052,18 +977,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-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-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-20200623002339-fbb79eadd5eb/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-20201110150050-8816d57aaa9a h1:pOwg4OoaRYScjmR4LlLgdtnyoHYTSAVhhqe5uPdpII8= google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -1073,14 +992,11 @@ google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= 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.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= +google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= 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= @@ -1093,8 +1009,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= @@ -1103,7 +1019,6 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= @@ -1126,7 +1041,6 @@ gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRN gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -1139,6 +1053,7 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C 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/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= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1147,7 +1062,6 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh 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.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= k8s.io/api v0.21.5 h1:9zp3SslPRB+rqxhGKqqTo6VsN3HX0Ype1nWV6UQQ+Sk= k8s.io/api v0.21.5/go.mod h1:Un8C5Hemo2r3MfPOjZvwQQ9KkBbiTBUCGrjlivo9uJ0= diff --git a/pkg/apis/ca/v1/ca.go b/pkg/apis/ca/v1/ca.go index 7c5ff128..9e4552ee 100644 --- a/pkg/apis/ca/v1/ca.go +++ b/pkg/apis/ca/v1/ca.go @@ -134,28 +134,28 @@ type CORS struct { } type BCCSP struct { - ProviderName string `json:"default,omitempty"` - SW *SwOpts `json:"sw,omitempty"` - PKCS11 *PKCS11Opts `json:"pkcs11,omitempty"` + Default string `json:"default,omitempty"` + SW *SwOpts `json:"sw,omitempty"` + PKCS11 *PKCS11Opts `json:"pkcs11,omitempty"` } // SwOpts contains options for the SWFactory type SwOpts struct { - SecLevel int `json:"security,omitempty"` - HashFamily string `json:"hash,omitempty"` + Security int `json:"security,omitempty"` + Hash string `json:"hash,omitempty"` FileKeyStore FileKeyStoreOpts `json:"filekeystore,omitempty"` } type PKCS11Opts struct { - SecLevel int `json:"security,omitempty"` - HashFamily string `json:"hash,omitempty"` - Library string `json:"library,omitempty"` - Label string `json:"label,omitempty"` - Pin string `json:"pin,omitempty"` - Ephemeral *bool `json:"tempkeys,omitempty"` - SoftVerify *bool `json:"softwareVerify,omitempty"` - Immutable *bool `json:"immutable,omitempty"` - FileKeyStore FileKeyStoreOpts `json:"filekeystore,omitempty"` + Security int `json:"security,omitempty"` + Hash string `json:"hash,omitempty"` + Library string `json:"library,omitempty"` + Label string `json:"label,omitempty"` + Pin string `json:"pin,omitempty"` + Ephemeral *bool `json:"tempkeys,omitempty"` + SoftwareVerify *bool `json:"softwareVerify,omitempty"` + Immutable *bool `json:"immutable,omitempty"` + FileKeyStore FileKeyStoreOpts `json:"filekeystore,omitempty"` } type FileKeyStoreOpts struct { diff --git a/pkg/apis/common/common.go b/pkg/apis/common/common.go index 71954401..bf588448 100644 --- a/pkg/apis/common/common.go +++ b/pkg/apis/common/common.go @@ -94,28 +94,28 @@ func ConvertTimeDuration(d time.Duration) Duration { } type BCCSP struct { - ProviderName string `json:"default,omitempty"` - SW *SwOpts `json:"SW,omitempty"` - PKCS11 *PKCS11Opts `json:"PKCS11,omitempty"` + Default string `json:"default,omitempty"` + SW *SwOpts `json:"SW,omitempty"` + PKCS11 *PKCS11Opts `json:"PKCS11,omitempty"` } // SwOpts contains options for the SWFactory type SwOpts struct { - SecLevel int `json:"security,omitempty"` - HashFamily string `json:"hash,omitempty"` + Security int `json:"security,omitempty"` + Hash string `json:"hash,omitempty"` FileKeyStore FileKeyStoreOpts `json:"filekeystore,omitempty"` } type PKCS11Opts struct { - SecLevel int `json:"security,omitempty"` - HashFamily string `json:"hash,omitempty"` - Library string `json:"library,omitempty"` - Label string `json:"label,omitempty"` - Pin string `json:"pin,omitempty"` - Ephemeral bool `json:"tempkeys,omitempty"` - SoftVerify bool `json:"softwareVerify,omitempty"` - Immutable bool `json:"immutable,omitempty"` - FileKeyStore *FileKeyStoreOpts `json:"filekeystore,omitempty"` + Security int `json:"security,omitempty"` + Hash string `json:"hash,omitempty"` + Library string `json:"library,omitempty"` + Label string `json:"label,omitempty"` + Pin string `json:"pin,omitempty"` + Ephemeral bool `json:"tempkeys,omitempty"` + SoftwareVerify bool `json:"softwareVerify,omitempty"` + Immutable bool `json:"immutable,omitempty"` + FileKeyStore *FileKeyStoreOpts `json:"filekeystore,omitempty"` } type FileKeyStoreOpts struct { diff --git a/pkg/certificate/reenroller/client_pkcs11.go b/pkg/certificate/reenroller/client_pkcs11.go index f35b1a14..cefa0e45 100644 --- a/pkg/certificate/reenroller/client_pkcs11.go +++ b/pkg/certificate/reenroller/client_pkcs11.go @@ -32,24 +32,17 @@ func GetClient(client *lib.Client, bccsp *commonapi.BCCSP) *lib.Client { if bccsp != nil { if bccsp.PKCS11 != nil { client.Config.CSP = &factory.FactoryOpts{ - ProviderName: bccsp.ProviderName, - Pkcs11Opts: &pkcs11.PKCS11Opts{ - SecLevel: bccsp.PKCS11.SecLevel, - HashFamily: bccsp.PKCS11.HashFamily, - Ephemeral: bccsp.PKCS11.Ephemeral, - Library: bccsp.PKCS11.Library, - Label: bccsp.PKCS11.Label, - Pin: bccsp.PKCS11.Pin, - SoftVerify: bccsp.PKCS11.SoftVerify, - Immutable: bccsp.PKCS11.Immutable, + Default: bccsp.Default, + PKCS11: &pkcs11.PKCS11Opts{ + Security: bccsp.PKCS11.Security, + Hash: bccsp.PKCS11.Hash, + Library: bccsp.PKCS11.Library, + Label: bccsp.PKCS11.Label, + Pin: bccsp.PKCS11.Pin, + SoftwareVerify: bccsp.PKCS11.SoftwareVerify, + Immutable: bccsp.PKCS11.Immutable, }, } - - if bccsp.PKCS11.FileKeyStore != nil { - client.Config.CSP.Pkcs11Opts.FileKeystore = &pkcs11.FileKeystoreOpts{ - KeyStorePath: bccsp.PKCS11.FileKeyStore.KeyStorePath, - } - } } } diff --git a/pkg/certificate/reenroller/reenroller.go b/pkg/certificate/reenroller/reenroller.go index fc8ef0ae..4f4a8f78 100644 --- a/pkg/certificate/reenroller/reenroller.go +++ b/pkg/certificate/reenroller/reenroller.go @@ -38,8 +38,8 @@ import ( "github.com/hyperledger/fabric-ca/lib/client/credential" fabricx509 "github.com/hyperledger/fabric-ca/lib/client/credential/x509" "github.com/hyperledger/fabric-ca/lib/tls" + utils "github.com/hyperledger/fabric-ca/util" "github.com/hyperledger/fabric/bccsp" - "github.com/hyperledger/fabric/bccsp/utils" "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/wait" diff --git a/pkg/initializer/ca/bccsp/config.go b/pkg/initializer/ca/bccsp/config.go index 58b823d9..673b31f2 100644 --- a/pkg/initializer/ca/bccsp/config.go +++ b/pkg/initializer/ca/bccsp/config.go @@ -28,13 +28,13 @@ import ( func GetBCCSPOpts(from v1.BCCSP) *factory.FactoryOpts { factoryOpts := &factory.FactoryOpts{ - ProviderName: from.ProviderName, + Default: from.Default, } if from.SW != nil { - factoryOpts.SwOpts = &factory.SwOpts{ - SecLevel: from.SW.SecLevel, - HashFamily: from.SW.HashFamily, + factoryOpts.SW = &factory.SwOpts{ + Security: from.SW.Security, + Hash: from.SW.Hash, FileKeystore: &factory.FileKeystoreOpts{ KeyStorePath: from.SW.FileKeyStore.KeyStorePath, }, diff --git a/pkg/initializer/ca/bccsp/configpkcs11.go b/pkg/initializer/ca/bccsp/configpkcs11.go index 3760a98a..b8ef8b6a 100644 --- a/pkg/initializer/ca/bccsp/configpkcs11.go +++ b/pkg/initializer/ca/bccsp/configpkcs11.go @@ -29,13 +29,13 @@ import ( func GetBCCSPOpts(from config.BCCSP) *factory.FactoryOpts { factoryOpts := &factory.FactoryOpts{ - ProviderName: from.ProviderName, + Default: from.Default, } if from.SW != nil { factoryOpts.SwOpts = &factory.SwOpts{ - SecLevel: from.SW.SecLevel, - HashFamily: from.SW.HashFamily, + Security: from.SW.Security, + Hash: from.SW.Hash, FileKeystore: &factory.FileKeystoreOpts{ KeyStorePath: from.SW.FileKeyStore.KeyStorePath, }, @@ -43,19 +43,13 @@ func GetBCCSPOpts(from config.BCCSP) *factory.FactoryOpts { } if from.PKCS11 != nil { - factoryOpts.Pkcs11Opts = &pkcs11.PKCS11Opts{ - SecLevel: from.PKCS11.SecLevel, - HashFamily: from.PKCS11.HashFamily, - Library: from.PKCS11.Library, - Label: from.PKCS11.Label, - Pin: from.PKCS11.Pin, - SoftVerify: from.PKCS11.SoftVerify, - } - - if from.PKCS11.FileKeystore != nil { - factoryOpts.Pkcs11Opts.FileKeystore = &pkcs11.FileKeystoreOpts{ - KeyStorePath: from.PKCS11.FileKeyStore.KeyStorePath, - } + factoryOpts.PKCS11 = &pkcs11.PKCS11Opts{ + Security: from.PKCS11.Security, + Hash: from.PKCS11.Hash, + Library: from.PKCS11.Library, + Label: from.PKCS11.Label, + Pin: from.PKCS11.Pin, + SoftwareVerify: from.PKCS11.SoftwareVerify, } } diff --git a/pkg/initializer/ca/ca.go b/pkg/initializer/ca/ca.go index c57d552a..eb0fb342 100644 --- a/pkg/initializer/ca/ca.go +++ b/pkg/initializer/ca/ca.go @@ -391,12 +391,12 @@ func (ca *CA) SetPKCS11Defaults(serverConfig *v1.ServerConfig) { serverConfig.CAConfig.CSP.PKCS11.FileKeyStore.KeyStorePath = "msp/keystore" - if serverConfig.CAConfig.CSP.PKCS11.HashFamily == "" { - serverConfig.CAConfig.CSP.PKCS11.HashFamily = "SHA2" + if serverConfig.CAConfig.CSP.PKCS11.Hash == "" { + serverConfig.CAConfig.CSP.PKCS11.Hash = "SHA2" } - if serverConfig.CAConfig.CSP.PKCS11.SecLevel == 0 { - serverConfig.CAConfig.CSP.PKCS11.SecLevel = 256 + if serverConfig.CAConfig.CSP.PKCS11.Security == 0 { + serverConfig.CAConfig.CSP.PKCS11.Security = 256 } } diff --git a/pkg/initializer/ca/ca_test.go b/pkg/initializer/ca/ca_test.go index 609c2acf..fd88678f 100644 --- a/pkg/initializer/ca/ca_test.go +++ b/pkg/initializer/ca/ca_test.go @@ -59,7 +59,7 @@ var _ = Describe("IBPCA", func() { ServerConfig: &v1.ServerConfig{ CAConfig: v1.CAConfig{ CSP: &v1.BCCSP{ - ProviderName: "PKCS11", + Default: "PKCS11", PKCS11: &v1.PKCS11Opts{ Pin: "1234", Label: "root", @@ -112,7 +112,7 @@ var _ = Describe("IBPCA", func() { override := &v1.ServerConfig{ CAConfig: v1.CAConfig{ CSP: &v1.BCCSP{ - ProviderName: "PKCS11", + Default: "PKCS11", }, }, } @@ -124,8 +124,8 @@ var _ = Describe("IBPCA", func() { By("setting in defaults when using pkcs11", func() { Expect(defaultConfig.GetServerConfig().CAConfig.CSP.PKCS11.Library).To(Equal("/usr/local/lib/libpkcs11-proxy.so")) Expect(defaultConfig.GetServerConfig().CAConfig.CSP.PKCS11.FileKeyStore.KeyStorePath).To(Equal("msp/keystore")) - Expect(defaultConfig.GetServerConfig().CAConfig.CSP.PKCS11.HashFamily).To(Equal("SHA2")) - Expect(defaultConfig.GetServerConfig().CAConfig.CSP.PKCS11.SecLevel).To(Equal(256)) + Expect(defaultConfig.GetServerConfig().CAConfig.CSP.PKCS11.Hash).To(Equal("SHA2")) + Expect(defaultConfig.GetServerConfig().CAConfig.CSP.PKCS11.Security).To(Equal(256)) Expect(defaultConfig.GetServerConfig().CAConfig.CSR.CN).To(Equal("ca_test")) }) }) diff --git a/pkg/initializer/ca/config/config.go b/pkg/initializer/ca/config/config.go index 3faeb6b6..1742a528 100644 --- a/pkg/initializer/ca/config/config.go +++ b/pkg/initializer/ca/config/config.go @@ -292,7 +292,7 @@ func (c *Config) SetMountPaths(caType Type) { func (c *Config) UsingPKCS11() bool { if c.ServerConfig != nil && c.ServerConfig.CAConfig.CSP != nil { - if strings.ToLower(c.ServerConfig.CAConfig.CSP.ProviderName) == "pkcs11" { + if strings.ToLower(c.ServerConfig.CAConfig.CSP.Default) == "pkcs11" { return true } } diff --git a/pkg/initializer/ca/tls/tls_test.go b/pkg/initializer/ca/tls/tls_test.go index cd5b637d..77433b8c 100644 --- a/pkg/initializer/ca/tls/tls_test.go +++ b/pkg/initializer/ca/tls/tls_test.go @@ -41,7 +41,7 @@ var _ = Describe("generating TLS crypto", func() { BeforeEach(func() { csp := &factory.FactoryOpts{ - ProviderName: "SW", + Default: "SW", } tlsGen = &tls.TLS{ CAHomeDir: "crypto", diff --git a/pkg/initializer/common/enroller/client_pkcs11.go b/pkg/initializer/common/enroller/client_pkcs11.go index 32e6c914..a5b55fde 100644 --- a/pkg/initializer/common/enroller/client_pkcs11.go +++ b/pkg/initializer/common/enroller/client_pkcs11.go @@ -32,24 +32,17 @@ func GetClient(client *lib.Client, bccsp *commonapi.BCCSP) *lib.Client { if bccsp != nil { if bccsp.PKCS11 != nil { client.Config.CSP = &factory.FactoryOpts{ - ProviderName: bccsp.ProviderName, - Pkcs11Opts: &pkcs11.PKCS11Opts{ - SecLevel: bccsp.PKCS11.SecLevel, - HashFamily: bccsp.PKCS11.HashFamily, - Ephemeral: bccsp.PKCS11.Ephemeral, - Library: bccsp.PKCS11.Library, - Label: bccsp.PKCS11.Label, - Pin: bccsp.PKCS11.Pin, - SoftVerify: bccsp.PKCS11.SoftVerify, - Immutable: bccsp.PKCS11.Immutable, + Default: bccsp.Default, + PKCS11: &pkcs11.PKCS11Opts{ + Security: bccsp.PKCS11.Security, + Hash: bccsp.PKCS11.Hash, + Library: bccsp.PKCS11.Library, + Label: bccsp.PKCS11.Label, + Pin: bccsp.PKCS11.Pin, + SoftwareVerify: bccsp.PKCS11.SoftwareVerify, + Immutable: bccsp.PKCS11.Immutable, }, } - - if bccsp.PKCS11.FileKeyStore != nil { - client.Config.CSP.Pkcs11Opts.FileKeystore = &pkcs11.FileKeystoreOpts{ - KeyStorePath: bccsp.PKCS11.FileKeyStore.KeyStorePath, - } - } } } diff --git a/pkg/initializer/orderer/config/v1/config_test.go b/pkg/initializer/orderer/config/v1/config_test.go index 04482531..d2c46cb4 100644 --- a/pkg/initializer/orderer/config/v1/config_test.go +++ b/pkg/initializer/orderer/config/v1/config_test.go @@ -54,13 +54,13 @@ var _ = Describe("Orderer configuration", func() { Orderer: v1.Orderer{ General: v1.General{ BCCSP: &commonapi.BCCSP{ - ProviderName: "PKCS11", + Default: "PKCS11", PKCS11: &commonapi.PKCS11Opts{ - Library: "library2", - Label: "label2", - Pin: "2222", - HashFamily: "SHA3", - SecLevel: 512, + Library: "library2", + Label: "label2", + Pin: "2222", + Hash: "SHA3", + Security: 512, FileKeyStore: &commonapi.FileKeyStoreOpts{ KeyStorePath: "keystore3", }, @@ -75,8 +75,8 @@ var _ = Describe("Orderer configuration", func() { Expect(orderer.General.BCCSP.PKCS11.Library).To(Equal("/usr/local/lib/libpkcs11-proxy.so")) Expect(orderer.General.BCCSP.PKCS11.Label).To(Equal("label2")) Expect(orderer.General.BCCSP.PKCS11.Pin).To(Equal("2222")) - Expect(orderer.General.BCCSP.PKCS11.HashFamily).To(Equal("SHA3")) - Expect(orderer.General.BCCSP.PKCS11.SecLevel).To(Equal(512)) + Expect(orderer.General.BCCSP.PKCS11.Hash).To(Equal("SHA3")) + Expect(orderer.General.BCCSP.PKCS11.Security).To(Equal(512)) Expect(orderer.General.BCCSP.PKCS11.FileKeyStore.KeyStorePath).To(Equal("keystore3")) }) @@ -157,16 +157,16 @@ var _ = Describe("Orderer configuration", func() { Expect(general.TLS.ClientRootCAs).To(Equal([]string{"tls/client.crt"})) }) - By("setting General.BCCSP.ProviderName", func() { - Expect(general.BCCSP.ProviderName).To(Equal("SW")) + By("setting General.BCCSP.Default", func() { + Expect(general.BCCSP.Default).To(Equal("SW")) }) - By("setting General.BCCSP.SW.HashFamily", func() { - Expect(general.BCCSP.SW.HashFamily).To(Equal("SHA2")) + By("setting General.BCCSP.SW.Hash", func() { + Expect(general.BCCSP.SW.Hash).To(Equal("SHA2")) }) - By("setting General.BCCSP.SW.SecLevel", func() { - Expect(general.BCCSP.SW.SecLevel).To(Equal(256)) + By("setting General.BCCSP.SW.Security", func() { + Expect(general.BCCSP.SW.Security).To(Equal(256)) }) By("setting General.BCCSP.SW.FileKeyStore.KeyStore", func() { @@ -185,12 +185,12 @@ var _ = Describe("Orderer configuration", func() { Expect(general.BCCSP.PKCS11.Pin).To(Equal("1234")) }) - By("setting BCCSP.PKCS11.HashFamily", func() { - Expect(general.BCCSP.PKCS11.HashFamily).To(Equal("SHA2")) + By("setting BCCSP.PKCS11.Hash", func() { + Expect(general.BCCSP.PKCS11.Hash).To(Equal("SHA2")) }) By("setting BCCSP.PKCS11.Security", func() { - Expect(general.BCCSP.PKCS11.SecLevel).To(Equal(256)) + Expect(general.BCCSP.PKCS11.Security).To(Equal(256)) }) By("setting BCCSP.PKCS11.FileKeystore.KeystorePath", func() { diff --git a/pkg/initializer/orderer/config/v1/orderer.go b/pkg/initializer/orderer/config/v1/orderer.go index caefeb45..46328459 100644 --- a/pkg/initializer/orderer/config/v1/orderer.go +++ b/pkg/initializer/orderer/config/v1/orderer.go @@ -98,7 +98,7 @@ func (o *Orderer) DeepCopy() *Orderer { func (o *Orderer) UsingPKCS11() bool { if o.General.BCCSP != nil { - if strings.ToLower(o.General.BCCSP.ProviderName) == "pkcs11" { + if strings.ToLower(o.General.BCCSP.Default) == "pkcs11" { return true } } @@ -114,12 +114,12 @@ func (o *Orderer) SetPKCS11Defaults(usingHSMProxy bool) { o.General.BCCSP.PKCS11.Library = "/usr/local/lib/libpkcs11-proxy.so" } - if o.General.BCCSP.PKCS11.HashFamily == "" { - o.General.BCCSP.PKCS11.HashFamily = "SHA2" + if o.General.BCCSP.PKCS11.Hash == "" { + o.General.BCCSP.PKCS11.Hash = "SHA2" } - if o.General.BCCSP.PKCS11.SecLevel == 0 { - o.General.BCCSP.PKCS11.SecLevel = 256 + if o.General.BCCSP.PKCS11.Security == 0 { + o.General.BCCSP.PKCS11.Security = 256 } } diff --git a/pkg/initializer/orderer/config/v2/config_test.go b/pkg/initializer/orderer/config/v2/config_test.go index 10e66b5c..f8063e91 100644 --- a/pkg/initializer/orderer/config/v2/config_test.go +++ b/pkg/initializer/orderer/config/v2/config_test.go @@ -56,13 +56,13 @@ var _ = Describe("V24 Orderer Configuration", func() { Orderer: v2.Orderer{ General: v2.General{ BCCSP: &commonapi.BCCSP{ - ProviderName: "PKCS11", + Default: "PKCS11", PKCS11: &commonapi.PKCS11Opts{ - Library: "library2", - Label: "label2", - Pin: "2222", - HashFamily: "SHA3", - SecLevel: 512, + Library: "library2", + Label: "label2", + Pin: "2222", + Hash: "SHA3", + Security: 512, FileKeyStore: &commonapi.FileKeyStoreOpts{ KeyStorePath: "keystore3", }, @@ -77,8 +77,8 @@ var _ = Describe("V24 Orderer Configuration", func() { Expect(orderer.General.BCCSP.PKCS11.Library).To(Equal("/usr/local/lib/libpkcs11-proxy.so")) Expect(orderer.General.BCCSP.PKCS11.Label).To(Equal("label2")) Expect(orderer.General.BCCSP.PKCS11.Pin).To(Equal("2222")) - Expect(orderer.General.BCCSP.PKCS11.HashFamily).To(Equal("SHA3")) - Expect(orderer.General.BCCSP.PKCS11.SecLevel).To(Equal(512)) + Expect(orderer.General.BCCSP.PKCS11.Hash).To(Equal("SHA3")) + Expect(orderer.General.BCCSP.PKCS11.Security).To(Equal(512)) Expect(orderer.General.BCCSP.PKCS11.FileKeyStore.KeyStorePath).To(Equal("keystore3")) }) @@ -155,16 +155,16 @@ var _ = Describe("V24 Orderer Configuration", func() { Expect(general.TLS.ClientRootCAs).To(Equal([]string{"tls/client.crt"})) }) - By("setting General.BCCSP.ProviderName", func() { - Expect(general.BCCSP.ProviderName).To(Equal("SW")) + By("setting General.BCCSP.Default", func() { + Expect(general.BCCSP.Default).To(Equal("SW")) }) - By("setting General.BCCSP.SW.HashFamily", func() { - Expect(general.BCCSP.SW.HashFamily).To(Equal("SHA2")) + By("setting General.BCCSP.SW.Hash", func() { + Expect(general.BCCSP.SW.Hash).To(Equal("SHA2")) }) - By("setting General.BCCSP.SW.SecLevel", func() { - Expect(general.BCCSP.SW.SecLevel).To(Equal(256)) + By("setting General.BCCSP.SW.Security", func() { + Expect(general.BCCSP.SW.Security).To(Equal(256)) }) By("setting General.BCCSP.SW.FileKeyStore.KeyStore", func() { @@ -183,12 +183,12 @@ var _ = Describe("V24 Orderer Configuration", func() { Expect(general.BCCSP.PKCS11.Pin).To(Equal("1234")) }) - By("setting BCCSP.PKCS11.HashFamily", func() { - Expect(general.BCCSP.PKCS11.HashFamily).To(Equal("SHA2")) + By("setting BCCSP.PKCS11.Hash", func() { + Expect(general.BCCSP.PKCS11.Hash).To(Equal("SHA2")) }) By("setting BCCSP.PKCS11.Security", func() { - Expect(general.BCCSP.PKCS11.SecLevel).To(Equal(256)) + Expect(general.BCCSP.PKCS11.Security).To(Equal(256)) }) By("setting BCCSP.PKCS11.FileKeystore.KeystorePath", func() { diff --git a/pkg/initializer/orderer/config/v2/orderer.go b/pkg/initializer/orderer/config/v2/orderer.go index c532446b..1b1e71cb 100644 --- a/pkg/initializer/orderer/config/v2/orderer.go +++ b/pkg/initializer/orderer/config/v2/orderer.go @@ -98,7 +98,7 @@ func (o *Orderer) DeepCopy() *Orderer { func (o *Orderer) UsingPKCS11() bool { if o.General.BCCSP != nil { - if strings.ToLower(o.General.BCCSP.ProviderName) == "pkcs11" { + if strings.ToLower(o.General.BCCSP.Default) == "pkcs11" { return true } } @@ -114,12 +114,12 @@ func (o *Orderer) SetPKCS11Defaults(usingHSMProxy bool) { o.General.BCCSP.PKCS11.Library = "/usr/local/lib/libpkcs11-proxy.so" } - if o.General.BCCSP.PKCS11.HashFamily == "" { - o.General.BCCSP.PKCS11.HashFamily = "SHA2" + if o.General.BCCSP.PKCS11.Hash == "" { + o.General.BCCSP.PKCS11.Hash = "SHA2" } - if o.General.BCCSP.PKCS11.SecLevel == 0 { - o.General.BCCSP.PKCS11.SecLevel = 256 + if o.General.BCCSP.PKCS11.Security == 0 { + o.General.BCCSP.PKCS11.Security = 256 } } diff --git a/pkg/initializer/orderer/config/v24/config_test.go b/pkg/initializer/orderer/config/v24/config_test.go index 17149250..1b159c07 100644 --- a/pkg/initializer/orderer/config/v24/config_test.go +++ b/pkg/initializer/orderer/config/v24/config_test.go @@ -56,13 +56,13 @@ var _ = Describe("V2 Orderer Configuration", func() { Orderer: v24.Orderer{ General: v24.General{ BCCSP: &commonapi.BCCSP{ - ProviderName: "PKCS11", + Default: "PKCS11", PKCS11: &commonapi.PKCS11Opts{ - Library: "library2", - Label: "label2", - Pin: "2222", - HashFamily: "SHA3", - SecLevel: 512, + Library: "library2", + Label: "label2", + Pin: "2222", + Hash: "SHA3", + Security: 512, FileKeyStore: &commonapi.FileKeyStoreOpts{ KeyStorePath: "keystore3", }, @@ -77,8 +77,8 @@ var _ = Describe("V2 Orderer Configuration", func() { Expect(orderer.General.BCCSP.PKCS11.Library).To(Equal("/usr/local/lib/libpkcs11-proxy.so")) Expect(orderer.General.BCCSP.PKCS11.Label).To(Equal("label2")) Expect(orderer.General.BCCSP.PKCS11.Pin).To(Equal("2222")) - Expect(orderer.General.BCCSP.PKCS11.HashFamily).To(Equal("SHA3")) - Expect(orderer.General.BCCSP.PKCS11.SecLevel).To(Equal(512)) + Expect(orderer.General.BCCSP.PKCS11.Hash).To(Equal("SHA3")) + Expect(orderer.General.BCCSP.PKCS11.Security).To(Equal(512)) Expect(orderer.General.BCCSP.PKCS11.FileKeyStore.KeyStorePath).To(Equal("keystore3")) }) @@ -155,16 +155,16 @@ var _ = Describe("V2 Orderer Configuration", func() { Expect(general.TLS.ClientRootCAs).To(Equal([]string{"tls/client.crt"})) }) - By("setting General.BCCSP.ProviderName", func() { - Expect(general.BCCSP.ProviderName).To(Equal("SW")) + By("setting General.BCCSP.Default", func() { + Expect(general.BCCSP.Default).To(Equal("SW")) }) - By("setting General.BCCSP.SW.HashFamily", func() { - Expect(general.BCCSP.SW.HashFamily).To(Equal("SHA2")) + By("setting General.BCCSP.SW.Hash", func() { + Expect(general.BCCSP.SW.Hash).To(Equal("SHA2")) }) - By("setting General.BCCSP.SW.SecLevel", func() { - Expect(general.BCCSP.SW.SecLevel).To(Equal(256)) + By("setting General.BCCSP.SW.Security", func() { + Expect(general.BCCSP.SW.Security).To(Equal(256)) }) By("setting General.BCCSP.SW.FileKeyStore.KeyStore", func() { @@ -183,12 +183,12 @@ var _ = Describe("V2 Orderer Configuration", func() { Expect(general.BCCSP.PKCS11.Pin).To(Equal("1234")) }) - By("setting BCCSP.PKCS11.HashFamily", func() { - Expect(general.BCCSP.PKCS11.HashFamily).To(Equal("SHA2")) + By("setting BCCSP.PKCS11.Hash", func() { + Expect(general.BCCSP.PKCS11.Hash).To(Equal("SHA2")) }) By("setting BCCSP.PKCS11.Security", func() { - Expect(general.BCCSP.PKCS11.SecLevel).To(Equal(256)) + Expect(general.BCCSP.PKCS11.Security).To(Equal(256)) }) By("setting BCCSP.PKCS11.FileKeystore.KeystorePath", func() { diff --git a/pkg/initializer/orderer/config/v24/orderer.go b/pkg/initializer/orderer/config/v24/orderer.go index bcabd8e8..7d1acd0c 100644 --- a/pkg/initializer/orderer/config/v24/orderer.go +++ b/pkg/initializer/orderer/config/v24/orderer.go @@ -97,7 +97,7 @@ func (o *Orderer) DeepCopy() *Orderer { func (o *Orderer) UsingPKCS11() bool { if o.General.BCCSP != nil { - if strings.ToLower(o.General.BCCSP.ProviderName) == "pkcs11" { + if strings.ToLower(o.General.BCCSP.Default) == "pkcs11" { return true } } @@ -113,12 +113,12 @@ func (o *Orderer) SetPKCS11Defaults(usingHSMProxy bool) { o.General.BCCSP.PKCS11.Library = "/usr/local/lib/libpkcs11-proxy.so" } - if o.General.BCCSP.PKCS11.HashFamily == "" { - o.General.BCCSP.PKCS11.HashFamily = "SHA2" + if o.General.BCCSP.PKCS11.Hash == "" { + o.General.BCCSP.PKCS11.Hash = "SHA2" } - if o.General.BCCSP.PKCS11.SecLevel == 0 { - o.General.BCCSP.PKCS11.SecLevel = 256 + if o.General.BCCSP.PKCS11.Security == 0 { + o.General.BCCSP.PKCS11.Security = 256 } } diff --git a/pkg/initializer/orderer/config/v25/config_test.go b/pkg/initializer/orderer/config/v25/config_test.go index 1429c248..af1b7aac 100644 --- a/pkg/initializer/orderer/config/v25/config_test.go +++ b/pkg/initializer/orderer/config/v25/config_test.go @@ -57,13 +57,13 @@ var _ = Describe("V2 Orderer Configuration", func() { Orderer: v25.Orderer{ General: v24.General{ BCCSP: &commonapi.BCCSP{ - ProviderName: "PKCS11", + Default: "PKCS11", PKCS11: &commonapi.PKCS11Opts{ - Library: "library2", - Label: "label2", - Pin: "2222", - HashFamily: "SHA3", - SecLevel: 512, + Library: "library2", + Label: "label2", + Pin: "2222", + Hash: "SHA3", + Security: 512, FileKeyStore: &commonapi.FileKeyStoreOpts{ KeyStorePath: "keystore3", }, @@ -78,8 +78,8 @@ var _ = Describe("V2 Orderer Configuration", func() { Expect(orderer.General.BCCSP.PKCS11.Library).To(Equal("/usr/local/lib/libpkcs11-proxy.so")) Expect(orderer.General.BCCSP.PKCS11.Label).To(Equal("label2")) Expect(orderer.General.BCCSP.PKCS11.Pin).To(Equal("2222")) - Expect(orderer.General.BCCSP.PKCS11.HashFamily).To(Equal("SHA3")) - Expect(orderer.General.BCCSP.PKCS11.SecLevel).To(Equal(512)) + Expect(orderer.General.BCCSP.PKCS11.Hash).To(Equal("SHA3")) + Expect(orderer.General.BCCSP.PKCS11.Security).To(Equal(512)) Expect(orderer.General.BCCSP.PKCS11.FileKeyStore.KeyStorePath).To(Equal("keystore3")) }) @@ -156,16 +156,16 @@ var _ = Describe("V2 Orderer Configuration", func() { Expect(general.TLS.ClientRootCAs).To(Equal([]string{"tls/client.crt"})) }) - By("setting General.BCCSP.ProviderName", func() { - Expect(general.BCCSP.ProviderName).To(Equal("SW")) + By("setting General.BCCSP.Default", func() { + Expect(general.BCCSP.Default).To(Equal("SW")) }) - By("setting General.BCCSP.SW.HashFamily", func() { - Expect(general.BCCSP.SW.HashFamily).To(Equal("SHA2")) + By("setting General.BCCSP.SW.Hash", func() { + Expect(general.BCCSP.SW.Hash).To(Equal("SHA2")) }) - By("setting General.BCCSP.SW.SecLevel", func() { - Expect(general.BCCSP.SW.SecLevel).To(Equal(256)) + By("setting General.BCCSP.SW.Security", func() { + Expect(general.BCCSP.SW.Security).To(Equal(256)) }) By("setting General.BCCSP.SW.FileKeyStore.KeyStore", func() { @@ -184,12 +184,12 @@ var _ = Describe("V2 Orderer Configuration", func() { Expect(general.BCCSP.PKCS11.Pin).To(Equal("1234")) }) - By("setting BCCSP.PKCS11.HashFamily", func() { - Expect(general.BCCSP.PKCS11.HashFamily).To(Equal("SHA2")) + By("setting BCCSP.PKCS11.Hash", func() { + Expect(general.BCCSP.PKCS11.Hash).To(Equal("SHA2")) }) By("setting BCCSP.PKCS11.Security", func() { - Expect(general.BCCSP.PKCS11.SecLevel).To(Equal(256)) + Expect(general.BCCSP.PKCS11.Security).To(Equal(256)) }) By("setting BCCSP.PKCS11.FileKeystore.KeystorePath", func() { diff --git a/pkg/initializer/orderer/config/v25/orderer.go b/pkg/initializer/orderer/config/v25/orderer.go index 3784f080..af006ef7 100644 --- a/pkg/initializer/orderer/config/v25/orderer.go +++ b/pkg/initializer/orderer/config/v25/orderer.go @@ -97,7 +97,7 @@ func (o *Orderer) DeepCopy() *Orderer { func (o *Orderer) UsingPKCS11() bool { if o.General.BCCSP != nil { - if strings.ToLower(o.General.BCCSP.ProviderName) == "pkcs11" { + if strings.ToLower(o.General.BCCSP.Default) == "pkcs11" { return true } } @@ -113,12 +113,12 @@ func (o *Orderer) SetPKCS11Defaults(usingHSMProxy bool) { o.General.BCCSP.PKCS11.Library = "/usr/local/lib/libpkcs11-proxy.so" } - if o.General.BCCSP.PKCS11.HashFamily == "" { - o.General.BCCSP.PKCS11.HashFamily = "SHA2" + if o.General.BCCSP.PKCS11.Hash == "" { + o.General.BCCSP.PKCS11.Hash = "SHA2" } - if o.General.BCCSP.PKCS11.SecLevel == 0 { - o.General.BCCSP.PKCS11.SecLevel = 256 + if o.General.BCCSP.PKCS11.Security == 0 { + o.General.BCCSP.PKCS11.Security = 256 } } diff --git a/pkg/initializer/orderer/configtx/configtx.go b/pkg/initializer/orderer/configtx/configtx.go index 94e90ee8..dd9e5bb3 100644 --- a/pkg/initializer/orderer/configtx/configtx.go +++ b/pkg/initializer/orderer/configtx/configtx.go @@ -25,7 +25,6 @@ import ( "github.com/hyperledger/fabric-protos-go/orderer/etcdraft" "github.com/hyperledger/fabric/common/viperutil" "github.com/pkg/errors" - "github.com/spf13/viper" ) // +k8s:openapi-gen=true @@ -102,12 +101,12 @@ func GetGenesisDefaults() *TopLevel { } func LoadTopLevelConfig(configFile string) (*TopLevel, error) { - config := viper.New() + config := viperutil.New() configDir, err := filepath.Abs(filepath.Dir(configFile)) if err != nil { return nil, errors.Wrap(err, "error getting absolute path") } - config.AddConfigPath(configDir) + config.AddConfigPaths(configDir) config.SetConfigName("configtx") err = config.ReadInConfig() @@ -116,7 +115,7 @@ func LoadTopLevelConfig(configFile string) (*TopLevel, error) { } var uconf TopLevel - err = viperutil.EnhancedExactUnmarshal(config, &uconf) + err = config.EnhancedExactUnmarshal(&uconf) if err != nil { return nil, errors.Wrap(err, "error unmarshaling config into struct") } diff --git a/pkg/initializer/orderer/configtx/encoder.go b/pkg/initializer/orderer/configtx/encoder.go index e467ab3a..12745b91 100644 --- a/pkg/initializer/orderer/configtx/encoder.go +++ b/pkg/initializer/orderer/configtx/encoder.go @@ -21,9 +21,9 @@ package configtx import ( cb "github.com/hyperledger/fabric-protos-go/common" pb "github.com/hyperledger/fabric-protos-go/peer" - "github.com/hyperledger/fabric/common/cauthdsl" "github.com/hyperledger/fabric/common/channelconfig" "github.com/hyperledger/fabric/common/policies" + "github.com/hyperledger/fabric/common/policydsl" "github.com/hyperledger/fabric/msp" "github.com/hyperledger/fabric/protoutil" "github.com/pkg/errors" @@ -101,7 +101,7 @@ func NewConsortiumsGroup(conf map[string]*Consortium) (*cb.ConfigGroup, error) { consortiumsGroup := protoutil.NewConfigGroup() // This policy is not referenced anywhere, it is only used as part of the implicit meta policy rule at the channel level, so this setting // effectively degrades control of the ordering system channel to the ordering admins - addPolicy(consortiumsGroup, policies.SignaturePolicy(channelconfig.AdminsPolicyKey, cauthdsl.AcceptAllPolicy), ordererAdminsPolicyName) + addPolicy(consortiumsGroup, policies.SignaturePolicy(channelconfig.AdminsPolicyKey, policydsl.AcceptAllPolicy), ordererAdminsPolicyName) for consortiumName, consortium := range conf { var err error @@ -186,7 +186,7 @@ func AddPolicies(cg *cb.ConfigGroup, policyMap map[string]*Policy, modPolicy str }, } case SignaturePolicyType: - sp, err := cauthdsl.FromString(policy.Rule) + sp, err := policydsl.FromString(policy.Rule) if err != nil { return errors.Wrapf(err, "invalid signature policy rule '%s'", policy.Rule) } diff --git a/pkg/initializer/orderer/configtx/profile.go b/pkg/initializer/orderer/configtx/profile.go index f8d56947..1497e80d 100644 --- a/pkg/initializer/orderer/configtx/profile.go +++ b/pkg/initializer/orderer/configtx/profile.go @@ -22,9 +22,9 @@ import ( "strings" "github.com/gogo/protobuf/proto" - "github.com/hyperledger/fabric/common/cauthdsl" "github.com/hyperledger/fabric/common/channelconfig" "github.com/hyperledger/fabric/common/policies" + "github.com/hyperledger/fabric/common/policydsl" cb "github.com/hyperledger/fabric-protos-go/common" "github.com/hyperledger/fabric-protos-go/msp" @@ -128,7 +128,7 @@ func (p *Profile) Block(channelID string, channelGroup *cb.ConfigGroup) *cb.Bloc block := utils.NewBlock(0, nil) block.Data = &cb.BlockData{Data: [][]byte{utils.MarshalOrPanic(envelope)}} - block.Header.DataHash = utils.BlockDataHash(block.Data) + block.Header.DataHash, _ = utils.BlockDataHash(block.Data) block.Metadata.Metadata[cb.BlockMetadataIndex_LAST_CONFIG] = utils.MarshalOrPanic(&cb.Metadata{ Value: utils.MarshalOrPanic(&cb.LastConfig{Index: 0}), }) @@ -305,7 +305,7 @@ func addPolicies(cg *cb.ConfigGroup, policyMap map[string]*Policy, modPolicy str }, } case SignaturePolicyType: - sp, err := cauthdsl.FromString(policy.Rule) + sp, err := policydsl.FromString(policy.Rule) if err != nil { return errors.Wrapf(err, "invalid signature policy rule '%s'", policy.Rule) } @@ -331,10 +331,10 @@ func addImplicitMetaPolicyDefaults(cg *cb.ConfigGroup) { func addSignaturePolicyDefaults(cg *cb.ConfigGroup, mspID string, devMode bool) { if devMode { - addPolicy(cg, policies.SignaturePolicy(channelconfig.AdminsPolicyKey, cauthdsl.SignedByMspMember(mspID)), channelconfig.AdminsPolicyKey) + addPolicy(cg, policies.SignaturePolicy(channelconfig.AdminsPolicyKey, policydsl.SignedByMspMember(mspID)), channelconfig.AdminsPolicyKey) } else { - addPolicy(cg, policies.SignaturePolicy(channelconfig.AdminsPolicyKey, cauthdsl.SignedByMspAdmin(mspID)), channelconfig.AdminsPolicyKey) + addPolicy(cg, policies.SignaturePolicy(channelconfig.AdminsPolicyKey, policydsl.SignedByMspAdmin(mspID)), channelconfig.AdminsPolicyKey) } - addPolicy(cg, policies.SignaturePolicy(channelconfig.ReadersPolicyKey, cauthdsl.SignedByMspMember(mspID)), channelconfig.AdminsPolicyKey) - addPolicy(cg, policies.SignaturePolicy(channelconfig.WritersPolicyKey, cauthdsl.SignedByMspMember(mspID)), channelconfig.AdminsPolicyKey) + addPolicy(cg, policies.SignaturePolicy(channelconfig.ReadersPolicyKey, policydsl.SignedByMspMember(mspID)), channelconfig.AdminsPolicyKey) + addPolicy(cg, policies.SignaturePolicy(channelconfig.WritersPolicyKey, policydsl.SignedByMspMember(mspID)), channelconfig.AdminsPolicyKey) } diff --git a/pkg/initializer/peer/config/v1/config.go b/pkg/initializer/peer/config/v1/config.go index 8d982d6f..73e249c8 100644 --- a/pkg/initializer/peer/config/v1/config.go +++ b/pkg/initializer/peer/config/v1/config.go @@ -107,7 +107,7 @@ func (c *Core) DeepCopy() *Core { func (c *Core) UsingPKCS11() bool { if c.Peer.BCCSP != nil { - if strings.ToLower(c.Peer.BCCSP.ProviderName) == "pkcs11" { + if strings.ToLower(c.Peer.BCCSP.Default) == "pkcs11" { return true } } @@ -123,15 +123,15 @@ func (c *Core) SetPKCS11Defaults(usingHSMProxy bool) { c.Peer.BCCSP.PKCS11.Library = "/usr/local/lib/libpkcs11-proxy.so" } - if c.Peer.BCCSP.PKCS11.HashFamily == "" { - c.Peer.BCCSP.PKCS11.HashFamily = "SHA2" + if c.Peer.BCCSP.PKCS11.Hash == "" { + c.Peer.BCCSP.PKCS11.Hash = "SHA2" } - if c.Peer.BCCSP.PKCS11.SecLevel == 0 { - c.Peer.BCCSP.PKCS11.SecLevel = 256 + if c.Peer.BCCSP.PKCS11.Security == 0 { + c.Peer.BCCSP.PKCS11.Security = 256 } - c.Peer.BCCSP.PKCS11.SoftVerify = true + c.Peer.BCCSP.PKCS11.SoftwareVerify = true } func (c *Core) SetDefaultKeyStore() { diff --git a/pkg/initializer/peer/config/v1/config_test.go b/pkg/initializer/peer/config/v1/config_test.go index 032681e0..5c0d1b43 100644 --- a/pkg/initializer/peer/config/v1/config_test.go +++ b/pkg/initializer/peer/config/v1/config_test.go @@ -67,13 +67,13 @@ var _ = Describe("Peer configuration", func() { Peer: v1.Peer{ ID: "test", BCCSP: &common.BCCSP{ - ProviderName: "PKCS11", + Default: "PKCS11", PKCS11: &common.PKCS11Opts{ - Library: "library2", - Label: "label2", - Pin: "2222", - HashFamily: "SHA3", - SecLevel: 512, + Library: "library2", + Label: "label2", + Pin: "2222", + Hash: "SHA3", + Security: 512, FileKeyStore: &common.FileKeyStoreOpts{ KeyStorePath: "keystore3", }, @@ -106,8 +106,8 @@ var _ = Describe("Peer configuration", func() { Expect(core.Peer.BCCSP.PKCS11.Library).To(Equal("/usr/local/lib/libpkcs11-proxy.so")) Expect(core.Peer.BCCSP.PKCS11.Label).To(Equal("label2")) Expect(core.Peer.BCCSP.PKCS11.Pin).To(Equal("2222")) - Expect(core.Peer.BCCSP.PKCS11.HashFamily).To(Equal("SHA3")) - Expect(core.Peer.BCCSP.PKCS11.SecLevel).To(Equal(512)) + Expect(core.Peer.BCCSP.PKCS11.Hash).To(Equal("SHA3")) + Expect(core.Peer.BCCSP.PKCS11.Security).To(Equal(512)) Expect(core.Peer.BCCSP.PKCS11.FileKeyStore.KeyStorePath).To(Equal("keystore3")) Expect(core.Peer.Keepalive.MinInterval).To(Equal(common.MustParseDuration("13s"))) @@ -129,7 +129,7 @@ var _ = Describe("Peer configuration", func() { Peer: v1.Peer{ ID: "test", BCCSP: &common.BCCSP{ - ProviderName: "PKCS11", + Default: "PKCS11", PKCS11: &common.PKCS11Opts{ Label: "label2", Pin: "2222", @@ -148,8 +148,8 @@ var _ = Describe("Peer configuration", func() { Expect(core.Peer.BCCSP.PKCS11.Library).To(Equal("/usr/local/lib/libpkcs11-proxy.so")) Expect(core.Peer.BCCSP.PKCS11.Label).To(Equal("label2")) Expect(core.Peer.BCCSP.PKCS11.Pin).To(Equal("2222")) - Expect(core.Peer.BCCSP.PKCS11.HashFamily).To(Equal("SHA2")) - Expect(core.Peer.BCCSP.PKCS11.SecLevel).To(Equal(256)) + Expect(core.Peer.BCCSP.PKCS11.Hash).To(Equal("SHA2")) + Expect(core.Peer.BCCSP.PKCS11.Security).To(Equal(256)) Expect(core.Peer.BCCSP.PKCS11.FileKeyStore.KeyStorePath).To(Equal("keystore2")) }) @@ -381,16 +381,16 @@ var _ = Describe("Peer configuration", func() { }) // BCCSP - By("setting BCCSP.ProviderName", func() { - Expect(peerConfig.BCCSP.ProviderName).To(Equal("SW")) + By("setting BCCSP.Default", func() { + Expect(peerConfig.BCCSP.Default).To(Equal("SW")) }) - By("setting BCCSP.SW.HashFamily", func() { - Expect(peerConfig.BCCSP.SW.HashFamily).To(Equal("SHA2")) + By("setting BCCSP.SW.Hash", func() { + Expect(peerConfig.BCCSP.SW.Hash).To(Equal("SHA2")) }) - By("setting BCCSP.SW.SecLevel", func() { - Expect(peerConfig.BCCSP.SW.SecLevel).To(Equal(256)) + By("setting BCCSP.SW.Security", func() { + Expect(peerConfig.BCCSP.SW.Security).To(Equal(256)) }) By("setting BCCSP.SW.FileKeystore.KeystorePath", func() { @@ -409,12 +409,12 @@ var _ = Describe("Peer configuration", func() { Expect(peerConfig.BCCSP.PKCS11.Pin).To(Equal("1234")) }) - By("setting BCCSP.PKCS11.HashFamily", func() { - Expect(peerConfig.BCCSP.PKCS11.HashFamily).To(Equal("SHA2")) + By("setting BCCSP.PKCS11.Hash", func() { + Expect(peerConfig.BCCSP.PKCS11.Hash).To(Equal("SHA2")) }) By("setting BCCSP.PKCS11.Security", func() { - Expect(peerConfig.BCCSP.PKCS11.SecLevel).To(Equal(256)) + Expect(peerConfig.BCCSP.PKCS11.Security).To(Equal(256)) }) By("setting BCCSP.PKCS11.FileKeystore.KeystorePath", func() { diff --git a/pkg/initializer/peer/config/v2/config.go b/pkg/initializer/peer/config/v2/config.go index 7d66fc2e..e4f9ae63 100644 --- a/pkg/initializer/peer/config/v2/config.go +++ b/pkg/initializer/peer/config/v2/config.go @@ -109,7 +109,7 @@ func (c *Core) DeepCopy() *Core { func (c *Core) UsingPKCS11() bool { if c.Peer.BCCSP != nil { - if strings.ToLower(c.Peer.BCCSP.ProviderName) == "pkcs11" { + if strings.ToLower(c.Peer.BCCSP.Default) == "pkcs11" { return true } } @@ -125,15 +125,15 @@ func (c *Core) SetPKCS11Defaults(usingHSMProxy bool) { c.Peer.BCCSP.PKCS11.Library = "/usr/local/lib/libpkcs11-proxy.so" } - if c.Peer.BCCSP.PKCS11.HashFamily == "" { - c.Peer.BCCSP.PKCS11.HashFamily = "SHA2" + if c.Peer.BCCSP.PKCS11.Hash == "" { + c.Peer.BCCSP.PKCS11.Hash = "SHA2" } - if c.Peer.BCCSP.PKCS11.SecLevel == 0 { - c.Peer.BCCSP.PKCS11.SecLevel = 256 + if c.Peer.BCCSP.PKCS11.Security == 0 { + c.Peer.BCCSP.PKCS11.Security = 256 } - c.Peer.BCCSP.PKCS11.SoftVerify = true + c.Peer.BCCSP.PKCS11.SoftwareVerify = true } func (c *Core) SetDefaultKeyStore() { diff --git a/pkg/initializer/peer/config/v2/config_test.go b/pkg/initializer/peer/config/v2/config_test.go index aff372ef..006f28bb 100644 --- a/pkg/initializer/peer/config/v2/config_test.go +++ b/pkg/initializer/peer/config/v2/config_test.go @@ -36,13 +36,13 @@ var _ = Describe("Peer configuration", func() { Core: v2core.Core{ Peer: v2core.Peer{ BCCSP: &common.BCCSP{ - ProviderName: "PKCS11", + Default: "PKCS11", PKCS11: &common.PKCS11Opts{ - Library: "library2", - Label: "label2", - Pin: "2222", - HashFamily: "SHA3", - SecLevel: 512, + Library: "library2", + Label: "label2", + Pin: "2222", + Hash: "SHA3", + Security: 512, FileKeyStore: &common.FileKeyStoreOpts{ KeyStorePath: "keystore3", }, @@ -58,12 +58,12 @@ var _ = Describe("Peer configuration", func() { Expect(err).NotTo(HaveOccurred()) Expect(*core.Peer.BCCSP.PKCS11).To(Equal(common.PKCS11Opts{ - Library: "/usr/local/lib/libpkcs11-proxy.so", - Label: "label2", - Pin: "2222", - HashFamily: "SHA3", - SecLevel: 512, - SoftVerify: true, + Library: "/usr/local/lib/libpkcs11-proxy.so", + Label: "label2", + Pin: "2222", + Hash: "SHA3", + Security: 512, + SoftwareVerify: true, FileKeyStore: &common.FileKeyStoreOpts{ KeyStorePath: "keystore3", }, diff --git a/pkg/initializer/peer/config/v25/config.go b/pkg/initializer/peer/config/v25/config.go index 7c2ea51b..3e1e0aec 100644 --- a/pkg/initializer/peer/config/v25/config.go +++ b/pkg/initializer/peer/config/v25/config.go @@ -109,7 +109,7 @@ func (c *Core) DeepCopy() *Core { func (c *Core) UsingPKCS11() bool { if c.Peer.BCCSP != nil { - if strings.ToLower(c.Peer.BCCSP.ProviderName) == "pkcs11" { + if strings.ToLower(c.Peer.BCCSP.Default) == "pkcs11" { return true } } @@ -125,15 +125,15 @@ func (c *Core) SetPKCS11Defaults(usingHSMProxy bool) { c.Peer.BCCSP.PKCS11.Library = "/usr/local/lib/libpkcs11-proxy.so" } - if c.Peer.BCCSP.PKCS11.HashFamily == "" { - c.Peer.BCCSP.PKCS11.HashFamily = "SHA2" + if c.Peer.BCCSP.PKCS11.Hash == "" { + c.Peer.BCCSP.PKCS11.Hash = "SHA2" } - if c.Peer.BCCSP.PKCS11.SecLevel == 0 { - c.Peer.BCCSP.PKCS11.SecLevel = 256 + if c.Peer.BCCSP.PKCS11.Security == 0 { + c.Peer.BCCSP.PKCS11.Security = 256 } - c.Peer.BCCSP.PKCS11.SoftVerify = true + c.Peer.BCCSP.PKCS11.SoftwareVerify = true } func (c *Core) SetDefaultKeyStore() { diff --git a/pkg/initializer/peer/config/v25/config_test.go b/pkg/initializer/peer/config/v25/config_test.go index 6a68f525..e2fff68a 100644 --- a/pkg/initializer/peer/config/v25/config_test.go +++ b/pkg/initializer/peer/config/v25/config_test.go @@ -37,13 +37,13 @@ var _ = Describe("Peer configuration", func() { Core: v25core.Core{ Peer: v25core.Peer{ BCCSP: &common.BCCSP{ - ProviderName: "PKCS11", + Default: "PKCS11", PKCS11: &common.PKCS11Opts{ - Library: "library2", - Label: "label2", - Pin: "2222", - HashFamily: "SHA3", - SecLevel: 512, + Library: "library2", + Label: "label2", + Pin: "2222", + Hash: "SHA3", + Security: 512, FileKeyStore: &common.FileKeyStoreOpts{ KeyStorePath: "keystore3", }, @@ -59,12 +59,12 @@ var _ = Describe("Peer configuration", func() { Expect(err).NotTo(HaveOccurred()) Expect(*core.Peer.BCCSP.PKCS11).To(Equal(common.PKCS11Opts{ - Library: "/usr/local/lib/libpkcs11-proxy.so", - Label: "label2", - Pin: "2222", - HashFamily: "SHA3", - SecLevel: 512, - SoftVerify: true, + Library: "/usr/local/lib/libpkcs11-proxy.so", + Label: "label2", + Pin: "2222", + Hash: "SHA3", + Security: 512, + SoftwareVerify: true, FileKeyStore: &common.FileKeyStoreOpts{ KeyStorePath: "keystore3", }, diff --git a/pkg/initializer/peer/peer_test.go b/pkg/initializer/peer/peer_test.go index f2e6038c..146df2ae 100644 --- a/pkg/initializer/peer/peer_test.go +++ b/pkg/initializer/peer/peer_test.go @@ -60,8 +60,8 @@ var _ = Describe("peer", func() { Core: v1.Core{ Peer: v1.Peer{ BCCSP: &commonapi.BCCSP{ - ProviderName: "PKCS11", - PKCS11: &commonapi.PKCS11Opts{}, + Default: "PKCS11", + PKCS11: &commonapi.PKCS11Opts{}, }, }, }, diff --git a/pkg/offering/base/ca/override/deployment_test.go b/pkg/offering/base/ca/override/deployment_test.go index e44b7839..7cef5bee 100644 --- a/pkg/offering/base/ca/override/deployment_test.go +++ b/pkg/offering/base/ca/override/deployment_test.go @@ -825,7 +825,7 @@ var _ = Describe("Deployment Overrides", func() { ca := &v1.ServerConfig{ CAConfig: v1.CAConfig{ CSP: &v1.BCCSP{ - ProviderName: "PKCS11", + Default: "PKCS11", PKCS11: &v1.PKCS11Opts{ Label: "partition1", Pin: "B6T9Q7mGNG", diff --git a/pkg/offering/base/orderer/node_test.go b/pkg/offering/base/orderer/node_test.go index 0fb779d0..fda2a740 100644 --- a/pkg/offering/base/orderer/node_test.go +++ b/pkg/offering/base/orderer/node_test.go @@ -912,7 +912,7 @@ var _ = Describe("Base Orderer Node", func() { Orderer: v1.Orderer{ General: v1.General{ BCCSP: &commonapi.BCCSP{ - ProviderName: "pkcs11", + Default: "pkcs11", PKCS11: &commonapi.PKCS11Opts{ FileKeyStore: &commonapi.FileKeyStoreOpts{ KeyStorePath: "msp/keystore", @@ -956,7 +956,7 @@ var _ = Describe("Base Orderer Node", func() { Orderer: v1.Orderer{ General: v1.General{ BCCSP: &commonapi.BCCSP{ - ProviderName: "sw", + Default: "sw", PKCS11: &commonapi.PKCS11Opts{ FileKeyStore: &commonapi.FileKeyStoreOpts{ KeyStorePath: "msp/keystore", @@ -992,7 +992,7 @@ var _ = Describe("Base Orderer Node", func() { Orderer: v2.Orderer{ General: v2.General{ BCCSP: &commonapi.BCCSP{ - ProviderName: "PKCS11", + Default: "PKCS11", }, }, }, diff --git a/pkg/offering/base/orderer/override/deployment_test.go b/pkg/offering/base/orderer/override/deployment_test.go index 7dd2c43d..13d08a50 100644 --- a/pkg/offering/base/orderer/override/deployment_test.go +++ b/pkg/offering/base/orderer/override/deployment_test.go @@ -500,7 +500,7 @@ var _ = Describe("Base Orderer Deployment Overrides", func() { Orderer: v2orderer.Orderer{ General: v2orderer.General{ BCCSP: &common.BCCSP{ - ProviderName: "PKCS11", + Default: "PKCS11", PKCS11: &common.PKCS11Opts{ Label: "partition1", Pin: "B6T9Q7mGNG", diff --git a/pkg/offering/base/peer/override/deployment_test.go b/pkg/offering/base/peer/override/deployment_test.go index 0b1039de..b03e011b 100644 --- a/pkg/offering/base/peer/override/deployment_test.go +++ b/pkg/offering/base/peer/override/deployment_test.go @@ -975,7 +975,7 @@ var _ = Describe("Base Peer Deployment Overrides", func() { Core: v2peer.Core{ Peer: v2peer.Peer{ BCCSP: &common.BCCSP{ - ProviderName: "PKCS11", + Default: "PKCS11", PKCS11: &common.PKCS11Opts{ Label: "partition1", Pin: "B6T9Q7mGNG", diff --git a/pkg/offering/base/peer/peer_test.go b/pkg/offering/base/peer/peer_test.go index 75d15b8f..524e54a9 100644 --- a/pkg/offering/base/peer/peer_test.go +++ b/pkg/offering/base/peer/peer_test.go @@ -899,7 +899,7 @@ var _ = Describe("Base Peer", func() { Core: v1.Core{ Peer: v1.Peer{ BCCSP: &commonapi.BCCSP{ - ProviderName: "pkcs11", + Default: "pkcs11", PKCS11: &commonapi.PKCS11Opts{ FileKeyStore: &commonapi.FileKeyStoreOpts{ KeyStorePath: "msp/keystore", @@ -958,7 +958,7 @@ var _ = Describe("Base Peer", func() { Core: v1.Core{ Peer: v1.Peer{ BCCSP: &commonapi.BCCSP{ - ProviderName: "sw", + Default: "sw", SW: &commonapi.SwOpts{ FileKeyStore: commonapi.FileKeyStoreOpts{ KeyStorePath: "msp/keystore",