Skip to content

Commit

Permalink
Merge branch 'misc-cleanup' into 'main'
Browse files Browse the repository at this point in the history 
fixing log statements, correcting domainInfo aliases, and updating doc

See merge request weblogic-cloud/weblogic-deploy-tooling!1490
  • Loading branch information
@robertpatrick
robertpatrick committed Aug 10, 2023
2 parents c4c828b + 9d6e525 commit a74067b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
10 changes: 5 additions & 5 deletions core/src/main/python/wlsdeploy/util/cla_utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,27 +276,27 @@ def process_args(self, args, tool_type=TOOL_TYPE_DEFAULT, trailing_arg_count=0):
value, idx = self._get_arg_value(args, idx)
self._validate_rcu_database_arg(value)
self._add_arg(key, value)
_logger.deprecation('WLSDPLY-31000')
_logger.deprecation('WLSDPLY-31000', class_name=self._class_name, method_name=method_name)
elif self.is_rcu_dbuser_key(key):
value, idx = self._get_arg_value(args, idx)
self._validate_rcu_dbuser_arg(value)
self._add_arg(key, value)
_logger.deprecation('WLSDPLY-31001')
_logger.deprecation('WLSDPLY-31001', class_name=self._class_name, method_name=method_name)
elif self.is_rcu_prefix_key(key):
value, idx = self._get_arg_value(args, idx)
self._validate_rcu_prefix_arg(value)
self._add_arg(key, value)
_logger.deprecation('WLSDPLY-31002')
_logger.deprecation('WLSDPLY-31002', class_name=self._class_name, method_name=method_name)
elif self.is_rcu_sys_pass_key(key):
value, idx = self._get_arg_value(args, idx)
self._validate_rcu_sys_pass_arg(value)
self._add_arg(key, value)
_logger.deprecation('WLSDPLY-31003')
_logger.deprecation('WLSDPLY-31003', class_name=self._class_name, method_name=method_name)
elif self.is_rcu_schema_pass_key(key):
value, idx = self._get_arg_value(args, idx)
self._validate_rcu_schema_pass_arg(value)
self._add_arg(key, value)
_logger.deprecation('WLSDPLY-31004')
_logger.deprecation('WLSDPLY-31004', class_name=self._class_name, method_name=method_name)
elif self.is_passphrase_switch(key):
value, idx = self._get_arg_value(args, idx)
self._validate_passphrase_arg(value)
Expand Down
10 changes: 5 additions & 5 deletions core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/RCUDbInfo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"atp.default.tablespace": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "atp.default.tablespace", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
"atp.temp.tablespace": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "atp.temp.tablespace", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
"databaseType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "databaseType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
"compInfoXMLLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "compInfoXMLLocation", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true"} ],
"javax.net.ssl.keyStore": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.keyStore", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
"compInfoXMLLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "compInfoXMLLocation", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
"javax.net.ssl.keyStore": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.keyStore", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
"javax.net.ssl.keyStoreType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.keyStoreType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
"javax.net.ssl.keyStorePassword": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.keyStorePassword", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "secret_suffix": "sslkeystore" } ],
"javax.net.ssl.trustStore": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.trustStore", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
"javax.net.ssl.trustStore": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.trustStore", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
"javax.net.ssl.trustStoreType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.trustStoreType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
"javax.net.ssl.trustStorePassword": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "javax.net.ssl.trustStorePassword", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "secret_suffix": "ssltruststore" } ],
"oracle.net.tns_admin": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "oracle.net.tns_admin", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
"oracle.net.tns_admin": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "oracle.net.tns_admin", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true"} ],
"rcu_admin_password": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_admin_password", "wlst_path": "WP001", "default_value": null, "wlst_type": "password" } ],
"rcu_db_conn_string": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_db_conn_string", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
"rcu_prefix": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_prefix", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
Expand All @@ -26,7 +26,7 @@
"rcu_temp_tablespace": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_temp_tablespace", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
"tns.alias": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "tns.alias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
"rcu_variables": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "rcu_variables", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
"storageXMLLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "storageXMLLocation", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true"} ],
"storageXMLLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "storageXMLLocation", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
"useATP": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "useATP", "wlst_path": "WP001", "default_value": null, "wlst_type": "boolean" } ],
"useSSL": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "useSSL", "wlst_path": "WP001", "default_value": null, "wlst_type": "boolean" } ]
},
Expand Down
1 change: 1 addition & 0 deletions documentation/3.0/content/userguide/database/connect-db.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ domainInfo:
RCUDbInfo:
databaseType : 'ATP'
rcu_prefix : DEV
rcu_db_conn_string: <required URL string for use with -run_rcu>
rcu_admin_password: <database admin password is required only when you specify -run_rcu flag>
rcu_schema_password : <RCU schema password>
rcu_db_user : admin
Expand Down

0 comments on commit a74067b

Please sign in to comment.