From b622066445f6ec5b64d140984f0773247dab20f9 Mon Sep 17 00:00:00 2001 From: Edgar Garcia Date: Wed, 11 Dec 2024 09:48:55 -0600 Subject: [PATCH] fix(pipelineRef): add resolvedExpectedArtifacts from pipelineTrigger to PipelineRefTrigger --- .../orca/sql/PipelineRefTriggerDeserializerSupplier.kt | 4 +++- .../orca/sql/pipeline/persistence/PipelineRefTrigger.kt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/PipelineRefTriggerDeserializerSupplier.kt b/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/PipelineRefTriggerDeserializerSupplier.kt index 9654002042..6cfe0ac3c9 100644 --- a/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/PipelineRefTriggerDeserializerSupplier.kt +++ b/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/PipelineRefTriggerDeserializerSupplier.kt @@ -61,7 +61,9 @@ class PipelineRefTriggerDeserializerSupplier( isStrategy = get("strategy")?.booleanValue() == true, parentExecutionId = parentExecutionId, parentPipelineStageId = get("parentPipelineStageId")?.textValue() - ) + ).apply { + resolvedExpectedArtifacts = get("resolvedExpectedArtifacts")?.listValue(parser) ?: mutableListOf() + } } } diff --git a/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/pipeline/persistence/PipelineRefTrigger.kt b/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/pipeline/persistence/PipelineRefTrigger.kt index b73f8aabdc..59fba65ea5 100644 --- a/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/pipeline/persistence/PipelineRefTrigger.kt +++ b/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/pipeline/persistence/PipelineRefTrigger.kt @@ -100,5 +100,7 @@ data class PipelineRefTrigger( isStrategy = isStrategy, parentExecution = parentExecution, parentPipelineStageId = parentPipelineStageId - ) + ).apply { + this.resolvedExpectedArtifacts = this@PipelineRefTrigger.resolvedExpectedArtifacts + } }