Skip to content

Commit 6d1e064

Browse files
seconroyseconroy
committed
Merge remote-tracking branch 'upstream/main' into policy-objects
2 parents 607219f + b35a25e commit 6d1e064

File tree

70 files changed

+97
-73
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+97
-73
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
## 0.3.13
1+
## 0.3.14 (unreleased)
22

3-
- Add workaround for issue when concurrently deleting security policy objects where the reference count is not updated
4-
- BREAKING CHANGE: Remove default value of `failure_mode` attribute of `sdwan_security_policy` resource
3+
- Fix issue when reading deleted `sdwan_cli_config_profile_parcel` resource, [link](https://github.com/CiscoDevNet/terraform-provider-sdwan/issues/291)
54
- Add `sdwan_policy_object_feature_profile` resource and data source
65
- Add `sdwan_policy_object_class_map_profile_parcel` resource and data source
76
- Add `sdwan_policy_object_color_list_profile_parcel` resource and data source
@@ -15,6 +14,11 @@
1514
- Add `sdwan_policy_object_ipv4_prefix_list_profile_parcel` resource and data source
1615
- Add `sdwan_policy_object_ipv6_prefix_list_profile_parcel` resource and data source
1716

17+
## 0.3.13
18+
19+
- Add workaround for issue when concurrently deleting security policy objects where the reference count is not updated
20+
- BREAKING CHANGE: Remove default value of `failure_mode` attribute of `sdwan_security_policy` resource
21+
1822
## 0.3.12
1923

2024
- Add `protocol_type` attribute to `sdwan_zone_based_firewall_policy_definition` resource and data source

‎docs/guides/changelog.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ description: |-
77

88
# Changelog
99

10-
## 0.3.13
10+
## 0.3.14 (unreleased)
1111

12-
- Add workaround for issue when concurrently deleting security policy objects where the reference count is not updated
13-
- BREAKING CHANGE: Remove default value of `failure_mode` attribute of `sdwan_security_policy` resource
12+
- Fix issue when reading deleted `sdwan_cli_config_profile_parcel` resource, [link](https://github.com/CiscoDevNet/terraform-provider-sdwan/issues/291)
1413
- Add `sdwan_policy_object_feature_profile` resource and data source
1514
- Add `sdwan_policy_object_class_map_profile_parcel` resource and data source
1615
- Add `sdwan_policy_object_color_list_profile_parcel` resource and data source
@@ -24,6 +23,11 @@ description: |-
2423
- Add `sdwan_policy_object_ipv4_prefix_list_profile_parcel` resource and data source
2524
- Add `sdwan_policy_object_ipv6_prefix_list_profile_parcel` resource and data source
2625

26+
## 0.3.13
27+
28+
- Add workaround for issue when concurrently deleting security policy objects where the reference count is not updated
29+
- BREAKING CHANGE: Remove default value of `failure_mode` attribute of `sdwan_security_policy` resource
30+
2731
## 0.3.12
2832

2933
- Add `protocol_type` attribute to `sdwan_zone_based_firewall_policy_definition` resource and data source

‎gen/templates/generic/resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ func (r *{{camelCase .Name}}Resource) Read(ctx context.Context, req resource.Rea
466466
tflog.Debug(ctx, fmt.Sprintf("%s: Beginning Read", state.Name.String()))
467467

468468
res, err := r.client.Get({{if .GetRestEndpoint}}"{{.GetRestEndpoint}}"{{else}}state.getPath(){{end}}{{if not .RemoveId}} + url.QueryEscape(state.Id.ValueString()){{end}})
469-
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") {
469+
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") || strings.Contains(res.Get("error.message").String(), "Invalid feature Id") {
470470
resp.State.RemoveResource(ctx)
471471
return
472472
} else if err != nil {

‎internal/provider/resource_sdwan_advanced_inspection_profile_policy_definition.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func (r *AdvancedInspectionProfilePolicyDefinitionResource) Read(ctx context.Con
184184
tflog.Debug(ctx, fmt.Sprintf("%s: Beginning Read", state.Name.String()))
185185

186186
res, err := r.client.Get(state.getPath() + url.QueryEscape(state.Id.ValueString()))
187-
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") {
187+
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") || strings.Contains(res.Get("error.message").String(), "Invalid feature Id") {
188188
resp.State.RemoveResource(ctx)
189189
return
190190
} else if err != nil {

‎internal/provider/resource_sdwan_advanced_malware_protection_policy_definition.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ func (r *AdvancedMalwareProtectionPolicyDefinitionResource) Read(ctx context.Con
208208
tflog.Debug(ctx, fmt.Sprintf("%s: Beginning Read", state.Name.String()))
209209

210210
res, err := r.client.Get(state.getPath() + url.QueryEscape(state.Id.ValueString()))
211-
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") {
211+
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") || strings.Contains(res.Get("error.message").String(), "Invalid feature Id") {
212212
resp.State.RemoveResource(ctx)
213213
return
214214
} else if err != nil {

‎internal/provider/resource_sdwan_allow_url_list_policy_object.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func (r *AllowURLListPolicyObjectResource) Read(ctx context.Context, req resourc
156156
tflog.Debug(ctx, fmt.Sprintf("%s: Beginning Read", state.Name.String()))
157157

158158
res, err := r.client.Get(state.getPath() + url.QueryEscape(state.Id.ValueString()))
159-
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") {
159+
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") || strings.Contains(res.Get("error.message").String(), "Invalid feature Id") {
160160
resp.State.RemoveResource(ctx)
161161
return
162162
} else if err != nil {

‎internal/provider/resource_sdwan_app_probe_class_policy_object.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func (r *AppProbeClassPolicyObjectResource) Read(ctx context.Context, req resour
168168
tflog.Debug(ctx, fmt.Sprintf("%s: Beginning Read", state.Name.String()))
169169

170170
res, err := r.client.Get(state.getPath() + url.QueryEscape(state.Id.ValueString()))
171-
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") {
171+
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") || strings.Contains(res.Get("error.message").String(), "Invalid feature Id") {
172172
resp.State.RemoveResource(ctx)
173173
return
174174
} else if err != nil {

‎internal/provider/resource_sdwan_application_aware_routing_policy_definition.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ func (r *ApplicationAwareRoutingPolicyDefinitionResource) Read(ctx context.Conte
345345
tflog.Debug(ctx, fmt.Sprintf("%s: Beginning Read", state.Name.String()))
346346

347347
res, err := r.client.Get(state.getPath() + url.QueryEscape(state.Id.ValueString()))
348-
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") {
348+
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") || strings.Contains(res.Get("error.message").String(), "Invalid feature Id") {
349349
resp.State.RemoveResource(ctx)
350350
return
351351
} else if err != nil {

‎internal/provider/resource_sdwan_application_list_policy_object.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func (r *ApplicationListPolicyObjectResource) Read(ctx context.Context, req reso
160160
tflog.Debug(ctx, fmt.Sprintf("%s: Beginning Read", state.Name.String()))
161161

162162
res, err := r.client.Get(state.getPath() + url.QueryEscape(state.Id.ValueString()))
163-
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") {
163+
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") || strings.Contains(res.Get("error.message").String(), "Invalid feature Id") {
164164
resp.State.RemoveResource(ctx)
165165
return
166166
} else if err != nil {

‎internal/provider/resource_sdwan_application_priority_feature_profile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func (r *ApplicationPriorityFeatureProfileResource) Read(ctx context.Context, re
138138
tflog.Debug(ctx, fmt.Sprintf("%s: Beginning Read", state.Name.String()))
139139

140140
res, err := r.client.Get(state.getPath() + url.QueryEscape(state.Id.ValueString()))
141-
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") {
141+
if strings.Contains(res.Get("error.message").String(), "Failed to find specified resource") || strings.Contains(res.Get("error.message").String(), "Invalid template type") || strings.Contains(res.Get("error.message").String(), "Template definition not found") || strings.Contains(res.Get("error.message").String(), "Invalid Profile Id") || strings.Contains(res.Get("error.message").String(), "Invalid feature Id") {
142142
resp.State.RemoveResource(ctx)
143143
return
144144
} else if err != nil {

0 commit comments

Comments
 (0)