Fix model template

CiscoDevNet · Sep 11, 2024 · 054fa0a · 054fa0a
1 parent 53b31be
commit 054fa0a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/gen/templates/model.go b/gen/templates/model.go
@@ -288,7 +288,7 @@ func (data *{{camelCase .Name}}) fromBodyPartial(ctx context.Context, res gjson.
 	{{- range .Attributes}}
 	{{- if and (not .Value) (not .WriteOnly) (not .Reference)}}
 	{{- if or (eq .Type "String") (eq .Type "Int64") (eq .Type "Float64") (eq .Type "Bool")}}
-	if value := res.Get("{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}"); value.Exists() {
+	if value := res.Get("{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}"); value.Exists() && !data.{{toGoName .TfName}}.IsNull() {
 		data.{{toGoName .TfName}} = types.{{.Type}}Value(value.{{if eq .Type "Int64"}}Int{{else if eq .Type "Float64"}}Float{{else}}{{.Type}}{{end}}())
 	} else {{if .DefaultValue}}if data.{{toGoName .TfName}}.Value{{.Type}}() != {{if eq .Type "String"}}"{{end}}{{.DefaultValue}}{{if eq .Type "String"}}"{{end}} {{end}}{
 		data.{{toGoName .TfName}} = types.{{.Type}}Null()

diff --git a/internal/provider/model_meraki_admin.go b/internal/provider/model_meraki_admin.go
@@ -178,17 +178,17 @@ func (data *Admin) fromBody(ctx context.Context, res gjson.Result) {
 // easily change across versions of the backend API.) For List/Set/Map attributes, the func only updates the
 // "managed" elements, instead of all elements.
 func (data *Admin) fromBodyPartial(ctx context.Context, res gjson.Result) {
-	if value := res.Get("email"); value.Exists() {
+	if value := res.Get("email"); value.Exists() && !data.Email.IsNull() {
 		data.Email = types.StringValue(value.String())
 	} else {
 		data.Email = types.StringNull()
 	}
-	if value := res.Get("name"); value.Exists() {
+	if value := res.Get("name"); value.Exists() && !data.Name.IsNull() {
 		data.Name = types.StringValue(value.String())
 	} else {
 		data.Name = types.StringNull()
 	}
-	if value := res.Get("orgAccess"); value.Exists() {
+	if value := res.Get("orgAccess"); value.Exists() && !data.OrgAccess.IsNull() {
 		data.OrgAccess = types.StringValue(value.String())
 	} else {
 		data.OrgAccess = types.StringNull()
@@ -229,12 +229,12 @@ func (data *Admin) fromBodyPartial(ctx context.Context, res gjson.Result) {
 
 			continue
 		}
-		if value := res.Get("access"); value.Exists() {
+		if value := res.Get("access"); value.Exists() && !data.Access.IsNull() {
 			data.Access = types.StringValue(value.String())
 		} else {
 			data.Access = types.StringNull()
 		}
-		if value := res.Get("id"); value.Exists() {
+		if value := res.Get("id"); value.Exists() && !data.Id.IsNull() {
 			data.Id = types.StringValue(value.String())
 		} else {
 			data.Id = types.StringNull()
@@ -277,12 +277,12 @@ func (data *Admin) fromBodyPartial(ctx context.Context, res gjson.Result) {
 
 			continue
 		}
-		if value := res.Get("access"); value.Exists() {
+		if value := res.Get("access"); value.Exists() && !data.Access.IsNull() {
 			data.Access = types.StringValue(value.String())
 		} else {
 			data.Access = types.StringNull()
 		}
-		if value := res.Get("tag"); value.Exists() {
+		if value := res.Get("tag"); value.Exists() && !data.Tag.IsNull() {
 			data.Tag = types.StringValue(value.String())
 		} else {
 			data.Tag = types.StringNull()

diff --git a/internal/provider/model_meraki_network.go b/internal/provider/model_meraki_network.go
@@ -123,17 +123,17 @@ func (data *Network) fromBody(ctx context.Context, res gjson.Result) {
 // easily change across versions of the backend API.) For List/Set/Map attributes, the func only updates the
 // "managed" elements, instead of all elements.
 func (data *Network) fromBodyPartial(ctx context.Context, res gjson.Result) {
-	if value := res.Get("name"); value.Exists() {
+	if value := res.Get("name"); value.Exists() && !data.Name.IsNull() {
 		data.Name = types.StringValue(value.String())
 	} else {
 		data.Name = types.StringNull()
 	}
-	if value := res.Get("notes"); value.Exists() {
+	if value := res.Get("notes"); value.Exists() && !data.Notes.IsNull() {
 		data.Notes = types.StringValue(value.String())
 	} else {
 		data.Notes = types.StringNull()
 	}
-	if value := res.Get("timeZone"); value.Exists() {
+	if value := res.Get("timeZone"); value.Exists() && !data.TimeZone.IsNull() {
 		data.TimeZone = types.StringValue(value.String())
 	} else {
 		data.TimeZone = types.StringNull()

diff --git a/internal/provider/model_meraki_organization.go b/internal/provider/model_meraki_organization.go
@@ -120,7 +120,7 @@ func (data *Organization) fromBody(ctx context.Context, res gjson.Result) {
 // easily change across versions of the backend API.) For List/Set/Map attributes, the func only updates the
 // "managed" elements, instead of all elements.
 func (data *Organization) fromBodyPartial(ctx context.Context, res gjson.Result) {
-	if value := res.Get("name"); value.Exists() {
+	if value := res.Get("name"); value.Exists() && !data.Name.IsNull() {
 		data.Name = types.StringValue(value.String())
 	} else {
 		data.Name = types.StringNull()
@@ -161,12 +161,12 @@ func (data *Organization) fromBodyPartial(ctx context.Context, res gjson.Result)
 
 			continue
 		}
-		if value := res.Get("name"); value.Exists() {
+		if value := res.Get("name"); value.Exists() && !data.Name.IsNull() {
 			data.Name = types.StringValue(value.String())
 		} else {
 			data.Name = types.StringNull()
 		}
-		if value := res.Get("value"); value.Exists() {
+		if value := res.Get("value"); value.Exists() && !data.Value.IsNull() {
 			data.Value = types.StringValue(value.String())
 		} else {
 			data.Value = types.StringNull()