terraform/tf_provider
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: nil-guard for nested map-fixed params in generated code

Browse Source
This commit is contained in:
“Naeel”
2026-07-18 22:51:43 +04:00
parent 7edea3f472
commit 92cb40e476
3 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TOOLS/resource-generator/internal/templates/instance.go
+24 -9
View File
@@ -235,13 +235,18 @@ func (r *{{ToCamel .Name}}Resource) ModifyPlan(ctx context.Context, req resource
{{- end }}
params := map[int]string{
{{- range .CreateParams }}
{{- if (IsNested .) }}
{{.ID}}: {{NestedJSONExpr . "config"}},
{{- else }}
{{- if not (IsNested .) }}
{{.ID}}: {{ParamFormat . (printf "config.%s" (ToCamel .Code))}},
{{- end }}
{{- end }}
}
{{- range .CreateParams }}
{{- if (IsNested .) }}
if config.{{ToCamel .Code}} != nil {
params[{{.ID}}] = {{NestedJSONExpr . "config"}}
}
{{- end }}
{{- end }}
desiredDomain := ""
{{- if .HasDomainParam }}
if !config.Domain.IsNull() && !config.Domain.IsUnknown() {
@@ -325,13 +330,18 @@ func (r *{{ToCamel .Name}}Resource) Create(ctx context.Context, req resource.Cre
params := map[int]string{
{{- range .CreateParams }}
{{- if (IsNested .) }}
{{.ID}}: {{NestedJSONExpr . "data"}},
{{- else }}
{{- if not (IsNested .) }}
{{.ID}}: {{ParamFormat . (printf "data.%s" (ToCamel .Code))}},
{{- end }}
{{- end }}
}
{{- range .CreateParams }}
{{- if (IsNested .) }}
if data.{{ToCamel .Code}} != nil {
params[{{.ID}}] = {{NestedJSONExpr . "data"}}
}
{{- end }}
{{- end }}
operationTimeout := ""
if !data.OperationTimeout.IsNull() && !data.OperationTimeout.IsUnknown() {
@@ -547,13 +557,18 @@ func (r *{{ToCamel .Name}}Resource) Update(ctx context.Context, req resource.Upd
{{- end }}
params := map[int]string{
{{- range .ModifyParams }}
{{- if (IsNested .) }}
{{.ID}}: {{NestedJSONExpr . "plan"}},
{{- else }}
{{- if not (IsNested .) }}
{{.ID}}: {{ParamFormat . (printf "plan.%s" (ToCamel .Code))}},
{{- end }}
{{- end }}
}
{{- range .ModifyParams }}
{{- if (IsNested .) }}
if plan.{{ToCamel .Code}} != nil {
params[{{.ID}}] = {{NestedJSONExpr . "plan"}}
}
{{- end }}
{{- end }}
if err := resources_core.UpdateResourceWithTimeout(ctx, r.client, instanceID.ValueString(), params, operationTimeout); err != nil {
resp.Diagnostics.AddError("Ошибка клиента", err.Error())
return