Skip to content

Commit 104520f

Browse files
authored
Merge pull request #14 from Keyfactor/Private-Key-Entry
2 parents 3c047be + b893d79 commit 104520f

File tree

5 files changed

+64
-45
lines changed

5 files changed

+64
-45
lines changed
Lines changed: 16 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,19 @@
1-
name: Starter Workflow
2-
on: [workflow_dispatch, push, pull_request]
1+
name: Keyfactor Bootstrap Workflow
32

4-
jobs:
5-
call-create-github-release-workflow:
6-
uses: Keyfactor/actions/.github/workflows/github-release.yml@main
7-
8-
get-manifest-properties:
9-
runs-on: windows-latest
10-
outputs:
11-
update_catalog: ${{ steps.read-json.outputs.prop }}
12-
steps:
13-
- uses: actions/checkout@v3
14-
- name: Read json
15-
id: read-json
16-
shell: pwsh
17-
run: |
18-
$json = Get-Content integration-manifest.json | ConvertFrom-Json
19-
echo "::set-output name=prop::$(echo $json.update_catalog)"
20-
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: GCPLoadBalancer/bin/Release/netcoreapp3.1
28-
secrets:
29-
token: ${{ secrets.PRIVATE_PACKAGE_ACCESS }}
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
types: [opened, closed, synchronize, edited, reopened]
7+
push:
8+
create:
9+
branches:
10+
- 'release-*.*'
3011

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 }}
36-
37-
call-update-catalog-workflow:
38-
needs: get-manifest-properties
39-
if: needs.get-manifest-properties.outputs.update_catalog == '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 }}
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 }}

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
v2.1.2
2+
- Bug Fix: Private key entry return value - set to True
3+
14
v2.1.1
25
- Modify to include root certificate in certificate chain during a Managment-Add (cert add/renewal) job
36

GCPLoadBalancer/GCPStore.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public List<CurrentInventoryItem> list()
215215
Alias = sslCertificate.Name,
216216
Certificates = new string[] { sslCertificate.Certificate },
217217
ItemStatus = OrchestratorInventoryItemStatus.Unknown,
218-
PrivateKeyEntry = false,
218+
PrivateKeyEntry = true,
219219
UseChainLevel = false
220220
});
221221
}
@@ -228,7 +228,7 @@ public List<CurrentInventoryItem> list()
228228
Alias = sslCertificate.Name,
229229
Certificates = new string[] { sslCertificate.SelfManaged.Certificate },
230230
ItemStatus = OrchestratorInventoryItemStatus.Unknown,
231-
PrivateKeyEntry = false,
231+
PrivateKeyEntry = true,
232232
UseChainLevel = false
233233
});
234234
}

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,22 @@ The Universal Orchestrator is part of the Keyfactor software distribution and is
1414
The Universal Orchestrator is the successor to the Windows Orchestrator. This Orchestrator Extension plugin only works with the Universal Orchestrator and does not work with the Windows Orchestrator.
1515

1616

17-
18-
1917
## Support for GCP Load Balancer
2018

2119
GCP Load Balancer is supported by Keyfactor for Keyfactor customers. If you have a support issue, please open a support ticket with your Keyfactor representative.
2220

2321
###### 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.
2422

2523

26-
2724
---
2825

2926

3027

3128

29+
## Keyfactor Version Supported
30+
31+
The minimum version of the Keyfactor Universal Orchestrator Framework needed to run this version of the extension is 10.1
32+
3233
## Platform Specific Notes
3334

3435
The Keyfactor Universal Orchestrator may be installed on either Windows or Linux based platforms. The certificate operations supported by a capability may vary based what platform the capability is installed on. The table below indicates what capabilities are supported based on which platform the encompassing Universal Orchestrator is running.

integration-manifest.json

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66
"update_catalog": true,
77
"link_github": true,
88
"support_level": "kf-supported",
9+
"release_dir": "GCPLoadBalancer/bin/Release/netcoreapp3.1",
910
"description": "The Google Cloud Platform (GCP) Load Balancer Orchestrator allows for the management of Google Cloud Platform Load Balancer certificate stores. Inventory, Management-Add, and Management-Remove functions are supported. Also, re-binding to endpoints IS supported for certificate renewals (but NOT adding new certificates). The orchestrator uses the Google Cloud Compute Engine API (https://cloud.google.com/compute/docs/reference/rest/v1) to manage stores.",
1011
"about": {
1112
"orchestrator": {
13+
"UOFramework": "10.1",
14+
"keyfactor_platform_version": "9.10",
1215
"win": {
1316
"supportsCreateStore": false,
1417
"supportsDiscovery": false,
@@ -26,7 +29,42 @@
2629
"supportsReenrollment": false,
2730
"supportsInventory": false,
2831
"platformSupport": "Unused"
32+
},
33+
"store_types": {
34+
"GCPLoadBal": {
35+
"Name": "GCP Load Balancer",
36+
"ShortName": "GCPLoadBal",
37+
"Capability": "GCPLoadBal",
38+
"ServerRequired": false,
39+
"BlueprintAllowed": false,
40+
"CustomAliasAllowed": "Optional",
41+
"PowerShell": false,
42+
"PrivateKeyAllowed": "Required",
43+
"SupportedOperations": {
44+
"Add": true,
45+
"Create": false,
46+
"Discovery": false,
47+
"Enrollment": false,
48+
"Remove": true
49+
},
50+
"PasswordOptions": {
51+
"Style": "Default",
52+
"EntrySupported": false,
53+
"StoreRequired": false
54+
},
55+
"Properties": [
56+
{
57+
"Name": "jsonKey",
58+
"DisplayName": "Service Account Key",
59+
"Required": true,
60+
"DependsOn": "",
61+
"Type": "Secret",
62+
"DefaultValue": ""
63+
}
64+
],
65+
"EntryParameters": []
66+
}
2967
}
3068
}
3169
}
32-
}
70+
}

0 commit comments

Comments
 (0)