Commit be333a5
authored
Avoid overwriting variable values with tokens in prepareModel (#960)
* Allow for unspecified or non-existent variables file
* JIRA WDT-572 - Added specific exception type for prepare model
* JIRA WDT-572 - Revised messages for prepareModel
* Add methods to check token-only strings
* Move check for secret overwriting a property value to credential injector
* Extract ModelPreparer class from prepare_model class to allow unit tests
* Extract ModelPreparer class from prepare_model class to allow unit tests
* Corrected test messages
* Maintain variable keys for removal in credential injector
* Added config directory for use with unit tests
* Removed unused logger
* Added a unit test for prepareModel
* Moved unit test to package, disabled logging during test
* Revised test to verify unchanged variable token
* Revised test to verify variable and secret files
* Cast os.environ arguments to str to avoid IDE analysis issue
* Create unit test base class; create config in output directory; check prepared variables and secrets
* Removed unused injector configuration files
* Correct argument count for ModelPreparer
* Clear unused properties after prepare and filter, rather than during prepare
* Support multiple variable tokens in a single value
* Changed method name and added description
* Allow variable argument list in match
* Use internal method to write properties to avoid comment and escaping, and to preserve order
* Correct variable name1 parent 331ef80 commit be333a5
File tree
16 files changed
+978
-494
lines changed- core/src
- main
- java/oracle/weblogic/deploy/prepare
- python
- wlsdeploy
- exception
- tool
- prepare
- util
- util
- resources/oracle/weblogic/deploy/messages
- test
- python
- wlsdeploy/tool/prepare
- resources/prepare
16 files changed
+978
-494
lines changedLines changed: 79 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
0 commit comments