Skip to content

Commit b35d0f4

Browse files
jakedoublevjakedoublev
committed
Merge branch 'main' into fix/metadata-render
2 parents e29cb9e + d2a3cb9 commit b35d0f4

Some content is hidden

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

64 files changed

+2380
-684
lines changed

‎.github/spellcheck.ignore‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
AllOf
2+
AnyOf
3+
Auth
4+
CLI's
5+
Changelog
6+
ConditionGroup
7+
CoolTool
8+
Decrypt
9+
ERS
10+
FQNs
11+
Hostname
12+
JSON
13+
JWT
14+
KASes
15+
KASs
16+
LDAP
17+
MacOS
18+
NPM
19+
Namespace
20+
Nano
21+
OIDC
22+
OpenTDF
23+
PDP
24+
PKCE
25+
README
26+
RadService
27+
SCS
28+
SDK
29+
ShinyThing
30+
TDF
31+
TDF'd
32+
TDFd
33+
TDFs
34+
TLS
35+
TODO
36+
TUI
37+
URI
38+
Unassign
39+
acmeco
40+
args
41+
attr
42+
auth
43+
cli
44+
clientId
45+
clientSecret
46+
config
47+
data-centric
48+
decrypt
49+
decryptable
50+
decrypted
51+
dev
52+
encodings
53+
enum
54+
https
55+
idP
56+
jq
57+
json
58+
jwt
59+
kas
60+
kas-url-path
61+
kasg
62+
kasr
63+
keychain
64+
keycloak
65+
keyring
66+
localhost
67+
namespace
68+
namespaces
69+
nano
70+
ns
71+
otdfctl
72+
performant
73+
poc
74+
pubkey
75+
quickstart
76+
resm
77+
resolvers
78+
scs
79+
sm
80+
stdin
81+
stdout
82+
stdout
83+
subcommand
84+
subcs
85+
subm
86+
submap
87+
tdf
88+
tdf-type
89+
tls
90+
tls-no-verify
91+
txt
92+
unassign
93+
unassignment
94+
upsert
95+
uri
96+
with-client-creds
97+
with-client-creds-file
98+
yaml

‎.github/workflows/ci.yaml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,24 @@ on:
44
pull_request:
55
branches:
66
- main
7+
paths-ignore:
8+
- '**/*.yaml'
9+
- '**/*.md'
10+
- LICENSE
11+
- CODEOWNERS
12+
- '.gitignore'
713

814
jobs:
15+
govulncheck:
16+
runs-on: ubuntu-latest
17+
name: Run govulncheck
18+
steps:
19+
- id: govulncheck
20+
uses: golang/govulncheck-action@v1
21+
with:
22+
go-version-file: go.mod
23+
go-package: ./...
24+
925
golangci:
1026
name: lint
1127
runs-on: ubuntu-22.04
@@ -66,6 +82,8 @@ jobs:
6682
working-directory: platform
6783
- run: go run ./service provision keycloak
6884
working-directory: platform
85+
- run: go run ./service provision fixtures
86+
working-directory: platform
6987
- uses: JarvusInnovations/background-action@2428e7b970a846423095c79d43f759abf979a635
7088
name: start server in background
7189
with:
@@ -85,4 +103,5 @@ jobs:
85103
- name: Setup Bats and bats libs
86104
uses: bats-core/[email protected]
87105
- run: tests/encrypt-decrypt.bats
88-
106+
- run: tests/kas-grants.bats
107+
- run: tests/kas-registry.bats

‎.github/workflows/pr-lint.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
chore
2525
docs
2626
scopes: |
27+
main
2728
core
2829
tui
2930
demo

‎.github/workflows/release.yaml‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
name: Release
22

33
permissions:
4-
contents: read
4+
contents: write
55
pull-requests: write
6-
packages: write
76
issues: write
87

98
on:
@@ -15,48 +14,52 @@ jobs:
1514
release-please:
1615
runs-on: ubuntu-latest
1716
steps:
17+
- name: Generate a token
18+
id: generate_token
19+
uses: actions/create-github-app-token@31c86eb3b33c9b601a1f60f98dcbfd1d70f379b4 # v1.10.3
20+
with:
21+
app-id: "${{ secrets.APP_ID }}"
22+
private-key: "${{ secrets.AUTOMATION_KEY }}"
1823
- uses: googleapis/release-please-action@7987652d64b4581673a76e33ad5e98e3dd56832f
1924
id: release
2025
with:
26+
token: ${{ steps.generate_token.outputs.token }}
2127
release-type: go
2228

23-
###
24-
# Tag the release
25-
- name: tag major and minor versions
26-
if: ${{ steps.release.outputs.release_created }}
27-
run: |
28-
git config user.name github-actions[bot]
29-
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
30-
git remote add gh-token "https://${{ secrets.GITHUB_TOKEN }}@github.com/googleapis/release-please-action.git"
31-
git tag -d v${{ steps.release.outputs.major }} || true
32-
git tag -d v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true
33-
git push origin :v${{ steps.release.outputs.major }} || true
34-
git push origin :v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true
35-
git tag -a v${{ steps.release.outputs.major }} -m "Release v${{ steps.release.outputs.major }}"
36-
git tag -a v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}"
37-
git push origin v${{ steps.release.outputs.major }}
38-
git push origin v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}
39-
40-
###
41-
# Build the release
4229
- uses: actions/checkout@v4
4330
if: ${{ steps.release.outputs.release_created }}
4431
- uses: actions/setup-go@v5
4532
if: ${{ steps.release.outputs.release_created }}
46-
- name: make-targets
33+
with:
34+
go-version-file: go.mod
35+
36+
## TODO get this working again
37+
## fatal: unable to access 'https://github.com/opentdf/otdfctl/': The requested URL returned error: 403
38+
# - name: Tag semver and push to repo
39+
# if: ${{ steps.release.outputs.release_created }}
40+
# run: |
41+
# git config user.name github-actions[bot]
42+
# git config user.email 41898282+github-actions[bot]@users.noreply.github.com
43+
# git remote add gh-token "https://${{ steps.generate_token.outputs.token }}@github.com/googleapis/release-please-action.git"
44+
# git tag -d v${{ steps.release.outputs.major }} || true
45+
# git tag -d v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true
46+
# git push origin :v${{ steps.release.outputs.major }} || true
47+
# git push origin :v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true
48+
# git tag -a v${{ steps.release.outputs.major }} -m "Release v${{ steps.release.outputs.major }}"
49+
# git tag -a v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}"
50+
# git push origin v${{ steps.release.outputs.major }}
51+
# git push origin v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}
52+
53+
- name: Build, compress, and draft checksums
4754
if: ${{ steps.release.outputs.release_created }}
4855
env:
4956
SEM_VER: ${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }}
5057
COMMIT_SHA: ${{ steps.release.outputs.sha }}
5158
run: make build
52-
- name: Compress the builds and generate checksums
53-
if: ${{ steps.release.outputs.release_created }}
54-
env:
55-
SEM_VER: ${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }}
56-
run: make zip-builds
59+
5760
- name: Upload Release Artifact
5861
if: ${{ steps.release.outputs.release_created }}
5962
env:
6063
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61-
run: gh release upload ${{ steps.release.outputs.tag_name }} ./output/**/*
64+
run: gh release upload ${{ steps.release.outputs.tag_name }} ./output/*
6265

‎.github/workflows/security-check.yaml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.github/workflows/spellcheck.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: 'spellcheck'
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
paths-ignore:
8+
- LICENSE
9+
- CODEOWNERS
10+
- '.gitignore'
11+
- '**/*.go'
12+
13+
jobs:
14+
spellcheck:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v3
18+
- uses: matheus23/[email protected]
19+
with:
20+
files-to-check: '**/*.md'
21+
files-to-exclude: 'CHANGELOG.md'
22+
words-to-ignore-file: './.github/spellcheck.ignore'

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ otdfctl.yaml
66

77
# Ignore the tructl binary
88
otdfctl
9+
otdfctl_testbuild
10+
11+
# Misc
12+
creds.json
913

1014
# Hugo
1115
public/

‎CHANGELOG.md‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# Changelog
2+
3+
## [0.12.2](https://github.com/opentdf/otdfctl/compare/v0.12.1...v0.12.2) (2024-08-27)
4+
5+
6+
### Bug Fixes
7+
8+
* **core:** improve KASR docs and add spellcheck GHA to pipeline ([#323](https://github.com/opentdf/otdfctl/issues/323)) ([a77cf30](https://github.com/opentdf/otdfctl/commit/a77cf30dc8077d034cb4c9df8cc94712b1a17dff)), closes [#335](https://github.com/opentdf/otdfctl/issues/335) [#337](https://github.com/opentdf/otdfctl/issues/337)
9+
* create new http client to ignore tls verification ([#324](https://github.com/opentdf/otdfctl/issues/324)) ([4d4afb7](https://github.com/opentdf/otdfctl/commit/4d4afb7e5b6411bb08a92bc53181ac5730ca1992))
10+
11+
## [0.12.1](https://github.com/opentdf/otdfctl/compare/v0.12.0...v0.12.1) (2024-08-26)
12+
13+
14+
### Bug Fixes
15+
16+
* **core:** remove documentation that cached kas pubkey is base64 ([#320](https://github.com/opentdf/otdfctl/issues/320)) ([fce8f44](https://github.com/opentdf/otdfctl/commit/fce8f44f767f35ccc4863f88d46e7ffcbd80f37a)), closes [#321](https://github.com/opentdf/otdfctl/issues/321)
17+
18+
## [0.12.0](https://github.com/opentdf/otdfctl/compare/v0.11.4...v0.12.0) (2024-08-23)
19+
20+
21+
### Features
22+
23+
* **ci:** attr e2e tests with mixed casing ([#315](https://github.com/opentdf/otdfctl/issues/315)) ([50ce712](https://github.com/opentdf/otdfctl/commit/50ce712eab38f6686611e2b306bda5cacd55c28e))
24+
* **core:** kasr cached keys to deprecate local ([#318](https://github.com/opentdf/otdfctl/issues/318)) ([5419cc3](https://github.com/opentdf/otdfctl/commit/5419cc39e143eb484f836ca1ee671d626d5e2c60)), closes [#317](https://github.com/opentdf/otdfctl/issues/317)
25+
26+
## [0.11.4](https://github.com/opentdf/otdfctl/compare/v0.11.3...v0.11.4) (2024-08-22)
27+
28+
29+
### Bug Fixes
30+
31+
* update workflow permissions ([#310](https://github.com/opentdf/otdfctl/issues/310)) ([3979fe8](https://github.com/opentdf/otdfctl/commit/3979fe85c9ab6511376d98b672cbfebddbf9bb84))
32+
33+
## [0.11.3](https://github.com/opentdf/otdfctl/compare/v0.11.2...v0.11.3) (2024-08-22)
34+
35+
36+
### Bug Fixes
37+
38+
* **core:** do not import unused fmt ([#306](https://github.com/opentdf/otdfctl/issues/306)) ([0dc552d](https://github.com/opentdf/otdfctl/commit/0dc552d3d6814f910c04d5f8cefa35404b4945f5))
39+
* **core:** nil panic on set-default ([#304](https://github.com/opentdf/otdfctl/issues/304)) ([92bbfa3](https://github.com/opentdf/otdfctl/commit/92bbfa32ae42b73b68551c2f9d3551d357bc5922))
40+
* **core:** warn and do now allow deletion of default profile ([#308](https://github.com/opentdf/otdfctl/issues/308)) ([fdd8167](https://github.com/opentdf/otdfctl/commit/fdd8167e8e2b22d652b48d796a756f86398bfd3c))
41+
* make file not building correctly ([#307](https://github.com/opentdf/otdfctl/issues/307)) ([64eb821](https://github.com/opentdf/otdfctl/commit/64eb82170fdcc50396194271be358bf9c9d43049))
42+
43+
## [0.11.2](https://github.com/opentdf/otdfctl/compare/v0.11.1...v0.11.2) (2024-08-22)
44+
45+
46+
### Bug Fixes
47+
48+
* disable tagging ([#302](https://github.com/opentdf/otdfctl/issues/302)) ([2b5db85](https://github.com/opentdf/otdfctl/commit/2b5db852ed0088e61f1180500135cd1865f9798b))
49+
50+
## [0.11.1](https://github.com/opentdf/otdfctl/compare/v0.11.0...v0.11.1) (2024-08-22)
51+
52+
53+
### Bug Fixes
54+
55+
* release-please tweak ([#300](https://github.com/opentdf/otdfctl/issues/300)) ([29fc836](https://github.com/opentdf/otdfctl/commit/29fc8360ae0b701aefe70b25d1838f442fd7eb8d))
56+
57+
## [0.11.0](https://github.com/opentdf/otdfctl/compare/v0.10.0...v0.11.0) (2024-08-22)
58+
59+
60+
### Features
61+
62+
* move git checkout before tagging ([#298](https://github.com/opentdf/otdfctl/issues/298)) ([1114e25](https://github.com/opentdf/otdfctl/commit/1114e25a90946e85622c8ff7a7befbf18beb4ba1))
63+
64+
## [0.10.0](https://github.com/opentdf/otdfctl/compare/v0.9.4...v0.10.0) (2024-08-22)
65+
66+
67+
### Features
68+
69+
* add profile support for cli ([#289](https://github.com/opentdf/otdfctl/issues/289)) ([15700f3](https://github.com/opentdf/otdfctl/commit/15700f3375196595e4a0ea3a7a6dea4da06d8612))
70+
* **core:** add scaffolding and POC for auth code flow ([#144](https://github.com/opentdf/otdfctl/issues/144)) ([03ecbfb](https://github.com/opentdf/otdfctl/commit/03ecbfb4f689f4a9f161a5a03d80efd50f728780))
71+
* **core:** support kas grants to namespaces ([#292](https://github.com/opentdf/otdfctl/issues/292)) ([f2c6689](https://github.com/opentdf/otdfctl/commit/f2c6689d2f775b1aed907d553c42d87c8464e6c7)), closes [#269](https://github.com/opentdf/otdfctl/issues/269)
72+
* improve auth with client credentials ([#286](https://github.com/opentdf/otdfctl/issues/286)) ([9c4968f](https://github.com/opentdf/otdfctl/commit/9c4968f48d1ba23a61ed5c8ad23a109bf141ba56))
73+
* improve auth with client credentials ([#296](https://github.com/opentdf/otdfctl/issues/296)) ([0f533c7](https://github.com/opentdf/otdfctl/commit/0f533c7278a53ddd90656b3c7efcaee1c5bfd957))
74+
75+
76+
### Bug Fixes
77+
78+
* **core:** bump platform deps ([#276](https://github.com/opentdf/otdfctl/issues/276)) ([e4ced99](https://github.com/opentdf/otdfctl/commit/e4ced996ae336b9db6db88906683f6600a2e5bf4))
79+
* reduce prints ([#277](https://github.com/opentdf/otdfctl/issues/277)) ([8b5734a](https://github.com/opentdf/otdfctl/commit/8b5734a18636071566fd8c4cfc808f3f240a02a5))

0 commit comments

Comments
 (0)