From 03b368a55a7b535faea9e5e9d813304e381c76dd Mon Sep 17 00:00:00 2001 From: Repinoid Date: Thu, 1 Oct 2026 18:37:44 +0300 Subject: [PATCH] =?UTF-8?q?test=5Fstand/crud(apps):=20=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B5?= =?UTF-8?q?=D1=81=D1=83=D1=80=D1=81=D0=BE=D0=B2=20+=20SERVICE=5FNAME=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BE=D0=BB=D0=BE=D0=BD=D0=BA=D0=B8?= =?UTF-8?q?=20created=5Fby?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - locals.tf: crud-flask → flask-crud, crud-lucee → lucee-crud, crud-nodejs → nodejs-crud; - json_env: SERVICE_NAME = flask/lucee/nodejs (без -crud) — это значение пишется приложением в колонку created_by таблицы crud_items; - terraform validate — Success. Код приложений (DDL created_at/created_by + INSERT + UI) — в репозиториях tfflaskcrud/tfnodejscrud/tfluceecrud (origin переключён на terraform/*): e5fce97, 23338cb, ffcd0c0. --- TEST_STAND/CRUD/apps/flask.tf | 14 ++++++++------ TEST_STAND/CRUD/apps/locals.tf | 6 +++--- TEST_STAND/CRUD/apps/lucee.tf | 5 ++++- TEST_STAND/CRUD/apps/nodejs.tf | 14 ++++++++------ 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/TEST_STAND/CRUD/apps/flask.tf b/TEST_STAND/CRUD/apps/flask.tf index fe29ae7..925ebf4 100644 --- a/TEST_STAND/CRUD/apps/flask.tf +++ b/TEST_STAND/CRUD/apps/flask.tf @@ -32,11 +32,13 @@ resource "nubes_flask" "appflask" { json_env = jsonencode({ TABLE_NAME = local.crud_table_name - PGHOST = local.pg_host - PGPORT = local.pg_port - PGUSER = local.pg_user - PGPASSWORD = local.pg_pass - PGDATABASE = local.pg_db - PGSSLMODE = local.pg_ssl + # SERVICE_NAME — значение колонки created_by («кто добавил строку»). + SERVICE_NAME = "flask" + PGHOST = local.pg_host + PGPORT = local.pg_port + PGUSER = local.pg_user + PGPASSWORD = local.pg_pass + PGDATABASE = local.pg_db + PGSSLMODE = local.pg_ssl }) } diff --git a/TEST_STAND/CRUD/apps/locals.tf b/TEST_STAND/CRUD/apps/locals.tf index 9a0e247..1b8983d 100644 --- a/TEST_STAND/CRUD/apps/locals.tf +++ b/TEST_STAND/CRUD/apps/locals.tf @@ -41,7 +41,7 @@ locals { # Lucee — CFML-приложение (сервис 94) # ═══════════════════════════════════════════════════════════════════════════ - lucee_resource_name = "crud-lucee" # имя ресурса в Nubes + lucee_resource_name = "lucee-crud" # имя ресурса в Nubes lucee_domain = "tflucee" # домен → <имя>.luceek8s.dev.nubes.ru. Должен быть УНИКАЛЬНЫМ — замени на своё! lucee_version = "5.4" lucee_git_path = "https://gitea.services.ngcloud.ru/terraform/tfluceecrud.git" @@ -53,7 +53,7 @@ locals { # Flask — Python-приложение (сервис 89) # ═══════════════════════════════════════════════════════════════════════════ - flask_resource_name = "crud-flask" + flask_resource_name = "flask-crud" flask_domain = "tfflask" # → <имя>.pythonk8s.dev.nubes.ru. Уникальный! flask_git_path = "https://gitea.services.ngcloud.ru/terraform/tfflaskcrud.git" flask_cpu = 300 @@ -64,7 +64,7 @@ locals { # Node.js — Express-приложение (сервис 95) # ═══════════════════════════════════════════════════════════════════════════ - nodejs_resource_name = "crud-nodejs" + nodejs_resource_name = "nodejs-crud" nodejs_domain = "tfnodejs" # Уникальный! nodejs_git_path = "https://gitea.services.ngcloud.ru/terraform/tfnodejscrud.git" nodejs_cpu = 300 diff --git a/TEST_STAND/CRUD/apps/lucee.tf b/TEST_STAND/CRUD/apps/lucee.tf index 4007b09..71b9094 100644 --- a/TEST_STAND/CRUD/apps/lucee.tf +++ b/TEST_STAND/CRUD/apps/lucee.tf @@ -31,7 +31,10 @@ resource "nubes_lucee" "applucee" { } json_env = jsonencode({ - TABLE_NAME = local.crud_table_name + TABLE_NAME = local.crud_table_name + # SERVICE_NAME — значение колонки created_by («кто добавил строку»). + # Все три приложения пишут в одну таблицу, поэтому имя сервиса обязательно. + SERVICE_NAME = "lucee" testds_class = local.jdbc_class testds_bundleName = local.jdbc_bundle_name testds_bundleVersion = local.jdbc_bundle_version diff --git a/TEST_STAND/CRUD/apps/nodejs.tf b/TEST_STAND/CRUD/apps/nodejs.tf index 04394ce..a61bc18 100644 --- a/TEST_STAND/CRUD/apps/nodejs.tf +++ b/TEST_STAND/CRUD/apps/nodejs.tf @@ -34,11 +34,13 @@ resource "nubes_nodejs" "appnodejs" { json_env = jsonencode({ TABLE_NAME = local.crud_table_name - PGHOST = local.pg_host - PGPORT = local.pg_port - PGUSER = local.pg_user - PGPASSWORD = local.pg_pass - PGDATABASE = local.pg_db - PGSSLMODE = local.pg_ssl + # SERVICE_NAME — значение колонки created_by («кто добавил строку»). + SERVICE_NAME = "nodejs" + PGHOST = local.pg_host + PGPORT = local.pg_port + PGUSER = local.pg_user + PGPASSWORD = local.pg_pass + PGDATABASE = local.pg_db + PGSSLMODE = local.pg_ssl }) }