From 67ce3e4ab953362896641e3101d45999ed725f95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CNaeel=E2=80=9D?= Date: Mon, 20 Jul 2026 07:51:46 +0400 Subject: [PATCH] =?UTF-8?q?fix:=20redeploy=20template=20=E2=80=94=20handle?= =?UTF-8?q?=20empty=20params=20+=20nil=20for=20Dummy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TEST_STAND/LUCEE/main.tf | 2 +- .../internal/templates/instance.go | 23 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/TEST_STAND/LUCEE/main.tf b/TEST_STAND/LUCEE/main.tf index bb25099..6c0328c 100644 --- a/TEST_STAND/LUCEE/main.tf +++ b/TEST_STAND/LUCEE/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { nubes = { source = "registry.kube5s.ru/nubes-test/nubes" - version = "5.1.12" + version = "5.1.13" } } } diff --git a/TOOLS/resource-generator/internal/templates/instance.go b/TOOLS/resource-generator/internal/templates/instance.go index 12893d6..b1e0c8f 100644 --- a/TOOLS/resource-generator/internal/templates/instance.go +++ b/TOOLS/resource-generator/internal/templates/instance.go @@ -549,19 +549,20 @@ func (r *{{ToCamel .Name}}Resource) Update(ctx context.Context, req resource.Upd // --- Redeploy support (ARCHITECTURE.md) --- if redeployRequested { {{- if .RedeployParams }} - redeployParams := map[int]string{ - {{- range .RedeployParams }} - {{- if (IsNested .) }} - if plan.{{ToCamel .Code}} != nil { - redeployParams[{{.ID}}] = {{NestedJSONExpr . "plan"}} - } - {{- else }} - {{.ID}}: {{ParamFormat . (printf "plan.%s" (ToCamel .Code))}}, - {{- end }} - {{- end }} + redeployParams := map[int]string{} + {{- range .RedeployParams }} + {{- if (IsNested .) }} + if plan.{{ToCamel .Code}} != nil { + redeployParams[{{.ID}}] = {{NestedJSONExpr . "plan"}} } + {{- else }} + redeployParams[{{.ID}}] = {{ParamFormat . (printf "plan.%s" (ToCamel .Code))}} + {{- end }} + {{- end }} + if err := r.client.RunRedeployOperation(ctx, instanceID.ValueString(), operationTimeout, redeployParams); err != nil { + {{- else }} + if err := r.client.RunRedeployOperation(ctx, instanceID.ValueString(), operationTimeout, nil); err != nil { {{- end }} - if err := r.client.RunRedeployOperation(ctx, instanceID.ValueString(), operationTimeout{{if .RedeployParams}}, redeployParams{{end}}); err != nil { resp.Diagnostics.AddError("Ошибка клиента", err.Error()) return }