rebase fixes

Marcin Parafiniuk · Marcin Parafiniuk · commit aad5fd413595 · 2024-09-13T12:01:45.000+02:00
diff --git a/gen/generator.go b/gen/generator.go
@@ -33,7 +33,7 @@ import (
 
 	"gopkg.in/yaml.v3"
 
-	"github.com/netascode/terraform-provider-meraki/gen"
+	"github.com/CiscoDevNet/terraform-provider-meraki/gen"
 )
 
 const (
diff --git a/gen/yamlconfig.go b/gen/yamlconfig.go
@@ -26,6 +26,9 @@ type YamlConfig struct {
 	TestTags            []string              `yaml:"test_tags,omitempty"`
 	TestPrerequisites   string                `yaml:"test_prerequisites,omitempty"`
 	IdName              string                `yaml:"id_name,omitempty"`
+	NoDataSource        bool                  `yaml:"no_data_source"`
+	NoResource          bool                  `yaml:"no_resource"`
+	NoImport            bool                  `yaml:"no_import"`
 }
 
 type YamlConfigAttribute struct {
diff --git a/go.mod b/go.mod
@@ -20,6 +20,8 @@ require (
 	gopkg.in/yaml.v3 v3.0.1
 )
 
+replace github.com/netascode/go-meraki v0.0.0-20240901102824-a67592c39438 => /Users/maparafi/go-meraki
+
 require (
 	github.com/BurntSushi/toml v1.2.1 // indirect
 	github.com/Kunde21/markdownfmt/v3 v3.1.0 // indirect
diff --git a/internal/provider/model_meraki_admin.go b/internal/provider/model_meraki_admin.go
@@ -68,6 +68,9 @@ func (data Admin) getPath() string {
 
 func (data Admin) toBody(ctx context.Context, state Admin) string {
 	body := ""
+	if data.Id.ValueString() != "" {
+		body, _ = sjson.Set(body, "id", data.Id.ValueString())
+	}
 	if !data.Email.IsNull() {
 		body, _ = sjson.Set(body, "email", data.Email.ValueString())
 	}
diff --git a/internal/provider/model_meraki_network.go b/internal/provider/model_meraki_network.go
@@ -57,6 +57,9 @@ func (data Network) getPath() string {
 
 func (data Network) toBody(ctx context.Context, state Network) string {
 	body := ""
+	if data.Id.ValueString() != "" {
+		body, _ = sjson.Set(body, "id", data.Id.ValueString())
+	}
 	if !data.Name.IsNull() {
 		body, _ = sjson.Set(body, "name", data.Name.ValueString())
 	}
diff --git a/internal/provider/model_meraki_network_device_claim.go b/internal/provider/model_meraki_network_device_claim.go
@@ -61,6 +61,9 @@ func (data NetworkDeviceClaim) getDevicesPath() string {
 
 func (data NetworkDeviceClaim) toBody(ctx context.Context, state NetworkDeviceClaim) string {
 	body := ""
+	if data.Id.ValueString() != "" {
+		body, _ = sjson.Set(body, "id", data.Id.ValueString())
+	}
 	if !data.Serials.IsNull() {
 		var values []string
 		data.Serials.ElementsAs(ctx, &values, false)
diff --git a/internal/provider/model_meraki_network_group_policy.go b/internal/provider/model_meraki_network_group_policy.go
@@ -25,9 +25,9 @@ import (
 	"slices"
 	"strconv"
 
+	"github.com/CiscoDevNet/terraform-provider-meraki/internal/provider/helpers"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	"github.com/netascode/terraform-provider-meraki/internal/provider/helpers"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
diff --git a/internal/provider/model_meraki_network_snmp.go b/internal/provider/model_meraki_network_snmp.go
@@ -61,6 +61,9 @@ func (data NetworkSNMP) getPath() string {
 
 func (data NetworkSNMP) toBody(ctx context.Context, state NetworkSNMP) string {
 	body := ""
+	if data.Id.ValueString() != "" {
+		body, _ = sjson.Set(body, "id", data.Id.ValueString())
+	}
 	if !data.Access.IsNull() {
 		body, _ = sjson.Set(body, "access", data.Access.ValueString())
 	}
diff --git a/internal/provider/model_meraki_organization.go b/internal/provider/model_meraki_organization.go
@@ -58,6 +58,9 @@ func (data Organization) getPath() string {
 
 func (data Organization) toBody(ctx context.Context, state Organization) string {
 	body := ""
+	if data.Id.ValueString() != "" {
+		body, _ = sjson.Set(body, "id", data.Id.ValueString())
+	}
 	if !data.Name.IsNull() {
 		body, _ = sjson.Set(body, "name", data.Name.ValueString())
 	}
diff --git a/internal/provider/model_meraki_organization_inventory_claim.go b/internal/provider/model_meraki_organization_inventory_claim.go
@@ -61,6 +61,9 @@ func (data OrganizationInventoryClaim) getDevicesPath() string {
 
 func (data OrganizationInventoryClaim) toBody(ctx context.Context, state OrganizationInventoryClaim) string {
 	body := ""
+	if data.Id.ValueString() != "" {
+		body, _ = sjson.Set(body, "id", data.Id.ValueString())
+	}
 	if !data.Serials.IsNull() {
 		var values []string
 		data.Serials.ElementsAs(ctx, &values, false)
diff --git a/internal/provider/resource_meraki_network_group_policy.go b/internal/provider/resource_meraki_network_group_policy.go
@@ -24,6 +24,7 @@ import (
 	"net/url"
 	"strings"
 
+	"github.com/CiscoDevNet/terraform-provider-meraki/internal/provider/helpers"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
@@ -32,7 +33,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/netascode/go-meraki"
-	"github.com/netascode/terraform-provider-meraki/internal/provider/helpers"
 )
 
 // End of section. //template:end imports
@@ -494,7 +494,6 @@ func (r *NetworkGroupPolicyResource) Delete(ctx context.Context, req resource.De
 // End of section. //template:end delete
 
 // Section below is generated&owned by "gen/generator.go". //template:begin import
-
 func (r *NetworkGroupPolicyResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
 	idParts := strings.Split(req.ID, ",")
 
diff --git a/internal/provider/resource_meraki_network_settings.go b/internal/provider/resource_meraki_network_settings.go
@@ -23,14 +23,14 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/CiscoDevNet/terraform-provider-meraki/internal/provider/helpers"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/netascode/go-meraki"
-	"github.com/netascode/terraform-provider-meraki/internal/provider/helpers"
 )
 
 // End of section. //template:end imports
@@ -243,7 +243,6 @@ func (r *NetworkSettingsResource) Delete(ctx context.Context, req resource.Delet
 // End of section. //template:end delete
 
 // Section below is generated&owned by "gen/generator.go". //template:begin import
-
 func (r *NetworkSettingsResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
 	idParts := strings.Split(req.ID, ",")
 
diff --git a/openapiconverter/main.go b/openapiconverter/main.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/netascode/terraform-provider-meraki/gen"
+	"github.com/CiscoDevNet/terraform-provider-meraki/gen"
 	"github.com/tidwall/gjson"
 	"gopkg.in/yaml.v2"
 )

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ import (`
`33`	`33`
`34`	`34`	`"gopkg.in/yaml.v3"`
`35`	`35`
`36`		`- "github.com/netascode/terraform-provider-meraki/gen"`
	`36`	`+ "github.com/CiscoDevNet/terraform-provider-meraki/gen"`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ type YamlConfig struct {`
`26`	`26`	TestTags []string `yaml:"test_tags,omitempty"`
`27`	`27`	TestPrerequisites string `yaml:"test_prerequisites,omitempty"`
`28`	`28`	IdName string `yaml:"id_name,omitempty"`
	`29`	+ NoDataSource bool `yaml:"no_data_source"`
	`30`	+ NoResource bool `yaml:"no_resource"`
	`31`	+ NoImport bool `yaml:"no_import"`
`29`	`32`	`}`
`30`	`33`
`31`	`34`	`type YamlConfigAttribute struct {`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ require (`
`20`	`20`	`gopkg.in/yaml.v3 v3.0.1`
`21`	`21`	`)`
`22`	`22`
	`23`	`+replace github.com/netascode/go-meraki v0.0.0-20240901102824-a67592c39438 => /Users/maparafi/go-meraki`
	`24`	`+`
`23`	`25`	`require (`
`24`	`26`	`github.com/BurntSushi/toml v1.2.1 // indirect`
`25`	`27`	`github.com/Kunde21/markdownfmt/v3 v3.1.0 // indirect`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,9 @@ func (data Admin) getPath() string {`
`68`	`68`
`69`	`69`	`func (data Admin) toBody(ctx context.Context, state Admin) string {`
`70`	`70`	`body := ""`
	`71`	`+ if data.Id.ValueString() != "" {`
	`72`	`+ body, _ = sjson.Set(body, "id", data.Id.ValueString())`
	`73`	`+ }`
`71`	`74`	`if !data.Email.IsNull() {`
`72`	`75`	`body, _ = sjson.Set(body, "email", data.Email.ValueString())`
`73`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,9 @@ func (data Network) getPath() string {`
`57`	`57`
`58`	`58`	`func (data Network) toBody(ctx context.Context, state Network) string {`
`59`	`59`	`body := ""`
	`60`	`+ if data.Id.ValueString() != "" {`
	`61`	`+ body, _ = sjson.Set(body, "id", data.Id.ValueString())`
	`62`	`+ }`
`60`	`63`	`if !data.Name.IsNull() {`
`61`	`64`	`body, _ = sjson.Set(body, "name", data.Name.ValueString())`
`62`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,9 @@ func (data NetworkSNMP) getPath() string {`
`61`	`61`
`62`	`62`	`func (data NetworkSNMP) toBody(ctx context.Context, state NetworkSNMP) string {`
`63`	`63`	`body := ""`
	`64`	`+ if data.Id.ValueString() != "" {`
	`65`	`+ body, _ = sjson.Set(body, "id", data.Id.ValueString())`
	`66`	`+ }`
`64`	`67`	`if !data.Access.IsNull() {`
`65`	`68`	`body, _ = sjson.Set(body, "access", data.Access.ValueString())`
`66`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,9 @@ func (data Organization) getPath() string {`
`58`	`58`
`59`	`59`	`func (data Organization) toBody(ctx context.Context, state Organization) string {`
`60`	`60`	`body := ""`
	`61`	`+ if data.Id.ValueString() != "" {`
	`62`	`+ body, _ = sjson.Set(body, "id", data.Id.ValueString())`
	`63`	`+ }`
`61`	`64`	`if !data.Name.IsNull() {`
`62`	`65`	`body, _ = sjson.Set(body, "name", data.Name.ValueString())`
`63`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"regexp"`
`8`	`8`	`"strings"`
`9`	`9`
`10`		`- "github.com/netascode/terraform-provider-meraki/gen"`
	`10`	`+ "github.com/CiscoDevNet/terraform-provider-meraki/gen"`
`11`	`11`	`"github.com/tidwall/gjson"`
`12`	`12`	`"gopkg.in/yaml.v2"`
`13`	`13`	`)`