From e106f1e0be91a15b08c79399e9abd18b55abbdac Mon Sep 17 00:00:00 2001 From: David Byron Date: Fri, 24 Nov 2023 14:39:49 -0800 Subject: [PATCH] chore(artifacts): always configure artifact store-related beans since https://github.com/spinnaker/kork/pull/1120 removes the artifact-store.enabled property such that ArtifactStore beans are always present. --- .../src/main/groovy/com/netflix/spinnaker/rosco/Main.groovy | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rosco-web/src/main/groovy/com/netflix/spinnaker/rosco/Main.groovy b/rosco-web/src/main/groovy/com/netflix/spinnaker/rosco/Main.groovy index d98596f69..2cfa29a03 100644 --- a/rosco-web/src/main/groovy/com/netflix/spinnaker/rosco/Main.groovy +++ b/rosco-web/src/main/groovy/com/netflix/spinnaker/rosco/Main.groovy @@ -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 @@ -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)