Skip to content

Commit d0e81af

Browse files
author
Raal Goff
committed
Merge branch 'master' into crl-support
2 parents 40baf73 + 6fe0fc8 commit d0e81af

File tree

150 files changed

+3994
-1569
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+3994
-1569
lines changed

Diff for: ‎.github/dependabot.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "gomod" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"

Diff for: ‎.github/workflows/ci.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
tags-ignore:
6+
- 'v*'
7+
branches:
8+
- "master"
9+
pull_request:
10+
workflow_call:
11+
secrets:
12+
GITLEAKS_LICENSE_KEY:
13+
required: true
14+
15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
17+
cancel-in-progress: true
18+
19+
jobs:
20+
ci:
21+
uses: smallstep/workflows/.github/workflows/goCI.yml@main
22+
with:
23+
os-dependencies: "libpcsclite-dev"
24+
run-gitleaks: true
25+
run-codeql: true
26+
secrets:
27+
GITLEAKS_LICENSE_KEY: ${{ secrets.GITLEAKS_LICENSE_KEY }}

Diff for: ‎.github/workflows/code-scan-cron.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
on:
2+
schedule:
3+
- cron: '0 0 * * *'
4+
5+
jobs:
6+
code-scan:
7+
uses: smallstep/workflows/.github/workflows/code-scan.yml@main
8+
secrets:
9+
GITLEAKS_LICENSE_KEY: ${{ secrets.GITLEAKS_LICENSE_KEY }}

Diff for: ‎.github/workflows/codeql-analysis.yml

-72
This file was deleted.

Diff for: ‎.github/workflows/release.yml

+5-33
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,13 @@ on:
77
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
88

99
jobs:
10-
test:
11-
name: Lint, Test, Build
12-
runs-on: ubuntu-20.04
13-
strategy:
14-
matrix:
15-
go: [ '1.18', '1.19' ]
16-
outputs:
17-
is_prerelease: ${{ steps.is_prerelease.outputs.IS_PRERELEASE }}
18-
steps:
19-
-
20-
name: Checkout
21-
uses: actions/checkout@v2
22-
-
23-
name: Setup Go
24-
uses: actions/setup-go@v2
25-
with:
26-
go-version: ${{ matrix.go }}
27-
-
28-
name: Install Deps
29-
id: install-deps
30-
run: sudo apt-get -y install libpcsclite-dev
31-
-
32-
name: golangci-lint
33-
uses: golangci/golangci-lint-action@v2
34-
with:
35-
version: ${{ secrets.GOLANGCI_LINT_VERSION }}
36-
args: --timeout=30m
37-
-
38-
name: Test, Build
39-
id: lint_test_build
40-
run: V=1 make ci
10+
ci:
11+
uses: smallstep/certificates/.github/workflows/ci.yml@main
12+
secrets: inherit
4113

4214
create_release:
4315
name: Create Release
44-
needs: test
16+
needs: ci
4517
runs-on: ubuntu-20.04
4618
outputs:
4719
debversion: ${{ steps.extract-tag.outputs.DEB_VERSION }}
@@ -132,7 +104,7 @@ jobs:
132104
build_upload_docker:
133105
name: Build & Upload Docker Images
134106
runs-on: ubuntu-20.04
135-
needs: test
107+
needs: ci
136108
steps:
137109
-
138110
name: Checkout

Diff for: ‎.github/workflows/test.yml

-49
This file was deleted.

Diff for: ‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
*.so
77
*.dylib
88

9+
# Go Workspaces
10+
go.work
11+
go.work.sum
12+
913
# Test binary, build with `go test -c`
1014
*.test
1115

Diff for: ‎.gitleaksignore

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
deac15327f5605a1a963e50818760a95cee9d882:docs/kms.md:generic-api-key:85
2+
deac15327f5605a1a963e50818760a95cee9d882:docs/kms.md:generic-api-key:107
3+
deac15327f5605a1a963e50818760a95cee9d882:docs/kms.md:generic-api-key:108
4+
deac15327f5605a1a963e50818760a95cee9d882:docs/kms.md:generic-api-key:129
5+
deac15327f5605a1a963e50818760a95cee9d882:docs/kms.md:generic-api-key:131
6+
deac15327f5605a1a963e50818760a95cee9d882:docs/kms.md:generic-api-key:136
7+
deac15327f5605a1a963e50818760a95cee9d882:docs/kms.md:generic-api-key:138
8+
7c9ab9814fb676cb3c125c3dac4893271f1b7ae5:README.md:generic-api-key:282
9+
fb7140444ac8f1fa1245a80e49d17e206f7435f3:docs/provisioners.md:generic-api-key:110
10+
e4de7f07e82118b3f926716666b620db058fa9f7:docs/revocation.md:generic-api-key:73
11+
e4de7f07e82118b3f926716666b620db058fa9f7:docs/revocation.md:generic-api-key:113
12+
e4de7f07e82118b3f926716666b620db058fa9f7:docs/revocation.md:generic-api-key:151
13+
8b2de42e9cf6ce99f53a5049881e1d6077d5d66e:docs/docker.md:generic-api-key:152
14+
3939e855264117e81531df777a642ea953d325a7:autocert/init/ca/intermediate_ca_key:private-key:1
15+
e72f08703753facfa05f2d8c68f9f6a3745824b8:README.md:generic-api-key:244
16+
e70a5dae7de0b6ca40a0393c09c28872d4cfa071:autocert/README.md:generic-api-key:365
17+
e70a5dae7de0b6ca40a0393c09c28872d4cfa071:autocert/README.md:generic-api-key:366
18+
c284a2c0ab1c571a46443104be38c873ef0c7c6d:config.json:generic-api-key:10

Diff for: ‎.golangci.yml

-74
This file was deleted.

Diff for: ‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1616
---
1717

1818
## [Unreleased]
19+
### Added
20+
- Added support for ACME device-attest-01 challenge.
21+
- Added name constraints evaluation and enforcement when issuing or renewing
22+
X.509 certificates.
1923

2024
## [0.22.1] - 2022-08-31
2125
### Fixed

Diff for: ‎Makefile

+12-11
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ ci: testcgo build
2828
#########################################
2929

3030
bootstra%:
31-
# Using a released version of golangci-lint to take into account custom replacements in their go.mod
32-
$Q curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.42.0
31+
$Q curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin latest
32+
$Q go install golang.org/x/vuln/cmd/govulncheck@latest
33+
$Q go install gotest.tools/gotestsum@latest
3334

3435
.PHONY: bootstra%
3536

@@ -132,17 +133,18 @@ generate:
132133
# Test
133134
#########################################
134135
test:
135-
$Q $(GOFLAGS) go test -short -coverprofile=coverage.out ./...
136+
$Q $(GOFLAGS) gotestsum -- -coverprofile=coverage.out -short -covermode=atomic ./...
137+
136138

137139
testcgo:
138-
$Q go test -short -coverprofile=coverage.out ./...
140+
$Q gotestsum -- -coverprofile=coverage.out -short -covermode=atomic ./...
139141

140142
.PHONY: test testcgo
141143

142144
integrate: integration
143145

144146
integration: bin/$(BINNAME)
145-
$Q $(GOFLAGS) go test -tags=integration ./integration/...
147+
$Q $(GOFLAGS) gotestsum -- -tags=integration ./integration/...
146148

147149
.PHONY: integrate integration
148150

@@ -151,15 +153,14 @@ integration: bin/$(BINNAME)
151153
#########################################
152154

153155
fmt:
154-
$Q gofmt -l -s -w $(SRC)
156+
$Q goimports -l -w $(SRC)
155157

158+
lint: SHELL:=/bin/bash
156159
lint:
157-
$Q golangci-lint run --timeout=30m
158-
159-
lintcgo:
160-
$Q LOG_LEVEL=error golangci-lint run --timeout=30m
160+
$Q LOG_LEVEL=error golangci-lint run --config <(curl -s https://raw.githubusercontent.com/smallstep/workflows/master/.golangci.yml) --timeout=30m
161+
$Q govulncheck ./...
161162

162-
.PHONY: fmt lint lintcgo
163+
.PHONY: fmt lint
163164

164165
#########################################
165166
# Install

0 commit comments

Comments
 (0)