Skip to content

Commit fe90075

Browse files
uibmuibm
authored
enhancement: improved error handling for is (ike/ipsec) policy (IBM-Cloud#6128)
1 parent f93bee0 commit fe90075

File tree

6 files changed

+320
-183
lines changed

6 files changed

+320
-183
lines changed

‎ibm/service/vpc/data_source_ibm_is_ike_policies.go‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,9 @@ func DataSourceIBMIsIkePolicies() *schema.Resource {
160160
func dataSourceIBMIsIkePoliciesRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
161161
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
162162
if err != nil {
163-
return diag.FromErr(err)
163+
tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_ike_policies", "read", "initialize-client")
164+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
165+
return tfErr.GetDiag()
164166
}
165167

166168
start := ""
@@ -170,10 +172,11 @@ func dataSourceIBMIsIkePoliciesRead(context context.Context, d *schema.ResourceD
170172
if start != "" {
171173
listIkePoliciesOptions.Start = &start
172174
}
173-
ikePolicyCollection, response, err := vpcClient.ListIkePoliciesWithContext(context, listIkePoliciesOptions)
175+
ikePolicyCollection, _, err := vpcClient.ListIkePoliciesWithContext(context, listIkePoliciesOptions)
174176
if err != nil || ikePolicyCollection == nil {
175-
log.Printf("[DEBUG] ListIkePoliciesWithContext failed %s\n%s", err, response)
176-
return diag.FromErr(fmt.Errorf("ListIkePoliciesWithContext failed %s\n%s", err, response))
177+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("ListIkePoliciesWithContext failed %s", err), "(Data) ibm_is_ike_policies", "read")
178+
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
179+
return tfErr.GetDiag()
177180
}
178181
start = flex.GetNext(ikePolicyCollection.Next)
179182
allrecs = append(allrecs, ikePolicyCollection.IkePolicies...)
@@ -186,7 +189,7 @@ func dataSourceIBMIsIkePoliciesRead(context context.Context, d *schema.ResourceD
186189

187190
err = d.Set("ike_policies", dataSourceIkePolicyCollectionFlattenIkePolicies(allrecs))
188191
if err != nil {
189-
return diag.FromErr(fmt.Errorf("Error setting ike_policies %s", err))
192+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting ike_policies %s", err), "(Data) ibm_is_ike_policies", "read", "ike_policies-set").GetDiag()
190193
}
191194

192195
return nil

‎ibm/service/vpc/data_source_ibm_is_ike_policy.go‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,9 @@ func DataSourceIBMIsIkePolicy() *schema.Resource {
152152
func dataSourceIBMIsIkePolicyRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
153153
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
154154
if err != nil {
155-
return diag.FromErr(err)
155+
tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_ike_policy", "read", "initialize-client")
156+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
157+
return tfErr.GetDiag()
156158
}
157159

158160
name := d.Get("name").(string)
@@ -166,9 +168,11 @@ func dataSourceIBMIsIkePolicyRead(context context.Context, d *schema.ResourceDat
166168
if start != "" {
167169
listIkePoliciesyOptions.Start = &start
168170
}
169-
ikePolicies, response, err := vpcClient.ListIkePolicies(listIkePoliciesyOptions)
171+
ikePolicies, _, err := vpcClient.ListIkePoliciesWithContext(context, listIkePoliciesyOptions)
170172
if err != nil {
171-
return diag.FromErr(fmt.Errorf("Error Fetching IKE Policies %s\n%s", err, response))
173+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("ListIkePoliciesWithContext failed: %s", err.Error()), "(Data) ibm_is_ike_policy", "read")
174+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
175+
return tfErr.GetDiag()
172176
}
173177
start = flex.GetNext(ikePolicies.Next)
174178
allrecs = append(allrecs, ikePolicies.IkePolicies...)
@@ -185,67 +189,70 @@ func dataSourceIBMIsIkePolicyRead(context context.Context, d *schema.ResourceDat
185189
}
186190
}
187191
if !ike_policy_found {
188-
log.Printf("[DEBUG] No ike policy found with given name %s", name)
189-
return diag.FromErr(fmt.Errorf("No ike policy found with given name %s", name))
192+
err = fmt.Errorf("No ike policy found with given name %s", name)
193+
tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_is_ike_policy", "read")
194+
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
195+
return tfErr.GetDiag()
190196
}
191197

192198
} else {
193199
getIkePolicyOptions := &vpcv1.GetIkePolicyOptions{}
194200

195201
getIkePolicyOptions.SetID(identifier)
196202

197-
ikePolicy1, response, err := vpcClient.GetIkePolicyWithContext(context, getIkePolicyOptions)
203+
ikePolicy1, _, err := vpcClient.GetIkePolicyWithContext(context, getIkePolicyOptions)
198204
if err != nil {
199-
log.Printf("[DEBUG] GetIkePolicyWithContext failed %s\n%s", err, response)
200-
return diag.FromErr(fmt.Errorf("GetIkePolicyWithContext failed %s\n%s", err, response))
205+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetIkePolicyWithContext failed: %s", err.Error()), "(Data) ibm_is_ike_policy", "read")
206+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
207+
return tfErr.GetDiag()
201208
}
202209
ikePolicy = ikePolicy1
203210
}
204211

205212
d.SetId(*ikePolicy.ID)
206213
if err = d.Set("authentication_algorithm", ikePolicy.AuthenticationAlgorithm); err != nil {
207-
return diag.FromErr(fmt.Errorf("Error setting authentication_algorithm: %s", err))
214+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting authentication_algorithm: %s", err), "(Data) ibm_is_ike_policy", "read", "set-authentication_algorithm").GetDiag()
208215
}
209-
210216
if ikePolicy.Connections != nil {
211217
err = d.Set("connections", dataSourceIkePolicyFlattenConnections(ikePolicy.Connections))
212218
if err != nil {
213-
return diag.FromErr(fmt.Errorf("Error setting connections %s", err))
219+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_ike_policy", "read", "connections-to-map").GetDiag()
214220
}
215221
}
216222
if err = d.Set("created_at", flex.DateTimeToString(ikePolicy.CreatedAt)); err != nil {
217-
return diag.FromErr(fmt.Errorf("Error setting created_at: %s", err))
223+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting created_at: %s", err), "(Data) ibm_is_ike_policy", "read", "set-created_at").GetDiag()
218224
}
219225
if err = d.Set("dh_group", flex.IntValue(ikePolicy.DhGroup)); err != nil {
220-
return diag.FromErr(fmt.Errorf("Error setting dh_group: %s", err))
226+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting dh_group: %s", err), "(Data) ibm_is_ike_policy", "read", "set-dh_group").GetDiag()
221227
}
222228
if err = d.Set("encryption_algorithm", ikePolicy.EncryptionAlgorithm); err != nil {
223-
return diag.FromErr(fmt.Errorf("Error setting encryption_algorithm: %s", err))
229+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting encryption_algorithm: %s", err), "(Data) ibm_is_ike_policy", "read", "set-encryption_algorithm").GetDiag()
224230
}
225231
if err = d.Set("href", ikePolicy.Href); err != nil {
226-
return diag.FromErr(fmt.Errorf("Error setting href: %s", err))
232+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting href: %s", err), "(Data) ibm_is_ike_policy", "read", "set-href").GetDiag()
227233
}
228234
if err = d.Set("ike_version", flex.IntValue(ikePolicy.IkeVersion)); err != nil {
229-
return diag.FromErr(fmt.Errorf("Error setting ike_version: %s", err))
235+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting ike_version: %s", err), "(Data) ibm_is_ike_policy", "read", "set-ike_version").GetDiag()
230236
}
231237
if err = d.Set("key_lifetime", flex.IntValue(ikePolicy.KeyLifetime)); err != nil {
232-
return diag.FromErr(fmt.Errorf("Error setting key_lifetime: %s", err))
238+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting key_lifetime: %s", err), "(Data) ibm_is_ike_policy", "read", "set-key_lifetime").GetDiag()
233239
}
240+
234241
if err = d.Set("name", ikePolicy.Name); err != nil {
235-
return diag.FromErr(fmt.Errorf("Error setting name: %s", err))
242+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting name: %s", err), "(Data) ibm_is_ike_policy", "read", "set-name").GetDiag()
236243
}
237244
if err = d.Set("negotiation_mode", ikePolicy.NegotiationMode); err != nil {
238-
return diag.FromErr(fmt.Errorf("Error setting negotiation_mode: %s", err))
245+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting negotiation_mode: %s", err), "(Data) ibm_is_ike_policy", "read", "set-negotiation_mode").GetDiag()
239246
}
240247

241248
if ikePolicy.ResourceGroup != nil {
242249
err = d.Set("resource_group", dataSourceIkePolicyFlattenResourceGroup(*ikePolicy.ResourceGroup))
243250
if err != nil {
244-
return diag.FromErr(fmt.Errorf("Error setting resource_group %s", err))
251+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting resource_group: %s", err), "(Data) ibm_is_ike_policy", "read", "set-resource_group").GetDiag()
245252
}
246253
}
247254
if err = d.Set("resource_type", ikePolicy.ResourceType); err != nil {
248-
return diag.FromErr(fmt.Errorf("Error setting resource_type: %s", err))
255+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting resource_type: %s", err), "(Data) ibm_is_ike_policy", "read", "set-resource_type").GetDiag()
249256
}
250257

251258
return nil

‎ibm/service/vpc/data_source_ibm_is_ipsec_policies.go‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,9 @@ func DataSourceIBMIsIpsecPolicies() *schema.Resource {
160160
func dataSourceIBMIsIpsecPoliciesRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
161161
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
162162
if err != nil {
163-
return diag.FromErr(err)
163+
tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_ipsec_policies", "read", "initialize-client")
164+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
165+
return tfErr.GetDiag()
164166
}
165167

166168
start := ""
@@ -170,10 +172,11 @@ func dataSourceIBMIsIpsecPoliciesRead(context context.Context, d *schema.Resourc
170172
if start != "" {
171173
listIpsecPoliciesOptions.Start = &start
172174
}
173-
iPsecPolicyCollection, response, err := vpcClient.ListIpsecPoliciesWithContext(context, listIpsecPoliciesOptions)
175+
iPsecPolicyCollection, _, err := vpcClient.ListIpsecPoliciesWithContext(context, listIpsecPoliciesOptions)
174176
if err != nil || iPsecPolicyCollection == nil {
175-
log.Printf("[DEBUG] ListIpsecPoliciesWithContext failed %s\n%s", err, response)
176-
return diag.FromErr(fmt.Errorf("ListIpsecPoliciesWithContext failed %s\n%s", err, response))
177+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("ListIpsecPoliciesWithContext failed %s", err), "(Data) ibm_is_ipsec_policies", "read")
178+
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
179+
return tfErr.GetDiag()
177180
}
178181
start = flex.GetNext(iPsecPolicyCollection.Next)
179182
allrecs = append(allrecs, iPsecPolicyCollection.IpsecPolicies...)
@@ -186,7 +189,7 @@ func dataSourceIBMIsIpsecPoliciesRead(context context.Context, d *schema.Resourc
186189

187190
err = d.Set("ipsec_policies", dataSourceIPsecPolicyCollectionFlattenIpsecPolicies(allrecs))
188191
if err != nil {
189-
return diag.FromErr(fmt.Errorf("Error setting ipsec_policies %s", err))
192+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting ipsec_policies %s", err), "(Data) ibm_is_ipsec_policies", "read", "ipsec_policies-set").GetDiag()
190193
}
191194

192195
return nil

‎ibm/service/vpc/data_source_ibm_is_ipsec_policy.go‎

Lines changed: 45 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,14 @@ func DataSourceIBMIsIpsecPolicy() *schema.Resource {
153153
func dataSourceIBMIsIpsecPolicyRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
154154
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
155155
if err != nil {
156-
return diag.FromErr(err)
156+
tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_ipsec_policy", "read", "initialize-client")
157+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
158+
return tfErr.GetDiag()
157159
}
158160

159161
name := d.Get("name").(string)
160162
identifier := d.Get("ipsec_policy").(string)
161-
var IPSecPolicy *vpcv1.IPsecPolicy
163+
var iPsecPolicy *vpcv1.IPsecPolicy
162164
if name != "" {
163165
start := ""
164166
allrecs := []vpcv1.IPsecPolicy{}
@@ -167,9 +169,11 @@ func dataSourceIBMIsIpsecPolicyRead(context context.Context, d *schema.ResourceD
167169
if start != "" {
168170
listIPSecPoliciesyOptions.Start = &start
169171
}
170-
ipSecPolicy, response, err := vpcClient.ListIpsecPolicies(listIPSecPoliciesyOptions)
172+
ipSecPolicy, _, err := vpcClient.ListIpsecPoliciesWithContext(context, listIPSecPoliciesyOptions)
171173
if err != nil {
172-
return diag.FromErr(fmt.Errorf("Error Fetching IPSec Policies %s\n%s", err, response))
174+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("ListIpsecPoliciesWithContext failed: %s", err.Error()), "(Data) ibm_is_ipsec_policy", "read")
175+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
176+
return tfErr.GetDiag()
173177
}
174178
start = flex.GetNext(ipSecPolicy.Next)
175179
allrecs = append(allrecs, ipSecPolicy.IpsecPolicies...)
@@ -180,76 +184,78 @@ func dataSourceIBMIsIpsecPolicyRead(context context.Context, d *schema.ResourceD
180184
ipsec_policy_found := false
181185
for _, ipSecPolicyItem := range allrecs {
182186
if *ipSecPolicyItem.Name == name {
183-
IPSecPolicy = &ipSecPolicyItem
187+
iPsecPolicy = &ipSecPolicyItem
184188
ipsec_policy_found = true
185189
break
186190
}
187191
}
188192

189193
if !ipsec_policy_found {
190-
log.Printf("[DEBUG] No ipsec policy found with given name %s", name)
191-
return diag.FromErr(fmt.Errorf("No ipsec policy found with given name %s", name))
194+
err = fmt.Errorf("No ipsec policy found with given name %s", name)
195+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Not found failed: %s", err.Error()), "(Data) ibm_is_ipsec_policy", "read")
196+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
197+
return tfErr.GetDiag()
192198
}
193199

194200
} else {
195201
getIPSecPolicyOptions := &vpcv1.GetIpsecPolicyOptions{}
196202

197203
getIPSecPolicyOptions.SetID(identifier)
198204

199-
ipsecPolicy1, response, err := vpcClient.GetIpsecPolicyWithContext(context, getIPSecPolicyOptions)
205+
ipsecPolicy1, _, err := vpcClient.GetIpsecPolicyWithContext(context, getIPSecPolicyOptions)
200206
if err != nil {
201-
log.Printf("[DEBUG] GetIpsecPolicyWithContext failed %s\n%s", err, response)
202-
return diag.FromErr(fmt.Errorf("GetIpsecPolicyWithContext failed %s\n%s", err, response))
207+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetIpsecPolicyWithContext failed: %s", err.Error()), "(Data) ibm_is_ipsec_policy", "read")
208+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
209+
return tfErr.GetDiag()
203210
}
204-
IPSecPolicy = ipsecPolicy1
211+
iPsecPolicy = ipsecPolicy1
205212
}
206213

207-
d.SetId(*IPSecPolicy.ID)
208-
if err = d.Set("authentication_algorithm", IPSecPolicy.AuthenticationAlgorithm); err != nil {
209-
return diag.FromErr(fmt.Errorf("Error setting authentication_algorithm: %s", err))
214+
d.SetId(*iPsecPolicy.ID)
215+
if err = d.Set("authentication_algorithm", iPsecPolicy.AuthenticationAlgorithm); err != nil {
216+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting authentication_algorithm: %s", err), "(Data) ibm_is_ipsec_policy", "read", "set-authentication_algorithm").GetDiag()
210217
}
211218

212-
if IPSecPolicy.Connections != nil {
213-
err = d.Set("connections", dataSourceIPsecPolicyFlattenConnections(IPSecPolicy.Connections))
219+
if iPsecPolicy.Connections != nil {
220+
err = d.Set("connections", dataSourceIPsecPolicyFlattenConnections(iPsecPolicy.Connections))
214221
if err != nil {
215-
return diag.FromErr(fmt.Errorf("Error setting connections %s", err))
222+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_ipsec_policy", "read", "connections-to-map").GetDiag()
216223
}
217224
}
218-
if err = d.Set("created_at", flex.DateTimeToString(IPSecPolicy.CreatedAt)); err != nil {
219-
return diag.FromErr(fmt.Errorf("Error setting created_at: %s", err))
225+
if err = d.Set("created_at", flex.DateTimeToString(iPsecPolicy.CreatedAt)); err != nil {
226+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting created_at: %s", err), "(Data) ibm_is_ipsec_policy", "read", "set-created_at").GetDiag()
220227
}
221-
if err = d.Set("encapsulation_mode", IPSecPolicy.EncapsulationMode); err != nil {
222-
return diag.FromErr(fmt.Errorf("Error setting encapsulation_mode: %s", err))
228+
if err = d.Set("encapsulation_mode", iPsecPolicy.EncapsulationMode); err != nil {
229+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting encapsulation_mode: %s", err), "(Data) ibm_is_ipsec_policy", "read", "set-encapsulation_mode").GetDiag()
223230
}
224-
if err = d.Set("encryption_algorithm", IPSecPolicy.EncryptionAlgorithm); err != nil {
225-
return diag.FromErr(fmt.Errorf("Error setting encryption_algorithm: %s", err))
231+
if err = d.Set("encryption_algorithm", iPsecPolicy.EncryptionAlgorithm); err != nil {
232+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting encryption_algorithm: %s", err), "(Data) ibm_is_ipsec_policy", "read", "set-encryption_algorithm").GetDiag()
226233
}
227-
if err = d.Set("href", IPSecPolicy.Href); err != nil {
228-
return diag.FromErr(fmt.Errorf("Error setting href: %s", err))
234+
if err = d.Set("href", iPsecPolicy.Href); err != nil {
235+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting href: %s", err), "(Data) ibm_is_ipsec_policy", "read", "set-href").GetDiag()
229236
}
230-
if err = d.Set("key_lifetime", flex.IntValue(IPSecPolicy.KeyLifetime)); err != nil {
231-
return diag.FromErr(fmt.Errorf("Error setting key_lifetime: %s", err))
237+
if err = d.Set("key_lifetime", flex.IntValue(iPsecPolicy.KeyLifetime)); err != nil {
238+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting key_lifetime: %s", err), "(Data) ibm_is_ipsec_policy", "read", "set-key_lifetime").GetDiag()
232239
}
233-
if err = d.Set("name", IPSecPolicy.Name); err != nil {
234-
return diag.FromErr(fmt.Errorf("Error setting name: %s", err))
240+
if err = d.Set("name", iPsecPolicy.Name); err != nil {
241+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting name: %s", err), "(Data) ibm_is_ipsec_policy", "read", "set-name").GetDiag()
235242
}
236-
if err = d.Set("pfs", IPSecPolicy.Pfs); err != nil {
237-
return diag.FromErr(fmt.Errorf("Error setting pfs: %s", err))
243+
if err = d.Set("pfs", iPsecPolicy.Pfs); err != nil {
244+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting pfs: %s", err), "(Data) ibm_is_ipsec_policy", "read", "set-pfs").GetDiag()
238245
}
239246

240-
if IPSecPolicy.ResourceGroup != nil {
241-
err = d.Set("resource_group", dataSourceIPsecPolicyFlattenResourceGroup(*IPSecPolicy.ResourceGroup))
247+
if iPsecPolicy.ResourceGroup != nil {
248+
err = d.Set("resource_group", dataSourceIPsecPolicyFlattenResourceGroup(*iPsecPolicy.ResourceGroup))
242249
if err != nil {
243-
return diag.FromErr(fmt.Errorf("Error setting resource_group %s", err))
250+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_ipsec_policy", "read", "resource_group-to-map").GetDiag()
244251
}
245252
}
246-
if err = d.Set("resource_type", IPSecPolicy.ResourceType); err != nil {
247-
return diag.FromErr(fmt.Errorf("Error setting resource_type: %s", err))
253+
if err = d.Set("resource_type", iPsecPolicy.ResourceType); err != nil {
254+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting resource_type: %s", err), "(Data) ibm_is_ipsec_policy", "read", "set-resource_type").GetDiag()
248255
}
249-
if err = d.Set("transform_protocol", IPSecPolicy.TransformProtocol); err != nil {
250-
return diag.FromErr(fmt.Errorf("Error setting transform_protocol: %s", err))
256+
if err = d.Set("transform_protocol", iPsecPolicy.TransformProtocol); err != nil {
257+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting transform_protocol: %s", err), "(Data) ibm_is_ipsec_policy", "read", "set-transform_protocol").GetDiag()
251258
}
252-
253259
return nil
254260
}
255261

0 commit comments

Comments
 (0)