Merge pull request #183 from cisco-open/develop

Develop v0.2.13-alpha
cisco-open · Nov 27, 2024 · e8df217 · e8df217
2 parents cd17916 + d71501d
commit e8df217
Show file tree

Hide file tree

Showing 108 changed files with 1,592 additions and 145 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.2.13-alpha (November 27, 2024)
+BUGFIXES:
+* meraki_debug no longer works #179 [fixed].
+* appliance_traffic_shaping_rules does not store order #173, Changing to list to preserve the order.
+* Terraform registry documentation updates #180.
+* meraki_organizations_policy_objects_groups broken, both the data and resource #178, documentation issue, changing types to umarshal struct.
+FEATURES:
+* **New Resource** `resource_meraki_networks_appliance_static_routes`
+* **New Data Source** `data_source_meraki_networks_appliance_static_routes`
+
 ## 0.2.12-alpha (October 01, 2024)
 BUGFIXES:
 * Updating logs to only english.

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

diff --git a/docs/data-sources/networks_appliance_static_routes.md b/docs/data-sources/networks_appliance_static_routes.md
@@ -0,0 +1,132 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "meraki_networks_appliance_static_routes Data Source - terraform-provider-meraki"
+subcategory: ""
+description: |-
+  
+---
+
+# meraki_networks_appliance_static_routes (Data Source)
+
+
+
+## Example Usage
+
+```terraform
+data "meraki_networks_appliance_static_routes" "example" {
+  provider   = meraki
+  network_id = "string"
+}
+
+output "meraki_networks_appliance_static_routes_example" {
+  value = data.meraki_networks_appliance_static_routes.example.items
+}
+
+data "meraki_networks_appliance_static_routes" "example" {
+  provider   = meraki
+  network_id = "string"
+}
+
+output "meraki_networks_appliance_static_routes_example" {
+  value = data.meraki_networks_appliance_static_routes.example.item
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Optional
+
+- `network_id` (String) networkId path parameter. Network ID
+- `static_route_id` (String) staticRouteId path parameter. Static route ID
+
+### Read-Only
+
+- `item` (Attributes) (see [below for nested schema](#nestedatt--item))
+- `items` (Attributes List) Array of ResponseApplianceGetNetworkApplianceStaticRoutes (see [below for nested schema](#nestedatt--items))
+
+<a id="nestedatt--item"></a>
+### Nested Schema for `item`
+
+Read-Only:
+
+- `enabled` (Boolean)
+- `fixed_ip_assignments` (Attributes) (see [below for nested schema](#nestedatt--item--fixed_ip_assignments))
+- `gateway_ip` (String)
+- `gateway_vlan_id` (Number)
+- `id` (String)
+- `ip_version` (Number)
+- `name` (String)
+- `network_id` (String)
+- `reserved_ip_ranges` (Attributes Set) (see [below for nested schema](#nestedatt--item--reserved_ip_ranges))
+- `subnet` (String)
+
+<a id="nestedatt--item--fixed_ip_assignments"></a>
+### Nested Schema for `item.fixed_ip_assignments`
+
+Read-Only:
+
+- `attribute_22_33_44_55_66_77` (Attributes) (see [below for nested schema](#nestedatt--item--fixed_ip_assignments--attribute_22_33_44_55_66_77))
+
+<a id="nestedatt--item--fixed_ip_assignments--attribute_22_33_44_55_66_77"></a>
+### Nested Schema for `item.fixed_ip_assignments.attribute_22_33_44_55_66_77`
+
+Read-Only:
+
+- `ip` (String)
+- `name` (String)
+
+
+
+<a id="nestedatt--item--reserved_ip_ranges"></a>
+### Nested Schema for `item.reserved_ip_ranges`
+
+Read-Only:
+
+- `comment` (String)
+- `end` (String)
+- `start` (String)
+
+
+
+<a id="nestedatt--items"></a>
+### Nested Schema for `items`
+
+Read-Only:
+
+- `enabled` (Boolean)
+- `fixed_ip_assignments` (Attributes) (see [below for nested schema](#nestedatt--items--fixed_ip_assignments))
+- `gateway_ip` (String)
+- `gateway_vlan_id` (Number)
+- `id` (String)
+- `ip_version` (Number)
+- `name` (String)
+- `network_id` (String)
+- `reserved_ip_ranges` (Attributes Set) (see [below for nested schema](#nestedatt--items--reserved_ip_ranges))
+- `subnet` (String)
+
+<a id="nestedatt--items--fixed_ip_assignments"></a>
+### Nested Schema for `items.fixed_ip_assignments`
+
+Read-Only:
+
+- `attribute_22_33_44_55_66_77` (Attributes) (see [below for nested schema](#nestedatt--items--fixed_ip_assignments--attribute_22_33_44_55_66_77))
+
+<a id="nestedatt--items--fixed_ip_assignments--attribute_22_33_44_55_66_77"></a>
+### Nested Schema for `items.fixed_ip_assignments.attribute_22_33_44_55_66_77`
+
+Read-Only:
+
+- `ip` (String)
+- `name` (String)
+
+
+
+<a id="nestedatt--items--reserved_ip_ranges"></a>
+### Nested Schema for `items.reserved_ip_ranges`
+
+Read-Only:
+
+- `comment` (String)
+- `end` (String)
+- `start` (String)
diff --git a/docs/resources/networks_appliance_static_routes.md b/docs/resources/networks_appliance_static_routes.md
@@ -0,0 +1,85 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "meraki_networks_appliance_static_routes Resource - terraform-provider-meraki"
+subcategory: ""
+description: |-
+  
+---
+
+# meraki_networks_appliance_static_routes (Resource)
+
+
+
+## Example Usage
+
+```terraform
+resource "meraki_networks_appliance_static_routes" "example" {
+  provider   = meraki
+  gateway_ip = "1.2.3.5"
+  name       = "My route"
+  network_id = "string"
+  subnet     = "192.168.1.0/24"
+}
+
+output "meraki_networks_appliance_static_routes_example" {
+  value = meraki_networks_appliance_static_routes.example
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `network_id` (String) networkId path parameter. Network ID
+
+### Optional
+
+- `enabled` (Boolean) The enabled state of the static route
+- `fixed_ip_assignments` (Attributes) The DHCP fixed IP assignments on the static route. This should be an object that contains mappings from MAC addresses to objects that themselves each contain "ip" and "name" string fields. See the sample request/response for more details. (see [below for nested schema](#nestedatt--fixed_ip_assignments))
+- `gateway_ip` (String) The gateway IP (next hop) of the static route
+- `gateway_vlan_id` (Number) The gateway IP (next hop) VLAN ID of the static route
+- `gateway_vlan_id_rs` (String) The gateway IP (next hop) VLAN ID of the static route
+- `name` (String) The name of the new static route
+- `reserved_ip_ranges` (Attributes Set) The DHCP reserved IP ranges on the static route (see [below for nested schema](#nestedatt--reserved_ip_ranges))
+- `static_route_id` (String) staticRouteId path parameter. Static route ID
+- `subnet` (String) The subnet of the static route
+
+### Read-Only
+
+- `id` (String) The ID of this resource.
+- `ip_version` (Number)
+
+<a id="nestedatt--fixed_ip_assignments"></a>
+### Nested Schema for `fixed_ip_assignments`
+
+Read-Only:
+
+- `attribute_22_33_44_55_66_77` (Attributes) (see [below for nested schema](#nestedatt--fixed_ip_assignments--attribute_22_33_44_55_66_77))
+
+<a id="nestedatt--fixed_ip_assignments--attribute_22_33_44_55_66_77"></a>
+### Nested Schema for `fixed_ip_assignments.attribute_22_33_44_55_66_77`
+
+Read-Only:
+
+- `ip` (String)
+- `name` (String)
+
+
+
+<a id="nestedatt--reserved_ip_ranges"></a>
+### Nested Schema for `reserved_ip_ranges`
+
+Optional:
+
+- `comment` (String) A text comment for the reserved range
+- `end` (String) The last IP in the reserved range
+- `start` (String) The first IP in the reserved range
+
+## Import
+
+Import is supported using the following syntax:
+
+```shell
+terraform import meraki_networks_appliance_static_routes.example "network_id,static_route_id"
+```
diff --git a/docs/resources/networks_group_policies.md b/docs/resources/networks_group_policies.md
@@ -425,5 +425,5 @@ Optional:
 Import is supported using the following syntax:
 
 ```shell
-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/data-sources/meraki_networks_appliance_static_routes/data-source.tf b/examples/data-sources/meraki_networks_appliance_static_routes/data-source.tf
@@ -0,0 +1,18 @@
+
+data "meraki_networks_appliance_static_routes" "example" {
+  provider   = meraki
+  network_id = "string"
+}
+
+output "meraki_networks_appliance_static_routes_example" {
+  value = data.meraki_networks_appliance_static_routes.example.items
+}
+
+data "meraki_networks_appliance_static_routes" "example" {
+  provider   = meraki
+  network_id = "string"
+}
+
+output "meraki_networks_appliance_static_routes_example" {
+  value = data.meraki_networks_appliance_static_routes.example.item
+}
diff --git a/examples/resources/meraki_networks_appliance_static_routes/import.sh b/examples/resources/meraki_networks_appliance_static_routes/import.sh
@@ -0,0 +1 @@
+terraform import meraki_networks_appliance_static_routes.example "network_id,static_route_id"
diff --git a/examples/resources/meraki_networks_appliance_static_routes/resource.tf b/examples/resources/meraki_networks_appliance_static_routes/resource.tf
@@ -0,0 +1,12 @@
+
+resource "meraki_networks_appliance_static_routes" "example" {
+  provider   = meraki
+  gateway_ip = "1.2.3.5"
+  name       = "My route"
+  network_id = "string"
+  subnet     = "192.168.1.0/24"
+}
+
+output "meraki_networks_appliance_static_routes_example" {
+  value = meraki_networks_appliance_static_routes.example
+}
diff --git a/examples/resources/meraki_networks_appliance_traffic_shaping_rules/resource.tf b/examples/resources/meraki_networks_appliance_traffic_shaping_rules/resource.tf
@@ -9,13 +9,13 @@ resource "meraki_networks_appliance_traffic_shaping_rules" "example" {
 
       type  = "host"
       value = "google.com" #if type is ('host', 'port', 'ipRange' or 'localNet')
-    },
-    {
-      type  = "host"
-      value_obj ={
-        id= "string"
-        name= "string"
-      }# if type is ('application' or 'applicationCategory')
+      },
+      {
+        type = "host"
+        value_obj = {
+          id   = "string"
+          name = "string"
+        } # if type is ('application' or 'applicationCategory')
     }]
     dscp_tag_value = 1
     per_client_bandwidth_limits = {

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.12-alpha"
+      version = "0.2.13-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.12-alpha"
+      version = "0.2.13-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,7 +1,7 @@
 terraform {
   required_providers {
     meraki = {
-      version = "0.2.12-alpha"
+      version = "0.2.13-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_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.12-alpha"
+      version = "0.2.13-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.12-alpha"
+      version = "0.2.13-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.12-alpha"
+      version = "0.2.13-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.12-alpha"
+      version = "0.2.13-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
		@@ -0,0 +1 @@
		terraform import meraki_networks_appliance_static_routes.example "network_id,static_route_id"