Skip to content

Commit 7a2b09f

Browse files
spbsolubleKeyfactorm8rmclarenfiddlermikey
authored
Release 1.3 (#117)
* feat(store-types): `get` add -o flag to update integration manifest with retrieved store type definition * fix(ci): replace starter and release workflows --------- Co-authored-by: Keyfactor <keyfactor@keyfactor.github.io> Co-authored-by: Hayden <49427552+m8rmclaren@users.noreply.github.com> Co-authored-by: Mikey Henderson <Michael.Henderson@keyfactor.com>
1 parent da8e1b5 commit 7a2b09f

Some content is hidden

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

65 files changed

+1814
-552
lines changed
Lines changed: 16 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,20 @@
1-
name: Starter Workflow
2-
on: workflow_dispatch
1+
name: Keyfactor Bootstrap Workflow
32

4-
jobs:
5-
catalog-update-check:
6-
runs-on: windows-latest
7-
outputs:
8-
upd_cat: ${{ steps.read-json.outputs.prop }}
9-
steps:
10-
- uses: actions/checkout@v4
11-
- name: Read json
12-
id: read-json
13-
shell: pwsh
14-
run: |
15-
$json = Get-Content integration-manifest.json | ConvertFrom-Json
16-
echo "::set-output name=prop::$(echo $json.update_catalog)"
17-
18-
#call-create-github-release-workflow:
19-
# uses: Keyfactor/actions/.github/workflows/github-release.yml@main
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
types: [opened, closed, synchronize, edited, reopened]
7+
push:
8+
create:
9+
branches:
10+
- 'release-*.*'
2011

21-
#call-dotnet-build-and-release-workflow:
22-
# needs: [call-create-github-release-workflow]
23-
# uses: Keyfactor/actions/.github/workflows/dotnet-build-and-release.yml@main
24-
# with:
25-
# release_version: ${{ needs.call-create-github-release-workflow.outputs.release_version }}
26-
# release_url: ${{ needs.call-create-github-release-workflow.outputs.release_url }}
27-
# release_dir: SslStoreCaProxy/bin/Release
28-
# secrets:
29-
# token: ${{ secrets.PRIVATE_PACKAGE_ACCESS }}
30-
31-
call-generate-readme-workflow:
32-
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
33-
uses: Keyfactor/actions/.github/workflows/generate-readme.yml@main
12+
jobs:
13+
call-starter-workflow:
14+
uses: keyfactor/actions/.github/workflows/starter.yml@v2
3415
secrets:
35-
token: ${{ secrets.APPROVE_README_PUSH }}
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 }}
3620

37-
call-update-catalog-workflow:
38-
needs: catalog-update-check
39-
if: needs.catalog-update-check.outputs.upd_cat == 'True' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
40-
uses: Keyfactor/actions/.github/workflows/update-catalog.yml@main
41-
secrets:
42-
token: ${{ secrets.SDK_SYNC_PAT }}
43-

.github/workflows/release.yml

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

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
uses: actions/checkout@v4
5252
- name: Run tests
5353
run: |
54-
unset KFUTIL_DEBUG
54+
export KFUTIL_DEBUG=1
5555
go test -v ./cmd -run "^Test_StoreTypes*"
5656
Test_StoreTypes_KFC_10_2_1:
5757
runs-on: ubuntu-latest
@@ -486,4 +486,4 @@ jobs:
486486

487487
# Run the tests with coverage found in the pkg directory
488488
- name: Run tests
489-
run: go test -v -cover ./pkg/...
489+
run: go test -v -cover ./pkg/...

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ vendor/
2121
*.csv
2222
/.vs/**/*
2323
/.vscode/**/*
24+
.DS_Store

.goreleaser.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ release:
5656
- glob: 'integration-manifest.json'
5757
name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json'
5858
# If you want to manually examine the release before its live, uncomment this line:
59-
draft: true
59+
#draft: true
6060
changelog:
6161
sort: asc
6262
use: github

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# v1.3.0
2+
## Features
3+
4+
### StoreTypes
5+
- Added `--output-to-integration-manifest` flag to `kfutil store-types get` to download a remote certificate store type definition into an `integration-manifest.json` file locally.
6+
- Updated usage: `kfutil store-types get [-i <store-type-id> | -n <store-type-name>] [-b <git-ref>] [-g | --output-to-integration-manifest]`
7+
18
# v1.2.1
29

310
## Bug Fixes
@@ -68,4 +75,4 @@ Production Supported CLIs:
6875

6976
- `login`: [kfutil login](docs/kfutil_login.md)
7077
- `store-types`: [kfutil store-types](docs/kfutil_store-types.md)
71-
- `stores rot`: [kfutil rot](docs/kfutil_stores_rot.md)
78+
- `stores rot`: [kfutil rot](docs/kfutil_stores_rot.md)

README.md

Lines changed: 21 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,18 @@
1-
- [Keyfactor Command Utility (kfutil)](#keyfactor-command-utility--kfutil-)
2-
- [Integration status: Production - Ready for use in production environments.](#integration-status--production---ready-for-use-in-production-environments)
3-
4-
* [Support for Keyfactor Command Utility (kfutil)](#support-for-keyfactor-command-utility--kfutil-)
5-
* [Quickstart](#quickstart)
6-
+ [Prerequisites:](#prerequisites-)
7-
+ [Installation:](#installation-)
8-
+ [Environmental Variables](#environmental-variables)
9-
* [Authentication Providers](#authentication-providers)
10-
* [Commands](#commands)
11-
+ [Login](#login)
12-
+ [Logout](#logout)
13-
* [Commands](#commands-1)
14-
+ [Bulk operations](#bulk-operations)
15-
- [Bulk create cert stores](#bulk-create-cert-stores)
16-
- [Bulk create cert store types](#bulk-create-cert-store-types)
17-
+ [Root of Trust](#root-of-trust)
18-
+ [Root of Trust Quickstart](#root-of-trust-quickstart)
19-
- [Generate Certificate List Template](#generate-certificate-list-template)
20-
- [Generate Certificate Store List Template](#generate-certificate-store-list-template)
21-
- [Run Root of Trust Audit](#run-root-of-trust-audit)
22-
- [Run Root of Trust Reconcile](#run-root-of-trust-reconcile)
23-
+ [Certificate Store Inventory](#certificate-store-inventory)
24-
- [Show the inventory of a certificate store](#show-the-inventory-of-a-certificate-store)
25-
- [Add certificates to certificate stores](#add-certificates-to-certificate-stores)
26-
- [Remove certificates from certificate stores](#remove-certificates-from-certificate-stores)
27-
* [Development](#development)
28-
+ [Adding a new command](#adding-a-new-command)
29-
301
# Keyfactor Command Utility (kfutil)
312

32-
`kfutil` is a go-lang CLI wrapper for Keyfactor Command API. It also includes other utility/helper functions around
33-
automating common Keyfactor Command operations.
3+
`kfutil` is a go-lang CLI wrapper for Keyfactor Command API. It also includes other utility/helper functions around automating common Keyfactor Command operations.
344

355
#### Integration status: Production - Ready for use in production environments.
366

7+
8+
379
## Support for Keyfactor Command Utility (kfutil)
3810

39-
Keyfactor Command Utility (kfutil) is open source and there is **no SLA** for this tool/library/client. Keyfactor will
40-
address issues as resources become available. Keyfactor customers may request escalation by opening up a support ticket
41-
through their Keyfactor representative.
11+
Keyfactor Command Utility (kfutil) is open source and there is **no SLA** for this tool/library/client. Keyfactor will address issues as resources become available. Keyfactor customers may request escalation by opening up a support ticket through their Keyfactor representative.
12+
13+
###### To report a problem or suggest a new feature, use the **[Issues](../../issues)** tab. If you want to contribute actual bug fixes or proposed enhancements, use the **[Pull requests](../../pulls)** tab.
4214

43-
###### To report a problem or suggest a new feature, use the **[Issues](../../issues)
4415

45-
** tab. If you want to contribute actual bug fixes or proposed enhancements, use the **[Pull requests](../../pulls)
46-
** tab.
4716

4817
## Quickstart
4918

@@ -54,14 +23,26 @@ through their Keyfactor representative.
5423
- OR [wget](https://www.gnu.org/software/wget/) CLI tool, used to download the release files.
5524
- [unzip](https://linuxize.com/post/how-to-unzip-files-in-linux/#installing-unzip) CLI tool, used to unzip the release
5625
- [openssl](https://www.openssl.org/source/) CLI tool, used to validate package checksum.
57-
- `$HOME/.local/bin` in your `$PATH` and exists.
26+
- `$HOME/.local/bin` in your `$PATH` and exists if not running as root, else `/usr/local/bin` if running as root.
5827

5928
### Installation:
6029

30+
#### Linux/MacOS
6131
```bash
62-
bash <(curl -s https://raw.githubusercontent.com/Keyfactor/kfutil/main/install.sh)
32+
curl -fsSL -o get-kfutil.sh https://raw.githubusercontent.com/Keyfactor/kfutil/main/install.sh
33+
chmod +x get-kfutil.sh
34+
# Install kfutil to $HOME/.local/bin. Use -h for help and examples.
35+
./get-kfutil.sh
6336
````
6437

38+
#### Windows (or Linux/MacOS if PowerShell is preferred)
39+
```powershell
40+
Invoke-WebRequest -Uri "https://raw.githubusercontent.com/Keyfactor/kfutil/main/install.ps1" -OutFile "install.ps1"
41+
# Install kfutil to $HOME/AppData/Local/Microsoft/WindowsApps.
42+
# Use Get-Help .\install.ps1 -Full for help and examples.
43+
.\install.ps1
44+
```
45+
6546
### Environmental Variables
6647

6748
All the variables listed below need to be set in your environment. The `kfutil` command will look for these variables
@@ -130,10 +111,7 @@ For full documentation on the `login` command, see the [login](docs/kfutil_login
130111

131112
*WARNING* - The `login` command will store your Keyfactor credentials in a file on your local machine. This file is not
132113
encrypted and is not secure. It is recommended that you use the `login` command only on your local machine and not on a
133-
shared machine. Instead of using the `login` command, you can set the environmental variables listed above. **You may
134-
also
135-
choose to use login and provide an empty password, in this mode you will be prompted for your password each time you run
136-
a command.**
114+
shared machine. Instead of using the `login` command, you can set the environmental variables listed above.
137115

138116
```bash
139117
kfutil login

0 commit comments

Comments
 (0)