Merge branch '2.1.x' into 2.2.x

Author: philwebb

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/artifactory/ArtifactoryService.java

@@ -124,26 +124,27 @@ private boolean isAlreadyPromoted(String buildName, String buildNumber, String t
 	 */
 	public void distribute(String sourceRepo, ReleaseInfo releaseInfo, Set<String> artifactDigests) {
 		logger.debug("Attempting distribute via Artifactory");
-		if (this.bintrayService.isDistributionComplete(releaseInfo, artifactDigests, Duration.ofMinutes(2))) {
-			logger.info("Distribution already complete");
-			return;
+		if (!this.bintrayService.isDistributionStarted(releaseInfo)) {
+			startDistribute(sourceRepo, releaseInfo);
 		}
+		if (!this.bintrayService.isDistributionComplete(releaseInfo, artifactDigests, Duration.ofMinutes(60))) {
+			throw new DistributionTimeoutException("Distribution timed out.");
+		}
+	}
+
+	private void startDistribute(String sourceRepo, ReleaseInfo releaseInfo) {
 		DistributionRequest request = new DistributionRequest(new String[] { sourceRepo });
 		RequestEntity<DistributionRequest> requestEntity = RequestEntity
 				.post(URI.create(DISTRIBUTION_URL + releaseInfo.getBuildName() + "/" + releaseInfo.getBuildNumber()))
 				.contentType(MediaType.APPLICATION_JSON).body(request);
 		try {
 			this.restTemplate.exchange(requestEntity, Object.class);
-			logger.debug("Distribution call completed");
+			logger.debug("Distribute call completed");
 		}
 		catch (HttpClientErrorException ex) {
 			logger.info("Failed to distribute.");
 			throw ex;
 		}
-		if (!this.bintrayService.isDistributionComplete(releaseInfo, artifactDigests, Duration.ofMinutes(60))) {
-			throw new DistributionTimeoutException("Distribution timed out.");
-		}
-
 	}
 
 	private PromotionRequest getPromotionRequest(String targetRepo) {

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/bintray/BintrayService.java

@@ -29,6 +29,7 @@
 import org.slf4j.LoggerFactory;
 
 import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.RequestEntity;
 import org.springframework.stereotype.Component;
@@ -73,14 +74,30 @@ public BintrayService(RestTemplateBuilder builder, BintrayProperties bintrayProp
 		this.restTemplate = builder.build();
 	}
 
+	public boolean isDistributionStarted(ReleaseInfo releaseInfo) {
+		logger.debug("Checking if distribution is started");
+		RequestEntity<Void> request = getPackageFilesRequest(releaseInfo, 1);
+		try {
+			logger.debug("Checking bintray");
+			this.restTemplate.exchange(request, PackageFile[].class).getBody();
+			return true;
+		}
+		catch (HttpClientErrorException ex) {
+			if (ex.getStatusCode() != HttpStatus.NOT_FOUND) {
+				throw ex;
+			}
+			return false;
+		}
+	}
+
 	public boolean isDistributionComplete(ReleaseInfo releaseInfo, Set<String> requiredDigests, Duration timeout) {
 		return isDistributionComplete(releaseInfo, requiredDigests, timeout, Duration.ofSeconds(20));
 	}
 
 	public boolean isDistributionComplete(ReleaseInfo releaseInfo, Set<String> requiredDigests, Duration timeout,
 			Duration pollInterval) {
 		logger.debug("Checking if distribution is complete");
-		RequestEntity<Void> request = getRequest(releaseInfo, 0);
+		RequestEntity<Void> request = getPackageFilesRequest(releaseInfo, 0);
 		try {
 			waitAtMost(timeout).with().pollDelay(Duration.ZERO).pollInterval(pollInterval).until(() -> {
 				logger.debug("Checking bintray");
@@ -115,7 +132,7 @@ private boolean hasPublishedAll(PackageFile[] published, Set<String> requiredDig
 		return false;
 	}
 
-	private RequestEntity<Void> getRequest(ReleaseInfo releaseInfo, int includeUnpublished) {
+	private RequestEntity<Void> getPackageFilesRequest(ReleaseInfo releaseInfo, int includeUnpublished) {
 		return RequestEntity.get(URI.create(BINTRAY_URL + "packages/" + this.bintrayProperties.getSubject() + "/"
 				+ this.bintrayProperties.getRepo() + "/" + releaseInfo.getGroupId() + "/versions/"
 				+ releaseInfo.getVersion() + "/files?include_unpublished=" + includeUnpublished)).build();

ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/artifactory/ArtifactoryServiceTests.java

@@ -63,9 +63,7 @@
 @EnableConfigurationProperties(ArtifactoryProperties.class)
 class ArtifactoryServiceTests {
 
-	private static final Duration SHORT_TIMEOUT = Duration.ofMinutes(2);
-
-	private static final Duration LONG_TIMEOUT = Duration.ofMinutes(60);
+	private static final Duration TIMEOUT = Duration.ofMinutes(60);
 
 	@Autowired
 	private ArtifactoryService service;
@@ -141,8 +139,8 @@ void promoteWhenPromotionFails() {
 	@SuppressWarnings("unchecked")
 	void distributeWhenSuccessful() throws Exception {
 		ReleaseInfo releaseInfo = getReleaseInfo();
-		given(this.bintrayService.isDistributionComplete(eq(releaseInfo), (Set<String>) any(), any())).willReturn(false,
-				true);
+		given(this.bintrayService.isDistributionStarted(eq(releaseInfo))).willReturn(false);
+		given(this.bintrayService.isDistributionComplete(eq(releaseInfo), (Set<String>) any(), any())).willReturn(true);
 		this.server.expect(requestTo("https://repo.spring.io/api/build/distribute/example-build/example-build-1"))
 				.andExpect(method(HttpMethod.POST))
 				.andExpect(content().json(
@@ -154,8 +152,7 @@ void distributeWhenSuccessful() throws Exception {
 		this.service.distribute("libs-release-local", releaseInfo, artifactDigests);
 		this.server.verify();
 		InOrder ordered = inOrder(this.bintrayService);
-		ordered.verify(this.bintrayService).isDistributionComplete(releaseInfo, artifactDigests, SHORT_TIMEOUT);
-		ordered.verify(this.bintrayService).isDistributionComplete(releaseInfo, artifactDigests, LONG_TIMEOUT);
+		ordered.verify(this.bintrayService).isDistributionComplete(releaseInfo, artifactDigests, TIMEOUT);
 	}
 
 	@Test
@@ -175,7 +172,7 @@ void distributeWhenFailure() throws Exception {
 		assertThatExceptionOfType(HttpClientErrorException.class)
 				.isThrownBy(() -> this.service.distribute("libs-release-local", releaseInfo, artifactDigests));
 		this.server.verify();
-		verify(this.bintrayService, times(1)).isDistributionComplete(releaseInfo, artifactDigests, SHORT_TIMEOUT);
+		verify(this.bintrayService, times(1)).isDistributionStarted(releaseInfo);
 		verifyNoMoreInteractions(this.bintrayService);
 	}
 
@@ -199,8 +196,7 @@ void distributeWhenGettingPackagesTimesOut() throws Exception {
 				.isThrownBy(() -> this.service.distribute("libs-release-local", releaseInfo, artifactDigests));
 		this.server.verify();
 		InOrder ordered = inOrder(this.bintrayService);
-		ordered.verify(this.bintrayService).isDistributionComplete(releaseInfo, artifactDigests, SHORT_TIMEOUT);
-		ordered.verify(this.bintrayService).isDistributionComplete(releaseInfo, artifactDigests, LONG_TIMEOUT);
+		ordered.verify(this.bintrayService).isDistributionComplete(releaseInfo, artifactDigests, TIMEOUT);
 	}
 
 	private ReleaseInfo getReleaseInfo() {