Skip to content

Commit 9f034fb

Browse files
committed
chore: use tools/mod to lock the cfssl cmd version
Signed-off-by: Wei Fu <[email protected]>
1 parent 9dc54ca commit 9f034fb

File tree

6 files changed

+119
-13
lines changed

6 files changed

+119
-13
lines changed

pkg/proxy/fixtures/gencerts.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ fi
99

1010
if ! command -v cfssl; then
1111
echo "cfssl is not installed"
12-
echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssl"
12+
echo 'use: bash -c "cd ../../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssl"'
1313
exit 255
1414
fi
1515

1616
if ! command -v cfssljson; then
1717
echo "cfssljson is not installed"
18-
echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssljson"
18+
echo 'use: bash -c "cd ../../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssljson"'
1919
exit 255
2020
fi
2121

tests/fixtures/gencerts.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ fi
99

1010
if ! command -v cfssl; then
1111
echo "cfssl is not installed"
12-
echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssl"
12+
echo 'use: bash -c "cd ../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssl"'
1313
exit 255
1414
fi
1515

1616
if ! command -v cfssljson; then
1717
echo "cfssljson is not installed"
18-
echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssljson"
18+
echo 'use: bash -c "cd ../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssljson"'
1919
exit 255
2020
fi
2121

tests/integration/fixtures-expired/gencerts.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ fi
99

1010
if ! command -v cfssl; then
1111
echo "cfssl is not installed"
12-
echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssl"
12+
echo 'use: bash -c "cd ../../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssl"'
1313
exit 255
1414
fi
1515

1616
if ! command -v cfssljson; then
1717
echo "cfssljson is not installed"
18-
echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssljson"
18+
echo 'use: bash -c "cd ../../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssljson"'
1919
exit 255
2020
fi
2121

tools/mod/go.mod

+18-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ go 1.19
55
require (
66
github.com/alexkohler/nakedret v1.0.1
77
github.com/chzchzchz/goword v0.0.0-20170907005317-a9744cb52b03
8+
github.com/cloudflare/cfssl v1.6.4
89
github.com/coreos/license-bill-of-materials v0.0.0-20190913234955-13baff47494e
910
github.com/gogo/protobuf v1.3.2
1011
github.com/google/addlicense v1.1.1
@@ -41,6 +42,7 @@ require (
4142
github.com/fatih/structtag v1.2.0 // indirect
4243
github.com/fsnotify/fsnotify v1.5.4 // indirect
4344
github.com/ghodss/yaml v1.0.0 // indirect
45+
github.com/go-logr/logr v1.2.0 // indirect
4446
github.com/go-openapi/analysis v0.21.2 // indirect
4547
github.com/go-openapi/errors v0.19.9 // indirect
4648
github.com/go-openapi/jsonpointer v0.19.5 // indirect
@@ -49,31 +51,43 @@ require (
4951
github.com/go-openapi/spec v0.20.4 // indirect
5052
github.com/go-openapi/strfmt v0.21.0 // indirect
5153
github.com/go-openapi/swag v0.19.15 // indirect
54+
github.com/go-sql-driver/mysql v1.6.0 // indirect
5255
github.com/go-stack/stack v1.8.0 // indirect
5356
github.com/goccy/go-json v0.10.2 // indirect
5457
github.com/goccy/go-yaml v1.10.0 // indirect
5558
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
5659
github.com/golang/protobuf v1.5.3 // indirect
60+
github.com/google/certificate-transparency-go v1.1.4 // indirect
5761
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
5862
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5963
github.com/jinzhu/copier v0.3.5 // indirect
64+
github.com/jmhodges/clock v1.2.0 // indirect
65+
github.com/jmoiron/sqlx v1.3.3 // indirect
6066
github.com/josharian/intern v1.0.0 // indirect
67+
github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46 // indirect
68+
github.com/lib/pq v1.10.1 // indirect
6169
github.com/magiconair/properties v1.8.7 // indirect
6270
github.com/mailru/easyjson v0.7.6 // indirect
6371
github.com/mattn/go-colorable v0.1.13 // indirect
6472
github.com/mattn/go-isatty v0.0.17 // indirect
65-
github.com/mattn/go-runewidth v0.0.9 // indirect
73+
github.com/mattn/go-runewidth v0.0.13 // indirect
74+
github.com/mattn/go-sqlite3 v1.14.15 // indirect
6675
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 // indirect
6776
github.com/mitchellh/go-homedir v1.1.0 // indirect
6877
github.com/mitchellh/mapstructure v1.4.1 // indirect
6978
github.com/oklog/ulid v1.3.1 // indirect
7079
github.com/olekukonko/tablewriter v0.0.5 // indirect
7180
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
7281
github.com/pkg/errors v0.9.1 // indirect
73-
github.com/spf13/cobra v1.7.0 // indirect
82+
github.com/rivo/uniseg v0.2.0 // indirect
83+
github.com/spf13/cobra v1.6.1 // indirect
7484
github.com/spf13/pflag v1.0.5 // indirect
7585
github.com/trustmaster/go-aspell v0.0.0-20200701131845-c2b1f55bec8f // indirect
86+
github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b // indirect
87+
github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc // indirect
88+
github.com/zmap/zlint/v3 v3.1.0 // indirect
7689
go.mongodb.org/mongo-driver v1.7.3 // indirect
90+
golang.org/x/crypto v0.3.0 // indirect
7791
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
7892
golang.org/x/mod v0.9.0 // indirect
7993
golang.org/x/net v0.9.0 // indirect
@@ -83,9 +97,10 @@ require (
8397
golang.org/x/text v0.9.0 // indirect
8498
golang.org/x/tools v0.7.0 // indirect
8599
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
86-
google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884 // indirect
100+
google.golang.org/genproto v0.0.0-20220706185917-7780775163c4 // indirect
87101
google.golang.org/protobuf v1.30.0 // indirect
88102
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
89103
gopkg.in/yaml.v2 v2.4.0 // indirect
90104
gopkg.in/yaml.v3 v3.0.1 // indirect
105+
k8s.io/klog/v2 v2.80.1 // indirect
91106
)

0 commit comments

Comments
 (0)