Fix idempotency issue with condition resources

CiscoDevNet · Dec 8, 2023 · 86144f7 · 86144f7
1 parent a494945
commit 86144f7
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 0.1.8 (unreleased)
 
 - Fix default value of `ip_version` attribute of `ise_trustsec_security_group_acl` resource
+- Fix idempotency issue with `ise_network_access_condition` and `ise_device_admin_condition` resources
 
 ## 0.1.7
 

diff --git a/docs/guides/changelog.md b/docs/guides/changelog.md
@@ -10,6 +10,7 @@ description: |-
 ## 0.1.8 (unreleased)
 
 - Fix default value of `ip_version` attribute of `ise_trustsec_security_group_acl` resource
+- Fix idempotency issue with `ise_network_access_condition` and `ise_device_admin_condition` resources
 
 ## 0.1.7
 

diff --git a/gen/definitions/device_admin_condition.yaml b/gen/definitions/device_admin_condition.yaml
@@ -83,6 +83,7 @@ attributes:
     attributes:
       - model_name: name
         type: String
+        id: true
         description: Condition name
         example: Cond1
       - model_name: description
@@ -91,6 +92,7 @@ attributes:
         example: My description
       - model_name: conditionType
         type: String
+        id: true
         mandatory: true
         enum_values:
           [
@@ -104,6 +106,7 @@ attributes:
       - model_name: id
         tf_name: id
         type: String
+        id: true
         description: UUID for condition
         example: 12345678-f0e7-456b-a2d1-876543320123
       - model_name: isNegate
@@ -112,23 +115,28 @@ attributes:
         example: false
       - model_name: attributeName
         type: String
+        id: true
         description: Dictionary attribute name
         example: User
       - model_name: attributeValue
         type: String
+        id: true
         description: Attribute value for condition. Value type is specified in dictionary object.
         example: User1
       - model_name: dictionaryName
         type: String
+        id: true
         description: Dictionary name
         example: TACACS
       - model_name: dictionaryValue
         type: String
+        id: true
         description: Dictionary value
         example: abc
         exclude_test: true
       - model_name: operator
         type: String
+        id: true
         enum_values:
           [
             contains,
@@ -160,6 +168,7 @@ attributes:
         attributes:
           - model_name: name
             type: String
+            id: true
             description: Condition name
             example: Cond1
           - model_name: description
@@ -168,6 +177,7 @@ attributes:
             example: My description
           - model_name: conditionType
             type: String
+            id: true
             mandatory: true
             enum_values:
               [
@@ -181,6 +191,7 @@ attributes:
           - model_name: id
             tf_name: id
             type: String
+            id: true
             description: UUID for condition
             example: 12345678-f0e7-456b-a2d1-876543320123
           - model_name: isNegate
@@ -189,23 +200,28 @@ attributes:
             example: false
           - model_name: attributeName
             type: String
+            id: true
             description: Dictionary attribute name
             example: User
           - model_name: attributeValue
             type: String
+            id: true
             description: Attribute value for condition. Value type is specified in dictionary object.
             example: User1
           - model_name: dictionaryName
             type: String
+            id: true
             description: Dictionary name
             example: TACACS
           - model_name: dictionaryValue
             type: String
+            id: true
             description: Dictionary value
             example: abc
             exclude_test: true
           - model_name: operator
             type: String
+            id: true
             enum_values:
               [
                 contains,

diff --git a/gen/definitions/license_tier_state.yaml b/gen/definitions/license_tier_state.yaml
@@ -17,6 +17,7 @@ attributes:
       - model_name: name
         type: String
         id: true
+        mandatory: true
         enum_values: [ESSENTIAL, ADVANTAGE, PREMIER, DEVICEADMIN, VM]
         description: License name
         example: ESSENTIAL

diff --git a/gen/definitions/network_access_condition.yaml b/gen/definitions/network_access_condition.yaml
@@ -83,6 +83,7 @@ attributes:
     attributes:
       - model_name: name
         type: String
+        id: true
         description: Condition name
         example: Cond1
       - model_name: description
@@ -91,6 +92,7 @@ attributes:
         example: My description
       - model_name: conditionType
         type: String
+        id: true
         mandatory: true
         enum_values:
           [
@@ -104,6 +106,7 @@ attributes:
       - model_name: id
         tf_name: id
         type: String
+        id: true
         description: UUID for condition
         example: 12345678-f0e7-456b-a2d1-876543320123
       - model_name: isNegate
@@ -112,23 +115,28 @@ attributes:
         example: false
       - model_name: attributeName
         type: String
+        id: true
         description: Dictionary attribute name
         example: EapAuthentication
       - model_name: attributeValue
         type: String
+        id: true
         description: Attribute value for condition. Value type is specified in dictionary object.
         example: EAP-TLS
       - model_name: dictionaryName
         type: String
+        id: true
         description: Dictionary name
         example: Network Access
       - model_name: dictionaryValue
         type: String
+        id: true
         description: Dictionary value
         example: abc
         exclude_test: true
       - model_name: operator
         type: String
+        id: true
         enum_values:
           [
             contains,
@@ -160,6 +168,7 @@ attributes:
         attributes:
           - model_name: name
             type: String
+            id: true
             description: Condition name
             example: Cond1
           - model_name: description
@@ -168,6 +177,7 @@ attributes:
             example: My description
           - model_name: conditionType
             type: String
+            id: true
             mandatory: true
             enum_values:
               [
@@ -181,6 +191,7 @@ attributes:
           - model_name: id
             tf_name: id
             type: String
+            id: true
             description: UUID for condition
             example: 12345678-f0e7-456b-a2d1-876543320123
           - model_name: isNegate
@@ -189,23 +200,28 @@ attributes:
             example: false
           - model_name: attributeName
             type: String
+            id: true
             description: Dictionary attribute name
             example: EapAuthentication
           - model_name: attributeValue
             type: String
+            id: true
             description: Attribute value for condition. Value type is specified in dictionary object.
             example: EAP-TLS
           - model_name: dictionaryName
             type: String
+            id: true
             description: Dictionary name
             example: Network Access
           - model_name: dictionaryValue
             type: String
+            id: true
             description: Dictionary value
             example: abc
             exclude_test: true
           - model_name: operator
             type: String
+            id: true
             enum_values:
               [
                 contains,

diff --git a/gen/definitions/network_access_dictionary.yaml b/gen/definitions/network_access_dictionary.yaml
@@ -7,6 +7,7 @@ attributes:
   - model_name: name
     type: String
     id: true
+    mandatory: true
     description: The dictionary name
     example: Dict1
   - model_name: description

diff --git a/gen/definitions/network_device.yaml b/gen/definitions/network_device.yaml
@@ -92,6 +92,7 @@ attributes:
       - model_name: ipaddress
         type: String
         id: true
+        mandatory: true
         description: It can be either single ip address or ip range address
         example: 2.3.4.5
       - model_name: ipaddressExclude

diff --git a/gen/definitions/repository.yaml b/gen/definitions/repository.yaml
@@ -7,6 +7,7 @@ attributes:
   - model_name: name
     type: String
     id: true
+    mandatory: true
     description: Repository name should be less than 80 characters and can contain alphanumeric, underscore, hyphen and dot characters.
     example: repo1
   - model_name: protocol

diff --git a/gen/templates/resource.go b/gen/templates/resource.go
diff --git a/internal/provider/model_ise_device_admin_condition.go b/internal/provider/model_ise_device_admin_condition.go
diff --git a/internal/provider/model_ise_network_access_condition.go b/internal/provider/model_ise_network_access_condition.go
diff --git a/templates/guides/changelog.md.tmpl b/templates/guides/changelog.md.tmpl
@@ -10,6 +10,7 @@ description: |-
 ## 0.1.8 (unreleased)
 
 - Fix default value of `ip_version` attribute of `ise_trustsec_security_group_acl` resource
+- Fix idempotency issue with `ise_network_access_condition` and `ise_device_admin_condition` resources
 
 ## 0.1.7