Merge pull request #205 from cisco-open/develop

Develop v1.0.1-beta
cisco-open · Feb 7, 2025 · 55dbe8e · 55dbe8e
2 parents aaa70e1 + d5eeadf
commit 55dbe8e
Show file tree

Hide file tree

Showing 99 changed files with 415 additions and 159 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.1-beta (January 20, 2025)
+FEATURES:
+* **New Data Source** `data_source_meraki_networks_wireless_air_marshal_rules.go`
+* Added support for `-1` value in the `per_page` parameter of the data source. When set to `-1`, the response will include all available data without pagination.
 
 ## 1.0.0-beta (January 20, 2025)
 BREAKING CHANGES:

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

diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ terraform {
   required_providers {
     meraki = {
       source = "cisco-open/meraki"
-      version = "1.0.0-beta"
+      version = "1.0.1-beta"
     }
   }
 }
@@ -68,7 +68,7 @@ terraform {
   required_providers {
     meraki = {
       source = "hashicorp.com/edu/meraki"
-      version = "1.0.0-beta"
+      version = "1.0.1-beta"
     }
   }
 }
@@ -120,10 +120,20 @@ 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.0-beta                          | 4.0.0                        |
+| 1.53.0                | 1.0.1-beta                          | 4.0.0                        |
 
 If your SDK, Terraform provider is older please consider updating it first.
 
+## Fetch All Items of an Endpoint with Pagination
+
+- **Support for fetching all items with `per_page=-1`**  
+  A new feature has been introduced to the API endpoints, enabling clients to fetch all available items in a single request by setting the `per_page` parameter to `-1`. This enhancement allows you to retrieve the full dataset without needing to make multiple paginated requests.
+
+### Behavior
+
+- When `per_page` is set to `-1`, the server will return **all available items** for that endpoint, bypassing the pagination logic.
+- If a positive integer is passed for `per_page`, the endpoint will continue using traditional pagination and return only the number of items specified by `per_page`.
+
 # Contributing
 
 Ongoing development efforts and contributions to this provider are tracked as issues in this repository.

diff --git a/examples/samples/data_sources/meraki_administered_identities_me copy/data_source.tf b/examples/samples/data_sources/meraki_administered_identities_me copy/data_source.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/data_sources/meraki_administered_identities_me/data_source.tf b/examples/samples/data_sources/meraki_administered_identities_me/data_source.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/data_sources/meraki_devices/data_source.tf b/examples/samples/data_sources/meraki_devices/data_source.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }
@@ -15,7 +15,8 @@ data "meraki_devices" "example" {
   #   organization_id = "828099381482762766"
   organization_id = "828099381482762270"
   # serial = "QBSB-AX45-LY9A"
-  network_ids = []
+  # network_ids = []
+  per_page = -1
   #   /api/v1/organizations/828099381482762270/devices?
   #   networkIds=%221HOLA1%22&networkIds=%224HOLA4%22
 }

diff --git a/examples/samples/data_sources/meraki_devices_management_interface/data-source.tf b/examples/samples/data_sources/meraki_devices_management_interface/data-source.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/data_sources/meraki_networks/data_source.tf b/examples/samples/data_sources/meraki_networks/data_source.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/data_sources/meraki_networks_wireless_rf_profiles/main.tf b/examples/samples/data_sources/meraki_networks_wireless_rf_profiles/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/data_sources/meraki_organizations/data_source.tf b/examples/samples/data_sources/meraki_organizations/data_source.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/...mples/data_sources/meraki_organizations_appliance_vpn_third_party_vpnpeers/data-source.tf b/...mples/data_sources/meraki_organizations_appliance_vpn_third_party_vpnpeers/data-source.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-beta"
       source  = "hashicorp.com/edu/meraki"
     }
   }

diff --git a/examples/samples/data_sources/meraki_organizations_policy_objects_groups/data-source.tf b/examples/samples/data_sources/meraki_organizations_policy_objects_groups/data-source.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-beta"
       source  = "hashicorp.com/edu/meraki"
     }
   }

diff --git a/examples/samples/resources/adaptative_policy_groups/resource.tf b/examples/samples/resources/adaptative_policy_groups/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/devices/resource.tf b/examples/samples/resources/devices/resource.tf
@@ -9,7 +9,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/example/main.tf b/examples/samples/resources/example/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/gnerate_snapshot/resource.tf b/examples/samples/resources/gnerate_snapshot/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/meraki_devices_appliance_uplinks_settings/main.tf b/examples/samples/resources/meraki_devices_appliance_uplinks_settings/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/meraki_devices_management_interface/resource.tf b/examples/samples/resources/meraki_devices_management_interface/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-beta"
       source  = "hashicorp.com/edu/meraki"
     }
   }

diff --git a/examples/samples/resources/meraki_devices_switch_routing_interfaces_dhcp/resource.tf b/examples/samples/resources/meraki_devices_switch_routing_interfaces_dhcp/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/meraki_devices_switch_routing_static_routes/resource.tf b/examples/samples/resources/meraki_devices_switch_routing_static_routes/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/meraki_networks/resource.tf b/examples/samples/resources/meraki_networks/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/meraki_networks_alerts_settings/resource.tf b/examples/samples/resources/meraki_networks_alerts_settings/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/meraki_networks_alerts_settings_2/resource.tf b/examples/samples/resources/meraki_networks_alerts_settings_2/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/meraki_networks_alerts_settings_3/resource.tf b/examples/samples/resources/meraki_networks_alerts_settings_3/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/meraki_networks_appliance_content_filtering/resource.tf b/examples/samples/resources/meraki_networks_appliance_content_filtering/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/...s/samples/resources/meraki_networks_appliance_firewall_inbound_firewall_rules/resource.tf b/...s/samples/resources/meraki_networks_appliance_firewall_inbound_firewall_rules/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/meraki_networks_appliance_firewall_l3_firewall_rules/resource.tf b/examples/samples/resources/meraki_networks_appliance_firewall_l3_firewall_rules/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/meraki_networks_appliance_firewall_l7_firewall_rules/resource.tf b/examples/samples/resources/meraki_networks_appliance_firewall_l7_firewall_rules/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/meraki_networks_appliance_firewall_l7_firewall_rules3/resource.tf b/examples/samples/resources/meraki_networks_appliance_firewall_l7_firewall_rules3/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/...es/samples/resources/meraki_networks_appliance_firewall_one_to_many_nat_rules/resource.tf b/...es/samples/resources/meraki_networks_appliance_firewall_one_to_many_nat_rules/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/...les/samples/resources/meraki_networks_appliance_firewall_one_to_one_nat_rules/resource.tf b/...les/samples/resources/meraki_networks_appliance_firewall_one_to_one_nat_rules/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/...es/samples/resources/meraki_networks_appliance_firewall_port_forwarding_rules/resource.tf b/...es/samples/resources/meraki_networks_appliance_firewall_port_forwarding_rules/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/meraki_networks_appliance_sdwan_internet_policies/resource.tf b/examples/samples/resources/meraki_networks_appliance_sdwan_internet_policies/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/meraki_networks_appliance_security_intrusion/main.tf b/examples/samples/resources/meraki_networks_appliance_security_intrusion/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     meraki = {
       source  = "hashicorp.com/edu/meraki"
-      version = "1.0.0-beta"
+      version = "1.0.1-beta"
     }
   }
 

diff --git a/examples/samples/resources/meraki_networks_appliance_static_routes/resource.tf b/examples/samples/resources/meraki_networks_appliance_static_routes/resource.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     meraki = {
       source  = "hashicorp.com/edu/meraki"
-      version = "1.0.0-beta"
+      version = "1.0.1-beta"
     }
   }
 

diff --git a/...esources/meraki_networks_appliance_traffic_shaping_custom_performance_classes/resource.tf b/...esources/meraki_networks_appliance_traffic_shaping_custom_performance_classes/resource.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     meraki = {
       source  = "hashicorp.com/edu/meraki"
-      version = "1.0.0-beta"
+      version = "1.0.1-beta"
     }
   }
 

diff --git a/examples/samples/resources/meraki_networks_appliance_traffic_shaping_rules/resource.tf b/examples/samples/resources/meraki_networks_appliance_traffic_shaping_rules/resource.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     meraki = {
       source  = "hashicorp.com/edu/meraki"
-      version = "1.0.0-beta"
+      version = "1.0.1-beta"
     }
   }
 

diff --git a/.../samples/resources/meraki_networks_appliance_traffic_shaping_uplink_selection/resource.tf b/.../samples/resources/meraki_networks_appliance_traffic_shaping_uplink_selection/resource.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     meraki = {
       source  = "hashicorp.com/edu/meraki"
-      version = "1.0.0-beta"
+      version = "1.0.1-beta"
     }
   }
 

diff --git a/examples/samples/resources/meraki_networks_appliance_vlans/resource.tf b/examples/samples/resources/meraki_networks_appliance_vlans/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }

diff --git a/examples/samples/resources/meraki_networks_appliance_vlans_2_exp/main.tf b/examples/samples/resources/meraki_networks_appliance_vlans_2_exp/main.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "1.0.0-beta"
+      version = "1.0.1-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
     }