Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit 847bedf

Browse files
troyrondatroyronda
committed
[FAB-7057] Fix third_party pinning script on MacOS
Change-Id: I81228e313060ee5ef00d43b86b5600dd7a5f6421 Signed-off-by: Troy Ronda <troy@troyronda.com>
1 parent a5e3c16 commit 847bedf

File tree

2 files changed

+34
-12
lines changed

2 files changed

+34
-12
lines changed

‎scripts/third_party_pins/fabric-ca/apply_fabric_ca_client_utils.sh‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,28 @@ FILTER_FN="Enroll,GenCSR,SendReq,Init,newPost,newEnrollmentResponse,newCertifica
7070
FILTER_FN+=",getURL,NormalizeURL,initHTTPClient,net2LocalServerInfo,NewIdentity"
7171
gofilter
7272
sed -i'' -e 's/util.GetServerPort()/\"\"/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
73-
sed -i '/log "github.com\// a "github.com\/hyperledger\/fabric-sdk-go\/api\/apicryptosuite"' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
73+
sed -i'' -e '/log "github.com\// a\
74+
"github.com\/hyperledger\/fabric-sdk-go\/api\/apicryptosuite"\
75+
' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
7476
sed -i'' -e 's/bccsp.BCCSP/apicryptosuite.CryptoSuite/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
7577
sed -i'' -e 's/bccsp.Key/apicryptosuite.Key/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
7678

7779
FILTER_FILENAME="lib/identity.go"
7880
FILTER_FN="newIdentity,Revoke,Post,addTokenAuthHdr,GetECert,Reenroll,Register,GetName"
7981
gofilter
8082
sed -i'' -e 's/util.GetDefaultBCCSP()/nil/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
81-
sed -i '/log "github.com\// a "github.com\/hyperledger\/fabric-sdk-go\/api\/apicryptosuite"' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
83+
sed -i'' -e '/log "github.com\// a\
84+
"github.com\/hyperledger\/fabric-sdk-go\/api\/apicryptosuite"\
85+
' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
8286
sed -i'' -e 's/bccsp.BCCSP/apicryptosuite.CryptoSuite/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
8387
sed -i'' -e 's/bccsp.Key/apicryptosuite.Key/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
8488

8589
FILTER_FILENAME="lib/signer.go"
8690
FILTER_FN="newSigner,Key,Cert"
8791
gofilter
88-
sed -i '/"github.com\// a "github.com\/hyperledger\/fabric-sdk-go\/api\/apicryptosuite"' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
92+
sed -i'' -e '/"github.com\// a\
93+
"github.com\/hyperledger\/fabric-sdk-go\/api\/apicryptosuite"\
94+
' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
8995
sed -i'' -e 's/bccsp.Key/apicryptosuite.Key/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
9096

9197
FILTER_FILENAME="lib/clientconfig.go"
@@ -99,8 +105,12 @@ gofilter
99105
FILTER_FILENAME="lib/tls/tls.go"
100106
FILTER_FN="GetClientTLSConfig,AbsTLSClient,checkCertDates"
101107
gofilter
102-
sed -i '/log "github.com\// a "github.com\/hyperledger\/fabric-sdk-go\/api\/apicryptosuite"' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
103-
sed -i '/"crypto\// a cryptosuite "github.com\/hyperledger\/fabric-sdk-go\/pkg\/cryptosuite\/bccsp"' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
108+
sed -i'' -e '/log "github.com\// a\
109+
"github.com\/hyperledger\/fabric-sdk-go\/api\/apicryptosuite"\
110+
' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
111+
sed -i'' -e '/"crypto\// a\
112+
cryptosuite "github.com\/hyperledger\/fabric-sdk-go\/pkg\/cryptosuite\/bccsp"\
113+
' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
104114
sed -i'' -e 's/bccsp.BCCSP/apicryptosuite.CryptoSuite/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
105115
sed -i'' -e 's/csp = factory.GetDefault()/csp = cryptosuite.GetSuite(factory.GetDefault())/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
106116

@@ -113,12 +123,18 @@ gofilter
113123
sed -i'' -e '/_.\"time\"/d' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
114124
sed -i'' -e '/\"github.com\/cloudflare\/cfssl\/cli\"/d' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
115125
sed -i'' -e '/\"github.com\/cloudflare\/cfssl\/ocsp\"/d' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
116-
sed -i '/log "github.com\// a "github.com\/hyperledger\/fabric-sdk-go\/api\/apicryptosuite"' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
117-
sed -i '/cspsigner "github.com\// a cryptosuite "github.com\/hyperledger\/fabric-sdk-go\/pkg\/cryptosuite\/bccsp"' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
126+
sed -i'' -e '/log "github.com\// a\
127+
"github.com\/hyperledger\/fabric-sdk-go\/api\/apicryptosuite"\
128+
' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
129+
sed -i'' -e '/cspsigner "github.com\// a\
130+
cryptosuite "github.com\/hyperledger\/fabric-sdk-go\/pkg\/cryptosuite\/bccsp"\
131+
' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
118132
sed -i'' -e 's/bccsp.BCCSP/apicryptosuite.CryptoSuite/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
119133
sed -i'' -e 's/bccsp.Key/apicryptosuite.Key/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
120-
sed -i'' -e '0,/return csp, nil/! {0,/return csp, nil/ s/return csp, nil/return cryptosuite.GetSuite(csp), nil/g}' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
121-
134+
# skip first substitution of "return csp, nil"
135+
START_LINE=`grep -n "return csp, nil" "${TMP_PROJECT_PATH}/${FILTER_FILENAME}" | head -n 1 | awk -F':' '{print $1}'`
136+
START_LINE=$((START_LINE+1))
137+
sed -i'' -e ${START_LINE}',$ s/return csp, nil/return cryptosuite.GetSuite(csp), nil/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
122138

123139
FILTER_FILENAME="util/util.go"
124140
FILTER_FN="ReadFile,HTTPRequestToString,HTTPResponseToString"
@@ -127,7 +143,9 @@ FILTER_FN+=",MakeFileAbs,Marshal,StructToString,LoadX509KeyPair,CreateToken"
127143
FILTER_FN+=",GenECDSAToken,GetEnrollmentIDFromX509Certificate,B64Encode,B64Decode"
128144
FILTER_FN+=",GetMaskedURL"
129145
gofilter
130-
sed -i '/log "golang.org\/x/ a "github.com\/hyperledger\/fabric-sdk-go\/api\/apicryptosuite"' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
146+
sed -i'' -e '/log "golang.org\/x/ a\
147+
"github.com\/hyperledger\/fabric-sdk-go\/api\/apicryptosuite"\
148+
' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
131149
sed -i'' -e 's/bccsp.BCCSP/apicryptosuite.CryptoSuite/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
132150
sed -i'' -e 's/bccsp.Key/apicryptosuite.Key/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
133151

‎scripts/third_party_pins/fabric/apply_fabric_client_utils.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,9 @@ FILTERS_ENABLED="fn"
108108
FILTER_FILENAME="bccsp/signer/signer.go"
109109
FILTER_FN=New,Public,Sign
110110
gofilter
111-
sed -i '/"github.com\// a "github.com\/hyperledger\/fabric-sdk-go\/api\/apicryptosuite"' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
111+
sed -i'' -e '/"github.com\// a \
112+
"github.com\/hyperledger\/fabric-sdk-go\/api\/apicryptosuite"\
113+
' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
112114
sed -i'' -e 's/bccsp.BCCSP/apicryptosuite.CryptoSuite/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
113115
sed -i'' -e 's/bccsp.Key/apicryptosuite.Key/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
114116

@@ -208,7 +210,9 @@ FILTER_FN+=",newBccspMsp,IsWellFormed,GetVersion"
208210
gofilter
209211
# TODO - adapt to msp/factory.go rather than changing newBccspMsp
210212
sed -i'' -e 's/newBccspMsp/NewBccspMsp/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
211-
sed -i '/m "github.com\// a cryptosuite "github.com\/hyperledger\/fabric-sdk-go\/pkg\/cryptosuite\/bccsp"' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
213+
sed -i'' -e '/m "github.com\// a \
214+
cryptosuite "github.com\/hyperledger\/fabric-sdk-go\/pkg\/cryptosuite\/bccsp"\
215+
' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
212216
sed -i'' -e 's/signer.New(msp.bccsp, privKey)/signer.New(cryptosuite.GetSuite(msp.bccsp), cryptosuite.GetKey(privKey))/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
213217

214218
FILTER_FILENAME="msp/mspimplsetup.go"

0 commit comments

Comments
 (0)
⚡