SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the YAML issue; fixes gh-88

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-06-29 16:58:00 +02:00
parent 60502c9cbc
commit 893b54ab09
4 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-release-tools-spring/pom.xml
View File

@@ -36,10 +36,14 @@
<version>5.0.3</version>
<optional>true</optional>
</dependency>
<!--<dependency>-->
<!--<groupId>com.esotericsoftware.yamlbeans</groupId>-->
<!--<artifactId>yamlbeans</artifactId>-->
<!--<version>1.13</version>-->
<!--</dependency>-->
<dependency>
<groupId>com.esotericsoftware.yamlbeans</groupId>
<artifactId>yamlbeans</artifactId>
<version>1.13</version>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
<dependency>

22
spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/ReleaserPropertiesUpdater.java
View File

@@ -1,20 +1,20 @@
package org.springframework.cloud.release.internal.spring;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
import java.util.Map;
import java.util.Properties;
import java.util.stream.Collectors;
import com.esotericsoftware.yamlbeans.YamlReader;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.YamlMapFactoryBean;
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.boot.context.properties.source.MapConfigurationPropertySource;
import org.springframework.cloud.release.internal.ReleaserProperties;
import org.springframework.cloud.release.internal.ReleaserPropertiesAware;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.FileSystemResource;
/**
* @author Marcin Grzejszczak
@@ -41,10 +41,16 @@ class ReleaserPropertiesUpdater {
File releaserConfig = new File(clonedProjectFromOrg, "config/releaser.yml");
if (releaserConfig.exists()) {
try {
Object read = new YamlReader(new FileReader(releaserConfig)).read();
YamlPropertiesFactoryBean yamlProcessor = new YamlPropertiesFactoryBean();
yamlProcessor.setResources(new FileSystemResource(releaserConfig));
Properties properties = yamlProcessor.getObject();
ReleaserProperties releaserProperties = new Binder(
new MapConfigurationPropertySource((Map) read))
.bind("releaser", ReleaserProperties.class).get();
new MapConfigurationPropertySource(properties.entrySet().stream().collect(
Collectors.toMap(
e -> e.getKey().toString(),
e -> e.getValue().toString()
)
))).bind("releaser", ReleaserProperties.class).get();
log.info("config/releaser.yml found. Will update the current properties");
copy.setMaven(releaserProperties.getMaven());
copy.setGradle(releaserProperties.getGradle());

19
spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/ReleaserPropertiesIntegrationTests.java
View File

@@ -53,7 +53,24 @@ public class ReleaserPropertiesIntegrationTests {
ReleaserPropertiesHaving having = ((ReleaserPropertiesHaving) aware);
BDDAssertions.then(having.properties.getPom().getBranch()).isEqualTo("barrrr");
BDDAssertions.then(having.properties.getMaven().getBuildCommand()).isEqualTo("./scripts/noIntegration.sh");
});
});
}
@Test public void should_update_properties_including_existing_releaser_config_for_netflix() {
ReleaserProperties properties = new ReleaserProperties();
properties.getPom().setBranch("bazzzz");
URL resource = ReleaserPropertiesIntegrationTests.class
.getResource("/projects/project-with-netflix-config");
new ReleaserPropertiesUpdater(this.context).updateProperties(properties,
new File(resource.getFile()));
BDDAssertions.then(this.propertiesAware).hasSize(2);
this.propertiesAware.forEach(aware -> {
ReleaserPropertiesHaving having = ((ReleaserPropertiesHaving) aware);
BDDAssertions.then(having.properties.getPom().getBranch()).isEqualTo("bazzzz");
BDDAssertions.then(having.properties.getMaven().getBuildCommand()).isEqualTo("./scripts/build.sh {{systemProps}}");
});
}
@Configuration

3
spring-cloud-release-tools-spring/src/test/resources/projects/project-with-netflix-config/config/releaser.yml Normal file
View File

@@ -0,0 +1,3 @@
releaser:
maven:
buildCommand: ./scripts/build.sh {{systemProps}}