refactor: единый registry.env + очистка profile.env от registry-параметров + синхронизация build-provider.sh

TOOLS/config/dev/profile.env

@@ -6,13 +6,8 @@ TOKEN_FILE="secrets/dev.token"
 # Version
 VERSION="3.1.13"
 
-# Registry/S3 settings
-REGISTRY_HOST="registry.kube5s.ru"
-REGISTRY_HOSTNAME="registry.kube5s.ru"
 NAMESPACE="nubes-dev"
 PROVIDER_NAME="nubes"
-S3_BUCKET="terraform-registry"
-S3CFG_REGISTRY="secrets/.s3cfg_registry"
 
 # Signing keys
 GPG_PRIVATE_KEY_PATH="secrets/private_key.asc"

TOOLS/config/prod/profile.env

@@ -6,13 +6,8 @@ TOKEN_FILE="secrets/prod.token"
 # Version
 VERSION="2.1.12"
 
-# Registry/S3 settings
-REGISTRY_HOST="registry.kube5s.ru"
-REGISTRY_HOSTNAME="registry.kube5s.ru"
-NAMESPACE="nubes-prod"
+NAMESPACE="nubes"
 PROVIDER_NAME="nubes"
-S3_BUCKET="terraform-registry"
-S3CFG_REGISTRY="secrets/.s3cfg_registry"
 
 # Signing keys
 GPG_PRIVATE_KEY_PATH="secrets/private_key.asc"

TOOLS/config/registry.env

@@ -0,0 +1,5 @@
+# Единый реестр Terraform-провайдеров — независим от стенда.
+# Подгружается скриптами вместе с profile.env.
+REGISTRY_HOSTNAME="tf-registry.containerk8s.services.ngcloud.ru"
+S3_BUCKET="nubes-terraform-registry"
+S3_ENDPOINT="https://s3.msk-1.ngcloud.ru"

TOOLS/config/test/profile.env

@@ -5,16 +5,8 @@ TOKEN_FILE="secrets/test.token"
 # Version
 VERSION="5.1.16"
 
-# Docs generation — ONLY from docs_gen/<stand>/ (never from docs/)
-DOCS_GEN_DIR="provider/docs_gen/test"
-
-# Registry/S3 settings
-REGISTRY_HOST="registry.kube5s.ru"
-REGISTRY_HOSTNAME="registry.kube5s.ru"
 NAMESPACE="nubes-test"
 PROVIDER_NAME="nubes"
-S3_BUCKET="terraform-registry"
-S3CFG_REGISTRY="secrets/.s3cfg_registry"
 
 # Signing keys
 GPG_PRIVATE_KEY_PATH="secrets/private_key.asc"

TOOLS/scripts/02_generate_resources_and_docs_v2.sh

@@ -39,6 +39,13 @@ if [[ -n "$PROFILE_DIR" ]]; then
     source "$PROFILE_ENV_FILE"
     set +a
   fi
+  REGISTRY_ENV_FILE="${ROOT_DIR}/TOOLS/config/registry.env"
+  if [[ -f "$REGISTRY_ENV_FILE" ]]; then
+    set -a
+    # shellcheck disable=SC1090
+    source "$REGISTRY_ENV_FILE"
+    set +a
+  fi
 fi
 
 if [[ -z "$PROFILE_DIR" ]]; then
@@ -105,6 +112,7 @@ ${ROOT_DIR}/TOOLS/bin/docs-generator \
   -docs "$DOCS_DIR" \
   -services "$SERVICES_LIST_PATH" \
   -version "${VERSION:-2.x}" \
-  -api-endpoint "$DOCS_API_ENDPOINT"
+  -api-endpoint "$DOCS_API_ENDPOINT" \
+  -provider-source "${REGISTRY_HOSTNAME}/${NAMESPACE}/${PROVIDER_NAME}"
 
 echo "Resources and docs generated in template format."

TOOLS/scripts/03_build_and_upload_provider.sh

@@ -24,6 +24,13 @@ if [[ -n "$PROFILE_DIR" ]]; then
     source "$PROFILE_ENV_FILE"
     set +a
   fi
+  REGISTRY_ENV_FILE="${ROOT_DIR}/TOOLS/config/registry.env"
+  if [[ -f "$REGISTRY_ENV_FILE" ]]; then
+    set -a
+    # shellcheck disable=SC1090
+    source "$REGISTRY_ENV_FILE"
+    set +a
+  fi
 fi
 
 if [[ -z "$PROFILE_DIR" ]]; then

TOOLS/scripts/04_build_and_publish_docs.sh

@@ -64,7 +64,7 @@ if [[ -z "$VERSION" ]]; then
   exit 2
 fi
 
-REGISTRY_HOST="${REGISTRY_HOST:-registry.kube5s.ru}"
+REGISTRY_HOST="${REGISTRY_HOST:-tf-registry.containerk8s.services.ngcloud.ru}"
 NAMESPACE="${NAMESPACE:-nubes}"
 PROVIDER_NAME="${PROVIDER_NAME:-nubes}"
 export REGISTRY_HOST NAMESPACE PROVIDER_NAME VERSION

TOOLS/scripts/build-provider.sh

@@ -34,18 +34,17 @@ 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:-go-registry.containerk8s.dev.nubes.ru}"
+REGISTRY_HOSTNAME="${REGISTRY_HOSTNAME:-tf-registry.containerk8s.services.ngcloud.ru}"
 NAMESPACE="${NAMESPACE:-nubes}"
 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
 
@@ -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"