Skip to content

Commit db5e0cf

Browse files
CarolynRountreeCarolynRountree
authored
fix server and server template alias definition for SSL password field (#1161)
1 parent 440c98c commit db5e0cf

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

‎core/src/main/python/wlsdeploy/tool/validate/validator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ def __validate_single_path_in_archive(self, path, attribute_name, model_folder_p
824824
if not archive_has_file:
825825
log_method('WLSDPLY-05024', attribute_name, model_folder_path, path,
826826
self._archive_file_name, class_name=_class_name, method_name=_method_name)
827-
elif not self._model_context.is_remote():
827+
elif not self._model_context.is_remote() and not self._model_context.skip_archive():
828828
log_method('WLSDPLY-05025', attribute_name, model_folder_path, path,
829829
class_name=_class_name, method_name=_method_name)
830830
else:

‎core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,9 +1094,7 @@
10941094
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
10951095
"OutboundCertificateValidation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "OutboundCertificateValidation", "wlst_path": "WP001", "default_value": "${__NULL__:BuiltinSSLValidationOnly}", "wlst_type": "string" } ],
10961096
"OutboundPrivateKeyAlias": [ {"version": "[10.3.6,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyAlias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "RO" } ],
1097-
"OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[10.3.6,12.2.1)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "access": "RO", "get_method": "GET"},
1098-
{"version": "[12.2.1]", "wlst_mode": "offline", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted","wlst_path": "WP001", "default_value": null, "wlst_type": "password" },
1099-
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET", "access": "RO" } ],
1097+
"OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password" }],
11001098
"SSLRejectionLoggingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SSLRejectionLoggingEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
11011099
"ServerCertificateChainFileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerCertificateChainFileName", "wlst_path": "WP001", "default_value": "server-certchain.pem", "wlst_type": "string" } ],
11021100
"ServerCertificateFileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerCertificateFileName", "wlst_path": "WP001", "default_value": "server-cert.der", "wlst_type": "string" } ],

‎core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,8 +1104,8 @@
11041104
"Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
11051105
"OutboundCertificateValidation": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundCertificateValidation", "wlst_path": "WP001", "default_value": "${__NULL__:BuiltinSSLValidationOnly}", "wlst_type": "string" } ],
11061106
"OutboundPrivateKeyAlias": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyAlias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "RO" } ],
1107-
"OutboundPrivateKeyPassPhrase": [ {"version": "[12.1.2,12.1.3]", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET", "access": "RO" } ],
1108-
"OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET", "access": "RO" } ],
1107+
"OutboundPrivateKeyPassPhrase": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ],
1108+
"OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ],
11091109
"SSLRejectionLoggingEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SSLRejectionLoggingEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
11101110
"ServerCertificateChainFileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerCertificateChainFileName", "wlst_path": "WP001", "default_value": "server-certchain.pem", "wlst_type": "string" } ],
11111111
"ServerCertificateFileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerCertificateFileName", "wlst_path": "WP001", "default_value": "server-cert.der", "wlst_type": "string" } ],

0 commit comments

Comments
 (0)