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

Added support for username and password

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-06-28 15:23:52 +02:00
parent ea3ab78228
commit 8590eece60
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/src/main/asciidoc/ghpages.sh
View File

@@ -47,8 +47,12 @@ function add_oauth_token_to_remote_url() {
remote="${remote}.git"
echo "Remote with [.git] suffix: [${remote}]"
fi
if [[ "${RELEASER_GIT_OAUTH_TOKEN}" != "" && ${remote} != *"@"* ]]; then
withToken=${remote/https:\/\//https://${RELEASER_GIT_OAUTH_TOKEN}:@}
if [[ "${GITHUB_REPO_USERNAME}" != "" && ${remote} != *"@"* ]]; then
withUserAndPass=${remote/https:\/\//https://${GITHUB_REPO_USERNAME}:${GITHUB_REPO_PASSWORD}@}
echo "Username and password found. Will reuse it to push the code to [${withUserAndPass}]"
"${GIT_BIN}" remote set-url --push origin "${withUserAndPass}"
elif [[ "${RELEASER_GIT_OAUTH_TOKEN}" != "" && ${remote} != *"@"* ]]; then
withToken=${remote/https:\/\//https://${RELEASER_GIT_OAUTH_TOKEN}@}
echo "OAuth token found. Will reuse it to push the code to [${withToken}]"
"${GIT_BIN}" remote set-url --push origin "${withToken}"
else

32
docs/src/test/bats/ghpages.bats
View File

@@ -92,7 +92,7 @@ export -f stubbed_git
run "${SOURCE_DIR}"/ghpages.sh
assert_success
assert_output --partial "git remote set-url --push origin https://mytoken:@foo.bar/baz.git"
assert_output --partial "git remote set-url --push origin https://mytoken@foo.bar/baz.git"
assert_output --partial "git fetch -q"
assert_output --partial "git checkout master"
assert_output --partial "git stash"
@@ -101,7 +101,7 @@ export -f stubbed_git
# Current branch is master - will copy the current docs only to the root folder
assert_output --partial "git add -A ${TEMP_DIR}/spring-cloud-stream"
assert_output --partial "git commit -a -m Sync docs from master to gh-pages"
assert_output --partial "git remote set-url --push origin https://mytoken:@foo.bar/baz.git"
assert_output --partial "git remote set-url --push origin https://mytoken@foo.bar/baz.git"
assert_output --partial "git push origin gh-pages"
assert_output --partial "git checkout master"
assert_output --partial "git stash pop"
@@ -122,7 +122,7 @@ export -f stubbed_git
run "${SOURCE_DIR}"/ghpages.sh
assert_success
assert_output --partial "git remote set-url --push origin https://mytoken:@foo.bar/baz.git"
assert_output --partial "git remote set-url --push origin https://mytoken@foo.bar/baz.git"
assert_output --partial "git remote set-branches --add origin gh-pages"
assert_output --partial "git fetch -q"
# Previous branch was [master]
@@ -136,7 +136,7 @@ export -f stubbed_git
assert [ -f "${TEMP_DIR}/spring-cloud-static/spring-cloud-stream/${VERSION}/foo.html" ]
assert_output --partial "git add -A ${TEMP_DIR}/spring-cloud-static/spring-cloud-stream/${VERSION}"
assert_output --partial "git commit -a -m Sync docs from v1.0.0.RELEASE to gh-pages"
assert_output --partial "git remote set-url --push origin https://mytoken:@foo.bar/baz.git"
assert_output --partial "git remote set-url --push origin https://mytoken@foo.bar/baz.git"
assert_output --partial "git push origin gh-pages"
assert_output --partial "git checkout master"
assert_output --partial "git stash pop"
@@ -158,7 +158,7 @@ export -f stubbed_git
run "${SOURCE_DIR}"/ghpages.sh
assert_success
assert_output --partial "git remote set-url --push origin https://mytoken:@foo.bar/baz.git"
assert_output --partial "git remote set-url --push origin https://mytoken@foo.bar/baz.git"
# Previous branch was [master]
assert_output --partial "git checkout master"
assert_output --partial "git stash"
@@ -168,7 +168,7 @@ export -f stubbed_git
assert [ -f "${TEMP_DIR}/spring-cloud-static/${VERSION}/foo.html" ]
assert_output --partial "git add -A ${TEMP_DIR}/spring-cloud-static/${VERSION}"
assert_output --partial "git commit -a -m Sync docs from vGreenwich.SR2 to gh-pages"
assert_output --partial "git remote set-url --push origin https://mytoken:@foo.bar/baz.git"
assert_output --partial "git remote set-url --push origin https://mytoken@foo.bar/baz.git"
assert_output --partial "git push origin gh-pages"
assert_output --partial "git checkout master"
assert_output --partial "git stash pop"
@@ -212,7 +212,7 @@ export -f stubbed_git
run add_oauth_token_to_remote_url
assert_success
assert_output --partial "git remote set-url --push origin https://mytoken:@foo.bar/baz.git"
assert_output --partial "git remote set-url --push origin https://mytoken@foo.bar/baz.git"
}
@test "should retrieve the name of the current branch" {
@@ -462,7 +462,23 @@ export -f stubbed_git
assert_success
assert_output --partial "git commit -a -m Sync docs from to gh-pages"
assert_output --partial "git remote set-url --push origin https://mytoken:@foo.bar/baz.git"
assert_output --partial "git remote set-url --push origin https://mytoken@foo.bar/baz.git"
assert_output --partial "git push origin gh-pages"
}
@test "should commit changes with username and password if commit flag set" {
export GIT_BIN="printing_git_with_remotes"
export COMMIT_CHANGES="yes"
export GITHUB_REPO_USERNAME="username"
export GITHUB_REPO_PASSWORD="password"
source "${SOURCE_DIR}"/ghpages.sh
run commit_changes_if_applicable
assert_success
assert_output --partial "git commit -a -m Sync docs from to gh-pages"
assert_output --partial "git remote set-url --push origin https://username:password@foo.bar/baz.git"
assert_output --partial "git push origin gh-pages"
}