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(MPTv2): Supports artifact resolution for v2 MPTs. #2725

Merged
merged 1 commit into from
Mar 11, 2019
Merged

fix(MPTv2): Supports artifact resolution for v2 MPTs. #2725

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
17 changes: 13 additions & 4 deletions ...c/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/handler/v2/V2Handlers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.netflix.spinnaker.orca.pipelinetemplate.v1schema.handler.v2

import com.fasterxml.jackson.databind.ObjectMapper
import com.netflix.spinnaker.orca.pipeline.util.ArtifactResolver
import com.netflix.spinnaker.orca.pipeline.util.ContextParameterProcessor
import com.netflix.spinnaker.orca.pipelinetemplate.handler.Handler
import com.netflix.spinnaker.orca.pipelinetemplate.handler.HandlerChain
Expand All @@ -34,7 +35,8 @@ class V2SchemaHandlerGroup
@Autowired constructor(
private val templateLoader: V2TemplateLoader,
private val objectMapper: ObjectMapper,
private val contextParameterProcessor: ContextParameterProcessor
private val contextParameterProcessor: ContextParameterProcessor,
private val artifactResolver: ArtifactResolver
): HandlerGroup {

override fun getHandlers(): List<Handler>
Expand All @@ -43,7 +45,7 @@ class V2SchemaHandlerGroup
V2ConfigurationValidationHandler(),
V2TemplateValidationHandler(),
V2GraphMutatorHandler(),
V2PipelineGenerator()
V2PipelineGenerator(artifactResolver)
)
}

Expand All @@ -55,10 +57,17 @@ class V2GraphMutatorHandler : Handler {
}
}

class V2PipelineGenerator : Handler {
class V2PipelineGenerator (
private val artifactResolver: ArtifactResolver
) : Handler {
override fun handle(chain: HandlerChain, context: PipelineTemplateContext) {
val ctx = context.getSchemaContext<V2PipelineTemplateContext>()
val generator = V2SchemaExecutionGenerator()
context.getProcessedOutput().putAll(generator.generate(ctx.template, ctx.configuration, context.getRequest()))

// Explicitly resolve artifacts after preprocessing to support artifacts in templated pipelines.
// TODO(jacobkiefer): Refactor /orchestrate so we don't have to special case v2 artifact resolution.
val generatedPipeline = generator.generate(ctx.template, ctx.configuration, context.getRequest())
artifactResolver.resolveArtifacts(generatedPipeline)
context.getProcessedOutput().putAll(generatedPipeline)
}
}
7 changes: 6 additions & 1 deletion ...m/netflix/spinnaker/orca/pipelinetemplate/PipelineTemplatePipelinePreprocessorSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import com.fasterxml.jackson.databind.ObjectMapper
import com.netflix.spectator.api.*
import com.netflix.spinnaker.orca.clouddriver.OortService
import com.netflix.spinnaker.orca.front50.Front50Service
import com.netflix.spinnaker.orca.pipeline.persistence.ExecutionRepository
import com.netflix.spinnaker.orca.pipeline.util.ArtifactResolver
import com.netflix.spinnaker.orca.pipeline.util.ContextParameterProcessor
import com.netflix.spinnaker.orca.pipelinetemplate.handler.PipelineTemplateErrorHandler
import com.netflix.spinnaker.orca.pipelinetemplate.handler.SchemaVersionHandler
Expand Down Expand Up @@ -47,6 +49,9 @@ class PipelineTemplatePipelinePreprocessorSpec extends Specification {
V2TemplateLoader v2TemplateLoader = new V2TemplateLoader(oortService, objectMapper)
ContextParameterProcessor contextParameterProcessor = new ContextParameterProcessor()

ExecutionRepository executionRepository = Mock(ExecutionRepository)
ArtifactResolver artifactResolver = Spy(ArtifactResolver, constructorArgs: [objectMapper, executionRepository, new ContextParameterProcessor()])

Renderer renderer = new JinjaRenderer(
new YamlRenderedValueConverter(), objectMapper, Mock(Front50Service), []
)
Expand All @@ -65,7 +70,7 @@ class PipelineTemplatePipelinePreprocessorSpec extends Specification {
objectMapper,
new SchemaVersionHandler(
new V1SchemaHandlerGroup( templateLoader, renderer, objectMapper, registry),
new V2SchemaHandlerGroup(v2TemplateLoader, objectMapper, contextParameterProcessor)),
new V2SchemaHandlerGroup(v2TemplateLoader, objectMapper, contextParameterProcessor, artifactResolver)),
new PipelineTemplateErrorHandler(),
registry
)
Expand Down
7 changes: 6 additions & 1 deletion ...roovy/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaIntegrationSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import com.fasterxml.jackson.databind.ObjectMapper
import com.netflix.spectator.api.*
import com.netflix.spinnaker.orca.clouddriver.OortService
import com.netflix.spinnaker.orca.front50.Front50Service
import com.netflix.spinnaker.orca.pipeline.persistence.ExecutionRepository
import com.netflix.spinnaker.orca.pipeline.util.ArtifactResolver
import com.netflix.spinnaker.orca.pipeline.util.ContextParameterProcessor
import com.netflix.spinnaker.orca.pipelinetemplate.PipelineTemplatePreprocessor
import com.netflix.spinnaker.orca.pipelinetemplate.handler.PipelineTemplateErrorHandler
Expand Down Expand Up @@ -52,6 +54,9 @@ class V1SchemaIntegrationSpec extends Specification {
V2TemplateLoader v2TemplateLoader = new V2TemplateLoader(oortService, objectMapper)
ContextParameterProcessor contextParameterProcessor = new ContextParameterProcessor()

ExecutionRepository executionRepository = Mock(ExecutionRepository)
ArtifactResolver artifactResolver = Spy(ArtifactResolver, constructorArgs: [objectMapper, executionRepository, new ContextParameterProcessor()])

Renderer renderer = new JinjaRenderer(
new YamlRenderedValueConverter(), objectMapper, Mock(Front50Service), []
)
Expand All @@ -72,7 +77,7 @@ class V1SchemaIntegrationSpec extends Specification {
objectMapper,
new SchemaVersionHandler(
new V1SchemaHandlerGroup(templateLoader, renderer, objectMapper, registry),
new V2SchemaHandlerGroup(v2TemplateLoader, objectMapper, contextParameterProcessor)),
new V2SchemaHandlerGroup(v2TemplateLoader, objectMapper, contextParameterProcessor, artifactResolver)),
new PipelineTemplateErrorHandler(),
registry
)
Expand Down