Skip to content

Commit faaff55

Browse files
committed
Fixes #1237 partially by updating test data certificates to be valid
1 parent 730ee58 commit faaff55

File tree

25 files changed

+44991
-5196
lines changed

25 files changed

+44991
-5196
lines changed

.github/workflows/go.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,10 @@ jobs:
7070
name: lint
7171
runs-on: ubuntu-latest
7272
steps:
73+
- uses: actions/checkout@v4
7374
- uses: actions/setup-go@v5
7475
with:
7576
go-version: 1.18
76-
- uses: actions/checkout@v4
7777
- name: golangci-lint
78-
uses: golangci/golangci-lint-action@v4
78+
uses: golangci/golangci-lint-action@v6
79+

.golangci.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,4 @@ linters:
55
- gosimple
66
- ineffassign
77
- unused
8-
- deadcode
98
- errcheck
10-
- varcheck

Makefile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ snapshot:
6060
--rm \
6161
-v $(PWD):/cross \
6262
-w /cross \
63-
ghcr.io/goreleaser/goreleaser-cross:latest --clean --snapshot --skip-publish
63+
ghcr.io/goreleaser/goreleaser-cross:latest --clean --snapshot --skip=publish
6464

6565
.PHONY: github-release
6666
github-release:
@@ -73,15 +73,8 @@ github-release:
7373
-w /cross \
7474
ghcr.io/goreleaser/goreleaser-cross:latest --clean
7575

76-
.PHONY: docker-build
77-
docker-build:
78-
docker build -f Dockerfile -t cfssl/cfssl:$(VERSION) .
79-
.PHONY: docker-push
80-
docker-push:
81-
docker push cfssl/cfssl:$(VERSION)
82-
8376
.PHONY: release
84-
release: github-release docker-build docker-push
77+
release: github-release
8578

8679
BUILD_PATH := $(CURDIR)/build
8780
INSTALL_PATH := $(BUILD_PATH)/usr/local/bin

api/bundle/bundle_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ var bundleTests = []bundleTest{
184184
}
185185

186186
func TestBundle(t *testing.T) {
187-
t.Skip("expired cert https://github.com/cloudflare/cfssl/issues/1237")
188187
for i, test := range bundleTests {
189188
resp, body := testBundleFile(t, test.Domain, test.IP, test.CertFile, test.KeyFile, test.Flavor)
190189
if resp.StatusCode != test.ExpectedHTTPStatus {

api/testdata/ca-bundle.pem

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
-----BEGIN CERTIFICATE-----
2-
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
17+
E4sm6QDE79e0Iw==
1718
-----END CERTIFICATE-----

bundler/bundle_from_remote_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ var remoteTests = []remoteTest{
103103

104104
// TestBundleFromRemote goes through the test cases defined in remoteTests and run them through. See above for test case definitions.
105105
func TestBundleFromRemote(t *testing.T) {
106-
t.Skip("expired cert https://github.com/cloudflare/cfssl/issues/1237")
107106
for _, bf := range []BundleFlavor{Ubiquitous, Optimal} {
108107
for _, test := range remoteTests {
109108
b := test.bundlerConstructor(t)
@@ -164,7 +163,6 @@ var remoteSNITests = []remoteTest{
164163

165164
// TestBundleFromRemoteSNI goes through the test cases defined in remoteSNITests and run them through. See above for test case definitions.
166165
func TestBundleFromRemoteSNI(t *testing.T) {
167-
t.Skip("expired cert https://github.com/cloudflare/cfssl/issues/1237")
168166
for _, bf := range []BundleFlavor{Ubiquitous, Optimal} {
169167
for _, test := range remoteSNITests {
170168
b := test.bundlerConstructor(t)

bundler/bundler_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,6 @@ func TestBundlerWithEmptyRootInfo(t *testing.T) {
916916
}
917917

918918
func TestBundlerClientAuth(t *testing.T) {
919-
t.Skip("expired cert https://github.com/cloudflare/cfssl/issues/1237")
920919
b, err := NewBundler("testdata/client-auth/root.pem", "testdata/client-auth/int.pem")
921920
if err != nil {
922921
t.Fatal(err)

0 commit comments

Comments
 (0)