Merge pull request #132 from cisco-open/develop

Develop
cisco-open · Aug 5, 2024 · a097184 · a097184
2 parents f64fb0a + 2908b4e
commit a097184
Show file tree

Hide file tree

Showing 108 changed files with 442 additions and 173 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## 0.2.10-alpha (August 05, 2024)
+BUGFIXES:
+* Issue #117 Fixed.
+* Issue #118 Fixed.
+* Issue #120 Fixed.
+* Issue #121 Fixed.
+* Issue #122 Fixed.
+* Issue #123 Fixed.
+* Issue #124 Fixed.
+* Issue #125 Fixed.
+* Issue #126 Fixed.
+* Issue #127 Fixed.
+* Issue #128 Fixed.
+* Issue #129 Fixed.
+* Issue #130 Fixed.
+* Issue #131 Fixed.
+
 ## 0.2.9-alpha (July 23, 2024)
 BUGFIXES:
 * meraki_networks_switch_stp - plugin crash when reading #114.

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ HOSTNAME=hashicorp.com
 NAMESPACE=edu
 NAME=meraki
 BINARY=terraform-provider-${NAME}
-VERSION=0.2.9-alpha
+VERSION=0.2.10-alpha
 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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
     }
   }
 }
@@ -68,7 +68,7 @@ terraform {
   required_providers {
     meraki = {
       source = "hashicorp.com/edu/meraki"
-      version = "0.2.9-alpha"
+      version = "0.2.10-alpha"
     }
   }
 }

diff --git a/docs/resources/devices_appliance_radio_settings.md b/docs/resources/devices_appliance_radio_settings.md
@@ -19,7 +19,7 @@ resource "meraki_devices_appliance_radio_settings" "example" {
   five_ghz_settings = {
 
     channel       = 149
-    channel_width = 20
+    channel_width = "20"
     target_power  = 15
   }
   rf_profile_id = "1234"
@@ -55,7 +55,7 @@ output "meraki_devices_appliance_radio_settings_example" {
 Optional:
 
 - `channel` (Number) Manual channel for 5 GHz
-- `channel_width` (Number) Manual channel width for 5 GHz
+- `channel_width` (String) Manual channel width for 5 GHz
 - `target_power` (Number) Manual target power for 5 GHz
 
 

diff --git a/examples/resources/meraki_networks_group_policies/import.sh b/examples/resources/meraki_networks_group_policies/import.sh
@@ -1 +1 @@
-terraform import meraki_networks_group_policies.example "group_policy_id,network_id"
+terraform import meraki_networks_group_policies.example "network_id,group_policy_id"
diff --git a/examples/resources/meraki_networks_switch_port_schedules/resource.tf b/examples/resources/meraki_networks_switch_port_schedules/resource.tf
@@ -8,37 +8,37 @@ resource "meraki_networks_switch_port_schedules" "example" {
     friday = {
 
       active = true
-      from   = "9:00"
+      from   = "09:00"
       to     = "17:00"
     }
     monday = {
 
       active = true
-      from   = "9:00"
+      from   = "09:00"
       to     = "17:00"
     }
     saturday = {
 
       active = false
-      from   = "0:00"
+      from   = "00:00"
       to     = "24:00"
     }
     sunday = {
 
       active = false
-      from   = "0:00"
+      from   = "00:00"
       to     = "24:00"
     }
     thursday = {
 
       active = true
-      from   = "9:00"
+      from   = "09:00"
       to     = "17:00"
     }
     tuesday = {
 
       active = true
-      from   = "9:00"
+      from   = "09:00"
       to     = "17:00"
     }
     wednesday = {

diff --git a/examples/resources/meraki_networks_vlan_profiles/import.sh b/examples/resources/meraki_networks_vlan_profiles/import.sh
@@ -1 +1 @@
-terraform import meraki_networks_vlan_profiles.example "iname,network_id"
+terraform import meraki_networks_vlan_profiles.example "network_id,iname"
diff --git a/examples/resources/meraki_organizations_early_access_features_opt_ins/resource.tf b/examples/resources/meraki_organizations_early_access_features_opt_ins/resource.tf
@@ -4,6 +4,7 @@ resource "meraki_organizations_early_access_features_opt_ins" "example" {
   limit_scope_to_networks = ["N_12345"]
   organization_id         = "string"
   short_name              = "has_magnetic_beta"
+  opt_in_id = "828099381482925914"
 }
 
 output "meraki_organizations_early_access_features_opt_ins_example" {

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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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,15 +1,15 @@
 terraform {
   required_providers {
     meraki = {
-      version = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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
     }
   }
 }
-provider "meraki" {
-  meraki_debug = "true"
-}
+# provider "meraki" {
+#   meraki_debug = "true"
+# }
 data "meraki_devices" "example" {
 
   #   organization_id = "828099381482762766"

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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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/adaptative_policy_groups/resource.tf b/examples/samples/resources/adaptative_policy_groups/resource.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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_wireless_radio_settings/import.sh b/examples/samples/resources/meraki_devices_wireless_radio_settings/import.sh
@@ -0,0 +1 @@
+terraform import meraki_devices_wireless_radio_settings.example "serial"
diff --git a/examples/samples/resources/meraki_devices_wireless_radio_settings/resource.tf b/examples/samples/resources/meraki_devices_wireless_radio_settings/resource.tf
@@ -0,0 +1,21 @@
+
+resource "meraki_devices_wireless_radio_settings" "example" {
+
+  five_ghz_settings = {
+
+    channel       = 149
+    channel_width = 20
+    target_power  = 15
+  }
+  # rf_profile_id = "1234"
+  serial        = "Q2FV-DJ6J-4QHD"
+  two_four_ghz_settings = {
+
+    channel      = 11
+    target_power = 21
+  }
+}
+
+output "meraki_devices_wireless_radio_settings_example" {
+  value = meraki_devices_wireless_radio_settings.example
+}
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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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 = "0.2.9-alpha"
+      version = "0.2.10-alpha"
       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
     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		terraform import meraki_networks_group_policies.example "group_policy_id,network_id"
		terraform import meraki_networks_group_policies.example "network_id,group_policy_id"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		terraform import meraki_networks_vlan_profiles.example "iname,network_id"
		terraform import meraki_networks_vlan_profiles.example "network_id,iname"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		terraform import meraki_devices_wireless_radio_settings.example "serial"