Skip to content

Commit 727f5ad

Browse files
URL Cleanup
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # HTTP URLs that Could Not Be Fixed These URLs were unable to be fixed. Please review them to see if they can be manually resolved. * [ ] http://arquillian.org/arquillian-cube/ (200) with 1 occurrences could not be migrated: ([https](https://arquillian.org/arquillian-cube/) result SSLHandshakeException). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://%s:%d (UnknownHostException) with 7 occurrences migrated to: https://%s:%d ([https](https://%s:%d) result UnknownHostException). * [ ] http://IP_OR_HOSTNAME/ (UnknownHostException) with 1 occurrences migrated to: https://IP_OR_HOSTNAME/ ([https](https://IP_OR_HOSTNAME/) result UnknownHostException). * [ ] http://IP_OR_HOSTNAME/greeting (UnknownHostException) with 6 occurrences migrated to: https://IP_OR_HOSTNAME/greeting ([https](https://IP_OR_HOSTNAME/greeting) result UnknownHostException). * [ ] http://IP_OR_HOSTNAME/services (UnknownHostException) with 1 occurrences migrated to: https://IP_OR_HOSTNAME/services ([https](https://IP_OR_HOSTNAME/services) result UnknownHostException). * [ ] http://compose.docker.io/ (UnknownHostException) with 1 occurrences migrated to: https://compose.docker.io/ ([https](https://compose.docker.io/) result UnknownHostException). * [ ] http://fake:8888/ (UnknownHostException) with 1 occurrences migrated to: https://fake:8888/ ([https](https://fake:8888/) result UnknownHostException). * [ ] http://name-service/name?delay=%d (UnknownHostException) with 1 occurrences migrated to: https://name-service/name?delay=%d ([https](https://name-service/name?delay=%d) result UnknownHostException). * [ ] http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to: https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd) result 404). ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://EditorConfig.org with 1 occurrences migrated to: https://EditorConfig.org ([https](https://EditorConfig.org) result 200). * [ ] http://microservices.io/patterns/client-side-discovery.html with 1 occurrences migrated to: https://microservices.io/patterns/client-side-discovery.html ([https](https://microservices.io/patterns/client-side-discovery.html) result 200). * [ ] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html with 1 occurrences migrated to: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html ([https](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) result 200). * [ ] http://www.java.com/en/download/help/error_hotspot.xml with 1 occurrences migrated to: https://www.java.com/en/download/help/error_hotspot.xml ([https](https://www.java.com/en/download/help/error_hotspot.xml) result 200). * [ ] http://plugins.jetbrains.com/plugin/6546 with 1 occurrences migrated to: https://plugins.jetbrains.com/plugin/6546 ([https](https://plugins.jetbrains.com/plugin/6546) result 301). * [ ] http://eclipse.org with 1 occurrences migrated to: https://eclipse.org ([https](https://eclipse.org) result 302). * [ ] http://eclipse.org/m2e/ with 2 occurrences migrated to: https://eclipse.org/m2e/ ([https](https://eclipse.org/m2e/) result 302). * [ ] http://www.springsource.com/developer/sts with 1 occurrences migrated to: https://www.springsource.com/developer/sts ([https](https://www.springsource.com/developer/sts) result 302). # Ignored These URLs were intentionally ignored. * http://localhost with 7 occurrences * http://testapp/greeting with 5 occurrences
1 parent 03ed0f2 commit 727f5ad

File tree

11 files changed

+28
-28
lines changed

11 files changed

+28
-28
lines changed

.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# EditorConfig is awesome: http://EditorConfig.org
1+
# EditorConfig is awesome: https://EditorConfig.org
22

33
# top-most EditorConfig file
44
root = true

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ buildNumber.properties
2121
*.war
2222
*.ear
2323

24-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
24+
# virtual machine crash logs, see https://www.java.com/en/download/help/error_hotspot.xml
2525
hs_err_pid*
2626

2727

README.adoc

+8-8
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ credentials and you already have those.
794794

795795
The projects that require middleware generally include a
796796
`docker-compose.yml`, so consider using
797-
http://compose.docker.io/[Docker Compose] to run the middeware servers
797+
https://compose.docker.io/[Docker Compose] to run the middeware servers
798798
in Docker containers. See the README in the
799799
https://github.com/spring-cloud-samples/scripts[scripts demo
800800
repository] for specific instructions about the common cases of mongo,
@@ -816,13 +816,13 @@ a modified file in the correct place. Just commit it and push the change.
816816

817817
=== Working with the code
818818
If you don't have an IDE preference we would recommend that you use
819-
http://www.springsource.com/developer/sts[Spring Tools Suite] or
820-
http://eclipse.org[Eclipse] when working with the code. We use the
821-
http://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
819+
https://www.springsource.com/developer/sts[Spring Tools Suite] or
820+
https://eclipse.org[Eclipse] when working with the code. We use the
821+
https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
822822
should also work without issue as long as they use Maven 3.3.3 or better.
823823

824824
==== Importing into eclipse with m2eclipse
825-
We recommend the http://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
825+
We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
826826
eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
827827
marketplace".
828828

@@ -880,7 +880,7 @@ added after the original pull request but before a merge.
880880
`eclipse-code-formatter.xml` file from the
881881
https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
882882
Cloud Build] project. If using IntelliJ, you can use the
883-
http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
883+
https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
884884
Plugin] to import the same file.
885885
* Make sure all new `.java` files to have a simple Javadoc class comment with at least an
886886
`@author` tag identifying you, and preferably at least a paragraph on what the class is
@@ -893,7 +893,7 @@ added after the original pull request but before a merge.
893893
* A few unit tests would help a lot as well -- someone has to do it.
894894
* If no-one else is using your branch, please rebase it against the current master (or
895895
other target branch in the main project).
896-
* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
896+
* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
897897
if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
898898
message (where XXXX is the issue number).
899899

@@ -964,7 +964,7 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i
964964
<?xml version="1.0"?>
965965
<!DOCTYPE suppressions PUBLIC
966966
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
967-
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
967+
"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
968968
<suppressions>
969969
<suppress files=".*ConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
970970
<suppress files=".*ConfigClientWatch\.java" checks="LineLengthCheck"/>

spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientConfigClientBootstrapConfigurationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void onWhenRequested() throws Exception {
6969
verify(client, atLeast(2)).getInstances("configserver");
7070
ConfigClientProperties locator = this.context
7171
.getBean(ConfigClientProperties.class);
72-
assertEquals("http://fake:8888/", locator.getUri()[0]);
72+
assertEquals("https://fake:8888/", locator.getUri()[0]);
7373
}
7474

7575
private void setup(String... env) {

spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/src/main/java/org/springframework/cloud/kubernetes/examples/NameService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public NameService(RestTemplate restTemplate) {
4040
@HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "1000") })
4141
public String getName(int delay) {
4242
return this.restTemplate.getForObject(
43-
String.format("http://name-service/name?delay=%d", delay), String.class);
43+
String.format("https://name-service/name?delay=%d", delay), String.class);
4444
}
4545

4646
private String getFallbackName(int delay) {

spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/readme.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Kubernetes Circuit Breaker & Load Balancer Example
22

3-
This example demonstrates how to use [Hystrix circuit breaker](https://martinfowler.com/bliki/CircuitBreaker.html) and the [Ribbon Load Balancing](http://microservices.io/patterns/client-side-discovery.html). The circuit breaker which is backed with Ribbon will check regularly if the target service is still alive. If this is not loner the case, then a fall back process will be excuted. In our case, the REST `greeting service` which is calling the `name Service` responsible to generate the response message will reply a "fallback message" to the client if the `name service` is not longer replying.
3+
This example demonstrates how to use [Hystrix circuit breaker](https://martinfowler.com/bliki/CircuitBreaker.html) and the [Ribbon Load Balancing](https://microservices.io/patterns/client-side-discovery.html). The circuit breaker which is backed with Ribbon will check regularly if the target service is still alive. If this is not loner the case, then a fall back process will be excuted. In our case, the REST `greeting service` which is calling the `name Service` responsible to generate the response message will reply a "fallback message" to the client if the `name service` is not longer replying.
44
As the Ribbon Kubernetes client is configured within this example, it will fetch from the Kubernetes API Server, the list of the endpoints available for the name service and loadbalance the request between the IP addresses available
55

66
### Running the example
@@ -39,7 +39,7 @@ minikube service --url greeting-service
3939
and then call the service using the curl client
4040

4141
```
42-
curl http://IP_OR_HOSTNAME/greeting
42+
curl https://IP_OR_HOSTNAME/greeting
4343
```
4444

4545
to get a response as such
@@ -84,9 +84,9 @@ name-service 172.17.0.5:8080,172.17.0.6:8080 40m
8484
Here is an example about what you will get
8585

8686
```
87-
curl http://IP_OR_HOSTNAME/greeting
87+
curl https://IP_OR_HOSTNAME/greeting
8888
Hello from name-service-1652024859-hf3xv!
89-
curl http://IP_OR_HOSTNAME/greeting
89+
curl https://IP_OR_HOSTNAME/greeting
9090
Hello from name-service-1652024859-426kv!
9191
...
9292
```
@@ -150,7 +150,7 @@ oc get route/greeting-service
150150
and then call the service using the curl client
151151

152152
```
153-
curl http://IP_OR_HOSTNAME/greeting
153+
curl https://IP_OR_HOSTNAME/greeting
154154
```
155155

156156
to get a response as such
@@ -195,9 +195,9 @@ name-service 172.17.0.2:8080,172.17.0.3:8080 40m
195195
Here is an example about what you will get
196196

197197
```
198-
curl http://IP_OR_HOSTNAME/greeting
198+
curl https://IP_OR_HOSTNAME/greeting
199199
Hello from name-service-1-0ss0r!
200-
curl http://IP_OR_HOSTNAME/greeting
200+
curl https://IP_OR_HOSTNAME/greeting
201201
Hello from name-service-1-fblp1!
202202
...
203203
```

spring-cloud-kubernetes-examples/kubernetes-hello-world-example/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ minikube service kubernetes-hello-world --url
4444
And next you can curl the endpoint using the url returned by the previous command
4545

4646
```
47-
curl http://IP_OR_HOSTNAME/
47+
curl https://IP_OR_HOSTNAME/
4848
```
4949

5050
then
5151

5252
```
53-
curl http://IP_OR_HOSTNAME/services
53+
curl https://IP_OR_HOSTNAME/services
5454
```
5555

5656
Should return you the list of available services discovered by the DiscoveryClient

spring-cloud-kubernetes-integration-tests/discovery/tests/src/test/java/org/springframework/cloud/kubernetes/it/ServicesIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class ServicesIT {
3737

3838
@Test
3939
public void testServicesEndpoint() {
40-
given().baseUri(String.format("http://%s:%d", HOST, PORT)).get("services").then()
40+
given().baseUri(String.format("https://%s:%d", HOST, PORT)).get("services").then()
4141
.statusCode(200).body(new StringContains("service-a") {
4242
@Override
4343
protected boolean evalSubstringOf(String s) {
@@ -48,7 +48,7 @@ protected boolean evalSubstringOf(String s) {
4848

4949
@Test
5050
public void testInstancesEndpoint() {
51-
given().baseUri(String.format("http://%s:%d", HOST, PORT))
51+
given().baseUri(String.format("https://%s:%d", HOST, PORT))
5252
.get("services/discovery-service-a/instances").then().statusCode(200)
5353
.body("instanceId", hasSize(1))
5454
.body("serviceId", hasItems("discovery-service-a"));

spring-cloud-kubernetes-integration-tests/istio/src/test/java/org/springframework/cloud/kubernetes/it/ProfilesIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class ProfilesIT {
3535

3636
@Test
3737
public void testProfileEndpoint() {
38-
given().baseUri(String.format("http://%s:%d", HOST, PORT)).get("profiles").then()
38+
given().baseUri(String.format("https://%s:%d", HOST, PORT)).get("profiles").then()
3939
.statusCode(200).body(new StringContains("istio"));
4040
}
4141

spring-cloud-kubernetes-integration-tests/simple-configmap/src/test/java/org/springframework/cloud/kubernetes/it/GreetingIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class GreetingIT {
3939

4040
@Test
4141
public void firstTestThatTheDefaultMessageIsReturned() {
42-
given().baseUri(String.format("http://%s:%d", HOST, PORT)).get("greeting").then()
42+
given().baseUri(String.format("https://%s:%d", HOST, PORT)).get("greeting").then()
4343
.statusCode(200).body("message", is("This is a dummy message"));
4444
}
4545

@@ -48,7 +48,7 @@ public void firstTestThatTheDefaultMessageIsReturned() {
4848
public void thenApplyAConfigMapAndEnsureThatTheMessageIsUpdated() {
4949
waitForApplicationToReload();
5050

51-
given().baseUri(String.format("http://%s:%d", HOST, PORT)).get("greeting").then()
51+
given().baseUri(String.format("https://%s:%d", HOST, PORT)).get("greeting").then()
5252
.statusCode(200)
5353
.body("message", is("Hello from Spring Cloud Kubernetes!"));
5454
}

spring-cloud-kubernetes-integration-tests/simple-core/src/test/java/org/springframework/cloud/kubernetes/it/GreetingAndHealthIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ public class GreetingAndHealthIT {
3535

3636
@Test
3737
public void testGreetingEndpoint() {
38-
given().baseUri(String.format("http://%s:%d", HOST, PORT)).get("greeting").then()
38+
given().baseUri(String.format("https://%s:%d", HOST, PORT)).get("greeting").then()
3939
.statusCode(200).body("message", is("Hello from k8s"));
4040
}
4141

4242
@Test
4343
public void testHealthEndpoint() {
44-
given().baseUri(String.format("http://%s:%d", HOST, PORT))
44+
given().baseUri(String.format("https://%s:%d", HOST, PORT))
4545
.contentType("application/json").get("actuator/health").then()
4646
.statusCode(200).body("details.kubernetes.details.inside", is(true));
4747
}

0 commit comments

Comments
 (0)