fix: publish generated providers to working registry

This commit is contained in:
Repinoid
2026-09-20 20:00:34 +03:00
parent a44894d877
commit f32159b3af
7 changed files with 84 additions and 10 deletions
+1 -1
View File
@@ -141,7 +141,7 @@ rm -f "$FAILURES_FILE"
# Auto-rebuild yaml-generator if sources are newer than binary
BIN="${ROOT_DIR}/TOOLS/bin/yaml-generator"
SRC="${ROOT_DIR}/TOOLS/yaml-generator/"
if [[ ! -x "$BIN" ]] || [[ "$SRC" -nt "$BIN" ]]; then
if [[ ! -x "$BIN" ]] || find "$SRC" -type f -newer "$BIN" -print -quit | grep -q .; then
echo "Building yaml-generator..."
(cd "${ROOT_DIR}/TOOLS/yaml-generator" && go build -o "$BIN" .)
fi
@@ -93,9 +93,20 @@ echo "Generating resources from unified YAML specs..."
TMP_GEN_DIR="$(mktemp -d)"
trap 'rm -rf "$TMP_GEN_DIR"' EXIT
RESOURCE_GENERATOR_BIN="${ROOT_DIR}/TOOLS/bin/resource-generator"
RESOURCE_GENERATOR_SRC="${ROOT_DIR}/TOOLS/resource-generator"
DOCS_GENERATOR_BIN="${ROOT_DIR}/TOOLS/bin/docs-generator"
DOCS_GENERATOR_SRC="${ROOT_DIR}/TOOLS/docs-generator"
if [[ ! -x "$RESOURCE_GENERATOR_BIN" ]] || find "$RESOURCE_GENERATOR_SRC" -type f -newer "$RESOURCE_GENERATOR_BIN" -print -quit | grep -q .; then
(cd "$RESOURCE_GENERATOR_SRC" && go build -o "$RESOURCE_GENERATOR_BIN" .)
fi
if [[ ! -x "$DOCS_GENERATOR_BIN" ]] || find "$DOCS_GENERATOR_SRC" -type f -newer "$DOCS_GENERATOR_BIN" -print -quit | grep -q .; then
(cd "$DOCS_GENERATOR_SRC" && go build -o "$DOCS_GENERATOR_BIN" .)
fi
NUBES_RESOURCES_DIR="$RESOURCES_YAML_DIR" \
NUBES_RESOURCES_GEN_DIR="$TMP_GEN_DIR" \
${ROOT_DIR}/TOOLS/bin/resource-generator
"$RESOURCE_GENERATOR_BIN"
mkdir -p "$GO_OUTPUT_DIR"
rm -rf "${GO_OUTPUT_DIR}"/*
@@ -113,7 +124,7 @@ if [[ "$DOCS_API_ENDPOINT" != *"/index.cfm"* ]] && [[ "$DOCS_API_ENDPOINT" != *"
DOCS_API_ENDPOINT="${DOCS_API_ENDPOINT%/}/index.cfm"
fi
${ROOT_DIR}/TOOLS/bin/docs-generator \
"$DOCS_GENERATOR_BIN" \
-resources "$RESOURCES_YAML_DIR" \
-docs "$DOCS_DIR" \
-services "$SERVICES_LIST_PATH" \
@@ -38,6 +38,9 @@ if [[ -z "$PROFILE_DIR" ]]; then
exit 2
fi
"${ROOT_DIR}/TOOLS/scripts/01_generate_yamls.sh" --profile "$PROFILE_DIR"
"${ROOT_DIR}/TOOLS/scripts/02_generate_resources_and_docs_v2.sh" --profile "$PROFILE_DIR"
resolve_root_path() {
local path_value="$1"
if [[ -z "$path_value" ]]; then
@@ -153,7 +156,7 @@ validate_registry_completeness() {
tmp_registered="$(mktemp)"
tmp_missing="$(mktemp)"
find "$resources_gen_dir" -maxdepth 1 -type f -name '*_resource.go' -print0 \
find "$resources_gen_dir" -maxdepth 1 -type f \( -name '*_resource.go' -o -name '*_modifier.go' -o -name '*_action.go' \) -print0 \
| xargs -0 grep -hE 'func[[:space:]]+New[[:alnum:]_]+Resource[[:space:]]*\(' \
| sed -E 's/.*(New[[:alnum:]_]+Resource).*/\1/' \
| sort -u > "$tmp_expected"
+1 -1
View File
@@ -37,7 +37,7 @@ VERSION="${1:-2.0.2}"
REGISTRY_HOSTNAME="${REGISTRY_HOSTNAME:-tf-registry.containerk8s.services.ngcloud.ru}"
NAMESPACE="${NAMESPACE:-nubes}"
PROVIDER_NAME="${PROVIDER_NAME:-nubes}"
S3_BUCKET="${S3_BUCKET:-nubes-terraform-registry}"
S3_BUCKET="${S3_BUCKET:-terraform-registry}"
S3_ENDPOINT="${S3_ENDPOINT:-https://s3.msk-1.ngcloud.ru}"
S3_ACCESS_KEY="${S3_ACCESS_KEY:-}"