Skip to content

fix server and server template alias definition for SSL password field #1161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 19, 2022
Merged

fix server and server template alias definition for SSL password field #1161

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59ca0e5
fix server and server template alias definition for SSL password field
CarolynRountree Jul 18, 2022
99f7d3b
fix for request
CarolynRountree Jul 19, 2022
7127741
fix for request
CarolynRountree Jul 19, 2022
3afc463
fix for request
CarolynRountree Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/python/wlsdeploy/tool/validate/validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ def __validate_single_path_in_archive(self, path, attribute_name, model_folder_p
if not archive_has_file:
log_method('WLSDPLY-05024', attribute_name, model_folder_path, path,
self._archive_file_name, class_name=_class_name, method_name=_method_name)
elif not self._model_context.is_remote():
elif not self._model_context.is_remote() and not self._model_context.skip_archive():
log_method('WLSDPLY-05025', attribute_name, model_folder_path, path,
class_name=_class_name, method_name=_method_name)
else:
Expand Down
4 changes: 1 addition & 3 deletions core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,9 +1069,7 @@
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
"OutboundCertificateValidation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "OutboundCertificateValidation", "wlst_path": "WP001", "default_value": "${__NULL__:BuiltinSSLValidationOnly}", "wlst_type": "string" } ],
"OutboundPrivateKeyAlias": [ {"version": "[10.3.6,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyAlias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "RO" } ],
"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"},
{"version": "[12.2.1]", "wlst_mode": "offline", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted","wlst_path": "WP001", "default_value": null, "wlst_type": "password" },
{"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" } ],
"OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[12.2.1.1,]", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password" }],
"SSLRejectionLoggingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SSLRejectionLoggingEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
"ServerCertificateChainFileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerCertificateChainFileName", "wlst_path": "WP001", "default_value": "server-certchain.pem", "wlst_type": "string" } ],
"ServerCertificateFileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerCertificateFileName", "wlst_path": "WP001", "default_value": "server-cert.der", "wlst_type": "string" } ],
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,8 +1079,8 @@
"Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
"OutboundCertificateValidation": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundCertificateValidation", "wlst_path": "WP001", "default_value": "${__NULL__:BuiltinSSLValidationOnly}", "wlst_type": "string" } ],
"OutboundPrivateKeyAlias": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyAlias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "RO" } ],
"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" } ],
"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" } ],
"OutboundPrivateKeyPassPhrase": [ {"version": "[12.1.2,]", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ],
"OutboundPrivateKeyPassPhraseEncrypted": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ],
"SSLRejectionLoggingEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SSLRejectionLoggingEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
"ServerCertificateChainFileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerCertificateChainFileName", "wlst_path": "WP001", "default_value": "server-certchain.pem", "wlst_type": "string" } ],
"ServerCertificateFileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerCertificateFileName", "wlst_path": "WP001", "default_value": "server-cert.der", "wlst_type": "string" } ],
Expand Down