Merge pull request #208 from cisco-open/develop

## 1.0.2-beta (February 13, 2025)

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.2-beta (February 13, 2025)
+BUGFIXES:
+* Update import syntax in Meraki resource documentation and examples to reflect changes in required parameters. #201
+* meraki_networks_appliance_vpn_site_to_site_vpn, impossible to manage priority order. Changing to list to preserve order. #203
+* Resource 'meraki_networks' possibly missing required argument in documentation. Documentation updated. #202
+* Resource 'meraki_networks' map networkIds #181.
+
 ## 1.0.1-beta (January 20, 2025)
 FEATURES:
 * **New Data Source** `data_source_meraki_networks_wireless_air_marshal_rules.go`

Makefile

@@ -3,7 +3,7 @@ HOSTNAME=hashicorp.com
 NAMESPACE=edu
 NAME=meraki
 BINARY=terraform-provider-${NAME}
-VERSION=1.0.1-beta
+VERSION=1.0.2-beta
 OS_ARCH=darwin_arm64
 # OS_ARCH=darwin_amd64
 GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)

README.md

@@ -30,7 +30,7 @@ terraform {
   required_providers {
     meraki = {
       source = "cisco-open/meraki"
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
     }
   }
 }
@@ -68,7 +68,7 @@ terraform {
   required_providers {
     meraki = {
       source = "hashicorp.com/edu/meraki"
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
     }
   }
 }
@@ -120,7 +120,7 @@ The following table shows the supported versions.
 |-----------------------|-------------------------------------|------------------------------|
 | 1.33.0                | 0.1.0-alpha                         | 2.0.9                        |
 | 1.44.1                | 0.2.0-alpha                         | 3.0.0                        |
-| 1.53.0                | 1.0.1-beta                          | 4.0.0                        |
+| 1.53.0                | 1.0.2-beta                          | 4.0.0                        |
 
 If your SDK, Terraform provider is older please consider updating it first.
 

docs/resources/devices.md

@@ -75,5 +75,5 @@ Read-Only:
 Import is supported using the following syntax:
 
 ```shell
-terraform import meraki_devices.example "organization_id,serial"
+terraform import meraki_devices.example "serial"
 ```

docs/resources/devices_live_tools_cable.md

@@ -124,5 +124,5 @@ Read-Only:
 Import is supported using the following syntax:
 
 ```shell
-terraform import meraki_devices_live_tools_cable.example "id,serial"
+terraform import meraki_devices_live_tools_cable.example "serial,id"
 ```

docs/resources/devices_switch_ports.md

@@ -174,5 +174,5 @@ Read-Only:
 Import is supported using the following syntax:
 
 ```shell
-terraform import meraki_devices_switch_ports.example "port_id,serial"
+terraform import meraki_devices_switch_ports.example "serial,port_id"
 ```

docs/resources/devices_switch_routing_interfaces.md

@@ -103,5 +103,5 @@ Optional:
 Import is supported using the following syntax:
 
 ```shell
-terraform import meraki_devices_switch_routing_interfaces.example "interface_id,serial"
+terraform import meraki_devices_switch_routing_interfaces.example "serial,interface_id"
 ```

docs/resources/devices_switch_routing_interfaces_dhcp.md

@@ -110,5 +110,5 @@ Optional:
 Import is supported using the following syntax:
 
 ```shell
-terraform import meraki_devices_switch_routing_interfaces_dhcp.example "interface_id,serial"
+terraform import meraki_devices_switch_routing_interfaces_dhcp.example "serial,interface_id"
 ```

docs/resources/networks.md

@@ -34,14 +34,14 @@ output "meraki_networks_example" {
 ### Required
 
 - `organization_id` (String) Organization ID
+- `product_types` (Set of String) List of the product types that the network supports
 
 ### Optional
 
 - `enrollment_string` (String) Enrollment string for the network
 - `name` (String) Network name
 - `network_id` (String) networkId path parameter. Network ID
 - `notes` (String) Notes for the network
-- `product_types` (Set of String) List of the product types that the network supports
 - `tags` (Set of String) Network tags
 - `time_zone` (String) Timezone of the network
 

docs/resources/organizations_adaptive_policy_acls.md

@@ -71,5 +71,5 @@ Optional:
 Import is supported using the following syntax:
 
 ```shell
-terraform import meraki_organizations_adaptive_policy_acls.example "acl_id,organization_id"
+terraform import meraki_organizations_adaptive_policy_acls.example "organization_id,acl_id"
 ```

docs/resources/organizations_adaptive_policy_groups.md

@@ -66,5 +66,5 @@ Optional:
 Import is supported using the following syntax:
 
 ```shell
-terraform import meraki_organizations_adaptive_policy_groups.example "id,organization_id"
+terraform import meraki_organizations_adaptive_policy_groups.example "organization_id,id"
 ```

docs/resources/organizations_adaptive_policy_policies.md

@@ -96,5 +96,5 @@ Optional:
 Import is supported using the following syntax:
 
 ```shell
-terraform import meraki_organizations_adaptive_policy_policies.example "id,organization_id"
+terraform import meraki_organizations_adaptive_policy_policies.example "organization_id,id"
 ```

docs/resources/organizations_licenses.md

@@ -71,5 +71,5 @@ Read-Only:
 Import is supported using the following syntax:
 
 ```shell
-terraform import meraki_organizations_licenses.example "license_id,organization_id"
+terraform import meraki_organizations_licenses.example "organization_id,license_id"
 ```

examples/resources/meraki_devices/import.sh

@@ -1 +1 @@
-terraform import meraki_devices.example "organization_id,serial"
+terraform import meraki_devices.example "serial"

examples/resources/meraki_devices_live_tools_cable/import.sh

@@ -1 +1 @@
-terraform import meraki_devices_live_tools_cable.example "id,serial"
+terraform import meraki_devices_live_tools_cable.example "serial,id"

examples/resources/meraki_devices_live_tools_cable_test/import.sh

@@ -1 +1 @@
-terraform import meraki_devices_live_tools_cable_test.example "id,serial"
+terraform import meraki_devices_live_tools_cable_test.example "serial,id"

examples/resources/meraki_devices_switch_ports/import.sh

@@ -1 +1 @@
-terraform import meraki_devices_switch_ports.example "port_id,serial"
+terraform import meraki_devices_switch_ports.example "serial,port_id"

examples/resources/meraki_devices_switch_routing_interfaces/import.sh

@@ -1 +1 @@
-terraform import meraki_devices_switch_routing_interfaces.example "interface_id,serial"
+terraform import meraki_devices_switch_routing_interfaces.example "serial,interface_id"

examples/resources/meraki_devices_switch_routing_interfaces_dhcp/import.sh

@@ -1 +1 @@
-terraform import meraki_devices_switch_routing_interfaces_dhcp.example "interface_id,serial"
+terraform import meraki_devices_switch_routing_interfaces_dhcp.example "serial,interface_id"

examples/resources/meraki_organizations_adaptive_policy_acls/import.sh

@@ -1 +1 @@
-terraform import meraki_organizations_adaptive_policy_acls.example "acl_id,organization_id"
+terraform import meraki_organizations_adaptive_policy_acls.example "organization_id,acl_id"

examples/resources/meraki_organizations_adaptive_policy_groups/import.sh

@@ -1 +1 @@
-terraform import meraki_organizations_adaptive_policy_groups.example "id,organization_id"
+terraform import meraki_organizations_adaptive_policy_groups.example "organization_id,id"

examples/resources/meraki_organizations_adaptive_policy_policies/import.sh

@@ -1 +1 @@
-terraform import meraki_organizations_adaptive_policy_policies.example "id,organization_id"
+terraform import meraki_organizations_adaptive_policy_policies.example "organization_id,id"

examples/resources/meraki_organizations_licenses/import.sh

@@ -1 +1 @@
-terraform import meraki_organizations_licenses.example "license_id,organization_id"
+terraform import meraki_organizations_licenses.example "organization_id,license_id"

examples/samples/data_sources/meraki_administered_identities_me copy/data_source.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/data_sources/meraki_administered_identities_me/data_source.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/data_sources/meraki_devices/data_source.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/data_sources/meraki_devices_management_interface/data-source.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/data_sources/meraki_networks/data_source.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/data_sources/meraki_networks_wireless_rf_profiles/main.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/data_sources/meraki_organizations/data_source.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/data_sources/meraki_organizations_appliance_vpn_third_party_vpnpeers/data-source.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
     }
   }

examples/samples/data_sources/meraki_organizations_policy_objects_groups/data-source.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
     }
   }

examples/samples/resources/adaptative_policy_groups/resource.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/resources/devices/resource.tf

@@ -9,7 +9,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/resources/example/main.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/resources/gnerate_snapshot/resource.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/resources/meraki_devices_appliance_uplinks_settings/main.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/resources/meraki_devices_management_interface/resource.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
     }
   }

examples/samples/resources/meraki_devices_switch_routing_interfaces_dhcp/resource.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/resources/meraki_devices_switch_routing_static_routes/resource.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/resources/meraki_networks/resource.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }
@@ -14,7 +14,7 @@ provider "meraki" {
 resource "meraki_networks" "example" {
   name            = "My Test Network"
   organization_id = "828099381482762270"
-  notes           = "This is a test network created by my team"
+  notes           = "This is a test network created by my team by terraform"
   product_types   = ["appliance", "switch", "wireless", "cellularGateway"]
   time_zone       = "America/Los_Angeles"
 }

examples/samples/resources/meraki_networks_alerts_settings/resource.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/resources/meraki_networks_alerts_settings_2/resource.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/resources/meraki_networks_alerts_settings_3/resource.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/resources/meraki_networks_appliance_content_filtering/resource.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }

examples/samples/resources/meraki_networks_appliance_firewall_inbound_firewall_rules/resource.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.1-beta"
+      version = "1.0.2-beta"
       source  = "hashicorp.com/edu/meraki"
       # "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
     }