2018-06-12 20:55:52 +00:00
|
|
|
function err {
|
|
|
|
if test "${COLORIZE}" -eq 1
|
|
|
|
then
|
|
|
|
tput bold
|
|
|
|
tput setaf 1
|
|
|
|
fi
|
|
|
|
|
2018-06-13 19:10:02 +00:00
|
|
|
echo "$@" 1>&2
|
2018-06-12 20:55:52 +00:00
|
|
|
|
|
|
|
if test "${COLORIZE}" -eq 1
|
|
|
|
then
|
|
|
|
tput sgr0
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
function status {
|
|
|
|
if test "${COLORIZE}" -eq 1
|
|
|
|
then
|
|
|
|
tput bold
|
|
|
|
tput setaf 4
|
|
|
|
fi
|
|
|
|
|
2018-06-13 19:10:02 +00:00
|
|
|
echo "$@"
|
2018-06-12 20:55:52 +00:00
|
|
|
|
|
|
|
if test "${COLORIZE}" -eq 1
|
|
|
|
then
|
|
|
|
tput sgr0
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
function status_stage {
|
|
|
|
if test "${COLORIZE}" -eq 1
|
|
|
|
then
|
|
|
|
tput bold
|
|
|
|
tput setaf 2
|
|
|
|
fi
|
|
|
|
|
2018-06-13 19:10:02 +00:00
|
|
|
echo "$@"
|
2018-06-12 20:55:52 +00:00
|
|
|
|
|
|
|
if test "${COLORIZE}" -eq 1
|
|
|
|
then
|
|
|
|
tput sgr0
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2018-06-13 19:10:02 +00:00
|
|
|
function debug {
|
|
|
|
if is_set "${BUILD_DEBUG}"
|
|
|
|
then
|
|
|
|
if test "${COLORIZE}" -eq 1
|
|
|
|
then
|
|
|
|
tput setaf 6
|
|
|
|
fi
|
|
|
|
echo "$@"
|
|
|
|
if test "${COLORIZE}" -eq 1
|
|
|
|
then
|
|
|
|
tput sgr0
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2018-06-25 14:01:20 +00:00
|
|
|
function sed_i {
|
|
|
|
if test "$(uname)" == "Darwin"
|
|
|
|
then
|
|
|
|
sed -i '' "$@"
|
|
|
|
return $?
|
|
|
|
else
|
|
|
|
sed -i "$@"
|
|
|
|
return $?
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2018-06-12 20:55:52 +00:00
|
|
|
function is_set {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - string value to check its truthiness
|
|
|
|
#
|
|
|
|
# Return:
|
|
|
|
# 0 - is truthy (backwards I know but allows syntax like `if is_set <var>` to work)
|
|
|
|
# 1 - is not truthy
|
|
|
|
|
|
|
|
local val=$(tr '[:upper:]' '[:lower:]' <<< "$1")
|
|
|
|
case $val in
|
|
|
|
1 | t | true | y | yes)
|
|
|
|
return 0
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
return 1
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
}
|
|
|
|
|
|
|
|
function have_gpg_key {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - GPG Key id to check if we have installed
|
|
|
|
#
|
|
|
|
# Return:
|
|
|
|
# 0 - success (we can use this key for signing)
|
|
|
|
# * - failure (key cannot be used)
|
|
|
|
|
2018-06-13 19:10:02 +00:00
|
|
|
gpg --list-secret-keys $1 > /dev/null 2>&1
|
2018-06-12 20:55:52 +00:00
|
|
|
return $?
|
|
|
|
}
|
|
|
|
|
|
|
|
function parse_version {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to the top level Consul source
|
2018-06-13 19:10:02 +00:00
|
|
|
# $2 - boolean value for whether the release version should be parsed from the source
|
|
|
|
# $3 - boolean whether to use GIT_DESCRIBE and GIT_COMMIT environment variables
|
2018-06-18 21:01:20 +00:00
|
|
|
# $4 - boolean whether to omit the version part of the version string. (optional)
|
2018-06-12 20:55:52 +00:00
|
|
|
#
|
|
|
|
# Return:
|
|
|
|
# 0 - success (will write the version to stdout)
|
|
|
|
# * - error (no version output)
|
|
|
|
#
|
|
|
|
# Notes:
|
|
|
|
# If the GOTAGS environment variable is present then it is used to determine which
|
|
|
|
# version file to use for parsing.
|
|
|
|
|
|
|
|
local vfile="${1}/version/version.go"
|
|
|
|
|
|
|
|
# ensure the version file exists
|
|
|
|
if ! test -f "${vfile}"
|
|
|
|
then
|
|
|
|
err "Error - File not found: ${vfile}"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
2018-06-13 19:10:02 +00:00
|
|
|
local include_release="$2"
|
|
|
|
local use_git_env="$3"
|
2018-06-18 21:01:20 +00:00
|
|
|
local omit_version="$4"
|
2018-06-13 19:10:02 +00:00
|
|
|
|
|
|
|
local git_version=""
|
|
|
|
local git_commit=""
|
|
|
|
|
|
|
|
if test -z "${include_release}"
|
|
|
|
then
|
|
|
|
include_release=true
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -z "${use_git_env}"
|
|
|
|
then
|
|
|
|
use_git_env=true
|
|
|
|
fi
|
|
|
|
|
|
|
|
if is_set "${use_git_env}"
|
|
|
|
then
|
|
|
|
git_version="${GIT_DESCRIBE}"
|
|
|
|
git_commit="${GIT_COMMIT}"
|
|
|
|
fi
|
|
|
|
|
2018-06-12 20:55:52 +00:00
|
|
|
# Get the main version out of the source file
|
|
|
|
version_main=$(awk '$1 == "Version" && $2 == "=" { gsub(/"/, "", $3); print $3 }' < ${vfile})
|
|
|
|
release_main=$(awk '$1 == "VersionPrerelease" && $2 == "=" { gsub(/"/, "", $3); print $3 }' < ${vfile})
|
2018-06-18 15:57:35 +00:00
|
|
|
|
2018-06-12 20:55:52 +00:00
|
|
|
|
|
|
|
# try to determine the version if we have build tags
|
|
|
|
for tag in "$GOTAGS"
|
|
|
|
do
|
2018-06-18 14:07:29 +00:00
|
|
|
for vfile in $(find "${1}/version" -name "version_*.go" 2> /dev/null| sort)
|
2018-06-12 20:55:52 +00:00
|
|
|
do
|
2018-06-18 14:07:29 +00:00
|
|
|
if grep -q "// +build $tag" "${vfile}"
|
2018-06-12 20:55:52 +00:00
|
|
|
then
|
|
|
|
version_main=$(awk '$1 == "Version" && $2 == "=" { gsub(/"/, "", $3); print $3 }' < ${vfile})
|
|
|
|
release_main=$(awk '$1 == "VersionPrerelease" && $2 == "=" { gsub(/"/, "", $3); print $3 }' < ${vfile})
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
done
|
2018-06-18 15:57:35 +00:00
|
|
|
|
2018-06-18 21:01:20 +00:00
|
|
|
local version="${version_main}"
|
2018-06-12 20:55:52 +00:00
|
|
|
# override the version from source with the value of the GIT_DESCRIBE env var if present
|
2018-06-13 19:10:02 +00:00
|
|
|
if test -n "${git_version}"
|
2018-06-12 20:55:52 +00:00
|
|
|
then
|
2018-06-13 19:10:02 +00:00
|
|
|
version="${git_version}"
|
2018-06-12 20:55:52 +00:00
|
|
|
fi
|
2018-06-18 21:01:20 +00:00
|
|
|
|
|
|
|
local rel_ver=""
|
2018-06-13 19:10:02 +00:00
|
|
|
if is_set "${include_release}"
|
2018-06-12 20:55:52 +00:00
|
|
|
then
|
2018-06-18 21:01:20 +00:00
|
|
|
# Default to pre-release from the source
|
2018-06-18 15:57:35 +00:00
|
|
|
rel_ver="${release_main}"
|
2018-06-12 20:55:52 +00:00
|
|
|
|
|
|
|
# When no GIT_DESCRIBE env var is present and no release is in the source then we
|
|
|
|
# are definitely in dev mode
|
2018-06-18 17:20:12 +00:00
|
|
|
if test -z "${git_version}" -a -z "${rel_ver}" && is_set "${use_git_env}"
|
2018-06-12 20:55:52 +00:00
|
|
|
then
|
2018-06-18 15:57:35 +00:00
|
|
|
rel_ver="dev"
|
2018-06-12 20:55:52 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Add the release to the version
|
2018-06-18 21:01:20 +00:00
|
|
|
if test -n "${rel_ver}" -a -n "${git_commit}"
|
2018-06-12 20:55:52 +00:00
|
|
|
then
|
2018-06-18 21:01:20 +00:00
|
|
|
rel_ver="${rel_ver} (${git_commit})"
|
2018-06-12 20:55:52 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2018-06-18 21:01:20 +00:00
|
|
|
if test -n "${rel_ver}"
|
|
|
|
then
|
|
|
|
if is_set "${omit_version}"
|
|
|
|
then
|
|
|
|
echo "${rel_ver}" | tr -d "'"
|
|
|
|
else
|
|
|
|
echo "${version}-${rel_ver}" | tr -d "'"
|
|
|
|
fi
|
|
|
|
return 0
|
|
|
|
elif ! is_set "${omit_version}"
|
|
|
|
then
|
|
|
|
echo "${version}" | tr -d "'"
|
|
|
|
return 0
|
|
|
|
else
|
|
|
|
return 1
|
|
|
|
fi
|
2018-06-12 20:55:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
function get_version {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to the top level Consul source
|
|
|
|
# $2 - Whether the release version should be parsed from source (optional)
|
2018-06-13 19:10:02 +00:00
|
|
|
# $3 - Whether to use GIT_DESCRIBE and GIT_COMMIT environment variables
|
2018-06-12 20:55:52 +00:00
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success (the version is also echoed to stdout)
|
|
|
|
# 1 - error
|
|
|
|
#
|
|
|
|
# Notes:
|
|
|
|
# If a VERSION environment variable is present it will override any parsing of the version from the source
|
|
|
|
# In addition to processing the main version.go, version_*.go files will be processed if they have
|
|
|
|
# a Go build tag that matches the one in the GOTAGS environment variable. This tag processing is
|
|
|
|
# primitive though and will not match complex build tags in the files with negation etc.
|
|
|
|
|
|
|
|
local vers="$VERSION"
|
|
|
|
if test -z "$vers"
|
|
|
|
then
|
|
|
|
# parse the OSS version from version.go
|
2018-06-13 19:10:02 +00:00
|
|
|
vers="$(parse_version ${1} ${2} ${3})"
|
2018-06-12 20:55:52 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test -z "$vers"
|
|
|
|
then
|
|
|
|
return 1
|
|
|
|
else
|
|
|
|
echo $vers
|
|
|
|
return 0
|
|
|
|
fi
|
2018-06-13 19:10:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
function git_branch {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to the git repo (optional - assumes pwd is git repo otherwise)
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - failure
|
|
|
|
#
|
|
|
|
# Notes:
|
|
|
|
# Echos the current branch to stdout when successful
|
|
|
|
|
|
|
|
local gdir="$(pwd)"
|
|
|
|
if test -d "$1"
|
|
|
|
then
|
|
|
|
gdir="$1"
|
|
|
|
fi
|
|
|
|
|
|
|
|
pushd "${gdir}" > /dev/null
|
|
|
|
|
|
|
|
local ret=0
|
|
|
|
local head="$(git status -b --porcelain=v2 | awk '{if ($1 == "#" && $2 =="branch.head") { print $3 }}')" || ret=1
|
|
|
|
|
|
|
|
popd > /dev/null
|
|
|
|
|
|
|
|
test ${ret} -eq 0 && echo "$head"
|
|
|
|
return ${ret}
|
|
|
|
}
|
|
|
|
|
|
|
|
function git_upstream {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to the git repo (optional - assumes pwd is git repo otherwise)
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - failure
|
|
|
|
#
|
|
|
|
# Notes:
|
|
|
|
# Echos the current upstream branch to stdout when successful
|
|
|
|
|
|
|
|
local gdir="$(pwd)"
|
|
|
|
if test -d "$1"
|
|
|
|
then
|
|
|
|
gdir="$1"
|
|
|
|
fi
|
|
|
|
|
|
|
|
pushd "${gdir}" > /dev/null
|
|
|
|
|
|
|
|
local ret=0
|
|
|
|
local head="$(git status -b --porcelain=v2 | awk '{if ($1 == "#" && $2 =="branch.upstream") { print $3 }}')" || ret=1
|
|
|
|
|
|
|
|
popd > /dev/null
|
|
|
|
|
|
|
|
test ${ret} -eq 0 && echo "$head"
|
|
|
|
return ${ret}
|
|
|
|
}
|
|
|
|
|
|
|
|
function git_log_summary {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to the git repo (optional - assumes pwd is git repo otherwise)
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - failure
|
|
|
|
#
|
|
|
|
|
|
|
|
local gdir="$(pwd)"
|
|
|
|
if test -d "$1"
|
|
|
|
then
|
|
|
|
gdir="$1"
|
|
|
|
fi
|
|
|
|
|
|
|
|
pushd "${gdir}" > /dev/null
|
|
|
|
|
|
|
|
local ret=0
|
|
|
|
|
|
|
|
local head=$(git_branch) || ret=1
|
|
|
|
local upstream=$(git_upstream) || ret=1
|
|
|
|
local rev_range="${head}...${upstream}"
|
|
|
|
|
|
|
|
if test ${ret} -eq 0
|
|
|
|
then
|
|
|
|
status "Git Changes:"
|
|
|
|
git log --pretty=oneline ${rev_range} || ret=1
|
|
|
|
|
|
|
|
fi
|
|
|
|
return $ret
|
|
|
|
}
|
|
|
|
|
2018-06-20 20:06:43 +00:00
|
|
|
function git_diff {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to the git repo (optional - assumes pwd is git repo otherwise)
|
|
|
|
# $2 .. $N - Optional path specification
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - failure
|
|
|
|
#
|
|
|
|
|
|
|
|
local gdir="$(pwd)"
|
|
|
|
if test -d "$1"
|
|
|
|
then
|
|
|
|
gdir="$1"
|
|
|
|
fi
|
|
|
|
|
|
|
|
shift
|
|
|
|
|
|
|
|
pushd "${gdir}" > /dev/null
|
|
|
|
|
|
|
|
local ret=0
|
|
|
|
|
|
|
|
local head=$(git_branch) || ret=1
|
|
|
|
local upstream=$(git_upstream) || ret=1
|
|
|
|
|
|
|
|
if test ${ret} -eq 0
|
|
|
|
then
|
|
|
|
status "Git Diff - Paths: $@"
|
|
|
|
git diff ${HEAD} ${upstream} -- "$@" || ret=1
|
|
|
|
fi
|
|
|
|
return $ret
|
|
|
|
}
|
|
|
|
|
2018-06-13 19:10:02 +00:00
|
|
|
function normalize_git_url {
|
|
|
|
url="${1#https://}"
|
|
|
|
url="${url#git@}"
|
|
|
|
url="${url%.git}"
|
2018-06-15 19:23:26 +00:00
|
|
|
url="$(sed ${SED_EXT} -e 's/([^\/:]*)[:\/](.*)/\1:\2/' <<< "${url}")"
|
2018-06-13 19:10:02 +00:00
|
|
|
echo "$url"
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
2018-06-20 19:22:43 +00:00
|
|
|
function git_remote_url {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to the top level Consul source
|
|
|
|
# $2 - Remote name
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - error
|
|
|
|
#
|
|
|
|
# Note:
|
|
|
|
# The push url for the git remote will be echoed to stdout
|
|
|
|
|
|
|
|
if ! test -d "$1"
|
|
|
|
then
|
|
|
|
err "ERROR: '$1' is not a directory. git_remote_url must be called with the path to the top level source as the first argument'"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -z "$2"
|
|
|
|
then
|
|
|
|
err "ERROR: git_remote_url must be called with a second argument that is the name of the remote"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
local ret=0
|
|
|
|
|
|
|
|
pushd "$1" > /dev/null
|
|
|
|
|
|
|
|
local url=$(git remote get-url --push $2 2>&1) || ret=1
|
|
|
|
|
|
|
|
popd > /dev/null
|
|
|
|
|
|
|
|
if test "${ret}" -eq 0
|
|
|
|
then
|
|
|
|
echo "${url}"
|
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2018-06-13 19:10:02 +00:00
|
|
|
function find_git_remote {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to the top level Consul source
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - error
|
|
|
|
#
|
|
|
|
# Note:
|
|
|
|
# The remote name to use for publishing will be echoed to stdout upon success
|
|
|
|
|
|
|
|
if ! test -d "$1"
|
|
|
|
then
|
|
|
|
err "ERROR: '$1' is not a directory. find_git_remote must be called with the path to the top level source as the first argument'"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
need_url=$(normalize_git_url "${PUBLISH_GIT_HOST}:${PUBLISH_GIT_REPO}")
|
2018-06-15 19:23:26 +00:00
|
|
|
debug "Required normalized remote: ${need_url}"
|
2018-06-13 19:10:02 +00:00
|
|
|
|
|
|
|
pushd "$1" > /dev/null
|
|
|
|
|
|
|
|
local ret=1
|
|
|
|
for remote in $(git remote)
|
|
|
|
do
|
|
|
|
url=$(git remote get-url --push ${remote}) || continue
|
|
|
|
url=$(normalize_git_url "${url}")
|
|
|
|
|
2018-06-15 19:23:26 +00:00
|
|
|
debug "Testing Remote: ${remote}: ${url}"
|
2018-06-13 19:10:02 +00:00
|
|
|
if test "${url}" == "${need_url}"
|
|
|
|
then
|
|
|
|
echo "${remote}"
|
|
|
|
ret=0
|
|
|
|
break
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
|
|
|
popd > /dev/null
|
2018-06-15 19:23:26 +00:00
|
|
|
return ${ret}
|
2018-06-13 19:10:02 +00:00
|
|
|
}
|
|
|
|
|
2018-06-20 20:35:54 +00:00
|
|
|
function git_remote_not_blacklisted {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - path to the repo
|
|
|
|
# $2 - the remote name
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - not blacklisted
|
|
|
|
# * - blacklisted
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
2018-06-13 19:10:02 +00:00
|
|
|
function is_git_clean {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to git repo
|
|
|
|
# $2 - boolean whether the git status should be output when not clean
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - error
|
|
|
|
#
|
|
|
|
|
|
|
|
if ! test -d "$1"
|
|
|
|
then
|
|
|
|
err "ERROR: '$1' is not a directory. is_git_clean must be called with the path to a git repo as the first argument'"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
local output_status="$2"
|
|
|
|
|
|
|
|
pushd "${1}" > /dev/null
|
|
|
|
|
|
|
|
local ret=0
|
|
|
|
test -z "$(git status --porcelain=v2 2> /dev/null)" || ret=1
|
|
|
|
|
|
|
|
if is_set "${output_status}" && test "$ret" -ne 0
|
|
|
|
then
|
|
|
|
err "Git repo is not clean"
|
|
|
|
# --porcelain=v1 is the same as --short except uncolorized
|
|
|
|
git status --porcelain=v1
|
|
|
|
fi
|
|
|
|
popd > /dev/null
|
|
|
|
return ${ret}
|
2018-06-15 01:25:59 +00:00
|
|
|
}
|
|
|
|
|
2018-06-15 19:23:26 +00:00
|
|
|
function update_git_env {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to git repo
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - error
|
|
|
|
#
|
|
|
|
|
|
|
|
if ! test -d "$1"
|
|
|
|
then
|
|
|
|
err "ERROR: '$1' is not a directory. is_git_clean must be called with the path to a git repo as the first argument'"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
export GIT_COMMIT=$(git rev-parse --short HEAD)
|
|
|
|
export GIT_DIRTY=$(test -n "$(git status --porcelain)" && echo "+CHANGES")
|
|
|
|
export GIT_DESCRIBE=$(git describe --tags --always)
|
|
|
|
export GIT_IMPORT=github.com/hashicorp/consul/version
|
|
|
|
export GOLDFLAGS="-X ${GIT_IMPORT}.GitCommit=${GIT_COMMIT}${GIT_DIRTY} -X ${GIT_IMPORT}.GitDescribe=${GIT_DESCRIBE}"
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
|
|
|
function git_push_ref {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to the top level Consul source
|
|
|
|
# $2 - Git ref (optional)
|
2018-06-20 19:22:43 +00:00
|
|
|
# $3 - remote (optional - if not specified we will try to determine it)
|
2018-06-15 19:23:26 +00:00
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - error
|
|
|
|
|
|
|
|
if ! test -d "$1"
|
|
|
|
then
|
|
|
|
err "ERROR: '$1' is not a directory. push_git_release must be called with the path to the top level source as the first argument'"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
local sdir="$1"
|
|
|
|
local ret=0
|
2018-06-20 19:22:43 +00:00
|
|
|
local remote="$3"
|
2018-06-15 19:23:26 +00:00
|
|
|
|
|
|
|
# find the correct remote corresponding to the desired repo (basically prevent pushing enterprise to oss or oss to enterprise)
|
2018-06-20 19:22:43 +00:00
|
|
|
if test -z "${remote}"
|
|
|
|
then
|
|
|
|
local remote=$(find_git_remote "${sdir}") || return 1
|
|
|
|
status "Using git remote: ${remote}"
|
|
|
|
fi
|
2018-06-15 19:23:26 +00:00
|
|
|
|
|
|
|
local ref=""
|
|
|
|
|
|
|
|
pushd "${sdir}" > /dev/null
|
|
|
|
|
|
|
|
if test -z "$2"
|
|
|
|
then
|
|
|
|
# If no git ref was provided we lookup the current local branch and its tracking branch
|
|
|
|
# It must have a tracking upstream and it must be tracking the sanctioned git remote
|
|
|
|
local head=$(git_branch "${sdir}") || return 1
|
|
|
|
local upstream=$(git_upstream "${sdir}") || return 1
|
|
|
|
|
|
|
|
# upstream branch for this branch does not track the remote we need to push to
|
|
|
|
# basically this checks that the upstream (could be something like origin/master) references the correct remote
|
|
|
|
# if it doesn't then the string modification wont apply and the var will reamin unchanged and equal to itself.
|
|
|
|
if test "${upstream#${remote}/}" == "${upstream}"
|
|
|
|
then
|
|
|
|
err "ERROR: Upstream branch '${upstream}' does not track the correct remote '${remote}' - cannot push"
|
|
|
|
ret=1
|
|
|
|
fi
|
|
|
|
ref="refs/heads/${head}"
|
|
|
|
else
|
|
|
|
# A git ref was provided - get the full ref and make sure it isn't ambiguous and also to
|
|
|
|
# be able to determine whether its a branch or tag we are pushing
|
|
|
|
ref_out=$(git rev-parse --symbolic-full-name "$2" --)
|
|
|
|
|
|
|
|
# -ne 2 because it should have the ref on one line followed by a line with '--'
|
|
|
|
if test "$(wc -l <<< "${ref_out}")" -ne 2
|
|
|
|
then
|
|
|
|
err "ERROR: Git ref '$2' is ambiguous"
|
|
|
|
debug "${ref_out}"
|
|
|
|
ret=1
|
|
|
|
else
|
|
|
|
ref=$(head -n 1 <<< "${ref_out}")
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test ${ret} -eq 0
|
|
|
|
then
|
|
|
|
case "${ref}" in
|
|
|
|
refs/tags/*)
|
|
|
|
status "Pushing tag ${ref#refs/tags/} to ${remote}"
|
|
|
|
;;
|
|
|
|
refs/heads/*)
|
|
|
|
status "Pushing local branch ${ref#refs/tags/} to ${remote}"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
err "ERROR: git_push_ref func is refusing to push ref that isn't a branch or tag"
|
|
|
|
return 1
|
|
|
|
esac
|
|
|
|
|
|
|
|
if ! git push "${remote}" "${ref}"
|
|
|
|
then
|
|
|
|
err "ERROR: Failed to push ${ref} to remote: ${remote}"
|
|
|
|
ret=1
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
popd > /dev/null
|
|
|
|
|
|
|
|
return $ret
|
|
|
|
}
|
|
|
|
|
2018-06-15 01:25:59 +00:00
|
|
|
function update_version {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to the version file
|
|
|
|
# $2 - Version string
|
|
|
|
# $3 - PreRelease version (if unset will become an empty string)
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - error
|
|
|
|
|
|
|
|
if ! test -f "$1"
|
|
|
|
then
|
|
|
|
err "ERROR: '$1' is not a regular file. update_version must be called with the path to a go version file"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -z "$2"
|
|
|
|
then
|
|
|
|
err "ERROR: The version specified was empty"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
local vfile="$1"
|
|
|
|
local version="$2"
|
|
|
|
local prerelease="$3"
|
|
|
|
|
2018-06-22 21:21:42 +00:00
|
|
|
sed_i ${SED_EXT} -e "s/(Version[[:space:]]*=[[:space:]]*)\"[^\"]*\"/\1\"${version}\"/g" -e "s/(VersionPrerelease[[:space:]]*=[[:space:]]*)\"[^\"]*\"/\1\"${prerelease}\"/g" "${vfile}"
|
2018-06-15 01:25:59 +00:00
|
|
|
return $?
|
|
|
|
}
|
|
|
|
|
|
|
|
function set_changelog_version {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to top level Consul source
|
|
|
|
# $2 - Version to put into the Changelog
|
|
|
|
# $3 - Release Date
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - error
|
|
|
|
|
|
|
|
local changelog="${1}/CHANGELOG.md"
|
|
|
|
local version="$2"
|
|
|
|
local rel_date="$3"
|
|
|
|
|
|
|
|
if ! test -f "${changelog}"
|
|
|
|
then
|
|
|
|
err "ERROR: File not found: ${changelog}"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -z "${version}"
|
|
|
|
then
|
|
|
|
err "ERROR: Must specify a version to put into the changelog"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -z "${rel_date}"
|
|
|
|
then
|
|
|
|
rel_date=$(date +"%B %d, %Y")
|
|
|
|
fi
|
|
|
|
|
2018-06-22 21:21:42 +00:00
|
|
|
sed_i ${SED_EXT} -e "s/## UNRELEASED/## ${version} (${rel_date})/" "${changelog}"
|
2018-06-15 01:25:59 +00:00
|
|
|
return $?
|
|
|
|
}
|
|
|
|
|
|
|
|
function unset_changelog_version {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to top level Consul source
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - error
|
|
|
|
|
|
|
|
local changelog="${1}/CHANGELOG.md"
|
|
|
|
|
|
|
|
if ! test -f "${changelog}"
|
|
|
|
then
|
|
|
|
err "ERROR: File not found: ${changelog}"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
2018-06-22 21:21:42 +00:00
|
|
|
sed_i ${SED_EXT} -e "1 s/^## [0-9]+\.[0-9]+\.[0-9]+ \([^)]*\)/## UNRELEASED/" "${changelog}"
|
2018-06-15 01:25:59 +00:00
|
|
|
return $?
|
|
|
|
}
|
|
|
|
|
|
|
|
function add_unreleased_to_changelog {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to top level Consul source
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - error
|
|
|
|
|
|
|
|
local changelog="${1}/CHANGELOG.md"
|
|
|
|
|
|
|
|
if ! test -f "${changelog}"
|
|
|
|
then
|
|
|
|
err "ERROR: File not found: ${changelog}"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Check if we are already in unreleased mode
|
|
|
|
if head -n 1 "${changelog}" | grep -q -c UNRELEASED
|
|
|
|
then
|
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
|
|
|
|
local tfile="$(mktemp) -t "CHANGELOG.md_")"
|
|
|
|
(
|
|
|
|
echo -e "## UNRELEASED\n" > "${tfile}" &&
|
|
|
|
cat "${changelog}" >> "${tfile}" &&
|
|
|
|
cp "${tfile}" "${changelog}"
|
|
|
|
)
|
|
|
|
local ret=$?
|
|
|
|
rm "${tfile}"
|
|
|
|
return $ret
|
|
|
|
}
|
|
|
|
|
|
|
|
function set_release_mode {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to top level Consul source
|
|
|
|
# $2 - The version of the release
|
|
|
|
# $3 - The release date
|
2018-06-18 21:01:20 +00:00
|
|
|
# $4 - The pre-release version
|
2018-06-15 01:25:59 +00:00
|
|
|
#
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - error
|
|
|
|
|
|
|
|
if ! test -d "$1"
|
|
|
|
then
|
|
|
|
err "ERROR: '$1' is not a directory. set_release_mode must be called with the path to a git repo as the first argument"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -z "$2"
|
|
|
|
then
|
|
|
|
err "ERROR: The version specified was empty"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
local sdir="$1"
|
|
|
|
local vers="$2"
|
|
|
|
local rel_date="$(date +"%B %d, %Y")"
|
|
|
|
|
|
|
|
if test -n "$3"
|
|
|
|
then
|
|
|
|
rel_date="$3"
|
|
|
|
fi
|
|
|
|
|
2018-06-18 21:01:20 +00:00
|
|
|
local changelog_vers="${vers}"
|
|
|
|
if test -n "$4"
|
|
|
|
then
|
|
|
|
changelog_vers="${vers}-$4"
|
|
|
|
fi
|
|
|
|
|
|
|
|
status_stage "==> Updating CHANGELOG.md with release info: ${changelog_vers} (${rel_date})"
|
|
|
|
set_changelog_version "${sdir}" "${changelog_vers}" "${rel_date}" || return 1
|
2018-06-15 01:25:59 +00:00
|
|
|
|
|
|
|
status_stage "==> Updating version/version.go"
|
2018-06-18 21:01:20 +00:00
|
|
|
if ! update_version "${sdir}/version/version.go" "${vers}" "$4"
|
2018-06-15 01:25:59 +00:00
|
|
|
then
|
|
|
|
unset_changelog_version "${sdir}"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
|
|
|
function set_dev_mode {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to top level Consul source
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - error
|
|
|
|
|
|
|
|
if ! test -d "$1"
|
|
|
|
then
|
|
|
|
err "ERROR: '$1' is not a directory. set_dev_mode must be called with the path to a git repo as the first argument'"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
local sdir="$1"
|
|
|
|
local vers="$(parse_version "${sdir}" false false)"
|
|
|
|
|
|
|
|
status_stage "==> Setting VersionPreRelease back to 'dev'"
|
|
|
|
update_version "${sdir}/version/version.go" "${vers}" dev || return 1
|
|
|
|
|
|
|
|
status_stage "==> Adding new UNRELEASED label in CHANGELOG.md"
|
|
|
|
add_unreleased_to_changelog "${sdir}" || return 1
|
|
|
|
|
|
|
|
return 0
|
2018-06-15 19:23:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
function git_staging_empty {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to git repo
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success (nothing staged)
|
|
|
|
# * - error (staged files)
|
|
|
|
|
|
|
|
if ! test -d "$1"
|
|
|
|
then
|
|
|
|
err "ERROR: '$1' is not a directory. commit_dev_mode must be called with the path to a git repo as the first argument'"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
pushd "$1" > /dev/null
|
|
|
|
|
|
|
|
declare -i ret=0
|
|
|
|
|
|
|
|
for status in $(git status --porcelain=v2 | awk '{print $2}' | cut -b 1)
|
|
|
|
do
|
|
|
|
if test "${status}" != "."
|
|
|
|
then
|
|
|
|
ret=1
|
|
|
|
break
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
|
|
|
popd > /dev/null
|
|
|
|
return ${ret}
|
|
|
|
}
|
|
|
|
|
|
|
|
function commit_dev_mode {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to top level Consul source
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - error
|
|
|
|
|
|
|
|
if ! test -d "$1"
|
|
|
|
then
|
|
|
|
err "ERROR: '$1' is not a directory. commit_dev_mode must be called with the path to a git repo as the first argument'"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
status "Checking for previously staged files"
|
|
|
|
git_staging_empty "$1" || return 1
|
|
|
|
|
|
|
|
declare -i ret=0
|
|
|
|
|
|
|
|
pushd "$1" > /dev/null
|
|
|
|
|
|
|
|
status "Staging CHANGELOG.md and version_*.go files"
|
2018-06-18 13:22:31 +00:00
|
|
|
git add CHANGELOG.md && git add version/version*.go
|
2018-06-15 19:23:26 +00:00
|
|
|
ret=$?
|
|
|
|
|
|
|
|
if test ${ret} -eq 0
|
|
|
|
then
|
|
|
|
status "Adding Commit"
|
|
|
|
git commit -m "Putting source back into Dev Mode"
|
|
|
|
ret=$?
|
|
|
|
fi
|
|
|
|
|
|
|
|
popd >/dev/null
|
|
|
|
return ${ret}
|
2018-06-18 15:23:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
function gpg_detach_sign {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - File to sign
|
|
|
|
# $2 - Alternative GPG key to use for signing
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - failure
|
|
|
|
|
|
|
|
# determine whether the gpg key to use is being overridden
|
|
|
|
local gpg_key=${HASHICORP_GPG_KEY}
|
|
|
|
if test -n "$2"
|
|
|
|
then
|
|
|
|
gpg_key=$2
|
|
|
|
fi
|
|
|
|
|
|
|
|
gpg --default-key "${gpg_key}" --detach-sig --yes -v "$1"
|
|
|
|
return $?
|
|
|
|
}
|
|
|
|
|
|
|
|
function shasum_directory {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - Path to directory containing the files to shasum
|
|
|
|
# $2 - File to output sha sums to
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * - failure
|
|
|
|
|
|
|
|
if ! test -d "$1"
|
|
|
|
then
|
|
|
|
err "ERROR: '$1' is not a directory and shasum_release requires passing a directory as the first argument"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test -z "$2"
|
|
|
|
then
|
|
|
|
err "ERROR: shasum_release requires a second argument to be the filename to output the shasums to but none was given"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
pushd $1 > /dev/null
|
|
|
|
shasum -a256 * > "$2"
|
|
|
|
ret=$?
|
|
|
|
popd >/dev/null
|
|
|
|
|
|
|
|
return $ret
|
|
|
|
}
|
2018-06-26 15:21:37 +00:00
|
|
|
|
|
|
|
function ui_version {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - path to index.html
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * -failure
|
|
|
|
#
|
|
|
|
# Notes: echoes the version to stdout upon success
|
|
|
|
if ! test -f "$1"
|
|
|
|
then
|
|
|
|
err "ERROR: No such file: '$1'"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
local ui_version=$(sed -n ${SED_EXT} -e 's/.*CONSUL_VERSION%22%3A%22([^%]*)%22%2C%22.*/\1/p' < "$1") || return 1
|
|
|
|
echo "$ui_version"
|
|
|
|
return 0
|
|
|
|
}
|
2018-07-30 16:59:43 +00:00
|
|
|
function ui_logo_type {
|
|
|
|
# Arguments:
|
|
|
|
# $1 - path to index.html
|
|
|
|
#
|
|
|
|
# Returns:
|
|
|
|
# 0 - success
|
|
|
|
# * -failure
|
|
|
|
#
|
|
|
|
# Notes: echoes the 'logo type' to stdout upon success
|
|
|
|
# the 'logo' can be one of 'enterprise' or 'oss'
|
|
|
|
# and doesn't necessarily correspond to the binary type of consul
|
|
|
|
# the logo is 'enterprise' if the binary type is anything but 'oss'
|
|
|
|
if ! test -f "$1"
|
|
|
|
then
|
|
|
|
err "ERROR: No such file: '$1'"
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
grep -q "data-enterprise-logo" < "$1"
|
|
|
|
|
|
|
|
if test $? -eq 0
|
|
|
|
then
|
|
|
|
echo "enterprise"
|
|
|
|
else
|
|
|
|
echo "oss"
|
|
|
|
fi
|
|
|
|
return 0
|
|
|
|
}
|