|
180 | 180 | "StoreRequired": false,
|
181 | 181 | "Style": "Default"
|
182 | 182 | },
|
183 |
| - "PrivateKeyAllowed": "Optional", |
| 183 | + "PrivateKeyAllowed": "Required", |
184 | 184 | "ServerRequired": true,
|
185 | 185 | "PowerShell": false,
|
186 | 186 | "BlueprintAllowed": true,
|
|
951 | 951 | {
|
952 | 952 | "Name": "Bosch IP Camera",
|
953 | 953 | "ShortName": "BIPCamera",
|
954 |
| - "Capability": "BoschIpCamera", |
| 954 | + "Capability": "BIPCamera", |
955 | 955 | "LocalStore": false,
|
956 | 956 | "SupportedOperations": {
|
957 |
| - "Add": false, |
| 957 | + "Add": true, |
958 | 958 | "Create": false,
|
959 | 959 | "Discovery": false,
|
960 | 960 | "Enrollment": true,
|
961 |
| - "Remove": false |
| 961 | + "Remove": true |
962 | 962 | },
|
963 | 963 | "Properties": [
|
964 | 964 | {
|
|
2381 | 2381 | "DependsOn": "",
|
2382 | 2382 | "DefaultValue": "cert",
|
2383 | 2383 | "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 |
2408 | 2384 | }
|
2409 | 2385 | ],
|
2410 | 2386 | "EntryParameters": null,
|
|
2436 | 2412 | },
|
2437 | 2413 | "Properties": [
|
2438 | 2414 | {
|
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", |
2444 | 2419 | "Required": false
|
2445 | 2420 | },
|
2446 | 2421 | {
|
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", |
2457 | 2424 | "Type": "Bool",
|
2458 |
| - "DependsOn": "", |
2459 | 2425 | "DefaultValue": "true",
|
2460 |
| - "Required": true |
| 2426 | + "Required": false |
2461 | 2427 | }
|
2462 | 2428 | ],
|
2463 | 2429 | "EntryParameters": null,
|
|
2517 | 2483 | "DisplayName": "CertificateDataFieldName",
|
2518 | 2484 | "Type": "String",
|
2519 | 2485 | "DependsOn": "",
|
2520 |
| - "DefaultValue": null, |
2521 |
| - "Required": false |
| 2486 | + "DefaultValue": ".jks", |
| 2487 | + "Required": true |
2522 | 2488 | },
|
2523 | 2489 | {
|
2524 | 2490 | "Name": "PasswordFieldName",
|
|
2530 | 2496 | },
|
2531 | 2497 | {
|
2532 | 2498 | "Name": "PasswordIsK8SSecret",
|
2533 |
| - "DisplayName": "PasswordIsK8SSecret", |
| 2499 | + "DisplayName": "Password Is K8S Secret", |
2534 | 2500 | "Type": "Bool",
|
2535 | 2501 | "DependsOn": "",
|
2536 | 2502 | "DefaultValue": "false",
|
|
2543 | 2509 | "DependsOn": "",
|
2544 | 2510 | "DefaultValue": null,
|
2545 | 2511 | "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 |
2570 | 2512 | }
|
2571 | 2513 | ],
|
2572 | 2514 | "EntryParameters": null,
|
2573 | 2515 | "PasswordOptions": {
|
2574 | 2516 | "EntrySupported": false,
|
2575 |
| - "StoreRequired": true, |
| 2517 | + "StoreRequired": false, |
2576 | 2518 | "Style": "Default"
|
2577 | 2519 | },
|
2578 | 2520 | "StorePathType": "",
|
|
2606 | 2548 | "Required": false
|
2607 | 2549 | },
|
2608 | 2550 | {
|
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", |
2614 | 2555 | "Required": false
|
2615 | 2556 | },
|
2616 | 2557 | {
|
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", |
2627 | 2560 | "Type": "Bool",
|
2628 |
| - "DependsOn": "", |
2629 | 2561 | "DefaultValue": "true",
|
2630 |
| - "Required": true |
| 2562 | + "Required": false |
2631 | 2563 | }
|
2632 | 2564 | ],
|
2633 | 2565 | "EntryParameters": null,
|
|
2659 | 2591 | },
|
2660 | 2592 | "Properties": [
|
2661 | 2593 | {
|
2662 |
| - "Name": "KubeSecretKey", |
2663 |
| - "DisplayName": "Kube Secret Key", |
| 2594 | + "Name": "KubeSecretType", |
| 2595 | + "DisplayName": "Kube Secret Type", |
2664 | 2596 | "Type": "String",
|
2665 | 2597 | "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 |
2668 | 2608 | },
|
2669 | 2609 | {
|
2670 | 2610 | "Name": "PasswordFieldName",
|
|
2698 | 2638 | "DefaultValue": null,
|
2699 | 2639 | "Required": false
|
2700 | 2640 | },
|
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 |
| - }, |
2733 | 2641 | {
|
2734 | 2642 | "Name": "StorePasswordPath",
|
2735 | 2643 | "DisplayName": "StorePasswordPath",
|
|
2742 | 2650 | "EntryParameters": null,
|
2743 | 2651 | "PasswordOptions": {
|
2744 | 2652 | "EntrySupported": false,
|
2745 |
| - "StoreRequired": true, |
| 2653 | + "StoreRequired": false, |
2746 | 2654 | "Style": "Default"
|
2747 | 2655 | },
|
2748 | 2656 | "StorePathType": "",
|
|
2792 | 2700 | "Required": true
|
2793 | 2701 | },
|
2794 | 2702 | {
|
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", |
2800 | 2707 | "Required": false
|
2801 | 2708 | },
|
2802 | 2709 | {
|
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", |
2813 | 2712 | "Type": "Bool",
|
2814 |
| - "DependsOn": "", |
2815 | 2713 | "DefaultValue": "true",
|
2816 |
| - "Required": true |
| 2714 | + "Required": false |
2817 | 2715 | }
|
2818 | 2716 | ],
|
2819 | 2717 | "EntryParameters": null,
|
|
2869 | 2767 | "Required": true
|
2870 | 2768 | },
|
2871 | 2769 | {
|
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", |
2877 | 2774 | "Required": false
|
2878 | 2775 | },
|
2879 | 2776 | {
|
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", |
2890 | 2779 | "Type": "Bool",
|
2891 |
| - "DependsOn": "", |
2892 | 2780 | "DefaultValue": "true",
|
2893 |
| - "Required": true |
| 2781 | + "Required": false |
2894 | 2782 | }
|
2895 | 2783 | ],
|
2896 | 2784 | "EntryParameters": null,
|
|
3028 | 2916 | "Required": false
|
3029 | 2917 | }
|
3030 | 2918 | ],
|
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": [], |
3068 | 2920 | "PasswordOptions": {
|
3069 | 2921 | "EntrySupported": false,
|
3070 | 2922 | "StoreRequired": false,
|
3071 | 2923 | "Style": "Default"
|
3072 | 2924 | },
|
3073 | 2925 | "PrivateKeyAllowed": "Optional",
|
| 2926 | + "JobProperties": [], |
3074 | 2927 | "ServerRequired": true,
|
3075 | 2928 | "PowerShell": false,
|
3076 | 2929 | "BlueprintAllowed": false,
|
|
0 commit comments