Skip to content
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

Jump to bottom

fix(artifacts): Ignoring the artifacts filter for pipeline stage #4487

Closed
wants to merge 1 commit into from
Closed

fix(artifacts): Ignoring the artifacts filter for pipeline stage #4487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/util/ArtifactUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,14 @@ public void resolveArtifacts(Map pipeline) {
.orElse(Stream.empty())
.map(it -> objectMapper.convertValue(it, ExpectedArtifact.class))
.filter(
artifact ->
expectedArtifactIds.contains(artifact.getId())
|| artifact.isUseDefaultArtifact()
|| artifact.isUsePriorArtifact())
// artifacts coming from a parent pipeline are always expected
trigger.get("parentPipelineStageId") != null
? artifact -> true
// artifacts coming from an automated trigger should be constrained
: artifact ->
(expectedArtifactIds.contains(artifact.getId()))
|| artifact.isUseDefaultArtifact()
|| artifact.isUsePriorArtifact())
.collect(toImmutableList());

ImmutableSet<Artifact> receivedArtifacts =
Expand Down
49 changes: 49 additions & 0 deletions orca-core/src/test/groovy/com/netflix/spinnaker/orca/pipeline/util/ArtifactUtilsSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,55 @@ class ArtifactUtilsSpec extends Specification {
resolvedArtifacts*.getBoundArtifact() == [receivedArtifact, anotherArtifact]
}

def "resolveArtifacts when trigger is from pipeline stage"() {
given:
def matchArtifact = Artifact.builder()
.type("docker/image")
.name("docker.io/mycompany/myimage")
.build()
def expectedArtifact1 = ExpectedArtifact.builder()
.id("expected-artifact-id")
.matchArtifact(matchArtifact)
.build()
def anotherArtifact = Artifact.builder()
.type("http/file")
.build()
def expectedArtifact3 = ExpectedArtifact.builder()
.id("expected-artifact-id-2")
.matchArtifact(anotherArtifact)
.build()
def receivedArtifact1 = Artifact.builder()
.name("docker.io/mycompany/myimage")
.type("docker/image")
.reference("docker.io/mycompany/myimage:mytag")
.build()
def receivedArtifact2 = Artifact.builder()
.name("my-artifact-2")
.type("http/file")
.build()

def pipeline = [
id: "abc",
trigger: [
type: "pipeline",
parentPipelineStageId: "0bd9ae0f-2871-4fd4-80f5-aeb1c48a2ed6",
artifacts: [receivedArtifact1, receivedArtifact2]
],
expectedArtifacts: [expectedArtifact1, expectedArtifact3]
]
def artifactUtils = makeArtifactUtils()

when:
artifactUtils.resolveArtifacts(pipeline)
List<ExpectedArtifact> resolvedArtifacts = objectMapper.convertValue(
pipeline.trigger.resolvedExpectedArtifacts,
new TypeReference<List<ExpectedArtifact>>() {})

then:
resolvedArtifacts.size() == 2
resolvedArtifacts*.getBoundArtifact() == [receivedArtifact1, receivedArtifact2]
}

def "resolveArtifacts adds received artifacts to the trigger, skipping duplicates"() {
given:
def matchArtifact = Artifact.builder().name("my-pipeline-artifact").type("docker/.*").build()
Expand Down