writeonly fix, tests pass

Author: Marcin Parafiniuk

gen/definitions/network_group_policy.yaml

@@ -297,6 +297,7 @@ attributes:
     type: String
     description: '    A string, indicating the priority level for packets bound to your rule.     Can be ''low'', ''normal'' or ''high''. '
     example: normal
+    write_only: true
 - model_name: l3FirewallRules
   type: List
   data_path:

gen/templates/model.go

@@ -319,8 +319,8 @@ func (data *{{camelCase .Name}}) fromBodyPartial(ctx context.Context, res gjson.
 		res := parentRes.Get(fmt.Sprintf("{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}.%d", i))
 	{{- else }}
 	for i := 0; i < len(data.{{toGoName .TfName}}); i++ {
-		keys := [...]string{ {{$noId := not (hasId .Attributes)}}{{range .Attributes}}{{if or .Id (and $noId (not .Value))}}{{if or (eq .Type "Int64") (eq .Type "Bool") (eq .Type "String")}}"{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}", {{end}}{{end}}{{end}} }
-		keyValues := [...]string{ {{$noId := not (hasId .Attributes)}}{{range .Attributes}}{{if or .Id (and $noId (not .Value))}}{{if eq .Type "Int64"}}strconv.FormatInt(data.{{$list}}[i].{{toGoName .TfName}}.ValueInt64(), 10), {{else if eq .Type "Bool"}}strconv.FormatBool(data.{{$list}}[i].{{toGoName .TfName}}.ValueBool()), {{else if eq .Type "String"}}data.{{$list}}[i].{{toGoName .TfName}}.Value{{.Type}}(), {{end}}{{end}}{{end}} }
+		keys := [...]string{ {{$noId := not (hasId .Attributes)}}{{range .Attributes}}{{if or .Id (and $noId (not .Value) (not .WriteOnly))}}{{if or (eq .Type "Int64") (eq .Type "Bool") (eq .Type "String")}}"{{range .DataPath}}{{.}}.{{end}}{{.ModelName}}", {{end}}{{end}}{{end}} }
+		keyValues := [...]string{ {{$noId := not (hasId .Attributes)}}{{range .Attributes}}{{if or .Id (and $noId (not .Value) (not .WriteOnly))}}{{if eq .Type "Int64"}}strconv.FormatInt(data.{{$list}}[i].{{toGoName .TfName}}.ValueInt64(), 10), {{else if eq .Type "Bool"}}strconv.FormatBool(data.{{$list}}[i].{{toGoName .TfName}}.ValueBool()), {{else if eq .Type "String"}}data.{{$list}}[i].{{toGoName .TfName}}.Value{{.Type}}(), {{end}}{{end}}{{end}} }
 
 		parent := &data
 		data := (*parent).{{toGoName .TfName}}[i]

internal/provider/data_source_meraki_network_group_policy_test.go

@@ -74,7 +74,6 @@ func TestAccDataSourceMerakiNetworkGroupPolicy(t *testing.T) {
 	checks = append(checks, resource.TestCheckResourceAttr("data.meraki_network_group_policy.test", "firewall_and_traffic_shaping_traffic_shaping_rules.0.per_client_bandwidth_limits_bandwidth_limits_limit_down", "1000000"))
 	checks = append(checks, resource.TestCheckResourceAttr("data.meraki_network_group_policy.test", "firewall_and_traffic_shaping_traffic_shaping_rules.0.dscp_tag_value", "0"))
 	checks = append(checks, resource.TestCheckResourceAttr("data.meraki_network_group_policy.test", "firewall_and_traffic_shaping_traffic_shaping_rules.0.pcp_tag_value", "0"))
-	checks = append(checks, resource.TestCheckResourceAttr("data.meraki_network_group_policy.test", "firewall_and_traffic_shaping_traffic_shaping_rules.0.priority", "normal"))
 	checks = append(checks, resource.TestCheckResourceAttr("data.meraki_network_group_policy.test", "firewall_and_traffic_shaping_l3_firewall_rules.0.protocol", "tcp"))
 	checks = append(checks, resource.TestCheckResourceAttr("data.meraki_network_group_policy.test", "firewall_and_traffic_shaping_l3_firewall_rules.0.dest_port", "443"))
 	checks = append(checks, resource.TestCheckResourceAttr("data.meraki_network_group_policy.test", "firewall_and_traffic_shaping_l3_firewall_rules.0.dest_cidr", "192.168.1.0/24"))

internal/provider/model_meraki_network_group_policy.go

@@ -605,11 +605,6 @@ func (data *NetworkGroupPolicy) fromBody(ctx context.Context, res gjson.Result)
 			} else {
 				data.PcpTagValue = types.Int64Null()
 			}
-			if value := res.Get("priority"); value.Exists() {
-				data.Priority = types.StringValue(value.String())
-			} else {
-				data.Priority = types.StringNull()
-			}
 			(*parent).FirewallAndTrafficShapingTrafficShapingRules = append((*parent).FirewallAndTrafficShapingTrafficShapingRules, data)
 			return true
 		})
@@ -951,8 +946,8 @@ func (data *NetworkGroupPolicy) fromBodyPartial(ctx context.Context, res gjson.R
 		data.FirewallAndTrafficShapingSettings = types.StringNull()
 	}
 	for i := 0; i < len(data.FirewallAndTrafficShapingTrafficShapingRules); i++ {
-		keys := [...]string{"perClientBandwidthLimits.settings", "perClientBandwidthLimits.bandwidthLimits.limitUp", "perClientBandwidthLimits.bandwidthLimits.limitDown", "dscpTagValue", "pcpTagValue", "priority"}
-		keyValues := [...]string{data.FirewallAndTrafficShapingTrafficShapingRules[i].PerClientBandwidthLimitsSettings.ValueString(), strconv.FormatInt(data.FirewallAndTrafficShapingTrafficShapingRules[i].PerClientBandwidthLimitsBandwidthLimitsLimitUp.ValueInt64(), 10), strconv.FormatInt(data.FirewallAndTrafficShapingTrafficShapingRules[i].PerClientBandwidthLimitsBandwidthLimitsLimitDown.ValueInt64(), 10), strconv.FormatInt(data.FirewallAndTrafficShapingTrafficShapingRules[i].DscpTagValue.ValueInt64(), 10), strconv.FormatInt(data.FirewallAndTrafficShapingTrafficShapingRules[i].PcpTagValue.ValueInt64(), 10), data.FirewallAndTrafficShapingTrafficShapingRules[i].Priority.ValueString()}
+		keys := [...]string{"perClientBandwidthLimits.settings", "perClientBandwidthLimits.bandwidthLimits.limitUp", "perClientBandwidthLimits.bandwidthLimits.limitDown", "dscpTagValue", "pcpTagValue"}
+		keyValues := [...]string{data.FirewallAndTrafficShapingTrafficShapingRules[i].PerClientBandwidthLimitsSettings.ValueString(), strconv.FormatInt(data.FirewallAndTrafficShapingTrafficShapingRules[i].PerClientBandwidthLimitsBandwidthLimitsLimitUp.ValueInt64(), 10), strconv.FormatInt(data.FirewallAndTrafficShapingTrafficShapingRules[i].PerClientBandwidthLimitsBandwidthLimitsLimitDown.ValueInt64(), 10), strconv.FormatInt(data.FirewallAndTrafficShapingTrafficShapingRules[i].DscpTagValue.ValueInt64(), 10), strconv.FormatInt(data.FirewallAndTrafficShapingTrafficShapingRules[i].PcpTagValue.ValueInt64(), 10)}
 
 		parent := &data
 		data := (*parent).FirewallAndTrafficShapingTrafficShapingRules[i]
@@ -1059,11 +1054,6 @@ func (data *NetworkGroupPolicy) fromBodyPartial(ctx context.Context, res gjson.R
 		} else {
 			data.PcpTagValue = types.Int64Null()
 		}
-		if value := res.Get("priority"); value.Exists() && !data.Priority.IsNull() {
-			data.Priority = types.StringValue(value.String())
-		} else {
-			data.Priority = types.StringNull()
-		}
 		(*parent).FirewallAndTrafficShapingTrafficShapingRules[i] = data
 	}
 	for i := 0; i < len(data.FirewallAndTrafficShapingL3FirewallRules); i++ {

internal/provider/resource_meraki_network_group_policy_test.go

@@ -75,7 +75,6 @@ func TestAccMerakiNetworkGroupPolicy(t *testing.T) {
 	checks = append(checks, resource.TestCheckResourceAttr("meraki_network_group_policy.test", "firewall_and_traffic_shaping_traffic_shaping_rules.0.per_client_bandwidth_limits_bandwidth_limits_limit_down", "1000000"))
 	checks = append(checks, resource.TestCheckResourceAttr("meraki_network_group_policy.test", "firewall_and_traffic_shaping_traffic_shaping_rules.0.dscp_tag_value", "0"))
 	checks = append(checks, resource.TestCheckResourceAttr("meraki_network_group_policy.test", "firewall_and_traffic_shaping_traffic_shaping_rules.0.pcp_tag_value", "0"))
-	checks = append(checks, resource.TestCheckResourceAttr("meraki_network_group_policy.test", "firewall_and_traffic_shaping_traffic_shaping_rules.0.priority", "normal"))
 	checks = append(checks, resource.TestCheckResourceAttr("meraki_network_group_policy.test", "firewall_and_traffic_shaping_l3_firewall_rules.0.protocol", "tcp"))
 	checks = append(checks, resource.TestCheckResourceAttr("meraki_network_group_policy.test", "firewall_and_traffic_shaping_l3_firewall_rules.0.dest_port", "443"))
 	checks = append(checks, resource.TestCheckResourceAttr("meraki_network_group_policy.test", "firewall_and_traffic_shaping_l3_firewall_rules.0.dest_cidr", "192.168.1.0/24"))