diff --git a/server/build-provider.sh b/server/build-provider.sh index f8d2a5e..46691fb 100755 --- a/server/build-provider.sh +++ b/server/build-provider.sh @@ -29,23 +29,22 @@ set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" ROOT_DIR="${ROOT_DIR:-$(cd "${SCRIPT_DIR}/.." && pwd)}" -PROVIDER_DIR="${PROVIDER_DIR:-${ROOT_DIR}/universal_rebuild}" +PROVIDER_DIR="${PROVIDER_DIR:-${ROOT_DIR}/provider}" BUILD_DIR="${BUILD_DIR:-${ROOT_DIR}/artifacts/provider_build}" GPG_KEY_FILE="${GPG_KEY_FILE:-${ROOT_DIR}/secrets/private_key.asc}" VERSION="${1:-2.0.2}" -REGISTRY_HOSTNAME="${REGISTRY_HOSTNAME:-terra.k8c.ru}" -NAMESPACE="${NAMESPACE:-nubes}" +REGISTRY_HOSTNAME="${REGISTRY_HOSTNAME:-tf-registry.containerk8s.services.ngcloud.ru}" +NAMESPACE="${NAMESPACE:-nubes-test}" PROVIDER_NAME="${PROVIDER_NAME:-nubes}" -S3_BUCKET="${S3_BUCKET:-terraform-registry}" +S3_BUCKET="${S3_BUCKET:-nubes-terraform-registry}" -S3_ENDPOINT="${S3_ENDPOINT:-}" +S3_ENDPOINT="${S3_ENDPOINT:-https://s3.msk-1.ngcloud.ru}" S3_ACCESS_KEY="${S3_ACCESS_KEY:-}" S3_SECRET_KEY="${S3_SECRET_KEY:-}" -if [[ -z "$S3_ENDPOINT" || -z "$S3_ACCESS_KEY" || -z "$S3_SECRET_KEY" ]]; then - echo "Error: S3_ENDPOINT/S3_ACCESS_KEY/S3_SECRET_KEY must be set" >&2 - echo "Hint: see ${ROOT_DIR}/secrets/.s3cfg_registry" >&2 +if [[ -z "$S3_ACCESS_KEY" || -z "$S3_SECRET_KEY" ]]; then + echo "Error: S3_ACCESS_KEY/S3_SECRET_KEY must be set" >&2 exit 2 fi @@ -77,7 +76,7 @@ build_and_zip() { fi echo "Building for ${os}/${arch}..." - (cd "$PROVIDER_DIR" && CGO_ENABLED=0 GOOS="$os" GOARCH="$arch" go build -o "${BUILD_DIR}/${binary}" .) + (cd "$PROVIDER_DIR" && CGO_ENABLED=0 GOOS="$os" GOARCH="$arch" go build -ldflags "-X main.address=${REGISTRY_HOSTNAME}/${NAMESPACE}/${PROVIDER_NAME} -X main.version=${VERSION}" -o "${BUILD_DIR}/${binary}" .) (cd "$BUILD_DIR" && python3 -m zipfile -c "terraform-provider-nubes_${VERSION}_${os}_${arch}.zip" "$binary") rm -f "${BUILD_DIR:?}/${binary}" @@ -104,8 +103,8 @@ gpg --batch --yes --detach-sign --default-key "$key_id" \ --output "${BUILD_DIR}/terraform-provider-nubes_${VERSION}_SHA256SUMS.sig" \ "${BUILD_DIR}/terraform-provider-nubes_${VERSION}_SHA256SUMS" -mc alias set registry "$s3_endpoint_url" "$S3_ACCESS_KEY" "$S3_SECRET_KEY" --api S3v4 -S3_PATH="registry/${S3_BUCKET}/${REGISTRY_HOSTNAME}/${NAMESPACE}/${PROVIDER_NAME}/${VERSION}/" +mc alias set prod-s3 "$s3_endpoint_url" "$S3_ACCESS_KEY" "$S3_SECRET_KEY" --api S3v4 +S3_PATH="prod-s3/${S3_BUCKET}/${REGISTRY_HOSTNAME}/${NAMESPACE}/${PROVIDER_NAME}/${VERSION}/" echo "Uploading to: ${S3_PATH}" mc cp "${BUILD_DIR}"/*.zip "$S3_PATH"