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

chore(artifacts): always configure artifact store-related beans #1045

Merged
merged 1 commit into from
Nov 26, 2023
Merged

chore(artifacts): always configure artifact store-related beans #1045

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
4 changes: 0 additions & 4 deletions rosco-web/src/main/groovy/com/netflix/spinnaker/rosco/Main.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ import com.netflix.spinnaker.rosco.services.ServiceConfig
import org.springframework.beans.factory.annotation.Qualifier
import org.springframework.boot.autoconfigure.EnableAutoConfiguration
import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression
import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration
import org.springframework.boot.builder.SpringApplicationBuilder
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
Expand Down Expand Up @@ -104,13 +102,11 @@ class Main extends SpringBootServletInitializer {
}

@Bean
@ConditionalOnExpression('${artifact-store.enabled:false}')
EmbeddedArtifactSerializer artifactSerializer(ArtifactStore store, @Qualifier("artifactObjectMapper") ObjectMapper objectMapper) {
return new EmbeddedArtifactSerializer(objectMapper, store);
}

@Bean
@ConditionalOnBean(EmbeddedArtifactSerializer.class)
ObjectMapper objectMapper(Jackson2ObjectMapperBuilder builder, EmbeddedArtifactSerializer serializer) {
return builder.createXmlMapper(false)
.serializerByType(Artifact.class, serializer)
Expand Down