fix(versions): Use thread safe yaml parser

halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/config/v1/HalconfigParser.java

@@ -45,6 +45,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.TrueFileFilter;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.parser.ParserException;
@@ -64,10 +65,14 @@ public class HalconfigParser {
 
   @Autowired HalconfigDirectoryStructure halconfigDirectoryStructure;
 
-  @Autowired Yaml yamlParser;
+  @Autowired ApplicationContext applicationContext;
 
   private boolean useBackup = false;
 
+  private Yaml getYamlParser() {
+    return applicationContext.getBean(Yaml.class);
+  }
+
   /**
    * Parse Halyard's config.
    *
@@ -76,7 +81,7 @@ public class HalconfigParser {
    * @see Halconfig
    */
   Halconfig parseHalconfig(InputStream is) throws IllegalArgumentException {
-    Object obj = yamlParser.load(is);
+    Object obj = getYamlParser().load(is);
     return objectMapper.convertValue(obj, Halconfig.class);
   }
 
@@ -232,7 +237,7 @@ private void saveConfigTo(Path path) {
     AtomicFileWriter writer = null;
     try {
       writer = new AtomicFileWriter(path);
-      writer.write(yamlParser.dump(objectMapper.convertValue(local, Map.class)));
+      writer.write(getYamlParser().dump(objectMapper.convertValue(local, Map.class)));
       writer.commit();
     } catch (IOException e) {
       throw new HalException(

halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/config/v1/ResourceConfig.java

@@ -21,7 +21,9 @@
 import java.util.Optional;
 import java.util.concurrent.Executors;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Scope;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
 import org.springframework.stereotype.Component;
@@ -94,6 +96,8 @@ String spinnakerStagingDependencyPath(
   }
 
   @Bean
+  @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) // snake yaml is not thread safe
+  // (https://bitbucket.org/asomov/snakeyaml/wiki/Documentation#markdown-header-threading)
   Yaml yamlParser() {
     DumperOptions options = new DumperOptions();
     options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);

halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/services/v1/VersionsService.java

@@ -30,15 +30,12 @@
 import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.yaml.snakeyaml.Yaml;
 import retrofit.RetrofitError;
 
 @Component
 public class VersionsService {
   @Autowired ProfileRegistry profileRegistry;
 
-  @Autowired Yaml yamlParser;
-
   @Autowired RelaxedObjectMapper relaxedObjectMapper;
 
   private static ExpiringConcurrentMap<String, String> concurrentMap =

halyard-config/src/test/groovy/com/netflix/spinnaker/halyard/config/config/v1/HalconfigParserSpec.groovy

@@ -17,6 +17,7 @@
 package com.netflix.spinnaker.halyard.config.config.v1
 
 import com.netflix.spinnaker.halyard.config.model.v1.node.Halconfig
+import org.springframework.context.ApplicationContext
 import org.yaml.snakeyaml.Yaml
 import org.yaml.snakeyaml.constructor.SafeConstructor
 import spock.lang.Specification
@@ -31,8 +32,10 @@ class HalconfigParserSpec extends Specification {
   HalconfigParser parser
 
   void setup() {
+    ApplicationContext applicationContext = Stub(ApplicationContext.class)
+    applicationContext.getBean(Yaml.class) >> new Yaml(new SafeConstructor())
     parser = new HalconfigParser()
-    parser.yamlParser = new Yaml(new SafeConstructor())
+    parser.applicationContext = applicationContext
     parser.objectMapper = new StrictObjectMapper()
   }
 

halyard-config/src/test/groovy/com/netflix/spinnaker/halyard/config/services/v1/HalconfigParserMocker.groovy

@@ -20,6 +20,7 @@ import com.netflix.spinnaker.halyard.config.config.v1.HalconfigDirectoryStructur
 import com.netflix.spinnaker.halyard.config.config.v1.HalconfigParser
 import com.netflix.spinnaker.halyard.config.config.v1.StrictObjectMapper
 import com.netflix.spinnaker.halyard.config.model.v1.node.Halconfig
+import org.springframework.context.ApplicationContext
 import org.yaml.snakeyaml.Yaml
 import org.yaml.snakeyaml.constructor.SafeConstructor
 import spock.lang.Specification
@@ -29,8 +30,10 @@ import java.nio.charset.StandardCharsets
 class HalconfigParserMocker extends Specification {
   HalconfigParser mockHalconfigParser(String config) {
     def parserStub = new HalconfigParser()
+    ApplicationContext applicationContext = Stub(ApplicationContext.class)
+    applicationContext.getBean(Yaml.class) >> new Yaml(new SafeConstructor())
     parserStub.objectMapper = new StrictObjectMapper()
-    parserStub.yamlParser = new Yaml(new SafeConstructor())
+    parserStub.applicationContext = applicationContext
     parserStub.halconfigDirectoryStructure = new HalconfigDirectoryStructure();
 
     def stream = new ByteArrayInputStream(config.getBytes(StandardCharsets.UTF_8))

halyard-core/src/main/java/com/netflix/spinnaker/halyard/core/registry/v1/GoogleProfileReader.java

@@ -33,6 +33,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 import org.yaml.snakeyaml.Yaml;
@@ -49,7 +50,11 @@ public class GoogleProfileReader implements ProfileReader {
 
   @Autowired ObjectMapper relaxedObjectMapper;
 
-  @Autowired Yaml yamlParser;
+  @Autowired ApplicationContext applicationContext;
+
+  private Yaml getYamlParser() {
+    return applicationContext.getBean(Yaml.class);
+  }
 
   @Bean
   public Storage applicationDefaultGoogleStorage() {
@@ -71,12 +76,12 @@ public BillOfMaterials readBom(String version) throws IOException {
     String bomName = bomPath(version);
 
     return relaxedObjectMapper.convertValue(
-        yamlParser.load(getContents(bomName)), BillOfMaterials.class);
+        getYamlParser().load(getContents(bomName)), BillOfMaterials.class);
   }
 
   public Versions readVersions() throws IOException {
     return relaxedObjectMapper.convertValue(
-        yamlParser.load(getContents("versions.yml")), Versions.class);
+        getYamlParser().load(getContents("versions.yml")), Versions.class);
   }
 
   public InputStream readArchiveProfile(String artifactName, String version, String profileName)

halyard-core/src/main/java/com/netflix/spinnaker/halyard/core/registry/v1/LocalDiskProfileReader.java

@@ -35,6 +35,7 @@
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 import org.yaml.snakeyaml.Yaml;
 
@@ -45,10 +46,14 @@ public class LocalDiskProfileReader implements ProfileReader {
 
   @Autowired ObjectMapper relaxedObjectMapper;
 
-  @Autowired Yaml yamlParser;
+  @Autowired ApplicationContext applicationContext;
 
   private static final String HALCONFIG_DIR = "halconfig";
 
+  private Yaml getYamlParser() {
+    return applicationContext.getBean(Yaml.class);
+  }
+
   @Override
   public InputStream readProfile(String artifactName, String version, String profileName)
       throws IOException {
@@ -72,7 +77,7 @@ public BillOfMaterials readBom(String version) throws IOException {
     String versionName = Versions.fromLocal(version);
     String bomName = bomPath(versionName);
     return relaxedObjectMapper.convertValue(
-        yamlParser.load(getContents(bomName)), BillOfMaterials.class);
+        getYamlParser().load(getContents(bomName)), BillOfMaterials.class);
   }
 
   @Override

halyard-core/src/main/java/com/netflix/spinnaker/halyard/core/registry/v1/ProfileRegistry.java

@@ -25,7 +25,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.yaml.snakeyaml.Yaml;
 
 @Component
 @Slf4j
@@ -37,8 +36,6 @@ public class ProfileRegistry {
 
   @Autowired LocalDiskProfileReader localDiskProfileReader;
 
-  @Autowired Yaml yamlParser;
-
   @Autowired ObjectMapper relaxedObjectMapper;
 
   public InputStream readProfile(String artifactName, String version, String profileName)