Adds more tests for ConfigResourceClient (#394)

spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/OAuth2ConfigResourceClient.java

@@ -56,6 +56,14 @@ protected OAuth2ConfigResourceClient(RestTemplate restTemplate,
 		this.configClientProperties = configClientProperties;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Resource getPlainTextResource(String path) {
+		return getPlainTextResource(null, null, path);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */

spring-cloud-services-config-client-autoconfigure/src/main/java/io/pivotal/spring/cloud/config/client/PlainTextConfigClient.java

@@ -27,7 +27,17 @@
 public interface PlainTextConfigClient {
 
 	/**
-	 * Retrieves a config file.
+	 * Retrieves a plain text config file using the defaults profiles and labels.
+	 * @param path config file path relative to spring application folder
+	 * @return plain text file retrieved from config server
+	 * @throws IllegalArgumentException when application name or Config Server url is
+	 * undefined.
+	 * @throws HttpClientErrorException when a config file is not found.
+	 */
+	Resource getPlainTextResource(String path);
+
+	/**
+	 * Retrieves a plain text config file.
 	 * @throws IllegalArgumentException when application name or Config Server url is
 	 * undefined.
 	 * @throws HttpClientErrorException when a config file is not found.

spring-cloud-services-config-client-autoconfigure/src/test/java/io/pivotal/spring/cloud/config/client/ConfigResourceClientAutoConfigurationTest.java

@@ -109,12 +109,11 @@ private void stubEndpoints() {
 			.willReturn(aResponse().withHeader("Content-Type", "application/json;charset=UTF-8").withBody("""
 					{
 					  "access_token" : "access-token",
-					  "token_type" : "bearer",
-					  "scope" : "emails.write"
+					  "token_type" : "bearer"
 					}""")));
 
 		stubFor(get("/application/profile/label/path").withHost(equalTo("server.local"))
-			.willReturn(aResponse().withHeader("Content-Type", "plain/text").withBody("::text::")));
+			.willReturn(aResponse().withHeader("Content-Type", "text/plain").withBody("::content::")));
 	}
 
 	private void tryFetchingAnyResource(BeanFactory factory) {

spring-cloud-services-config-client-autoconfigure/src/test/java/io/pivotal/spring/cloud/config/client/ConfigResourceClientTests.java

@@ -0,0 +1,105 @@
+/*
+ * Copyright 2017 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
+ *
+ *      https://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 io.pivotal.spring.cloud.config.client;
+
+import com.github.tomakehurst.wiremock.junit5.WireMockTest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.config.client.ConfigClientProperties;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.ActiveProfiles;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Daniel Lavoie
+ */
+@Import(ConfigResourceClientAutoConfiguration.class)
+@SpringBootTest(classes = ConfigClientProperties.class,
+		properties = { "spring.cloud.config.label=main", "spring.cloud.config.uri=http://server.local",
+				"spring.cloud.config.client.oauth2.client-id=id",
+				"spring.cloud.config.client.oauth2.client-secret=secret",
+				"spring.cloud.config.client.oauth2.access-token-uri=http://uaa.local/token/uri" })
+@ActiveProfiles("integration-test")
+@WireMockTest(proxyMode = true)
+public class ConfigResourceClientTests {
+
+	@Autowired
+	private ConfigResourceClient configResourceClient;
+
+	@BeforeEach
+	void setup() {
+		stubFor(post("/token/uri").withHost(equalTo("uaa.local"))
+			.willReturn(aResponse().withHeader("Content-Type", "application/json;charset=UTF-8").withBody("""
+					{
+					  "access_token" : "access-token",
+					  "token_type" : "bearer"
+					}""")));
+	}
+
+	@Test
+	public void shouldLoadPlainText() throws IOException {
+		stubFor(get("/application/development/dev/path").withHost(equalTo("server.local"))
+			.withHeader("Accept", not(equalTo("application/octet-stream")))
+			.willReturn(aResponse().withHeader("Content-Type", "plain/text").withBody("::text::")));
+
+		var resource = configResourceClient.getPlainTextResource("development", "dev", "path");
+
+		assertThat(resource.getContentAsString(StandardCharsets.UTF_8)).isEqualTo("::text::");
+	}
+
+	@Test
+	public void shouldLoadBinaryResource() throws IOException {
+		stubFor(get("/application/production/prd/path").withHost(equalTo("server.local"))
+			.withHeader("Accept", equalTo("application/octet-stream"))
+			.willReturn(aResponse().withHeader("Content-Type", "application/octet-stream").withBody("::binary::")));
+
+		var resource = configResourceClient.getBinaryResource("production", "prd", "path");
+
+		assertThat(resource.getContentAsString(StandardCharsets.UTF_8)).isEqualTo("::binary::");
+	}
+
+	@Test
+	public void shouldLoadPlainTextWithDefaultProfileAndLabel() throws IOException {
+		stubFor(get("/application/default/main/path").withHost(equalTo("server.local"))
+			.withHeader("Accept", not(equalTo("application/octet-stream")))
+			.willReturn(
+					aResponse().withHeader("Content-Type", "application/octet-stream").withBody("::default text::")));
+
+		var resource = configResourceClient.getPlainTextResource("path");
+		assertThat(resource.getContentAsString(StandardCharsets.UTF_8)).isEqualTo("::default text::");
+	}
+
+	@Test
+	public void shouldLoadBinaryResourceWithDefaultProfileAndLabel() throws IOException {
+		stubFor(get("/application/default/main/path").withHost(equalTo("server.local"))
+			.withHeader("Accept", equalTo("application/octet-stream"))
+			.willReturn(
+					aResponse().withHeader("Content-Type", "application/octet-stream").withBody("::default binary::")));
+
+		var resource = configResourceClient.getBinaryResource("path");
+
+		assertThat(resource.getContentAsString(StandardCharsets.UTF_8)).isEqualTo("::default binary::");
+	}
+
+}

spring-cloud-services-config-client-autoconfigure/src/test/java/io/pivotal/spring/cloud/config/client/VaultTokenRenewalAutoConfigurationTest.java

@@ -127,8 +127,7 @@ private void stubTokenEndpoints() {
 			.willReturn(aResponse().withHeader("Content-Type", "application/json;charset=UTF-8").withBody("""
 					{
 					  "access_token" : "access-token",
-					  "token_type" : "bearer",
-					  "scope" : "emails.write"
+					  "token_type" : "bearer"
 					}""")));
 
 		stubFor(post("/vault/v1/auth/token/renew-self").withHost(equalTo("server.local"))

spring-cloud-services-service-registry-autoconfigure/src/test/java/io/pivotal/spring/cloud/service/registry/EurekaClientOAuth2AutoConfigurationTest.java

@@ -103,8 +103,7 @@ private void stubTokenEndpoint() {
 			.willReturn(aResponse().withHeader("Content-Type", "application/json;charset=UTF-8").withBody("""
 					{
 					  "access_token" : "access-token",
-					  "token_type" : "bearer",
-					  "scope" : "emails.write"
+					  "token_type" : "bearer"
 					}""")));
 	}