Fix issue with nested conditions

CiscoDevNet · Oct 5, 2023 · c09051b · c09051b
1 parent a44f3fb
commit c09051b
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.1 (unreleased)
+
+- Fix issue with nested conditions using `ise_network_access_condition` resource
+
 ## 0.1.0
 
 - Initial Release
diff --git a/docs/guides/changelog.md b/docs/guides/changelog.md
@@ -7,6 +7,10 @@ description: |-
 
 # Changelog
 
+## 0.1.1 (unreleased)
+
+- Fix issue with nested conditions using `ise_network_access_condition` resource
+
 ## 0.1.0
 
 - Initial Release

diff --git a/docs/resources/network_access_condition.md b/docs/resources/network_access_condition.md
@@ -57,7 +57,6 @@ Required:
 
 - `condition_type` (String) Indicates whether the record is the condition itself or a logical aggregation. Logical aggreation indicates that additional conditions are present under the children attribute.
   - Choices: `ConditionAndBlock`, `ConditionAttributes`, `ConditionOrBlock`, `ConditionReference`
-- `name` (String) Condition name
 
 Optional:
 
@@ -69,6 +68,7 @@ Optional:
 - `dictionary_value` (String) Dictionary value
 - `id` (String) UUID for condition
 - `is_negate` (Boolean) Indicates whereas this condition is in negate mode
+- `name` (String) Condition name
 - `operator` (String) Equality operator
   - Choices: `contains`, `endsWith`, `equals`, `greaterOrEquals`, `greaterThan`, `in`, `ipEquals`, `ipGreaterThan`, `ipLessThan`, `ipNotEquals`, `lessOrEquals`, `lessThan`, `matches`, `notContains`, `notEndsWith`, `notEquals`, `notIn`, `notStartsWith`, `startsWith`
 
@@ -79,7 +79,6 @@ Required:
 
 - `condition_type` (String) Indicates whether the record is the condition itself or a logical aggregation. Logical aggreation indicates that additional conditions are present under the children attribute.
   - Choices: `ConditionAndBlock`, `ConditionAttributes`, `ConditionOrBlock`, `ConditionReference`
-- `name` (String) Condition name
 
 Optional:
 
@@ -90,6 +89,7 @@ Optional:
 - `dictionary_value` (String) Dictionary value
 - `id` (String) UUID for condition
 - `is_negate` (Boolean) Indicates whereas this condition is in negate mode
+- `name` (String) Condition name
 - `operator` (String) Equality operator
   - Choices: `contains`, `endsWith`, `equals`, `greaterOrEquals`, `greaterThan`, `in`, `ipEquals`, `ipGreaterThan`, `ipLessThan`, `ipNotEquals`, `lessOrEquals`, `lessThan`, `matches`, `notContains`, `notEndsWith`, `notEquals`, `notIn`, `notStartsWith`, `startsWith`
 

diff --git a/gen/definitions/network_access_condition.yaml b/gen/definitions/network_access_condition.yaml
@@ -56,7 +56,6 @@ attributes:
     attributes:
       - model_name: name
         type: String
-        id: true
         description: Condition name
         example: Cond1
       - model_name: description
@@ -107,7 +106,6 @@ attributes:
         attributes:
           - model_name: name
             type: String
-            id: true
             description: Condition name
             example: Cond1
           - model_name: description

diff --git a/gen/templates/model.go b/gen/templates/model.go
diff --git a/internal/provider/model_ise_network_access_condition.go b/internal/provider/model_ise_network_access_condition.go
diff --git a/internal/provider/resource_ise_network_access_condition.go b/internal/provider/resource_ise_network_access_condition.go
diff --git a/templates/guides/changelog.md.tmpl b/templates/guides/changelog.md.tmpl
@@ -7,6 +7,10 @@ description: |-
 
 # Changelog
 
+## 0.1.1 (unreleased)
+
+- Fix issue with nested conditions using `ise_network_access_condition` resource
+
 ## 0.1.0
 
 - Initial Release