Skip to content

Commit a10aee4

Browse files
joevanwanzeeleKFjoevanwanzeeleKF
committed
Merge branch 'fix_ci' of https://github.com/Keyfactor/hashicorp-vault-secretsengine into role-domain-validation
2 parents 84a3bde + 580f15c commit a10aee4

File tree

8 files changed

+194
-10
lines changed

8 files changed

+194
-10
lines changed

‎.github/dependabot.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# See GitHub's documentation for more information on this file:
2+
# https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates
3+
version: 2
4+
updates:
5+
- package-ecosystem: "github-actions"
6+
directory: "/"
7+
schedule:
8+
interval: "daily"
9+
- package-ecosystem: "gomod"
10+
directory: "/"
11+
schedule:
12+
interval: "daily"

‎.github/images/kf_logo.png‎

3.52 KB
Loading

‎.github/workflows/keyfactor-starter-workflow.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Keyfactor Bootstrap Workflow
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
types: [opened, closed, synchronize, edited, reopened]
7+
push:
8+
create:
9+
branches:
10+
- 'release-*.*'
11+
12+
jobs:
13+
call-starter-workflow:
14+
uses: keyfactor/actions/.github/workflows/starter.yml@v2
15+
secrets:
16+
token: ${{ secrets.V2BUILDTOKEN}}
17+
APPROVE_README_PUSH: ${{ secrets.APPROVE_README_PUSH}}
18+
gpg_key: ${{ secrets.KF_GPG_PRIVATE_KEY }}
19+
gpg_pass: ${{ secrets.KF_GPG_PASSPHRASE }}

‎.goreleaser.yml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# Visit https://goreleaser.com for documentation on how to customize this
2+
# behavior.
3+
before:
4+
hooks:
5+
# this is just an example and not a requirement for provider building/publishing
6+
- go mod tidy
7+
builds:
8+
- env:
9+
# goreleaser does not work with CGO, it could also complicate
10+
# usage by users in CI/CD systems like Terraform Cloud where
11+
# they are unable to install libraries.
12+
- CGO_ENABLED=0
13+
mod_timestamp: '{{ .CommitTimestamp }}'
14+
flags:
15+
- -trimpath
16+
ldflags:
17+
- '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}'
18+
goos:
19+
- freebsd
20+
- windows
21+
- linux
22+
- darwin
23+
goarch:
24+
- amd64
25+
- '386'
26+
- arm
27+
- arm64
28+
ignore:
29+
- goos: darwin
30+
goarch: '386'
31+
- goos: freebsd
32+
goarch: 'arm64'
33+
binary: 'keyfactor'
34+
main: './cmd/keyfactor'
35+
archives:
36+
- format: zip
37+
name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
38+
checksum:
39+
extra_files:
40+
- glob: 'integration-manifest.json'
41+
name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json'
42+
name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'
43+
algorithm: sha256
44+
signs:
45+
- artifacts: checksum
46+
args:
47+
# if you are using this in a GitHub action or some other automated pipeline, you
48+
# need to pass the batch flag to indicate its not interactive.
49+
- "--batch"
50+
- "--local-user"
51+
- "{{ .Env.GPG_FINGERPRINT }}" # set this environment variable for your signing key
52+
- "--output"
53+
- "${signature}"
54+
- "--detach-sign"
55+
- "${artifact}"
56+
release:
57+
prerelease: auto
58+
extra_files:
59+
- glob: 'integration-manifest.json'
60+
name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json'
61+
# If you want to manually examine the release before its live, uncomment this line:
62+
draft: true
63+
changelog:
64+
sort: asc
65+
use: github
66+
filters:
67+
exclude:
68+
- '^test:'
69+
- '^chore'
70+
- 'merge conflict'
71+
- Merge pull request
72+
- Merge remote-tracking branch
73+
- Merge branch
74+
- go mod tidy
75+
groups:
76+
- title: Dependency updates
77+
regexp: "^.*(feat|fix)\\(deps\\)*:+.*$"
78+
order: 300
79+
- title: 'New Features'
80+
regexp: "^.*feat[(\\w)]*:+.*$"
81+
order: 100
82+
- title: 'Bug fixes'
83+
regexp: "^.*fix[(\\w)]*:+.*$"
84+
order: 200
85+
- title: 'Documentation updates'
86+
regexp: "^.*docs[(\\w)]*:+.*$"
87+
order: 400
88+
- title: Other work
89+
order: 9999

‎Makefile‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
BINARY = "keyfactor"
2+
VERSION = "v1.3.1"
3+
14
GOARCH = amd64
25

36
UNAME = $(shell uname -s)
@@ -31,4 +34,20 @@ clean:
3134
fmt:
3235
go fmt $$(go list ./...)
3336

37+
38+
release:
39+
GOOS=darwin GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_darwin_amd64
40+
GOOS=freebsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_freebsd_386
41+
GOOS=freebsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_freebsd_amd64
42+
GOOS=freebsd GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_freebsd_arm
43+
GOOS=linux GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_linux_386
44+
GOOS=linux GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_linux_amd64
45+
GOOS=linux GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_linux_arm
46+
GOOS=openbsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_openbsd_386
47+
GOOS=openbsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_openbsd_amd64
48+
GOOS=solaris GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_solaris_amd64
49+
GOOS=windows GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_windows_386
50+
GOOS=windows GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_windows_amd64
51+
52+
3453
.PHONY: build clean fmt start enable

‎go.mod‎

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,55 @@
11
module github.com/keyfactor/hashicorp-vault-secrets-engine
22

3-
go 1.12
3+
go 1.20
44

55
require (
66
github.com/Keyfactor/keyfactor-go-client v1.2.0
77
github.com/hashicorp/errwrap v1.0.0
88
github.com/hashicorp/go-hclog v0.16.2
99
github.com/hashicorp/vault/api v1.1.1
1010
github.com/hashicorp/vault/sdk v0.2.1
11-
github.com/ryanuber/go-glob v1.0.0
12-
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29
13-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2
11+
)
12+
13+
require (
14+
github.com/armon/go-metrics v0.3.3 // indirect
15+
github.com/armon/go-radix v1.0.0 // indirect
16+
github.com/cenkalti/backoff/v3 v3.0.0 // indirect
17+
github.com/fatih/color v1.7.0 // indirect
18+
github.com/golang/protobuf v1.4.2 // indirect
19+
github.com/golang/snappy v0.0.1 // indirect
20+
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
21+
github.com/hashicorp/go-immutable-radix v1.1.0 // indirect
22+
github.com/hashicorp/go-kms-wrapping/entropy v0.1.0 // indirect
23+
github.com/hashicorp/go-multierror v1.1.0 // indirect
24+
github.com/hashicorp/go-plugin v1.0.1 // indirect
25+
github.com/hashicorp/go-retryablehttp v0.6.6 // indirect
26+
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
27+
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
28+
github.com/hashicorp/go-uuid v1.0.2 // indirect
29+
github.com/hashicorp/go-version v1.2.0 // indirect
30+
github.com/hashicorp/golang-lru v0.5.3 // indirect
31+
github.com/hashicorp/hcl v1.0.0 // indirect
32+
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
33+
github.com/mattn/go-colorable v0.1.6 // indirect
34+
github.com/mattn/go-isatty v0.0.12 // indirect
35+
github.com/mitchellh/copystructure v1.0.0 // indirect
36+
github.com/mitchellh/go-homedir v1.1.0 // indirect
37+
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
38+
github.com/mitchellh/mapstructure v1.3.2 // indirect
39+
github.com/mitchellh/reflectwalk v1.0.0 // indirect
40+
github.com/oklog/run v1.0.0 // indirect
41+
github.com/pierrec/lz4 v2.5.2+incompatible // indirect
42+
github.com/ryanuber/go-glob v1.0.0 // indirect
43+
github.com/spbsoluble/go-pkcs12 v0.3.1 // indirect
44+
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
45+
go.uber.org/atomic v1.6.0 // indirect
46+
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect
47+
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
48+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
49+
golang.org/x/text v0.3.6 // indirect
50+
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
51+
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
52+
google.golang.org/grpc v1.29.1 // indirect
53+
google.golang.org/protobuf v1.25.0 // indirect
54+
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
1455
)

‎go.sum‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
33
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
44
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
55
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
6-
github.com/Keyfactor/keyfactor-go-client v1.2.0-rc1/go.mod h1:u1M1AjcwiO/Tbvc7EsNl9YTy757hO5wmey1/W/7Qkbs=
76
github.com/Keyfactor/keyfactor-go-client v1.2.0 h1:2gl9CMXoZ7H6mmssqQYUbrJNNyQ3wk2LZzqCiXykIiE=
87
github.com/Keyfactor/keyfactor-go-client v1.2.0/go.mod h1:u1M1AjcwiO/Tbvc7EsNl9YTy757hO5wmey1/W/7Qkbs=
98
github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
@@ -274,7 +273,6 @@ golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnf
274273
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
275274
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
276275
golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
277-
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 h1:vEg9joUBmeBcK9iSJftGNf3coIG4HqZElCPehJsfAYM=
278276
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
279277
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 h1:tkVvjkPTB7pnW3jnid7kNyAMPVWllTNOf/qKDze4p9o=
280278
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
@@ -298,7 +296,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
298296
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
299297
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
300298
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
301-
golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM=
302299
golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
303300
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
304301
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -328,15 +325,13 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
328325
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
329326
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
330327
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
331-
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y=
332328
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
333329
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
334330
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
335331
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
336332
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
337333
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
338334
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
339-
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
340335
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
341336
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
342337
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -388,7 +383,6 @@ gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4
388383
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
389384
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
390385
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
391-
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
392386
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
393387
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
394388
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=

‎integration-manifest.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"$schema": "https://keyfactor.github.io/integration-manifest-schema.json",
3+
"integration_type": "api-client",
4+
"name": "keyfactor-vault-secrets-engine",
5+
"status": "production",
6+
"support_level": "community",
7+
"link_github": false,
8+
"update_catalog": false,
9+
"description": "A Vault plugin that allows Vault to use Keyfactor Command as a CA and issue certificates."
10+
}

0 commit comments

Comments
 (0)