Merge remote-tracking branch 'origin/2.0.x'

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeBootstrapFailureAnalyzerTests.java

@@ -0,0 +1,34 @@
+package org.springframework.cloud.config.server;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.cloud.config.server.diagnostics.GitUriFailureAnalyzer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+
+/**
+ * @author Ryan Baxter
+ */
+public class NativeBootstrapFailureAnalyzerTests {
+
+	@Rule
+	public OutputCapture outputCapture = new OutputCapture();
+
+	@Test
+	public void contextLoads(){
+		try {
+			new SpringApplicationBuilder(ConfigServerApplication.class)
+					.web(WebApplicationType.SERVLET).properties("spring.cloud.bootstrap.name:enable-nativebootstrap").profiles("test","native").run();
+			fail("Application started successfully");
+		}
+		catch (Exception ex) {
+			assertThat(this.outputCapture.toString())
+					.contains(GitUriFailureAnalyzer.ACTION);
+			assertThat(this.outputCapture.toString()).contains(GitUriFailureAnalyzer.DESCRIPTION);
+		}
+	}
+}

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryConcurrencyTests.java

@@ -17,12 +17,24 @@
 package org.springframework.cloud.config.server.environment;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.eclipse.jgit.api.CheckoutCommand;
+import org.eclipse.jgit.api.CloneCommand;
+import org.eclipse.jgit.api.FetchCommand;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.*;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.transport.FetchResult;
 import org.eclipse.jgit.util.FileUtils;
 import org.junit.After;
 import org.junit.Before;
@@ -96,6 +108,63 @@ public class JGitEnvironmentRepositoryConcurrencyTests {
 		assertEquals("master", environment.getLabel());
 	}
 
+	protected Log logger = LogFactory.getLog(getClass());
+
+	/**
+	 * Simulates following actions in parallel:
+	 *   - Client tries to obtain configuration with specified label
+	 *   - Spring Refresh Context Event occurs
+	 */
+	@Test
+	public void concurrentRefreshContextAndGetLabels() throws Exception {
+		// Prepare the repo
+		final JGitConfigServerTestData testData = JGitConfigServerTestData.prepareClonedGitRepository(TestConfiguration.class);
+		JGitEnvironmentRepository repository = testData.getRepository();
+		repository.setCloneOnStart(true);
+		repository.setGitFactory(new DelayedGitFactoryMock());
+		repository.setBasedir(testData.getClonedGit().getGitWorkingDirectory());
+		repository.setUri(testData.getServerGit().getGitWorkingDirectory().getAbsolutePath().replace("file://", ""));
+
+		final AtomicInteger errorCount = new AtomicInteger();
+
+		// Prepare two threads to do the parallel work
+		Thread client = new Thread(new Runnable() {
+			@Override
+			public void run() {
+				logger.info("client start.");
+				try {
+					Environment environment = testData.getRepository().findOne("bar", "staging", "master");
+				} catch (Exception e) {
+					errorCount.incrementAndGet();
+					e.printStackTrace();
+				}
+				logger.info("client end.");
+			}
+		});
+
+		Thread refresh = new Thread(new Runnable() {
+			@Override
+			public void run() {
+				try {
+					logger.info("refresh start.");
+					testData.getRepository().afterPropertiesSet();
+					logger.info("refresh end.");
+				} catch (Exception e) {
+					errorCount.incrementAndGet();
+					e.printStackTrace();
+				}
+			}
+		});
+
+		// Start the parallel actions and wait till the end.
+		refresh.start();
+		client.start();
+		refresh.join();
+		client.join();
+
+		assertEquals(0, errorCount.get());
+	}
+
 	@Configuration
 	@EnableConfigurationProperties(ConfigServerProperties.class)
 	@Import({ PropertyPlaceholderAutoConfiguration.class,
@@ -103,4 +172,80 @@ public class JGitEnvironmentRepositoryConcurrencyTests {
 	protected static class TestConfiguration {
 	}
 
+	private static class DelayedGitFactoryMock extends JGitEnvironmentRepository.JGitFactory {
+
+		@Override
+		public Git getGitByOpen(File file) throws IOException {
+			Git originalGit = DelayedGitMock.open(file);
+			return new DelayedGitMock(originalGit.getRepository());
+		}
+
+		@Override
+		public CloneCommand getCloneCommandByCloneRepository() {
+			return new DelayedCloneCommand();
+		}
+	}
+
+	private static class DelayedGitMock extends Git {
+
+		public DelayedGitMock(Repository repo) {
+			super(repo);
+		}
+
+		@Override
+		public FetchCommand fetch() {
+			return new DelayedFetchCommand(getRepository());
+		}
+
+		@Override
+		public CheckoutCommand checkout() {
+			return new DelayedCheckoutCommand(getRepository());
+		}
+	}
+
+	private static class DelayedCloneCommand extends CloneCommand {
+		@Override
+		public Git call() throws GitAPIException, InvalidRemoteException, TransportException {
+			try {
+				Thread.sleep(250);
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
+			return super.call();
+		}
+	}
+
+	private static class DelayedFetchCommand extends FetchCommand {
+
+		public DelayedFetchCommand(Repository repo) {
+			super(repo);
+		}
+
+		@Override
+		public FetchResult call() throws GitAPIException, InvalidRemoteException, TransportException {
+			try {
+				Thread.sleep(250);
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
+			return super.call();
+		}
+	}
+
+	private static class DelayedCheckoutCommand extends CheckoutCommand {
+		public DelayedCheckoutCommand(Repository repo) {
+			super(repo);
+		}
+
+		@Override
+		public Ref call() throws GitAPIException, RefAlreadyExistsException, RefNotFoundException, InvalidRefNameException, CheckoutConflictException {
+			try {
+				Thread.sleep(250);
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
+			return super.call();
+		}
+	}
+
 }

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepositoryFactoryTest.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cloud.config.server.environment;
+
+import org.junit.Test;
+import org.springframework.cloud.config.server.config.ConfigServerProperties;
+import org.springframework.core.env.StandardEnvironment;
+
+import static org.junit.Assert.assertEquals;
+
+
+/**
+ * @author Ryan Baxter
+ */
+public class NativeEnvironmentRepositoryFactoryTest {
+
+	@Test
+	public void testDefaultLabel() {
+		ConfigServerProperties props = new ConfigServerProperties();
+		props.setDefaultLabel("mylabel");
+		NativeEnvironmentRepositoryFactory factory = new NativeEnvironmentRepositoryFactory(new StandardEnvironment(), props);
+		NativeEnvironmentProperties environmentProperties = new NativeEnvironmentProperties();
+		NativeEnvironmentRepository repo = factory.build(environmentProperties);
+		assertEquals("mylabel", repo.getDefaultLabel());
+
+		factory = new NativeEnvironmentRepositoryFactory(new StandardEnvironment(), props);
+		environmentProperties = new NativeEnvironmentProperties();
+		environmentProperties.setDefaultLabel("mynewlabel");
+		repo = factory.build(environmentProperties);
+		assertEquals("mylabel", repo.getDefaultLabel());
+
+		factory = new NativeEnvironmentRepositoryFactory(new StandardEnvironment(), new ConfigServerProperties());
+		environmentProperties = new NativeEnvironmentProperties();
+		environmentProperties.setDefaultLabel("mynewlabel");
+		repo = factory.build(environmentProperties);
+		assertEquals("mynewlabel", repo.getDefaultLabel());
+	}
+}

spring-cloud-config-server/src/test/resources/enable-nativebootstrap.yml

@@ -0,0 +1,5 @@
+spring:
+  cloud:
+    config:
+      server:
+        bootstrap: true