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

Add scheme to test URLs (#1250)

Browse Source
This commit is contained in:
Ryan Baxter
2023-03-10 09:42:34 -05:00
committed by GitHub
parent 38930205f7
commit 2780a158e6
13 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog/KubernetesClientCatalogWatchIT.java
View File

@@ -113,7 +113,7 @@ class KubernetesClientCatalogWatchIT {
*/
private void test() {
WebClient client = builder().baseUrl("localhost/result").build();
WebClient client = builder().baseUrl("http://localhost/result").build();
EndpointNameAndNamespace[] holder = new EndpointNameAndNamespace[2];
ResolvableType resolvableType = ResolvableType.forClassWithGenerics(List.class, EndpointNameAndNamespace.class);

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/client/catalog/KubernetesClientCatalogWatchNamespacesIT.java
View File

@@ -133,7 +133,7 @@ public class KubernetesClientCatalogWatchNamespacesIT {
*/
private void test() {
WebClient client = builder().baseUrl("localhost/result").build();
WebClient client = builder().baseUrl("http://localhost/result").build();
EndpointNameAndNamespace[] holder = new EndpointNameAndNamespace[4];
ResolvableType resolvableType = ResolvableType.forClassWithGenerics(List.class, EndpointNameAndNamespace.class);

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchIT.java
View File

@@ -123,7 +123,7 @@ class Fabric8CatalogWatchIT {
@SuppressWarnings("unchecked")
private void test() {
WebClient client = builder().baseUrl("localhost/result").build();
WebClient client = builder().baseUrl("http://localhost/result").build();
EndpointNameAndNamespace[] holder = new EndpointNameAndNamespace[2];
ResolvableType resolvableType = ResolvableType.forClassWithGenerics(List.class, EndpointNameAndNamespace.class);

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithNamespacesIT.java
View File

@@ -144,7 +144,7 @@ class Fabric8CatalogWatchWithNamespacesIT {
@SuppressWarnings("unchecked")
private void test() {
WebClient client = builder().baseUrl("localhost/result").build();
WebClient client = builder().baseUrl("http://localhost/result").build();
EndpointNameAndNamespace[] holder = new EndpointNameAndNamespace[2];
ResolvableType resolvableType = ResolvableType.forClassWithGenerics(List.class, EndpointNameAndNamespace.class);

16
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/event/reload/ConfigMapEventReloadIT.java
View File

@@ -103,7 +103,7 @@ class ConfigMapEventReloadIT {
Commons.assertReloadLogStatements("added configmap informer for namespace",
"added secret informer for namespace", IMAGE_NAME);
WebClient webClient = builder().baseUrl("localhost/left").build();
WebClient webClient = builder().baseUrl("http://localhost/left").build();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(retrySpec())
.block();
@@ -111,7 +111,7 @@ class ConfigMapEventReloadIT {
Assertions.assertEquals("left-initial", result);
// then read the value from the right-configmap
webClient = builder().baseUrl("localhost/right").build();
webClient = builder().baseUrl("http://localhost/right").build();
result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(retrySpec()).block();
Assertions.assertEquals("right-initial", result);
@@ -125,7 +125,7 @@ class ConfigMapEventReloadIT {
// wait dummy for 5 seconds
LockSupport.parkNanos(TimeUnit.SECONDS.toNanos(5));
webClient = builder().baseUrl("localhost/left").build();
webClient = builder().baseUrl("http://localhost/left").build();
result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(retrySpec()).block();
// left configmap has not changed, no restart of app has happened
Assertions.assertEquals("left-initial", result);
@@ -148,7 +148,7 @@ class ConfigMapEventReloadIT {
"added secret informer for namespace", IMAGE_NAME);
// read the value from the right-configmap
WebClient webClient = builder().baseUrl("localhost/right").build();
WebClient webClient = builder().baseUrl("http://localhost/right").build();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(retrySpec())
.block();
Assertions.assertEquals("right-initial", result);
@@ -162,7 +162,7 @@ class ConfigMapEventReloadIT {
String[] resultAfterChange = new String[1];
await().pollInterval(Duration.ofSeconds(3)).atMost(Duration.ofSeconds(90)).until(() -> {
WebClient innerWebClient = builder().baseUrl("localhost/right").build();
WebClient innerWebClient = builder().baseUrl("http://localhost/right").build();
String innerResult = innerWebClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class)
.retryWhen(retrySpec()).block();
resultAfterChange[0] = innerResult;
@@ -189,13 +189,13 @@ class ConfigMapEventReloadIT {
"added secret informer for namespace", IMAGE_NAME);
// read the initial value from the right-configmap
WebClient rightWebClient = builder().baseUrl("localhost/right").build();
WebClient rightWebClient = builder().baseUrl("http://localhost/right").build();
String rightResult = rightWebClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class)
.retryWhen(retrySpec()).block();
Assertions.assertEquals("right-initial", rightResult);
// then read the initial value from the right-with-label-configmap
WebClient rightWithLabelWebClient = builder().baseUrl("localhost/with-label").build();
WebClient rightWithLabelWebClient = builder().baseUrl("http://localhost/with-label").build();
String rightWithLabelResult = rightWithLabelWebClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class)
.retryWhen(retrySpec()).block();
Assertions.assertEquals("right-with-label-initial", rightWithLabelResult);
@@ -227,7 +227,7 @@ class ConfigMapEventReloadIT {
// value
String[] resultAfterChange = new String[1];
await().pollInterval(Duration.ofSeconds(3)).atMost(Duration.ofSeconds(90)).until(() -> {
WebClient innerWebClient = builder().baseUrl("localhost/with-label").build();
WebClient innerWebClient = builder().baseUrl("http://localhost/with-label").build();
String innerResult = innerWebClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class)
.retryWhen(retrySpec()).block();
resultAfterChange[0] = innerResult;

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/ConfigMapPollingReloadIT.java
View File

@@ -80,7 +80,7 @@ class ConfigMapPollingReloadIT {
@Test
void test() {
WebClient webClient = builder().baseUrl("localhost/key").build();
WebClient webClient = builder().baseUrl("http://localhost/key").build();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(retrySpec())
.block();

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8ConfigMapIT.java
View File

@@ -74,7 +74,7 @@ class Fabric8ConfigMapIT {
@Test
void test() {
WebClient client = builder().baseUrl("localhost/key1").build();
WebClient client = builder().baseUrl("http://localhost/key1").build();
String result = client.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(retrySpec())
.block();

4
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryIT.java
View File

@@ -90,7 +90,7 @@ class Fabric8DiscoveryIT {
*/
@Test
void testAllServices() {
WebClient client = builder().baseUrl("localhost/services").build();
WebClient client = builder().baseUrl("http://localhost/services").build();
List<String> result = client.method(HttpMethod.GET).retrieve()
.bodyToMono(new ParameterizedTypeReference<List<String>>() {
@@ -107,7 +107,7 @@ class Fabric8DiscoveryIT {
@Test
void testExternalNameServiceInstance() {
WebClient client = builder().baseUrl("localhost/service-instances/external-name-service").build();
WebClient client = builder().baseUrl("http://localhost/service-instances/external-name-service").build();
List<DefaultKubernetesServiceInstance> serviceInstances = client.method(HttpMethod.GET).retrieve()
.bodyToMono(new ParameterizedTypeReference<List<DefaultKubernetesServiceInstance>>() {

4
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryNamespaceFilterIT.java
View File

@@ -94,7 +94,7 @@ class Fabric8DiscoveryNamespaceFilterIT {
@Test
void test() {
WebClient clientServices = builder().baseUrl("localhost/services").build();
WebClient clientServices = builder().baseUrl("http://localhost/services").build();
@SuppressWarnings("unchecked")
List<String> services = (List<String>) clientServices.method(HttpMethod.GET).retrieve().bodyToMono(List.class)
@@ -103,7 +103,7 @@ class Fabric8DiscoveryNamespaceFilterIT {
Assertions.assertEquals(services.size(), 1);
Assertions.assertTrue(services.contains("service-wiremock"));
WebClient clientEndpoints = builder().baseUrl("localhost/endpoints/service-wiremock").build();
WebClient clientEndpoints = builder().baseUrl("http://localhost/endpoints/service-wiremock").build();
List<Endpoints> endpoints = clientEndpoints.method(HttpMethod.GET).retrieve()
.bodyToMono(new ParameterizedTypeReference<List<Endpoints>>() {

4
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Fabric8ClientLoadbalancerIT.java
View File

@@ -93,7 +93,7 @@ public class Fabric8ClientLoadbalancerIT {
manifests("SERVICE", Phase.CREATE);
WebClient client = builder().baseUrl("localhost/loadbalancer-it/servicea").build();
WebClient client = builder().baseUrl("http://localhost/loadbalancer-it/servicea").build();
@SuppressWarnings("unchecked")
Map<String, String> mapResult = (Map<String, String>) client.method(HttpMethod.GET).retrieve()
@@ -111,7 +111,7 @@ public class Fabric8ClientLoadbalancerIT {
manifests("POD", Phase.CREATE);
WebClient client = builder().baseUrl("localhost/loadbalancer-it/servicea").build();
WebClient client = builder().baseUrl("http://localhost/loadbalancer-it/servicea").build();
@SuppressWarnings("unchecked")
Map<String, String> mapResult = (Map<String, String>) client.method(HttpMethod.GET).retrieve()

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/secrets/event/reload/SecretsEventsReloadIT.java
View File

@@ -84,7 +84,7 @@ class SecretsEventsReloadIT {
void test() {
Commons.assertReloadLogStatements("added secret informer for namespace",
"added configmap informer for namespace", IMAGE_NAME);
WebClient webClient = builder().baseUrl("localhost/key").build();
WebClient webClient = builder().baseUrl("http://localhost/key").build();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(retrySpec())
.block();

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/src/test/java/org/springframework/cloud/kubernetes/fabric8/core/SimpleCoreIT.java
View File

@@ -76,7 +76,7 @@ class SimpleCoreIT {
@Test
void test() {
WebClient client = builder().baseUrl("localhost/message").build();
WebClient client = builder().baseUrl("http://localhost/message").build();
String result = client.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(retrySpec())
.block();

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/src/test/java/org/springframework/cloud/kubernetes/fabric8/istio/Fabric8IstioIT.java
View File

@@ -109,7 +109,7 @@ class Fabric8IstioIT {
@Test
void test() {
WebClient client = builder().baseUrl("localhost/profiles").build();
WebClient client = builder().baseUrl("http://localhost/profiles").build();
@SuppressWarnings("unchecked")
List<String> result = client.method(HttpMethod.GET).retrieve().bodyToMono(List.class).retryWhen(retrySpec())