Fix the rest of application type value custom formats (#81)

Author: vozhyk-

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.3.0 (unreleased)
+
+- Fix API format of `definitions[].value` attribute of `meraki_appliance_traffic_shaping_rules` resource, [link](https://github.com/CiscoDevNet/terraform-provider-meraki/pull/81)
+- Fix API format of `l7_firewall_rules[].value` attribute of `meraki_network_group_policy` resource, [link](https://github.com/CiscoDevNet/terraform-provider-meraki/pull/81)
+- Fix API format of `traffic_shaping_rules[].definitions[].value` attribute of `meraki_network_group_policy` resource, [link](https://github.com/CiscoDevNet/terraform-provider-meraki/pull/81)
+- Fix API format of `rules[].value` attribute of `meraki_wireless_ssid_l7_firewall_rules` resource, [link](https://github.com/CiscoDevNet/terraform-provider-meraki/pull/81)
+
 ## 1.2.0
 
 - Handle HTTP error code `400` correctly when trying to read non-existent resources

docs/data-sources/appliance_traffic_shaping_rules.md

@@ -49,4 +49,4 @@ Read-Only:
 Read-Only:
 
 - `type` (String) The type of definition. Can be one of `application`, `applicationCategory`, `host`, `port`, `ipRange` or `localNet`.
-- `value` (String) If 'type' is `host`, `port`, `ipRange` or `localNet`, then 'value' must be a string, matching either a hostname (e.g. 'somesite.com'), a port (e.g. 8080), or an IP range ('192.1.0.0', '192.1.0.0/16', or '10.1.0.0/16:80'). `localNet` also supports CIDR notation, excluding custom ports. If 'type' is `application` or `applicationCategory`, then 'value' must be an object with the structure { 'id': 'meraki:layer7/...' }, where 'id' is the application category or application ID (for a list of IDs for your network, use the trafficShaping/applicationCategories endpoint).
+- `value` (String) If 'type' is `host`, `port`, `ipRange` or `localNet`, then 'value' must be a string, matching either a hostname (e.g. 'somesite.com'), a port (e.g. 8080), or an IP range ('192.1.0.0', '192.1.0.0/16', or '10.1.0.0/16:80'). `localNet` also supports CIDR notation, excluding custom ports. If 'type' is `application` or `applicationCategory`, then 'value' must be an application category or application ID (for a list of IDs for your network, use the trafficShaping/applicationCategories endpoint).

docs/data-sources/network_group_policies.md

@@ -107,7 +107,7 @@ Read-Only:
 
 - `policy` (String) The policy applied to matching traffic. Must be `deny`.
 - `type` (String) Type of the L7 Rule. Must be `application`, `applicationCategory`, `host`, `port` or `ipRange`
-- `value` (String) The `value` of what you want to block. If `type` is `host`, `port` or `ipRange`, `value` must be a string matching either a hostname (e.g. somewhere.com), a port (e.g. 8080), or an IP range (e.g. 192.1.0.0/16). If `type` is `application` or `applicationCategory`, then `value` must be an object with an ID for the application.
+- `value` (String) The `value` of what you want to block. If `type` is `host`, `port` or `ipRange`, `value` must be a string matching either a hostname (e.g. somewhere.com), a port (e.g. 8080), or an IP range (e.g. 192.1.0.0/16). If `type` is `application` or `applicationCategory`, then `value` must be an ID for the application.
 
 
 <a id="nestedatt--items--traffic_shaping_rules"></a>
@@ -129,4 +129,4 @@ Read-Only:
 Read-Only:
 
 - `type` (String) The type of definition. Can be one of `application`, `applicationCategory`, `host`, `port`, `ipRange` or `localNet`.
-- `value` (String) If 'type' is `host`, `port`, `ipRange` or `localNet`, then 'value' must be a string, matching either a hostname (e.g. 'somesite.com'), a port (e.g. 8080), or an IP range ('192.1.0.0', '192.1.0.0/16', or '10.1.0.0/16:80'). `localNet` also supports CIDR notation, excluding custom ports. If 'type' is `application` or `applicationCategory`, then 'value' must be an object with the structure { 'id': 'meraki:layer7/...' }, where 'id' is the application category or application ID (for a list of IDs for your network, use the trafficShaping/applicationCategories endpoint).
+- `value` (String) If 'type' is `host`, `port`, `ipRange` or `localNet`, then 'value' must be a string, matching either a hostname (e.g. 'somesite.com'), a port (e.g. 8080), or an IP range ('192.1.0.0', '192.1.0.0/16', or '10.1.0.0/16:80'). `localNet` also supports CIDR notation, excluding custom ports. If 'type' is `application` or `applicationCategory`, then 'value' must be an application category or application ID (for a list of IDs for your network, use the trafficShaping/applicationCategories endpoint).

docs/data-sources/network_group_policy.md

@@ -104,7 +104,7 @@ Read-Only:
 
 - `policy` (String) The policy applied to matching traffic. Must be `deny`.
 - `type` (String) Type of the L7 Rule. Must be `application`, `applicationCategory`, `host`, `port` or `ipRange`
-- `value` (String) The `value` of what you want to block. If `type` is `host`, `port` or `ipRange`, `value` must be a string matching either a hostname (e.g. somewhere.com), a port (e.g. 8080), or an IP range (e.g. 192.1.0.0/16). If `type` is `application` or `applicationCategory`, then `value` must be an object with an ID for the application.
+- `value` (String) The `value` of what you want to block. If `type` is `host`, `port` or `ipRange`, `value` must be a string matching either a hostname (e.g. somewhere.com), a port (e.g. 8080), or an IP range (e.g. 192.1.0.0/16). If `type` is `application` or `applicationCategory`, then `value` must be an ID for the application.
 
 
 <a id="nestedatt--traffic_shaping_rules"></a>
@@ -126,4 +126,4 @@ Read-Only:
 Read-Only:
 
 - `type` (String) The type of definition. Can be one of `application`, `applicationCategory`, `host`, `port`, `ipRange` or `localNet`.
-- `value` (String) If 'type' is `host`, `port`, `ipRange` or `localNet`, then 'value' must be a string, matching either a hostname (e.g. 'somesite.com'), a port (e.g. 8080), or an IP range ('192.1.0.0', '192.1.0.0/16', or '10.1.0.0/16:80'). `localNet` also supports CIDR notation, excluding custom ports. If 'type' is `application` or `applicationCategory`, then 'value' must be an object with the structure { 'id': 'meraki:layer7/...' }, where 'id' is the application category or application ID (for a list of IDs for your network, use the trafficShaping/applicationCategories endpoint).
+- `value` (String) If 'type' is `host`, `port`, `ipRange` or `localNet`, then 'value' must be a string, matching either a hostname (e.g. 'somesite.com'), a port (e.g. 8080), or an IP range ('192.1.0.0', '192.1.0.0/16', or '10.1.0.0/16:80'). `localNet` also supports CIDR notation, excluding custom ports. If 'type' is `application` or `applicationCategory`, then 'value' must be an application category or application ID (for a list of IDs for your network, use the trafficShaping/applicationCategories endpoint).

docs/guides/changelog.md

@@ -7,6 +7,13 @@ description: |-
 
 # Changelog
 
+## 1.3.0 (unreleased)
+
+- Fix API format of `definitions[].value` attribute of `meraki_appliance_traffic_shaping_rules` resource, [link](https://github.com/CiscoDevNet/terraform-provider-meraki/pull/81)
+- Fix API format of `l7_firewall_rules[].value` attribute of `meraki_network_group_policy` resource, [link](https://github.com/CiscoDevNet/terraform-provider-meraki/pull/81)
+- Fix API format of `traffic_shaping_rules[].definitions[].value` attribute of `meraki_network_group_policy` resource, [link](https://github.com/CiscoDevNet/terraform-provider-meraki/pull/81)
+- Fix API format of `rules[].value` attribute of `meraki_wireless_ssid_l7_firewall_rules` resource, [link](https://github.com/CiscoDevNet/terraform-provider-meraki/pull/81)
+
 ## 1.2.0
 
 - Handle HTTP error code `400` correctly when trying to read non-existent resources

docs/resources/appliance_traffic_shaping_rules.md

@@ -72,7 +72,7 @@ Required:
 
 - `type` (String) The type of definition. Can be one of `application`, `applicationCategory`, `host`, `port`, `ipRange` or `localNet`.
   - Choices: `application`, `applicationCategory`, `host`, `ipRange`, `localNet`, `port`
-- `value` (String) If 'type' is `host`, `port`, `ipRange` or `localNet`, then 'value' must be a string, matching either a hostname (e.g. 'somesite.com'), a port (e.g. 8080), or an IP range ('192.1.0.0', '192.1.0.0/16', or '10.1.0.0/16:80'). `localNet` also supports CIDR notation, excluding custom ports. If 'type' is `application` or `applicationCategory`, then 'value' must be an object with the structure { 'id': 'meraki:layer7/...' }, where 'id' is the application category or application ID (for a list of IDs for your network, use the trafficShaping/applicationCategories endpoint).
+- `value` (String) If 'type' is `host`, `port`, `ipRange` or `localNet`, then 'value' must be a string, matching either a hostname (e.g. 'somesite.com'), a port (e.g. 8080), or an IP range ('192.1.0.0', '192.1.0.0/16', or '10.1.0.0/16:80'). `localNet` also supports CIDR notation, excluding custom ports. If 'type' is `application` or `applicationCategory`, then 'value' must be an application category or application ID (for a list of IDs for your network, use the trafficShaping/applicationCategories endpoint).
 
 ## Import
 

docs/resources/network_group_policy.md

@@ -190,7 +190,7 @@ Optional:
   - Choices: `deny`
 - `type` (String) Type of the L7 Rule. Must be `application`, `applicationCategory`, `host`, `port` or `ipRange`
   - Choices: `application`, `applicationCategory`, `host`, `ipRange`, `port`
-- `value` (String) The `value` of what you want to block. If `type` is `host`, `port` or `ipRange`, `value` must be a string matching either a hostname (e.g. somewhere.com), a port (e.g. 8080), or an IP range (e.g. 192.1.0.0/16). If `type` is `application` or `applicationCategory`, then `value` must be an object with an ID for the application.
+- `value` (String) The `value` of what you want to block. If `type` is `host`, `port` or `ipRange`, `value` must be a string matching either a hostname (e.g. somewhere.com), a port (e.g. 8080), or an IP range (e.g. 192.1.0.0/16). If `type` is `application` or `applicationCategory`, then `value` must be an ID for the application.
 
 
 <a id="nestedatt--traffic_shaping_rules"></a>
@@ -216,7 +216,7 @@ Required:
 
 - `type` (String) The type of definition. Can be one of `application`, `applicationCategory`, `host`, `port`, `ipRange` or `localNet`.
   - Choices: `application`, `applicationCategory`, `host`, `ipRange`, `localNet`, `port`
-- `value` (String) If 'type' is `host`, `port`, `ipRange` or `localNet`, then 'value' must be a string, matching either a hostname (e.g. 'somesite.com'), a port (e.g. 8080), or an IP range ('192.1.0.0', '192.1.0.0/16', or '10.1.0.0/16:80'). `localNet` also supports CIDR notation, excluding custom ports. If 'type' is `application` or `applicationCategory`, then 'value' must be an object with the structure { 'id': 'meraki:layer7/...' }, where 'id' is the application category or application ID (for a list of IDs for your network, use the trafficShaping/applicationCategories endpoint).
+- `value` (String) If 'type' is `host`, `port`, `ipRange` or `localNet`, then 'value' must be a string, matching either a hostname (e.g. 'somesite.com'), a port (e.g. 8080), or an IP range ('192.1.0.0', '192.1.0.0/16', or '10.1.0.0/16:80'). `localNet` also supports CIDR notation, excluding custom ports. If 'type' is `application` or `applicationCategory`, then 'value' must be an application category or application ID (for a list of IDs for your network, use the trafficShaping/applicationCategories endpoint).
 
 ## Import
 

gen/definitions/appliance_traffic_shaping_rules.yaml

@@ -65,7 +65,7 @@ attributes:
             type: String
             id: true
             mandatory: true
-            description: 'If ''type'' is `host`, `port`, `ipRange` or `localNet`, then ''value'' must be a string, matching either a hostname (e.g. ''somesite.com''), a port (e.g. 8080), or an IP range (''192.1.0.0'', ''192.1.0.0/16'', or ''10.1.0.0/16:80''). `localNet` also supports CIDR notation, excluding custom ports. If ''type'' is `application` or `applicationCategory`, then ''value'' must be an object with the structure { ''id'': ''meraki:layer7/...'' }, where ''id'' is the application category or application ID (for a list of IDs for your network, use the trafficShaping/applicationCategories endpoint).'
+            description: If 'type' is `host`, `port`, `ipRange` or `localNet`, then 'value' must be a string, matching either a hostname (e.g. 'somesite.com'), a port (e.g. 8080), or an IP range ('192.1.0.0', '192.1.0.0/16', or '10.1.0.0/16:80'). `localNet` also supports CIDR notation, excluding custom ports. If 'type' is `application` or `applicationCategory`, then 'value' must be an application category or application ID (for a list of IDs for your network, use the trafficShaping/applicationCategories endpoint).
             example: google.com
 test_prerequisites: |
   data "meraki_organization" "test" {
@@ -76,3 +76,46 @@ test_prerequisites: |
     name            = var.test_network
     product_types   = ["switch", "wireless", "appliance"]
   }
+additional_tests:
+  - |-
+    resource "meraki_appliance_traffic_shaping_rules" "test" {
+      network_id = meraki_network.test.id
+      rules = [
+        {
+          definitions = [
+            {
+              type  = "application"
+              value = "meraki:layer7/application/171"
+            },
+            {
+              type  = "host"
+              value = "google.com"
+            },
+            {
+              type  = "port"
+              value = "9091"
+            },
+            {
+              type  = "applicationCategory"
+              value = "meraki:layer7/category/27"
+            },
+            {
+              type  = "application"
+              value = "meraki:layer7/application/133"
+            },
+            {
+              type  = "ipRange"
+              value = "192.168.0.3/16:80"
+            },
+            {
+              type  = "localNet"
+              value = "192.168.2.4/16"
+            },
+            {
+              type  = "host"
+              value = "test.com"
+            }
+          ]
+        }
+      ]
+    }

gen/definitions/network_group_policy.yaml

@@ -168,7 +168,7 @@ attributes:
         enum_values: [application, applicationCategory, host, ipRange, port]
       - model_name: value
         type: String
-        description: The `value` of what you want to block. If `type` is `host`, `port` or `ipRange`, `value` must be a string matching either a hostname (e.g. somewhere.com), a port (e.g. 8080), or an IP range (e.g. 192.1.0.0/16). If `type` is `application` or `applicationCategory`, then `value` must be an object with an ID for the application.
+        description: The `value` of what you want to block. If `type` is `host`, `port` or `ipRange`, `value` must be a string matching either a hostname (e.g. somewhere.com), a port (e.g. 8080), or an IP range (e.g. 192.1.0.0/16). If `type` is `application` or `applicationCategory`, then `value` must be an ID for the application.
         example: google.com
   - model_name: trafficShapingRules
     tf_name: traffic_shaping_rules
@@ -221,7 +221,7 @@ attributes:
             type: String
             id: true
             mandatory: true
-            description: 'If ''type'' is `host`, `port`, `ipRange` or `localNet`, then ''value'' must be a string, matching either a hostname (e.g. ''somesite.com''), a port (e.g. 8080), or an IP range (''192.1.0.0'', ''192.1.0.0/16'', or ''10.1.0.0/16:80''). `localNet` also supports CIDR notation, excluding custom ports. If ''type'' is `application` or `applicationCategory`, then ''value'' must be an object with the structure { ''id'': ''meraki:layer7/...'' }, where ''id'' is the application category or application ID (for a list of IDs for your network, use the trafficShaping/applicationCategories endpoint).'
+            description: If 'type' is `host`, `port`, `ipRange` or `localNet`, then 'value' must be a string, matching either a hostname (e.g. 'somesite.com'), a port (e.g. 8080), or an IP range ('192.1.0.0', '192.1.0.0/16', or '10.1.0.0/16:80'). `localNet` also supports CIDR notation, excluding custom ports. If 'type' is `application` or `applicationCategory`, then 'value' must be an application category or application ID (for a list of IDs for your network, use the trafficShaping/applicationCategories endpoint).
             example: google.com
   - model_name: enabled
     type: Bool
@@ -364,3 +364,78 @@ additional_tests:
       name         = "No video streaming"
       force_delete = true
     }
+  - |-
+    resource "meraki_network_group_policy" "test" {
+      network_id = meraki_network.test.id
+      name       = "No video streaming"
+      l7_firewall_rules = [
+        {
+          policy = "deny"
+          type   = "host"
+          value  = "google.com"
+        },
+        {
+          policy = "deny"
+          type   = "port"
+          value  = "9091"
+        },
+        {
+          policy = "deny"
+          type   = "ipRange"
+          value  = "192.168.0.3/16:80"
+        },
+        {
+          policy = "deny"
+          type   = "application"
+          value  = "meraki:layer7/application/171"
+        },
+        {
+          policy = "deny"
+          type   = "applicationCategory"
+          value  = "meraki:layer7/category/17"
+        }
+      ]
+    }
+  - |-
+    resource "meraki_network_group_policy" "test" {
+      network_id = meraki_network.test.id
+      name       = "No video streaming"
+      traffic_shaping_rules = [
+        {
+          definitions = [
+            {
+              type  = "application"
+              value = "meraki:layer7/application/171"
+            },
+            {
+              type  = "host"
+              value = "google.com"
+            },
+            {
+              type  = "port"
+              value = "9091"
+            },
+            {
+              type  = "applicationCategory"
+              value = "meraki:layer7/category/27"
+            },
+            {
+              type  = "application"
+              value = "meraki:layer7/application/133"
+            },
+            {
+              type  = "ipRange"
+              value = "192.168.0.3/16:80"
+            },
+            {
+              type  = "localNet"
+              value = "192.168.2.4/16"
+            },
+            {
+              type  = "host"
+              value = "test.com"
+            }
+          ]
+        }
+      ]
+    }

gen/definitions/wireless_ssid_l7_firewall_rules.yaml

@@ -54,3 +54,36 @@ test_prerequisites: |
     number     = "0"
     name       = "My SSID"
   }
+additional_tests:
+  - |-
+    resource "meraki_wireless_ssid_l7_firewall_rules" "test" {
+      network_id = meraki_network.test.id
+      number     = meraki_wireless_ssid.test.id
+      rules = [
+        {
+          policy = "deny"
+          type   = "host"
+          value  = "google.com"
+        },
+        {
+          policy = "deny"
+          type   = "port"
+          value  = "9091"
+        },
+        {
+          policy = "deny"
+          type   = "ipRange"
+          value  = "192.168.0.3/16:80"
+        },
+        {
+          policy = "deny"
+          type   = "application"
+          value  = "meraki:layer7/application/171"
+        },
+        {
+          policy = "deny"
+          type   = "applicationCategory"
+          value  = "meraki:layer7/category/17"
+        }
+      ]
+    }