Skip to content
This repository has been archived by the owner on Apr 20, 2022. It is now read-only.

URL Cleanup #218

Open
wants to merge 1 commit into
base: cf-docs
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# EditorConfig is awesome: http://EditorConfig.org
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*.war
*.ear

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

.gradle
Expand Down
36 changes: 18 additions & 18 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,11 @@ microservices. That way the testing setup looks like this:
image::{intro-root-docs}/stubbed_dependencies.png[title="We're testing microservices in isolation"]

Such an approach to testing and deployment gives the following benefits
(thanks to the usage of http://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html[Spring Cloud Contract]):
(thanks to the usage of https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html[Spring Cloud Contract]):

- No need to deploy dependant services
- The stubs used for the tests ran on a deployed microservice are the same as those used during integration tests
- Those stubs have been tested against the application that produces them (check http://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html[Spring Cloud Contract] for more information)
- Those stubs have been tested against the application that produces them (check https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html[Spring Cloud Contract] for more information)
- We don't have many slow tests running on a deployed application - thus the pipeline gets executed much faster
- We don't have to queue deployments - we're testing in isolation thus pipelines don't interfere with each other
- We don't have to spawn virtual machines each time for deployment purposes
Expand Down Expand Up @@ -803,7 +803,7 @@ Below you can see what environment variables are required by the scripts. To the
|PAAS_STAGE_SPACE | Name of the space for the stage env | sc-pipelines-stage
|PAAS_PROD_ORG | Name of the org for the prod env | pcfdev-org
|PAAS_PROD_SPACE | Name of the space for the prod env | sc-pipelines-prod
|REPO_WITH_BINARIES_FOR_UPLOAD | URL to repo with the deployed jars | http://192.168.99.100:8081/artifactory/libs-release-local
|REPO_WITH_BINARIES_FOR_UPLOAD | URL to repo with the deployed jars | https://192.168.99.100:8081/artifactory/libs-release-local
|M2_SETTINGS_REPO_ID | The id of server from Maven settings.xml | artifactory-local
|PAAS_HOSTNAME_UUID | Additional suffix for the route. In a shared environment the default routes can be already taken |
|JAVA_BUILDPACK_URL | The URL to the Java buildpack to be used by CF | https://github.com/cloudfoundry/java-buildpack.git#v3.8.1 |
Expand Down Expand Up @@ -1319,7 +1319,7 @@ executing `tools/deploy-infra.sh`. Example for deploying to Artifactory at IP `1
----
git clone https://github.com/spring-cloud/spring-cloud-pipelines
cd spring-cloud-pipelines/
ARTIFACTORY_URL="http://192.168.99.100:8081/artifactory/libs-release-local" ./tools/deploy-infra.sh
ARTIFACTORY_URL="https://192.168.99.100:8081/artifactory/libs-release-local" ./tools/deploy-infra.sh
----

[[setup-settings-xml]]
Expand Down Expand Up @@ -1702,7 +1702,7 @@ You can also use the https://jenkins.io/doc/book/pipeline/syntax/[declarative pi
https://jenkins.io/projects/blueocean/[Blue Ocean UI]. Here is a step by step guide to run a pipeline via
this approach.

The Blue Ocean UI is available under the `blue/` URL. E.g. for Docker Machine based setup `http://192.168.99.100:8080/blue`.
The Blue Ocean UI is available under the `blue/` URL. E.g. for Docker Machine based setup `https://192.168.99.100:8080/blue`.

{nbsp}
{nbsp}
Expand Down Expand Up @@ -1749,7 +1749,7 @@ check out this https://issues.jenkins-ci.org/browse/JENKINS-33846[issue] for mor
WARNING: Currently there is no way to introduce manual steps in a performant way. Jenkins is
blocking an executor when manual step is required. That means that you'll run out of executors
pretty fast. You can check out this https://issues.jenkins-ci.org/browse/JENKINS-36235[issue] for
and this http://stackoverflow.com/questions/42561241/how-to-wait-for-user-input-in-a-declarative-pipeline-without-blocking-a-heavywei[StackOverflow question]
and this https://stackoverflow.com/questions/42561241/how-to-wait-for-user-input-in-a-declarative-pipeline-without-blocking-a-heavywei[StackOverflow question]
for more information.

[[optional-steps-cf]]
Expand Down Expand Up @@ -1992,7 +1992,7 @@ You can also use the https://jenkins.io/doc/book/pipeline/syntax/[declarative pi
https://jenkins.io/projects/blueocean/[Blue Ocean UI]. Here is a step by step guide to run a pipeline via
this approach.

The Blue Ocean UI is available under the `blue/` URL. E.g. for Docker Machine based setup `http://192.168.99.100:8080/blue`.
The Blue Ocean UI is available under the `blue/` URL. E.g. for Docker Machine based setup `https://192.168.99.100:8080/blue`.

{nbsp}
{nbsp}
Expand Down Expand Up @@ -2039,7 +2039,7 @@ check out this https://issues.jenkins-ci.org/browse/JENKINS-33846[issue] for mor
WARNING: Currently there is no way to introduce manual steps in a performant way. Jenkins is
blocking an executor when manual step is required. That means that you'll run out of executors
pretty fast. You can check out this https://issues.jenkins-ci.org/browse/JENKINS-36235[issue] for
and this http://stackoverflow.com/questions/42561241/how-to-wait-for-user-input-in-a-declarative-pipeline-without-blocking-a-heavywei[StackOverflow question]
and this https://stackoverflow.com/questions/42561241/how-to-wait-for-user-input-in-a-declarative-pipeline-without-blocking-a-heavywei[StackOverflow question]
for more information.

[[optional-steps-k8s]]
Expand Down Expand Up @@ -2920,7 +2920,7 @@ alertmanager:

## alertmanager data Persistent Volume access modes
## Must match those of existing PV or dynamic provisioner
## Ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
## Ref: https://kubernetes.io/docs/user-guide/persistent-volumes/
##
accessModes:
- ReadWriteOnce
Expand Down Expand Up @@ -2963,7 +2963,7 @@ alertmanager:
replicaCount: 1

## alertmanager resource requests and limits
## Ref: http://kubernetes.io/docs/user-guide/compute-resources/
## Ref: https://kubernetes.io/docs/user-guide/compute-resources/
##
resources: {}
# limits:
Expand Down Expand Up @@ -3005,7 +3005,7 @@ configmapReload:
pullPolicy: IfNotPresent

## configmap-reload resource requests and limits
## Ref: http://kubernetes.io/docs/user-guide/compute-resources/
## Ref: https://kubernetes.io/docs/user-guide/compute-resources/
##
resources: {}

Expand Down Expand Up @@ -3040,7 +3040,7 @@ kubeStateMetrics:
replicaCount: 1

## kube-state-metrics resource requests and limits
## Ref: http://kubernetes.io/docs/user-guide/compute-resources/
## Ref: https://kubernetes.io/docs/user-guide/compute-resources/
##
resources: {}
# limits:
Expand Down Expand Up @@ -3237,7 +3237,7 @@ server:

## Prometheus server data Persistent Volume access modes
## Must match those of existing PV or dynamic provisioner
## Ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
## Ref: https://kubernetes.io/docs/user-guide/persistent-volumes/
##
accessModes:
- ReadWriteOnce
Expand Down Expand Up @@ -3281,7 +3281,7 @@ server:
replicaCount: 1

## Prometheus server resource requests and limits
## Ref: http://kubernetes.io/docs/user-guide/compute-resources/
## Ref: https://kubernetes.io/docs/user-guide/compute-resources/
##
resources: {}
# limits:
Expand Down Expand Up @@ -3371,7 +3371,7 @@ pushgateway:
replicaCount: 1

## pushgateway resource requests and limits
## Ref: http://kubernetes.io/docs/user-guide/compute-resources/
## Ref: https://kubernetes.io/docs/user-guide/compute-resources/
##
resources: {}
# limits:
Expand Down Expand Up @@ -3691,7 +3691,7 @@ NOTES:
----

Perform the aforementioned steps and add the Grafana's datasource
as Prometheus with URL `http://sc-pipelines-prometheus-prometheus-server.default.svc.cluster.local`
as Prometheus with URL `https://sc-pipelines-prometheus-prometheus-server.default.svc.cluster.local`

You can pick the dashboard via the Grafana ID (2471). This is the
default dashboard for the Spring Cloud Pipelines demo apps.
Expand Down Expand Up @@ -3761,7 +3761,7 @@ We will also be refactoring the application to comply with Spring Cloud Pipeline
- https://github.com/ciberkleid/app-config[app-config]
- https://github.com/spring-cloud-samples/cloudfoundry-stub-runner-boot[cloudfoundry-stub-runner-boot]
- https://github.com/spring-cloud/spring-cloud-pipelines[spring-cloud-pipelines]
* *Pivotal Web Services* - public hosted Cloud Foundry offering http://run.pivotal.io[free trial accounts] and including MySQL, Rabbit, and Pivotal Spring Cloud Services in the Marketplace
* *Pivotal Web Services* - public hosted Cloud Foundry offering https://run.pivotal.io[free trial accounts] and including MySQL, Rabbit, and Pivotal Spring Cloud Services in the Marketplace
* *Concourse*
* *JFrog Bintray* - public hosted Maven repository offering free https://bintray.com/signup/oss[OSS accounts]
* *Client Tools* - on your local machine, you will need an IDE as well as the mvn, git, cf, and fly (Concourse) CLIs
Expand Down Expand Up @@ -5245,7 +5245,7 @@ Happy coding!

=== Prerequisites

As prerequisites you need to have http://www.shellcheck.net/[shellcheck],
As prerequisites you need to have https://www.shellcheck.net/[shellcheck],
https://github.com/sstephenson/bats[bats], https://stedolan.github.io/jq/[jq]
and https://rubyinstaller.org/downloads/[ruby] installed. If you're on a Linux
machine then `bats` and `shellcheck` will be installed for you.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ Below you can see what environment variables are required by the scripts. To the
|PAAS_STAGE_SPACE | Name of the space for the stage env | sc-pipelines-stage
|PAAS_PROD_ORG | Name of the org for the prod env | pcfdev-org
|PAAS_PROD_SPACE | Name of the space for the prod env | sc-pipelines-prod
|REPO_WITH_BINARIES_FOR_UPLOAD | URL to repo with the deployed jars | http://192.168.99.100:8081/artifactory/libs-release-local
|REPO_WITH_BINARIES_FOR_UPLOAD | URL to repo with the deployed jars | https://192.168.99.100:8081/artifactory/libs-release-local
|M2_SETTINGS_REPO_ID | The id of server from Maven settings.xml | artifactory-local
|PAAS_HOSTNAME_UUID | Additional suffix for the route. In a shared environment the default routes can be already taken |
|APP_MEMORY_LIMIT | How much memory should be used by the infra apps (Eureka, Stub Runner etc.) | 256m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,11 @@ microservices. That way the testing setup looks like this:
image::{intro-root-docs}/stubbed_dependencies.png[title="We're testing microservices in isolation"]

Such an approach to testing and deployment gives the following benefits
(thanks to the usage of http://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html[Spring Cloud Contract]):
(thanks to the usage of https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html[Spring Cloud Contract]):

- No need to deploy dependant services
- The stubs used for the tests ran on a deployed microservice are the same as those used during integration tests
- Those stubs have been tested against the application that produces them (check http://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html[Spring Cloud Contract] for more information)
- Those stubs have been tested against the application that produces them (check https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html[Spring Cloud Contract] for more information)
- We don't have many slow tests running on a deployed application - thus the pipeline gets executed much faster
- We don't have to queue deployments - we're testing in isolation thus pipelines don't interfere with each other
- We don't have to spawn virtual machines each time for deployment purposes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ You can also use the https://jenkins.io/doc/book/pipeline/syntax/[declarative pi
https://jenkins.io/projects/blueocean/[Blue Ocean UI]. Here is a step by step guide to run a pipeline via
this approach.

The Blue Ocean UI is available under the `blue/` URL. E.g. for Docker Machine based setup `http://192.168.99.100:8080/blue`.
The Blue Ocean UI is available under the `blue/` URL. E.g. for Docker Machine based setup `https://192.168.99.100:8080/blue`.

{nbsp}
{nbsp}
Expand Down Expand Up @@ -49,5 +49,5 @@ check out this https://issues.jenkins-ci.org/browse/JENKINS-33846[issue] for mor
WARNING: Currently there is no way to introduce manual steps in a performant way. Jenkins is
blocking an executor when manual step is required. That means that you'll run out of executors
pretty fast. You can check out this https://issues.jenkins-ci.org/browse/JENKINS-36235[issue] for
and this http://stackoverflow.com/questions/42561241/how-to-wait-for-user-input-in-a-declarative-pipeline-without-blocking-a-heavywei[StackOverflow question]
and this https://stackoverflow.com/questions/42561241/how-to-wait-for-user-input-in-a-declarative-pipeline-without-blocking-a-heavywei[StackOverflow question]
for more information.
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ executing `tools/deploy-infra.sh`. Example for deploying to Artifactory at IP `1
----
git clone https://github.com/spring-cloud/spring-cloud-pipelines
cd spring-cloud-pipelines/
ARTIFACTORY_URL="http://192.168.99.100:8081/artifactory/libs-release-local" ./tools/deploy-infra.sh
ARTIFACTORY_URL="https://192.168.99.100:8081/artifactory/libs-release-local" ./tools/deploy-infra.sh
----

[[setup-settings-xml]]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

=== Prerequisites

As prerequisites you need to have http://www.shellcheck.net/[shellcheck],
As prerequisites you need to have https://www.shellcheck.net/[shellcheck],
https://github.com/sstephenson/bats[bats], https://stedolan.github.io/jq/[jq]
and https://rubyinstaller.org/downloads/[ruby] installed. If you're on a Linux
machine then `bats` and `shellcheck` will be installed for you.
Expand Down
4 changes: 2 additions & 2 deletions common/src/test/bats/pipeline-cf.bats
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ export -f fakeRetrieveStubRunnerIds
# Stub Runner
assert_output --partial "Setting env var [APPLICATION_HOSTNAME] -> [stubrunner-test-my-project] for app [stubrunner]"
assert_output --partial "Setting env var [APPLICATION_DOMAIN] -> [cfapps.io] for app [stubrunner]"
assert_output --partial "curl -u foo:bar http://foo/com/example/github/github-analytics-stub-runner-boot-classpath-stubs/0.0.1.M1/github-analytics-stub-runner-boot-classpath-stubs-0.0.1.M1.jar -o"
assert_output --partial "curl -u foo:bar https://foo/com/example/github/github-analytics-stub-runner-boot-classpath-stubs/0.0.1.M1/github-analytics-stub-runner-boot-classpath-stubs-0.0.1.M1.jar -o"
assert_output --partial "cf curl /v2/apps/4215794a-eeef-4de2-9a80-c73b5d1a02be -X PUT"
assert_output --partial "[8080,10000,10001,10002"
assert_output --partial "cf create-route test-space-my-project cfapps.io --hostname stubrunner-test-my-project-10000"
Expand Down Expand Up @@ -335,7 +335,7 @@ export -f fakeRetrieveStubRunnerIds
# Stub Runner
assert_output --partial "Setting env var [APPLICATION_HOSTNAME] -> [stubrunner-test-${projectNameUppercase}] for app [stubrunner]"
assert_output --partial "Setting env var [APPLICATION_DOMAIN] -> [artifactId] for app [stubrunner]"
assert_output --partial "curl -u foo:bar http://foo/com/example/github/github-analytics-stub-runner-boot-classpath-stubs/0.0.1.M1/github-analytics-stub-runner-boot-classpath-stubs-0.0.1.M1.jar -o"
assert_output --partial "curl -u foo:bar https://foo/com/example/github/github-analytics-stub-runner-boot-classpath-stubs/0.0.1.M1/github-analytics-stub-runner-boot-classpath-stubs-0.0.1.M1.jar -o"
assert_output --partial "cf curl /v2/apps/4215794a-eeef-4de2-9a80-c73b5d1a02be -X PUT"
assert_output --partial "[8080,10000,10001,10002"
assert_output --partial "cf create-route test-space-${projectNameUppercase} artifactId --hostname stubrunner-test-${projectNameUppercase}-10000"
Expand Down
2 changes: 1 addition & 1 deletion concourse/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*.war
*.ear

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

credentials.yml
Expand Down
2 changes: 1 addition & 1 deletion concourse/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ Below you can see what environment variables are required by the scripts. To the
|PAAS_STAGE_SPACE | Name of the space for the stage env | sc-pipelines-stage
|PAAS_PROD_ORG | Name of the org for the prod env | pcfdev-org
|PAAS_PROD_SPACE | Name of the space for the prod env | sc-pipelines-prod
|REPO_WITH_BINARIES_FOR_UPLOAD | URL to repo with the deployed jars | http://192.168.99.100:8081/artifactory/libs-release-local
|REPO_WITH_BINARIES_FOR_UPLOAD | URL to repo with the deployed jars | https://192.168.99.100:8081/artifactory/libs-release-local
|M2_SETTINGS_REPO_ID | The id of server from Maven settings.xml | artifactory-local
|PAAS_HOSTNAME_UUID | Additional suffix for the route. In a shared environment the default routes can be already taken |
|JAVA_BUILDPACK_URL | The URL to the Java buildpack to be used by CF | https://github.com/cloudfoundry/java-buildpack.git#v3.8.1 |
Expand Down
4 changes: 2 additions & 2 deletions concourse/credentials-sample-cf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,5 @@ m2-settings-repo-password: password

# if download differs from upload set `repo-with-binaries-for-upload`
# example of such a case is Bintray
repo-with-binaries: http://192.168.99.100:8081/artifactory/libs-release-local
repo-with-binaries-for-upload: http://192.168.99.100:8081/artifactory/libs-release-local
repo-with-binaries: https://192.168.99.100:8081/artifactory/libs-release-local
repo-with-binaries-for-upload: https://192.168.99.100:8081/artifactory/libs-release-local
2 changes: 1 addition & 1 deletion docs-sources/src/main/asciidoc/CF_CONCOURSE.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ Below you can see what environment variables are required by the scripts. To the
|PAAS_STAGE_SPACE | Name of the space for the stage env | sc-pipelines-stage
|PAAS_PROD_ORG | Name of the org for the prod env | pcfdev-org
|PAAS_PROD_SPACE | Name of the space for the prod env | sc-pipelines-prod
|REPO_WITH_BINARIES_FOR_UPLOAD | URL to repo with the deployed jars | http://192.168.99.100:8081/artifactory/libs-release-local
|REPO_WITH_BINARIES_FOR_UPLOAD | URL to repo with the deployed jars | https://192.168.99.100:8081/artifactory/libs-release-local
|M2_SETTINGS_REPO_ID | The id of server from Maven settings.xml | artifactory-local
|PAAS_HOSTNAME_UUID | Additional suffix for the route. In a shared environment the default routes can be already taken |
|JAVA_BUILDPACK_URL | The URL to the Java buildpack to be used by CF | https://github.com/cloudfoundry/java-buildpack.git#v3.8.1 |
Expand Down
2 changes: 1 addition & 1 deletion docs-sources/src/main/asciidoc/CF_MIGRATION.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ We will also be refactoring the application to comply with Spring Cloud Pipeline
- https://github.com/ciberkleid/app-config[app-config]
- https://github.com/spring-cloud-samples/cloudfoundry-stub-runner-boot[cloudfoundry-stub-runner-boot]
- https://github.com/spring-cloud/spring-cloud-pipelines[spring-cloud-pipelines]
* *Pivotal Web Services* - public hosted Cloud Foundry offering http://run.pivotal.io[free trial accounts] and including MySQL, Rabbit, and Pivotal Spring Cloud Services in the Marketplace
* *Pivotal Web Services* - public hosted Cloud Foundry offering https://run.pivotal.io[free trial accounts] and including MySQL, Rabbit, and Pivotal Spring Cloud Services in the Marketplace
* *Concourse*
* *JFrog Bintray* - public hosted Maven repository offering free https://bintray.com/signup/oss[OSS accounts]
* *Client Tools* - on your local machine, you will need an IDE as well as the mvn, git, cf, and fly (Concourse) CLIs
Expand Down
Loading