From 42de74da5d5176d742c78dfff4a0f07d6da477dc Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Tue, 26 Mar 2019 03:44:49 -0500 Subject: [PATCH] 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). # 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://dashboard.example.com (UnknownHostException) with 3 occurrences migrated to: https://dashboard.example.com ([https](https://dashboard.example.com) result UnknownHostException). * [ ] http://example.com/binding/create/schema (404) with 6 occurrences migrated to: https://example.com/binding/create/schema ([https](https://example.com/binding/create/schema) result 404). * [ ] http://example.com/service-binding/create/schema (404) with 3 occurrences migrated to: https://example.com/service-binding/create/schema ([https](https://example.com/service-binding/create/schema) result 404). * [ ] http://example.com/service/create/schema (404) with 15 occurrences migrated to: https://example.com/service/create/schema ([https](https://example.com/service/create/schema) result 404). * [ ] http://example.com/service/update/schema (404) with 12 occurrences migrated to: https://example.com/service/update/schema ([https](https://example.com/service/update/schema) 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://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/ with 1 occurrences migrated to: https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/ ([https](https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/) result 200). * [ ] http://projects.spring.io/spring-security/ with 1 occurrences migrated to: https://projects.spring.io/spring-security/ ([https](https://projects.spring.io/spring-security/) result 200). * [ ] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html with 2 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://contributor-covenant.org with 1 occurrences migrated to: https://contributor-covenant.org ([https](https://contributor-covenant.org) result 301). * [ ] http://contributor-covenant.org/version/1/3/0/ with 1 occurrences migrated to: https://contributor-covenant.org/version/1/3/0/ ([https](https://contributor-covenant.org/version/1/3/0/) result 301). * [ ] http://plugins.jetbrains.com/plugin/6546 with 2 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 1 occurrences migrated to: https://eclipse.org/m2e/ ([https](https://eclipse.org/m2e/) result 302). # Ignored These URLs were intentionally ignored. * http://localhost with 2 occurrences * http://test.example.com with 2 occurrences * http://test.example.com/ with 1 occurrences * http://test.example.com//v2/service_instances/ with 1 occurrences --- CODE_OF_CONDUCT.adoc | 2 +- CONTRIBUTING.adoc | 4 ++-- README.adoc | 8 ++++---- .../web/ServiceBrokerPropertiesTest.java | 18 +++++++++--------- .../ServiceBrokerPropertiesValidationTest.java | 6 +++--- .../web/fixture/ServiceFixture.java | 6 +++--- .../src/test/resources/catalog-full.properties | 6 +++--- .../src/test/resources/catalog-full.yml | 6 +++--- .../servlet/retrieve_catalog_response.json | 6 +++--- .../model/catalog/SchemasTest.java | 18 +++++++++--------- .../CreateServiceInstanceResponseTest.java | 6 +++--- .../src/test/resources/catalog.json | 6 +++--- .../src/docs/asciidoc/getting-started.adoc | 2 +- .../docs/asciidoc/service-broker-security.adoc | 2 +- 14 files changed, 48 insertions(+), 48 deletions(-) diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc index f64fb1b7..33ae7bc9 100644 --- a/CODE_OF_CONDUCT.adoc +++ b/CODE_OF_CONDUCT.adoc @@ -24,4 +24,4 @@ Instances of abusive, harassing, or otherwise unacceptable behavior may be repor All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident. -This Code of Conduct is adapted from the http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]. \ No newline at end of file +This Code of Conduct is adapted from the https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]. \ No newline at end of file diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 5057d604..32f7d0e3 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -28,7 +28,7 @@ added after the original pull request but before a merge. `eclipse-code-formatter.xml` file from the https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the - http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is @@ -41,7 +41,7 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). diff --git a/README.adoc b/README.adoc index 14b63287..19a5ffcb 100644 --- a/README.adoc +++ b/README.adoc @@ -39,8 +39,8 @@ You may also build and run tests against the latest versions or specific version == Working with the code If you don't have an IDE preference we would recommend that you use https://spring.io/tools[Spring Tool Suite] or -http://eclipse.org[Eclipse] when working with the code. We use the -http://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools +https://eclipse.org[Eclipse] when working with the code. We use the +https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. == Contributing @@ -73,7 +73,7 @@ added after the original pull request but before a merge. `eclipse-code-formatter.xml` file from the https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the - http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is @@ -86,7 +86,7 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). diff --git a/spring-cloud-open-service-broker-autoconfigure/src/test/java/org/springframework/cloud/servicebroker/autoconfigure/web/ServiceBrokerPropertiesTest.java b/spring-cloud-open-service-broker-autoconfigure/src/test/java/org/springframework/cloud/servicebroker/autoconfigure/web/ServiceBrokerPropertiesTest.java index dcd30de0..523950d5 100644 --- a/spring-cloud-open-service-broker-autoconfigure/src/test/java/org/springframework/cloud/servicebroker/autoconfigure/web/ServiceBrokerPropertiesTest.java +++ b/spring-cloud-open-service-broker-autoconfigure/src/test/java/org/springframework/cloud/servicebroker/autoconfigure/web/ServiceBrokerPropertiesTest.java @@ -84,11 +84,11 @@ public class ServiceBrokerPropertiesTest { map.put("spring.cloud.openservicebroker.catalog.services[0].plans[1].metadata[key2]", "value2"); map.put("spring.cloud.openservicebroker.catalog.services[0].plans[1].bindable", "true"); map.put("spring.cloud.openservicebroker.catalog.services[0].plans[1].free", "true"); - map.put("spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.serviceinstance.create.parameters[$schema]", "http://example.com/service/create/schema"); + map.put("spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.serviceinstance.create.parameters[$schema]", "https://example.com/service/create/schema"); map.put("spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.serviceinstance.create.parameters[type]", "object"); - map.put("spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.serviceinstance.update.parameters[$schema]", "http://example.com/service/update/schema"); + map.put("spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.serviceinstance.update.parameters[$schema]", "https://example.com/service/update/schema"); map.put("spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.serviceinstance.update.parameters[type]", "object"); - map.put("spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.servicebinding.create.parameters[$schema]", "http://example.com/service/create/schema"); + map.put("spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.servicebinding.create.parameters[$schema]", "https://example.com/service/create/schema"); map.put("spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.servicebinding.create.parameters[type]", "object"); map.put("spring.cloud.openservicebroker.catalog.services[1].id", "service-two-id"); map.put("spring.cloud.openservicebroker.catalog.services[1].name", "Service Two"); @@ -125,11 +125,11 @@ public class ServiceBrokerPropertiesTest { assertThat(properties.getCatalog().getServices().get(0).getPlans().get(1).isBindable()).isTrue(); assertThat(properties.getCatalog().getServices().get(0).getPlans().get(1).isFree()).isTrue(); assertThat(properties.getCatalog().getServices().get(0).getPlans().get(1).getSchemas().getServiceInstance().getCreate().getParameters()) - .containsOnly(entry("$schema", "http://example.com/service/create/schema"), entry("type", "object")); + .containsOnly(entry("$schema", "https://example.com/service/create/schema"), entry("type", "object")); assertThat(properties.getCatalog().getServices().get(0).getPlans().get(1).getSchemas().getServiceInstance().getUpdate().getParameters()) - .containsOnly(entry("$schema", "http://example.com/service/update/schema"), entry("type", "object")); + .containsOnly(entry("$schema", "https://example.com/service/update/schema"), entry("type", "object")); assertThat(properties.getCatalog().getServices().get(0).getPlans().get(1).getSchemas().getServiceBinding().getCreate().getParameters()) - .containsOnly(entry("$schema", "http://example.com/service/create/schema"), entry("type", "object")); + .containsOnly(entry("$schema", "https://example.com/service/create/schema"), entry("type", "object")); assertThat(properties.getCatalog().getServices().get(1).getId()).isEqualTo("service-two-id"); assertThat(properties.getCatalog().getServices().get(1).getName()).isEqualTo("Service Two"); assertThat(properties.getCatalog().getServices().get(1).getDescription()).isEqualTo("Description for Service Two"); @@ -162,11 +162,11 @@ public class ServiceBrokerPropertiesTest { assertThat(catalog.getServiceDefinitions().get(0).getPlans().get(1).isBindable()).isTrue(); assertThat(catalog.getServiceDefinitions().get(0).getPlans().get(1).isFree()).isTrue(); assertThat(catalog.getServiceDefinitions().get(0).getPlans().get(1).getSchemas().getServiceInstanceSchema().getCreateMethodSchema().getParameters()) - .containsOnly(entry("$schema", "http://example.com/service/create/schema"), entry("type", "object")); + .containsOnly(entry("$schema", "https://example.com/service/create/schema"), entry("type", "object")); assertThat(catalog.getServiceDefinitions().get(0).getPlans().get(1).getSchemas().getServiceInstanceSchema().getUpdateMethodSchema().getParameters()) - .containsOnly(entry("$schema", "http://example.com/service/update/schema"), entry("type", "object")); + .containsOnly(entry("$schema", "https://example.com/service/update/schema"), entry("type", "object")); assertThat(catalog.getServiceDefinitions().get(0).getPlans().get(1).getSchemas().getServiceBindingSchema().getCreateMethodSchema().getParameters()) - .containsOnly(entry("$schema", "http://example.com/service/create/schema"), entry("type", "object")); + .containsOnly(entry("$schema", "https://example.com/service/create/schema"), entry("type", "object")); assertThat(catalog.getServiceDefinitions().get(1).getId()).isEqualTo("service-two-id"); assertThat(catalog.getServiceDefinitions().get(1).getName()).isEqualTo("Service Two"); assertThat(catalog.getServiceDefinitions().get(1).getDescription()).isEqualTo("Description for Service Two"); diff --git a/spring-cloud-open-service-broker-autoconfigure/src/test/java/org/springframework/cloud/servicebroker/autoconfigure/web/ServiceBrokerPropertiesValidationTest.java b/spring-cloud-open-service-broker-autoconfigure/src/test/java/org/springframework/cloud/servicebroker/autoconfigure/web/ServiceBrokerPropertiesValidationTest.java index 3a0abde4..81c9db91 100644 --- a/spring-cloud-open-service-broker-autoconfigure/src/test/java/org/springframework/cloud/servicebroker/autoconfigure/web/ServiceBrokerPropertiesValidationTest.java +++ b/spring-cloud-open-service-broker-autoconfigure/src/test/java/org/springframework/cloud/servicebroker/autoconfigure/web/ServiceBrokerPropertiesValidationTest.java @@ -138,11 +138,11 @@ public class ServiceBrokerPropertiesValidationTest { assertThat(catalog.getServices().get(0).getPlans().get(1).isBindable()).isTrue(); assertThat(catalog.getServices().get(0).getPlans().get(1).isFree()).isTrue(); assertThat(catalog.getServices().get(0).getPlans().get(1).getSchemas().getServiceInstance().getCreate().getParameters()) - .containsOnly(entry("$schema", "http://example.com/service/create/schema"), entry("type", "object")); + .containsOnly(entry("$schema", "https://example.com/service/create/schema"), entry("type", "object")); assertThat(catalog.getServices().get(0).getPlans().get(1).getSchemas().getServiceInstance().getUpdate().getParameters()) - .containsOnly(entry("$schema", "http://example.com/service/update/schema"), entry("type", "object")); + .containsOnly(entry("$schema", "https://example.com/service/update/schema"), entry("type", "object")); assertThat(catalog.getServices().get(0).getPlans().get(1).getSchemas().getServiceBinding().getCreate().getParameters()) - .containsOnly(entry("$schema", "http://example.com/service-binding/create/schema"), entry("type", "object")); + .containsOnly(entry("$schema", "https://example.com/service-binding/create/schema"), entry("type", "object")); assertThat(catalog.getServices().get(1).getId()).isEqualTo("service-two-id"); assertThat(catalog.getServices().get(1).getName()).isEqualTo("Service Two"); assertThat(catalog.getServices().get(1).getDescription()).isEqualTo("Description for Service Two"); diff --git a/spring-cloud-open-service-broker-autoconfigure/src/test/java/org/springframework/cloud/servicebroker/autoconfigure/web/fixture/ServiceFixture.java b/spring-cloud-open-service-broker-autoconfigure/src/test/java/org/springframework/cloud/servicebroker/autoconfigure/web/fixture/ServiceFixture.java index 4f4bb2f6..abfefbfd 100644 --- a/spring-cloud-open-service-broker-autoconfigure/src/test/java/org/springframework/cloud/servicebroker/autoconfigure/web/fixture/ServiceFixture.java +++ b/spring-cloud-open-service-broker-autoconfigure/src/test/java/org/springframework/cloud/servicebroker/autoconfigure/web/fixture/ServiceFixture.java @@ -53,17 +53,17 @@ public final class ServiceFixture { Schemas schemas = Schemas.builder() .serviceInstanceSchema(ServiceInstanceSchema.builder() .createMethodSchema(MethodSchema.builder() - .parameters("$schema", "http://example.com/service/create/schema") + .parameters("$schema", "https://example.com/service/create/schema") .parameters("type", "object") .build()) .updateMethodSchema(MethodSchema.builder() - .parameters("$schema", "http://example.com/service/update/schema") + .parameters("$schema", "https://example.com/service/update/schema") .parameters("type", "object") .build()) .build()) .serviceBindingSchema(ServiceBindingSchema.builder() .createMethodSchema(MethodSchema.builder() - .parameters("$schema", "http://example.com/binding/create/schema") + .parameters("$schema", "https://example.com/binding/create/schema") .parameters("type", "object") .build()) .build()) diff --git a/spring-cloud-open-service-broker-autoconfigure/src/test/resources/catalog-full.properties b/spring-cloud-open-service-broker-autoconfigure/src/test/resources/catalog-full.properties index 757a8a53..0de86823 100644 --- a/spring-cloud-open-service-broker-autoconfigure/src/test/resources/catalog-full.properties +++ b/spring-cloud-open-service-broker-autoconfigure/src/test/resources/catalog-full.properties @@ -24,11 +24,11 @@ spring.cloud.openservicebroker.catalog.services[0].plans[1].metadata[key1]=value spring.cloud.openservicebroker.catalog.services[0].plans[1].metadata[key2]=value2 spring.cloud.openservicebroker.catalog.services[0].plans[1].bindable=true spring.cloud.openservicebroker.catalog.services[0].plans[1].free=true -spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.serviceinstance.create.parameters[$schema]=http://example.com/service/create/schema +spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.serviceinstance.create.parameters[$schema]=https://example.com/service/create/schema spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.serviceinstance.create.parameters[type]=object -spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.serviceinstance.update.parameters[$schema]=http://example.com/service/update/schema +spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.serviceinstance.update.parameters[$schema]=https://example.com/service/update/schema spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.serviceinstance.update.parameters[type]=object -spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.servicebinding.create.parameters[$schema]=http://example.com/service-binding/create/schema +spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.servicebinding.create.parameters[$schema]=https://example.com/service-binding/create/schema spring.cloud.openservicebroker.catalog.services[0].plans[1].schemas.servicebinding.create.parameters[type]=object spring.cloud.openservicebroker.catalog.services[1].id=service-two-id spring.cloud.openservicebroker.catalog.services[1].name=Service Two diff --git a/spring-cloud-open-service-broker-autoconfigure/src/test/resources/catalog-full.yml b/spring-cloud-open-service-broker-autoconfigure/src/test/resources/catalog-full.yml index e5d8386b..303b567e 100644 --- a/spring-cloud-open-service-broker-autoconfigure/src/test/resources/catalog-full.yml +++ b/spring-cloud-open-service-broker-autoconfigure/src/test/resources/catalog-full.yml @@ -38,16 +38,16 @@ spring: schemas: serviceinstance: create: - parameters[$schema]: "http://example.com/service/create/schema" + parameters[$schema]: "https://example.com/service/create/schema" parameters: type: object update: - parameters[$schema]: "http://example.com/service/update/schema" + parameters[$schema]: "https://example.com/service/update/schema" parameters: type: object servicebinding: create: - parameters[$schema]: "http://example.com/service-binding/create/schema" + parameters[$schema]: "https://example.com/service-binding/create/schema" parameters: type: object diff --git a/spring-cloud-open-service-broker-autoconfigure/src/test/resources/contracts/catalog/servlet/retrieve_catalog_response.json b/spring-cloud-open-service-broker-autoconfigure/src/test/resources/contracts/catalog/servlet/retrieve_catalog_response.json index 5a6c7c9c..761ae550 100644 --- a/spring-cloud-open-service-broker-autoconfigure/src/test/resources/contracts/catalog/servlet/retrieve_catalog_response.json +++ b/spring-cloud-open-service-broker-autoconfigure/src/test/resources/contracts/catalog/servlet/retrieve_catalog_response.json @@ -29,13 +29,13 @@ "service_instance": { "create": { "parameters": { - "$schema": "http://example.com/service/create/schema", + "$schema": "https://example.com/service/create/schema", "type": "object" } }, "update": { "parameters": { - "$schema": "http://example.com/service/update/schema", + "$schema": "https://example.com/service/update/schema", "type": "object" } } @@ -43,7 +43,7 @@ "service_binding": { "create": { "parameters": { - "$schema": "http://example.com/binding/create/schema", + "$schema": "https://example.com/binding/create/schema", "type": "object" } } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/catalog/SchemasTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/catalog/SchemasTest.java index 6de8d823..64f119f7 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/catalog/SchemasTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/catalog/SchemasTest.java @@ -77,42 +77,42 @@ public class SchemasTest { Schemas schemas = Schemas.builder() .serviceInstanceSchema(ServiceInstanceSchema.builder() .createMethodSchema(MethodSchema.builder() - .parameters("$schema", "http://example.com/service/create/schema") + .parameters("$schema", "https://example.com/service/create/schema") .parameters("type", "object") .parameters(schemaProperties) .build()) .updateMethodSchema(MethodSchema.builder() - .parameters("$schema", "http://example.com/service/update/schema") + .parameters("$schema", "https://example.com/service/update/schema") .parameters("type", "object") .build()) .build()) .serviceBindingSchema(ServiceBindingSchema.builder() .createMethodSchema(MethodSchema.builder() - .parameters("$schema", "http://example.com/binding/create/schema") + .parameters("$schema", "https://example.com/binding/create/schema") .parameters("type", "object") .build()) .build()) .build(); assertThat(schemas.getServiceInstanceSchema().getCreateMethodSchema().getParameters() - .get("$schema")).isEqualTo("http://example.com/service/create/schema"); + .get("$schema")).isEqualTo("https://example.com/service/create/schema"); assertThat(schemas.getServiceInstanceSchema().getCreateMethodSchema().getParameters() .get("type")).isEqualTo("object"); assertThat(schemas.getServiceInstanceSchema().getUpdateMethodSchema().getParameters() - .get("$schema")).isEqualTo("http://example.com/service/update/schema"); + .get("$schema")).isEqualTo("https://example.com/service/update/schema"); assertThat(schemas.getServiceInstanceSchema().getUpdateMethodSchema().getParameters() .get("type")).isEqualTo("object"); assertThat(schemas.getServiceBindingSchema().getCreateMethodSchema().getParameters() - .get("$schema")).isEqualTo("http://example.com/binding/create/schema"); + .get("$schema")).isEqualTo("https://example.com/binding/create/schema"); assertThat(schemas.getServiceBindingSchema().getCreateMethodSchema().getParameters() .get("type")).isEqualTo("object"); DocumentContext json = JsonUtils.toJsonPath(schemas); assertThat(json).hasPath("$.service_instance.create.parameters.$schema") - .isEqualTo("http://example.com/service/create/schema"); + .isEqualTo("https://example.com/service/create/schema"); assertThat(json).hasPath("$.service_instance.create.parameters.type") .isEqualTo("object"); assertThat(json).hasPath("$.service_instance.create.parameters.properties.billing-account.description") @@ -121,11 +121,11 @@ public class SchemasTest { .isEqualTo("string"); assertThat(json).hasMapAtPath("$.service_instance.update.parameters").contains( - entry("$schema", "http://example.com/service/update/schema"), + entry("$schema", "https://example.com/service/update/schema"), entry("type", "object") ); assertThat(json).hasMapAtPath("$.service_binding.create.parameters").contains( - entry("$schema", "http://example.com/binding/create/schema"), + entry("$schema", "https://example.com/binding/create/schema"), entry("type", "object") ); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceResponseTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceResponseTest.java index f0e26744..7db4a46a 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceResponseTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceResponseTest.java @@ -49,18 +49,18 @@ public class CreateServiceInstanceResponseTest { .async(true) .operation("in progress") .instanceExisted(true) - .dashboardUrl("http://dashboard.example.com") + .dashboardUrl("https://dashboard.example.com") .build(); assertThat(response.isAsync()).isEqualTo(true); assertThat(response.getOperation()).isEqualTo("in progress"); assertThat(response.isInstanceExisted()).isEqualTo(true); - assertThat(response.getDashboardUrl()).isEqualTo("http://dashboard.example.com"); + assertThat(response.getDashboardUrl()).isEqualTo("https://dashboard.example.com"); DocumentContext json = JsonUtils.toJsonPath(response); assertThat(json).hasPath("$.operation").isEqualTo("in progress"); - assertThat(json).hasPath("$.dashboard_url").isEqualTo("http://dashboard.example.com"); + assertThat(json).hasPath("$.dashboard_url").isEqualTo("https://dashboard.example.com"); } @Test diff --git a/spring-cloud-open-service-broker-core/src/test/resources/catalog.json b/spring-cloud-open-service-broker-core/src/test/resources/catalog.json index 02b0bdbb..02b74484 100644 --- a/spring-cloud-open-service-broker-core/src/test/resources/catalog.json +++ b/spring-cloud-open-service-broker-core/src/test/resources/catalog.json @@ -34,13 +34,13 @@ "service_instance": { "create": { "parameters": { - "$schema": "http://example.com/service/create/schema", + "$schema": "https://example.com/service/create/schema", "type": "object" } }, "update": { "parameters": { - "$schema": "http://example.com/service/update/schema", + "$schema": "https://example.com/service/update/schema", "type": "object" } } @@ -48,7 +48,7 @@ "service_binding": { "create": { "parameters": { - "$schema": "http://example.com/binding/create/schema", + "$schema": "https://example.com/binding/create/schema", "type": "object" } } diff --git a/spring-cloud-open-service-broker-docs/src/docs/asciidoc/getting-started.adoc b/spring-cloud-open-service-broker-docs/src/docs/asciidoc/getting-started.adoc index 3b13f85f..b33e9717 100644 --- a/spring-cloud-open-service-broker-docs/src/docs/asciidoc/getting-started.adoc +++ b/spring-cloud-open-service-broker-docs/src/docs/asciidoc/getting-started.adoc @@ -28,7 +28,7 @@ To use Spring Cloud Open Service Broker in a *Spring MVC* application, add the ` === Configuring the service broker -See the http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#getting-started-first-application[Spring Boot documentation] for getting started building a Spring Boot application. +See the https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#getting-started-first-application[Spring Boot documentation] for getting started building a Spring Boot application. The framework provides default implementations of most of the components needed to implement a service broker. In Spring Boot fashion, you can override the default behavior by providing your own implementation of Spring beans, and the framework will back away from its defaults. diff --git a/spring-cloud-open-service-broker-docs/src/docs/asciidoc/service-broker-security.adoc b/spring-cloud-open-service-broker-docs/src/docs/asciidoc/service-broker-security.adoc index 1518a43a..465919f3 100644 --- a/spring-cloud-open-service-broker-docs/src/docs/asciidoc/service-broker-security.adoc +++ b/spring-cloud-open-service-broker-docs/src/docs/asciidoc/service-broker-security.adoc @@ -4,7 +4,7 @@ Authentication and authorization of service broker endpoints is not specified in the Open Service Broker API specification, but some platforms require or let https://en.wikipedia.org/wiki/Basic_access_authentication[basic authentication] or https://oauth.net/2/[OAuth2] credentials be provided when a service broker is registered to the platform. The Spring Cloud Open Service Broker project does not implement any security configuration. -Service broker application endpoints can be secured with http://projects.spring.io/spring-security/[Spring Security] +Service broker application endpoints can be secured with https://projects.spring.io/spring-security/[Spring Security] and https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-security.html[Spring Boot security configuration] by applying security to application endpoints with the path-matching pattern: `/v2/**`.