From 76f70c91de014a87a5ee56767deaa465a902d719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CNaeel=E2=80=9D?= Date: Sun, 9 Aug 2026 15:03:25 +0400 Subject: [PATCH] =?UTF-8?q?fix:=20build-provider.sh=20=E2=80=94=20=D0=BE?= =?UTF-8?q?=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B2=D1=81?= =?UTF-8?q?=D0=B5=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D1=8B?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=20=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=BF=D1=80=D0=BE=D0=B4=20(ngcloud,=20=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D1=8B=D0=B9=20=D0=B4=D0=BE=D0=BC=D0=B5=D0=BD,=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=BA=D0=B5=D1=82,=20ldflags,=20mc=20alias)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/build-provider.sh | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) 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"