Skip to content

Commit 86144f7

Browse files
danischmdanischm
committed
Fix idempotency issue with condition resources
1 parent a494945 commit 86144f7

File tree

12 files changed

+51
-14
lines changed

12 files changed

+51
-14
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## 0.1.8 (unreleased)
22

33
- Fix default value of `ip_version` attribute of `ise_trustsec_security_group_acl` resource
4+
- Fix idempotency issue with `ise_network_access_condition` and `ise_device_admin_condition` resources
45

56
## 0.1.7
67

‎docs/guides/changelog.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ description: |-
1010
## 0.1.8 (unreleased)
1111

1212
- Fix default value of `ip_version` attribute of `ise_trustsec_security_group_acl` resource
13+
- Fix idempotency issue with `ise_network_access_condition` and `ise_device_admin_condition` resources
1314

1415
## 0.1.7
1516

‎gen/definitions/device_admin_condition.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ attributes:
8383
attributes:
8484
- model_name: name
8585
type: String
86+
id: true
8687
description: Condition name
8788
example: Cond1
8889
- model_name: description
@@ -91,6 +92,7 @@ attributes:
9192
example: My description
9293
- model_name: conditionType
9394
type: String
95+
id: true
9496
mandatory: true
9597
enum_values:
9698
[
@@ -104,6 +106,7 @@ attributes:
104106
- model_name: id
105107
tf_name: id
106108
type: String
109+
id: true
107110
description: UUID for condition
108111
example: 12345678-f0e7-456b-a2d1-876543320123
109112
- model_name: isNegate
@@ -112,23 +115,28 @@ attributes:
112115
example: false
113116
- model_name: attributeName
114117
type: String
118+
id: true
115119
description: Dictionary attribute name
116120
example: User
117121
- model_name: attributeValue
118122
type: String
123+
id: true
119124
description: Attribute value for condition. Value type is specified in dictionary object.
120125
example: User1
121126
- model_name: dictionaryName
122127
type: String
128+
id: true
123129
description: Dictionary name
124130
example: TACACS
125131
- model_name: dictionaryValue
126132
type: String
133+
id: true
127134
description: Dictionary value
128135
example: abc
129136
exclude_test: true
130137
- model_name: operator
131138
type: String
139+
id: true
132140
enum_values:
133141
[
134142
contains,
@@ -160,6 +168,7 @@ attributes:
160168
attributes:
161169
- model_name: name
162170
type: String
171+
id: true
163172
description: Condition name
164173
example: Cond1
165174
- model_name: description
@@ -168,6 +177,7 @@ attributes:
168177
example: My description
169178
- model_name: conditionType
170179
type: String
180+
id: true
171181
mandatory: true
172182
enum_values:
173183
[
@@ -181,6 +191,7 @@ attributes:
181191
- model_name: id
182192
tf_name: id
183193
type: String
194+
id: true
184195
description: UUID for condition
185196
example: 12345678-f0e7-456b-a2d1-876543320123
186197
- model_name: isNegate
@@ -189,23 +200,28 @@ attributes:
189200
example: false
190201
- model_name: attributeName
191202
type: String
203+
id: true
192204
description: Dictionary attribute name
193205
example: User
194206
- model_name: attributeValue
195207
type: String
208+
id: true
196209
description: Attribute value for condition. Value type is specified in dictionary object.
197210
example: User1
198211
- model_name: dictionaryName
199212
type: String
213+
id: true
200214
description: Dictionary name
201215
example: TACACS
202216
- model_name: dictionaryValue
203217
type: String
218+
id: true
204219
description: Dictionary value
205220
example: abc
206221
exclude_test: true
207222
- model_name: operator
208223
type: String
224+
id: true
209225
enum_values:
210226
[
211227
contains,

‎gen/definitions/license_tier_state.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ attributes:
1717
- model_name: name
1818
type: String
1919
id: true
20+
mandatory: true
2021
enum_values: [ESSENTIAL, ADVANTAGE, PREMIER, DEVICEADMIN, VM]
2122
description: License name
2223
example: ESSENTIAL

‎gen/definitions/network_access_condition.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ attributes:
8383
attributes:
8484
- model_name: name
8585
type: String
86+
id: true
8687
description: Condition name
8788
example: Cond1
8889
- model_name: description
@@ -91,6 +92,7 @@ attributes:
9192
example: My description
9293
- model_name: conditionType
9394
type: String
95+
id: true
9496
mandatory: true
9597
enum_values:
9698
[
@@ -104,6 +106,7 @@ attributes:
104106
- model_name: id
105107
tf_name: id
106108
type: String
109+
id: true
107110
description: UUID for condition
108111
example: 12345678-f0e7-456b-a2d1-876543320123
109112
- model_name: isNegate
@@ -112,23 +115,28 @@ attributes:
112115
example: false
113116
- model_name: attributeName
114117
type: String
118+
id: true
115119
description: Dictionary attribute name
116120
example: EapAuthentication
117121
- model_name: attributeValue
118122
type: String
123+
id: true
119124
description: Attribute value for condition. Value type is specified in dictionary object.
120125
example: EAP-TLS
121126
- model_name: dictionaryName
122127
type: String
128+
id: true
123129
description: Dictionary name
124130
example: Network Access
125131
- model_name: dictionaryValue
126132
type: String
133+
id: true
127134
description: Dictionary value
128135
example: abc
129136
exclude_test: true
130137
- model_name: operator
131138
type: String
139+
id: true
132140
enum_values:
133141
[
134142
contains,
@@ -160,6 +168,7 @@ attributes:
160168
attributes:
161169
- model_name: name
162170
type: String
171+
id: true
163172
description: Condition name
164173
example: Cond1
165174
- model_name: description
@@ -168,6 +177,7 @@ attributes:
168177
example: My description
169178
- model_name: conditionType
170179
type: String
180+
id: true
171181
mandatory: true
172182
enum_values:
173183
[
@@ -181,6 +191,7 @@ attributes:
181191
- model_name: id
182192
tf_name: id
183193
type: String
194+
id: true
184195
description: UUID for condition
185196
example: 12345678-f0e7-456b-a2d1-876543320123
186197
- model_name: isNegate
@@ -189,23 +200,28 @@ attributes:
189200
example: false
190201
- model_name: attributeName
191202
type: String
203+
id: true
192204
description: Dictionary attribute name
193205
example: EapAuthentication
194206
- model_name: attributeValue
195207
type: String
208+
id: true
196209
description: Attribute value for condition. Value type is specified in dictionary object.
197210
example: EAP-TLS
198211
- model_name: dictionaryName
199212
type: String
213+
id: true
200214
description: Dictionary name
201215
example: Network Access
202216
- model_name: dictionaryValue
203217
type: String
218+
id: true
204219
description: Dictionary value
205220
example: abc
206221
exclude_test: true
207222
- model_name: operator
208223
type: String
224+
id: true
209225
enum_values:
210226
[
211227
contains,

‎gen/definitions/network_access_dictionary.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ attributes:
77
- model_name: name
88
type: String
99
id: true
10+
mandatory: true
1011
description: The dictionary name
1112
example: Dict1
1213
- model_name: description

‎gen/definitions/network_device.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ attributes:
9292
- model_name: ipaddress
9393
type: String
9494
id: true
95+
mandatory: true
9596
description: It can be either single ip address or ip range address
9697
example: 2.3.4.5
9798
- model_name: ipaddressExclude

‎gen/definitions/repository.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ attributes:
77
- model_name: name
88
type: String
99
id: true
10+
mandatory: true
1011
description: Repository name should be less than 80 characters and can contain alphanumeric, underscore, hyphen and dot characters.
1112
example: repo1
1213
- model_name: protocol

‎gen/templates/resource.go‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/provider/model_ise_device_admin_condition.go‎

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)