This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
from c2d1ea600c fix some persistence issues with Dynamic MultiGroup and
PropagateToMembers
new e1373b5143 prevent to extract files outside the scoped `targetFolder`
new e50ea74b85 test for checking exception malicious zip files are not
extracted
new 2ee90579dd tidy imports + add the new test to the `integration` group
new 1b8279767f address PR comments
new 1182b0d91d Update
core/src/test/java/org/apache/brooklyn/util/core/file/ArchiveUtilsTest.java
new f113ec65e2 address PR comments II
new d9dc358201 add license to zip README.md file
new 0195ac9115 Merge remote-tracking branch 'jcabrerizo/prevent-zip-slip'
new 0716b3f14f ensure anonymous config is restored on adjuncts after
persistence
add 0445ab8049 entitlements for workflow
add 39d75ded95 add `require` option to set-sensor
add 67c5c06075 refactor workflow tests
add 8a3c11d5de add transform step
add f490d7ed73 nested workflow with target and list working
add 07797e6ea3 correctly run cross-entity nested workflows in target entity
add a1cd03e927 support concurrency setting on nested workflows, with test
add a04c2085ca handle "interruption exception" caused by freemarker lookup
wait
add 536c15f731 replaying sub-workflows when there are multiple
add 6768e7bd02 allow 'lock' field on workflow step type
add 4a0e9fce80 fix failing test re Instant rounding
add 23b4e776c4 tidy and prep for retention code
add 46b6727190 add switch step, along with sub-step tidy and next refactor
add f5fd368b3b major refactor of 'replayable' splitting off `idempotent`
add 1e09c3895c tidy error handling, fix output and next and improve
messages; add automatic and disabled
add 572c51e941 tidy how condition is interpreted with nested workflow
add fe1bdc6c79 add retention model, with test
add a49187a6cf allow error handler to take single step (map or string) as
well as a list
add a9aabb41f0 allow workflow hash to be an expression
add 31c5e5608a move workflow steps to subdirs
add a1785bc903 step to deploy an application
add 879db9ba14 improve blockUntilEnded semantics in cases of cancellation,
to fix idempotency test
add 77c5ac8b35 workflow steps to change the application model -
add-entity, etc
add 08b72263d4 more workflow steps for modifying the application model
add d66e7d41b0 simplify and tidy some entitlements, user refers to
powerUser, and import requires root
add e55451626c Merge branch 'clarify-permissions' into workflow-nested
new 57469d8c90 Merge branch 'master' into workflow-nested
new 8b1044f311 Merge branch 'master' into workflow-nested
new 45d376c2e7 Merge branch 'master' into workflow-nested
new eb8e3f3176 Merge branch 'master' into workflow-nested
new 25f92a0b95 support a workflow initializer
new c0b03e152a add a workflow.util expression namespace with time and
random capabilities
new 322d87a79d Merge branch 'master' into workflow-nested
new 27a26ec059 support inline single-step error on steps
new 5eaaf8b868 Merge branch 'workflow-nested'
The 18 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../brooklyn/api/mgmt/ManagementContext.java | 5 +-
.../java/org/apache/brooklyn/api/mgmt/Task.java | 5 +
.../BrooklynCampPlatformLauncherAbstract.java | 7 +-
.../camp/brooklyn/AddChildrenEffectorYamlTest.java | 28 +-
.../brooklyn/AddChildrenInitializerYamlTest.java | 18 +-
.../brooklyn/camp/brooklyn/EnrichersYamlTest.java | 18 +-
.../camp/brooklyn/FunctionSensorYamlTest.java | 8 +-
.../brooklyn/camp/brooklyn/PoliciesYamlTest.java | 19 +-
.../brooklyn/WorkflowApplicationModelTest.java | 318 ++++++
.../camp/brooklyn/WorkflowExpressionsYamlTest.java | 3 +-
.../camp/brooklyn/WorkflowYamlRebindTest.java | 16 +-
.../brooklyn/camp/brooklyn/WorkflowYamlTest.java | 91 +-
.../catalog/SpecParameterUnwrappingTest.java | 2 -
.../test/policy/failover/ElectPrimaryTest.java | 14 +-
.../catalog/internal/BasicBrooklynCatalog.java | 3 +-
.../brooklyn/core/entity/AbstractEntity.java | 6 +-
.../org/apache/brooklyn/core/entity/Entities.java | 22 +-
.../brooklyn/core/entity/EntityAdjuncts.java | 68 +-
.../brooklyn/core/mgmt/BrooklynTaskTags.java | 39 +-
.../brooklyn/core/mgmt/EntityManagementUtils.java | 68 +-
.../core/mgmt/entitlement/Entitlements.java | 19 +-
.../mgmt/internal/EntityManagementSupport.java | 15 +-
.../core/mgmt/internal/LocalManagementContext.java | 27 +
.../internal/NonDeploymentManagementContext.java | 5 +
.../brooklyn/core/objs/AbstractEntityAdjunct.java | 1 +
.../core/resolve/jackson/BeanWithTypeUtils.java | 8 +-
.../jackson/BrooklynJacksonSerializationUtils.java | 12 +
.../resolve/jackson/CommonTypesSerialization.java | 132 ++-
.../jackson/JsonPassThroughDeserializer.java | 16 +
.../brooklyn/core/workflow/ShorthandProcessor.java | 4 +-
.../core/workflow/WorkflowCommonConfig.java | 22 +-
.../brooklyn/core/workflow/WorkflowEffector.java | 3 +-
.../core/workflow/WorkflowErrorHandling.java | 165 +++-
.../core/workflow/WorkflowExecutionContext.java | 1042 +++++++++++++-------
.../workflow/WorkflowExpressionResolution.java | 84 +-
.../core/workflow/WorkflowInitializer.java | 132 +++
.../brooklyn/core/workflow/WorkflowPolicy.java | 15 +-
.../core/workflow/WorkflowReplayUtils.java | 437 ++++++--
.../brooklyn/core/workflow/WorkflowSensor.java | 6 +-
.../core/workflow/WorkflowStepDefinition.java | 113 ++-
.../WorkflowStepInstanceExecutionContext.java | 20 +-
.../core/workflow/WorkflowStepResolution.java | 46 +-
.../core/workflow/steps/CustomWorkflowStep.java | 359 ++++++-
.../steps/appmodel/AddEntityWorkflowStep.java | 182 ++++
.../steps/appmodel/AddPolicyWorkflowStep.java | 130 +++
.../appmodel/ApplyInitializerWorkflowStep.java | 108 ++
.../{ => appmodel}/ClearConfigWorkflowStep.java | 4 +-
.../{ => appmodel}/ClearSensorWorkflowStep.java | 6 +-
.../steps/appmodel/DeleteEntityWorkflowStep.java | 120 +++
.../steps/appmodel/DeletePolicyWorkflowStep.java | 99 ++
.../appmodel/DeployApplicationWorkflowStep.java | 141 +++
.../steps/{ => appmodel}/EntityValueToSet.java | 5 +-
.../{ => appmodel}/InvokeEffectorWorkflowStep.java | 45 +-
.../steps/appmodel/ReparentEntityWorkflowStep.java | 75 ++
.../{ => appmodel}/SetConfigWorkflowStep.java | 6 +-
.../{ => appmodel}/SetSensorWorkflowStep.java | 64 +-
.../steps/{ => external}/HttpWorkflowStep.java | 3 +-
.../steps/{ => external}/SshWorkflowStep.java | 3 +-
.../steps/{ => flow}/FailWorkflowStep.java | 6 +-
.../steps/{ => flow}/GotoWorkflowStep.java | 14 +-
.../workflow/steps/{ => flow}/LogWorkflowStep.java | 7 +-
.../steps/{ => flow}/NoOpWorkflowStep.java | 3 +-
.../steps/{ => flow}/RetryWorkflowStep.java | 136 ++-
.../steps/{ => flow}/ReturnWorkflowStep.java | 13 +-
.../steps/{ => flow}/SleepWorkflowStep.java | 3 +-
.../workflow/steps/flow/SwitchWorkflowStep.java | 154 +++
.../{ => variables}/ClearVariableWorkflowStep.java | 4 +-
.../steps/{ => variables}/LoadWorkflowStep.java | 31 +-
.../{ => variables}/SetVariableWorkflowStep.java | 240 +----
.../workflow/steps/variables/TransformJsonish.java | 155 +++
.../workflow/steps/variables/TransformMerge.java | 150 +++
.../workflow/steps/variables/TransformTrim.java} | 45 +-
.../workflow/steps/variables/TransformType.java | 47 +
.../variables/TransformVariableWorkflowStep.java | 213 ++++
.../workflow/steps/variables/TransformWait.java | 19 +-
.../steps/{ => variables}/TypedValueToSet.java | 3 +-
.../steps/{ => variables}/WaitWorkflowStep.java | 4 +-
.../steps/variables/WorkflowTransform.java} | 8 +-
.../steps/variables/WorkflowTransformDefault.java | 29 +-
.../variables/WorkflowTransformWithContext.java} | 17 +-
.../store/WorkflowRetentionAndExpiration.java | 190 ++++
.../store/WorkflowStateActiveInMemory.java | 115 +++
.../store/WorkflowStatePersistenceViaSensors.java | 175 +++-
.../workflow/utils/WorkflowConcurrencyParser.java | 295 ++++++
.../workflow/utils/WorkflowRetentionParser.java | 340 +++++++
.../brooklyn/util/core/file/ArchiveUtils.java | 36 +-
.../apache/brooklyn/util/core/flags/FlagUtils.java | 21 +-
.../brooklyn/util/core/flags/TypeCoercions.java | 17 +-
.../util/core/predicates/DslPredicates.java | 6 +
.../apache/brooklyn/util/core/task/BasicTask.java | 64 +-
.../brooklyn/util/core/task/ForwardingTask.java | 5 +
.../org/apache/brooklyn/util/core/task/Tasks.java | 8 +-
.../brooklyn/util/core/text/TemplateProcessor.java | 84 +-
.../mgmt/internal/EntityExecutionManagerTest.java | 7 +-
.../rebind/ActivePartialRebindVersionTest.java | 2 +-
.../core/mgmt/rebind/RebindTestFixture.java | 6 +-
.../brooklyn/core/mgmt/rebind/RebindTestUtils.java | 16 +
.../BrooklynMiscJacksonSerializationTest.java | 29 +
.../SpecificShorthandTest.java} | 25 +-
.../brooklyn/core/workflow/WorkflowBasicTest.java | 66 +-
.../core/workflow/WorkflowBeefyStepTest.java | 3 +-
.../workflow/WorkflowInputOutputExtensionTest.java | 499 ++++++----
.../WorkflowNestedAndCustomExtensionTest.java | 696 +++++++++++++
.../workflow/WorkflowPersistReplayErrorsTest.java | 451 +++++++--
.../brooklyn/core/workflow/WorkflowRetryTest.java | 22 +-
.../brooklyn/util/core/file/ArchiveUtilsTest.java | 37 +-
.../brooklyn/util/core/internal/FlagUtilsTest.java | 3 +-
.../resources/brooklyn/util/file.core/README.md | 25 +
.../brooklyn/util/file.core/evilLinux.zip | Bin 0 -> 174 bytes
.../resources/brooklyn/util/file.core/evilWin.zip | Bin 0 -> 174 bytes
.../resources/brooklyn/util/file.core/noEvil.zip | Bin 0 -> 334 bytes
karaf/init/src/main/resources/catalog.bom | 88 +-
.../org/apache/brooklyn/rest/api/EntityApi.java | 23 +-
.../brooklyn/rest/resources/AdjunctResource.java | 14 +-
.../rest/resources/EntityConfigResource.java | 14 +-
.../brooklyn/rest/resources/EntityResource.java | 41 +-
.../brooklyn/rest/resources/ServerResource.java | 3 +
.../rest/resources/EntityWorkflowsRestTest.java | 3 -
.../util/json/BrooklynJacksonSerializerTest.java | 22 +-
.../tasks/kubectl/ContainerWorkflowStep.java | 4 +-
...sterWithAvailabilityZonesMultiLocationTest.java | 2 +-
.../brooklyn/location/winrm/WinrmWorkflowStep.java | 7 +-
.../org/apache/brooklyn/test/ClassLogWatcher.java | 2 +-
.../apache/brooklyn/util/collections/Jsonya.java | 7 +
.../java/org/apache/brooklyn/util/guava/Maybe.java | 7 +-
125 files changed, 7579 insertions(+), 1634 deletions(-)
create mode 100644
camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/WorkflowApplicationModelTest.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowInitializer.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/steps/appmodel/AddEntityWorkflowStep.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/steps/appmodel/AddPolicyWorkflowStep.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/steps/appmodel/ApplyInitializerWorkflowStep.java
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
appmodel}/ClearConfigWorkflowStep.java (95%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
appmodel}/ClearSensorWorkflowStep.java (92%)
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/steps/appmodel/DeleteEntityWorkflowStep.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/steps/appmodel/DeletePolicyWorkflowStep.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/steps/appmodel/DeployApplicationWorkflowStep.java
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
appmodel}/EntityValueToSet.java (91%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
appmodel}/InvokeEffectorWorkflowStep.java (73%)
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/steps/appmodel/ReparentEntityWorkflowStep.java
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
appmodel}/SetConfigWorkflowStep.java (93%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
appmodel}/SetSensorWorkflowStep.java (55%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
external}/HttpWorkflowStep.java (98%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
external}/SshWorkflowStep.java (98%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
flow}/FailWorkflowStep.java (94%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
flow}/GotoWorkflowStep.java (74%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
flow}/LogWorkflowStep.java (90%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
flow}/NoOpWorkflowStep.java (92%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
flow}/RetryWorkflowStep.java (61%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
flow}/ReturnWorkflowStep.java (84%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
flow}/SleepWorkflowStep.java (94%)
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/steps/flow/SwitchWorkflowStep.java
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
variables}/ClearVariableWorkflowStep.java (91%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
variables}/LoadWorkflowStep.java (78%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
variables}/SetVariableWorkflowStep.java (51%)
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/steps/variables/TransformJsonish.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/steps/variables/TransformMerge.java
copy
core/src/{test/java/org/apache/brooklyn/core/entity/EntitySetFromFlagTest.java
=>
main/java/org/apache/brooklyn/core/workflow/steps/variables/TransformTrim.java}
(50%)
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/steps/variables/TransformType.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/steps/variables/TransformVariableWorkflowStep.java
copy
utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/TypeCoercer.java
=>
core/src/main/java/org/apache/brooklyn/core/workflow/steps/variables/TransformWait.java
(65%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
variables}/TypedValueToSet.java (96%)
rename core/src/main/java/org/apache/brooklyn/core/workflow/steps/{ =>
variables}/WaitWorkflowStep.java (97%)
copy
core/src/main/java/org/apache/brooklyn/core/{location/geo/HasHostGeoInfo.java
=> workflow/steps/variables/WorkflowTransform.java} (81%)
copy
rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/provider/BlackholeSecurityProvider.java
=>
core/src/main/java/org/apache/brooklyn/core/workflow/steps/variables/WorkflowTransformDefault.java
(54%)
copy
core/src/main/java/org/apache/brooklyn/core/{config/external/ExternalConfigSupplier.java
=> workflow/steps/variables/WorkflowTransformWithContext.java} (71%)
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/store/WorkflowRetentionAndExpiration.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/store/WorkflowStateActiveInMemory.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/utils/WorkflowConcurrencyParser.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/workflow/utils/WorkflowRetentionParser.java
copy
core/src/test/java/org/apache/brooklyn/core/{mgmt/persist/BrooklynMementoPersisterInMemoryTest.java
=> workflow/SpecificShorthandTest.java} (58%)
create mode 100644
core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowNestedAndCustomExtensionTest.java
create mode 100644 core/src/test/resources/brooklyn/util/file.core/README.md
create mode 100644
core/src/test/resources/brooklyn/util/file.core/evilLinux.zip
create mode 100644 core/src/test/resources/brooklyn/util/file.core/evilWin.zip
create mode 100644 core/src/test/resources/brooklyn/util/file.core/noEvil.zip
