Skip to content

Commit 0821cf5

Browse files
spbsolublespbsoluble
authored
Merge pull request #207 from Keyfactor/all
fix(store-types): Updates `Bosch` and `K8S` store-type definitions
2 parents ca778b6 + 56eeeed commit 0821cf5

File tree

1 file changed

+51
-198
lines changed

1 file changed

+51
-198
lines changed

‎store_types.json‎

Lines changed: 51 additions & 198 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
"StoreRequired": false,
181181
"Style": "Default"
182182
},
183-
"PrivateKeyAllowed": "Optional",
183+
"PrivateKeyAllowed": "Required",
184184
"ServerRequired": true,
185185
"PowerShell": false,
186186
"BlueprintAllowed": true,
@@ -951,14 +951,14 @@
951951
{
952952
"Name": "Bosch IP Camera",
953953
"ShortName": "BIPCamera",
954-
"Capability": "BoschIpCamera",
954+
"Capability": "BIPCamera",
955955
"LocalStore": false,
956956
"SupportedOperations": {
957-
"Add": false,
957+
"Add": true,
958958
"Create": false,
959959
"Discovery": false,
960960
"Enrollment": true,
961-
"Remove": false
961+
"Remove": true
962962
},
963963
"Properties": [
964964
{
@@ -2381,30 +2381,6 @@
23812381
"DependsOn": "",
23822382
"DefaultValue": "cert",
23832383
"Required": true
2384-
},
2385-
{
2386-
"Name": "ServerUsername",
2387-
"DisplayName": "Server Username",
2388-
"Type": "Secret",
2389-
"DependsOn": "",
2390-
"DefaultValue": null,
2391-
"Required": false
2392-
},
2393-
{
2394-
"Name": "ServerPassword",
2395-
"DisplayName": "Server Password",
2396-
"Type": "Secret",
2397-
"DependsOn": "",
2398-
"DefaultValue": null,
2399-
"Required": true
2400-
},
2401-
{
2402-
"Name": "ServerUseSsl",
2403-
"DisplayName": "Use SSL",
2404-
"Type": "Bool",
2405-
"DependsOn": "",
2406-
"DefaultValue": "true",
2407-
"Required": true
24082384
}
24092385
],
24102386
"EntryParameters": null,
@@ -2436,28 +2412,18 @@
24362412
},
24372413
"Properties": [
24382414
{
2439-
"Name": "ServerUsername",
2440-
"DisplayName": "Server Username",
2441-
"Type": "Secret",
2442-
"DependsOn": "",
2443-
"DefaultValue": null,
2415+
"Name": "SeparateChain",
2416+
"DisplayName": "Separate Certificate Chain",
2417+
"Type": "Bool",
2418+
"DefaultValue": "false",
24442419
"Required": false
24452420
},
24462421
{
2447-
"Name": "ServerPassword",
2448-
"DisplayName": "Server Password",
2449-
"Type": "Secret",
2450-
"DependsOn": "",
2451-
"DefaultValue": null,
2452-
"Required": true
2453-
},
2454-
{
2455-
"Name": "ServerUseSsl",
2456-
"DisplayName": "Use SSL",
2422+
"Name": "IncludeCertChain",
2423+
"DisplayName": "Include Certificate Chain",
24572424
"Type": "Bool",
2458-
"DependsOn": "",
24592425
"DefaultValue": "true",
2460-
"Required": true
2426+
"Required": false
24612427
}
24622428
],
24632429
"EntryParameters": null,
@@ -2517,8 +2483,8 @@
25172483
"DisplayName": "CertificateDataFieldName",
25182484
"Type": "String",
25192485
"DependsOn": "",
2520-
"DefaultValue": null,
2521-
"Required": false
2486+
"DefaultValue": ".jks",
2487+
"Required": true
25222488
},
25232489
{
25242490
"Name": "PasswordFieldName",
@@ -2530,7 +2496,7 @@
25302496
},
25312497
{
25322498
"Name": "PasswordIsK8SSecret",
2533-
"DisplayName": "PasswordIsK8SSecret",
2499+
"DisplayName": "Password Is K8S Secret",
25342500
"Type": "Bool",
25352501
"DependsOn": "",
25362502
"DefaultValue": "false",
@@ -2543,36 +2509,12 @@
25432509
"DependsOn": "",
25442510
"DefaultValue": null,
25452511
"Required": false
2546-
},
2547-
{
2548-
"Name": "ServerUsername",
2549-
"DisplayName": "Server Username",
2550-
"Type": "Secret",
2551-
"DependsOn": "",
2552-
"DefaultValue": null,
2553-
"Required": false
2554-
},
2555-
{
2556-
"Name": "ServerPassword",
2557-
"DisplayName": "Server Password",
2558-
"Type": "Secret",
2559-
"DependsOn": "",
2560-
"DefaultValue": null,
2561-
"Required": true
2562-
},
2563-
{
2564-
"Name": "ServerUseSsl",
2565-
"DisplayName": "Use SSL",
2566-
"Type": "Bool",
2567-
"DependsOn": "",
2568-
"DefaultValue": "true",
2569-
"Required": true
25702512
}
25712513
],
25722514
"EntryParameters": null,
25732515
"PasswordOptions": {
25742516
"EntrySupported": false,
2575-
"StoreRequired": true,
2517+
"StoreRequired": false,
25762518
"Style": "Default"
25772519
},
25782520
"StorePathType": "",
@@ -2606,28 +2548,18 @@
26062548
"Required": false
26072549
},
26082550
{
2609-
"Name": "ServerUsername",
2610-
"DisplayName": "Server Username",
2611-
"Type": "Secret",
2612-
"DependsOn": "",
2613-
"DefaultValue": null,
2551+
"Name": "SeparateChain",
2552+
"DisplayName": "Separate Certificate Chain",
2553+
"Type": "Bool",
2554+
"DefaultValue": "false",
26142555
"Required": false
26152556
},
26162557
{
2617-
"Name": "ServerPassword",
2618-
"DisplayName": "Server Password",
2619-
"Type": "Secret",
2620-
"DependsOn": "",
2621-
"DefaultValue": null,
2622-
"Required": true
2623-
},
2624-
{
2625-
"Name": "ServerUseSsl",
2626-
"DisplayName": "Use SSL",
2558+
"Name": "IncludeCertChain",
2559+
"DisplayName": "Include Certificate Chain",
26272560
"Type": "Bool",
2628-
"DependsOn": "",
26292561
"DefaultValue": "true",
2630-
"Required": true
2562+
"Required": false
26312563
}
26322564
],
26332565
"EntryParameters": null,
@@ -2659,12 +2591,20 @@
26592591
},
26602592
"Properties": [
26612593
{
2662-
"Name": "KubeSecretKey",
2663-
"DisplayName": "Kube Secret Key",
2594+
"Name": "KubeSecretType",
2595+
"DisplayName": "Kube Secret Type",
26642596
"Type": "String",
26652597
"DependsOn": "",
2666-
"DefaultValue": "pfx",
2667-
"Required": false
2598+
"DefaultValue": "pkcs12",
2599+
"Required": true
2600+
},
2601+
{
2602+
"Name": "CertificateDataFieldName",
2603+
"DisplayName": "CertificateDataFieldName",
2604+
"Type": "String",
2605+
"DependsOn": "",
2606+
"DefaultValue": ".p12",
2607+
"Required": true
26682608
},
26692609
{
26702610
"Name": "PasswordFieldName",
@@ -2698,38 +2638,6 @@
26982638
"DefaultValue": null,
26992639
"Required": false
27002640
},
2701-
{
2702-
"Name": "ServerUsername",
2703-
"DisplayName": "Server Username",
2704-
"Type": "Secret",
2705-
"DependsOn": "",
2706-
"DefaultValue": null,
2707-
"Required": false
2708-
},
2709-
{
2710-
"Name": "ServerPassword",
2711-
"DisplayName": "Server Password",
2712-
"Type": "Secret",
2713-
"DependsOn": "",
2714-
"DefaultValue": null,
2715-
"Required": true
2716-
},
2717-
{
2718-
"Name": "ServerUseSsl",
2719-
"DisplayName": "Use SSL",
2720-
"Type": "Bool",
2721-
"DependsOn": "",
2722-
"DefaultValue": "true",
2723-
"Required": true
2724-
},
2725-
{
2726-
"Name": "KubeSecretType",
2727-
"DisplayName": "Kube Secret Type",
2728-
"Type": "String",
2729-
"DependsOn": "",
2730-
"DefaultValue": "pkcs12",
2731-
"Required": true
2732-
},
27332641
{
27342642
"Name": "StorePasswordPath",
27352643
"DisplayName": "StorePasswordPath",
@@ -2742,7 +2650,7 @@
27422650
"EntryParameters": null,
27432651
"PasswordOptions": {
27442652
"EntrySupported": false,
2745-
"StoreRequired": true,
2653+
"StoreRequired": false,
27462654
"Style": "Default"
27472655
},
27482656
"StorePathType": "",
@@ -2792,28 +2700,18 @@
27922700
"Required": true
27932701
},
27942702
{
2795-
"Name": "ServerUsername",
2796-
"DisplayName": "Server Username",
2797-
"Type": "Secret",
2798-
"DependsOn": "",
2799-
"DefaultValue": null,
2703+
"Name": "SeparateChain",
2704+
"DisplayName": "Separate Certificate Chain",
2705+
"Type": "Bool",
2706+
"DefaultValue": "false",
28002707
"Required": false
28012708
},
28022709
{
2803-
"Name": "ServerPassword",
2804-
"DisplayName": "Server Password",
2805-
"Type": "Secret",
2806-
"DependsOn": "",
2807-
"DefaultValue": null,
2808-
"Required": true
2809-
},
2810-
{
2811-
"Name": "ServerUseSsl",
2812-
"DisplayName": "Use SSL",
2710+
"Name": "IncludeCertChain",
2711+
"DisplayName": "Include Certificate Chain",
28132712
"Type": "Bool",
2814-
"DependsOn": "",
28152713
"DefaultValue": "true",
2816-
"Required": true
2714+
"Required": false
28172715
}
28182716
],
28192717
"EntryParameters": null,
@@ -2869,28 +2767,18 @@
28692767
"Required": true
28702768
},
28712769
{
2872-
"Name": "ServerUsername",
2873-
"DisplayName": "Server Username",
2874-
"Type": "Secret",
2875-
"DependsOn": "",
2876-
"DefaultValue": null,
2770+
"Name": "SeparateChain",
2771+
"DisplayName": "Separate Certificate Chain",
2772+
"Type": "Bool",
2773+
"DefaultValue": "false",
28772774
"Required": false
28782775
},
28792776
{
2880-
"Name": "ServerPassword",
2881-
"DisplayName": "Server Password",
2882-
"Type": "Secret",
2883-
"DependsOn": "",
2884-
"DefaultValue": null,
2885-
"Required": true
2886-
},
2887-
{
2888-
"Name": "ServerUseSsl",
2889-
"DisplayName": "Use SSL",
2777+
"Name": "IncludeCertChain",
2778+
"DisplayName": "Include Certificate Chain",
28902779
"Type": "Bool",
2891-
"DependsOn": "",
28922780
"DefaultValue": "true",
2893-
"Required": true
2781+
"Required": false
28942782
}
28952783
],
28962784
"EntryParameters": null,
@@ -3028,49 +2916,14 @@
30282916
"Required": false
30292917
}
30302918
],
3031-
"EntryParameters": [
3032-
{
3033-
"Name": "TlsMinVersion",
3034-
"DisplayName": "TLS Min Version",
3035-
"Type": "MultipleChoice",
3036-
"RequiredWhen": {
3037-
"HasPrivateKey": false,
3038-
"OnAdd": false,
3039-
"OnRemove": false,
3040-
"OnReenrollment": false
3041-
},
3042-
"Options": ",tls1-0,tls1-1,tls1-2"
3043-
},
3044-
{
3045-
"Name": "TLSMaxVersion",
3046-
"DisplayName": "TLS Max Version",
3047-
"Type": "MultipleChoice",
3048-
"RequiredWhen": {
3049-
"HasPrivateKey": false,
3050-
"OnAdd": false,
3051-
"OnRemove": false,
3052-
"OnReenrollment": false
3053-
},
3054-
"Options": ",tls1-0,tls1-1,tls1-2,max"
3055-
},
3056-
{
3057-
"Name": "TlsProfileName",
3058-
"DisplayName": "TLS Profile Name",
3059-
"Type": "String",
3060-
"RequiredWhen": {
3061-
"HasPrivateKey": false,
3062-
"OnAdd": false,
3063-
"OnRemove": false,
3064-
"OnReenrollment": false
3065-
}
3066-
}
3067-
],
2919+
"EntryParameters": [],
30682920
"PasswordOptions": {
30692921
"EntrySupported": false,
30702922
"StoreRequired": false,
30712923
"Style": "Default"
30722924
},
30732925
"PrivateKeyAllowed": "Optional",
2926+
"JobProperties": [],
30742927
"ServerRequired": true,
30752928
"PowerShell": false,
30762929
"BlueprintAllowed": false,

0 commit comments

Comments
 (0)