Skip to content

Commit fc17d50

Browse files
uibmuibm
committed
vpc fixes
1 parent aeb4cab commit fc17d50

7 files changed

+356
-124
lines changed

‎ibm/provider/provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ func Provider() *schema.Provider {
611611
"ibm_is_vpn_gateway_connection_peer_cidrs": vpc.DataSourceIBMIsVPNGatewayConnectionPeerCidrs(),
612612

613613
"ibm_is_vpc_default_routing_table": vpc.DataSourceIBMISVPCDefaultRoutingTable(),
614-
"ibm_is_vpc_routing_table": vpc.DataSourceIBMIBMIsVPCRoutingTable(),
614+
"ibm_is_vpc_routing_table": vpc.DataSourceIBMIsVPCRoutingTable(),
615615
"ibm_is_vpc_routing_tables": vpc.DataSourceIBMISVPCRoutingTables(),
616616
"ibm_is_vpc_routing_table_route": vpc.DataSourceIBMIBMIsVPCRoutingTableRoute(),
617617
"ibm_is_vpc_routing_table_routes": vpc.DataSourceIBMISVPCRoutingTableRoutes(),

‎ibm/service/vpc/data_source_ibm_is_vpc_address_prefix.go‎

Lines changed: 48 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,12 @@ func DataSourceIBMIsVPCAddressPrefix() *schema.Resource {
9898
}
9999
}
100100

101-
func dataSourceIBMIsVPCAddressPrefixRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
101+
func dataSourceIBMIsVPCAddressPrefixRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
102102
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
103103
if err != nil {
104-
return diag.FromErr(err)
104+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("vpcClient creation failed: %s", err.Error()), "(Data) ibm_is_vpc_address_prefix", "read")
105+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
106+
return tfErr.GetDiag()
105107
}
106108

107109
vpc_id := d.Get("vpc").(string)
@@ -117,9 +119,11 @@ func dataSourceIBMIsVPCAddressPrefixRead(context context.Context, d *schema.Reso
117119
if start != "" {
118120
listVpcsOptions.Start = &start
119121
}
120-
vpcs, response, err := vpcClient.ListVpcs(listVpcsOptions)
122+
vpcs, response, err := vpcClient.ListVpcsWithContext(ctx, listVpcsOptions)
121123
if err != nil {
122-
return diag.FromErr(fmt.Errorf("Error Fetching vpcs %s\n%s", err, response))
124+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("ListVpcsWithContext failed %s\n%s", err, response), "ibm_is_vpc_address_prefix", "read")
125+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
126+
return tfErr.GetDiag()
123127
}
124128
start = flex.GetNext(vpcs.Next)
125129
allrecs = append(allrecs, vpcs.Vpcs...)
@@ -136,8 +140,10 @@ func dataSourceIBMIsVPCAddressPrefixRead(context context.Context, d *schema.Reso
136140
}
137141
}
138142
if !vpc_found {
139-
log.Printf("[DEBUG] VPC with given name not found %s\n", vpc_name)
140-
return diag.FromErr(fmt.Errorf("VPC with given name not found %s\n", vpc_name))
143+
err = fmt.Errorf("VPC with given name not found %s", vpc_name)
144+
tfErr := flex.TerraformErrorf(err, err.Error(), "ibm_is_vpc_address_prefix", "read")
145+
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
146+
return tfErr.GetDiag()
141147
}
142148
}
143149
if address_prefix_id != "" {
@@ -146,10 +152,11 @@ func dataSourceIBMIsVPCAddressPrefixRead(context context.Context, d *schema.Reso
146152
getVPCAddressPrefixOptions.SetVPCID(vpc_id)
147153
getVPCAddressPrefixOptions.SetID(address_prefix_id)
148154

149-
addressPrefix1, response, err := vpcClient.GetVPCAddressPrefixWithContext(context, getVPCAddressPrefixOptions)
155+
addressPrefix1, response, err := vpcClient.GetVPCAddressPrefixWithContext(ctx, getVPCAddressPrefixOptions)
150156
if err != nil {
151-
log.Printf("[DEBUG] GetVPCAddressPrefixWithContext failed %s\n%s", err, response)
152-
return diag.FromErr(fmt.Errorf("GetVPCAddressPrefixWithContext failed %s\n%s", err, response))
157+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetVPCAddressPrefixWithContext failed %s\n%s", err, response), "ibm_is_vpc_address_prefix", "read")
158+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
159+
return tfErr.GetDiag()
153160
}
154161
addressPrefix = addressPrefix1
155162

@@ -163,10 +170,11 @@ func dataSourceIBMIsVPCAddressPrefixRead(context context.Context, d *schema.Reso
163170
if start != "" {
164171
listVpcAddressPrefixesOptions.Start = &start
165172
}
166-
addressPrefixCollection, response, err := vpcClient.ListVPCAddressPrefixesWithContext(context, listVpcAddressPrefixesOptions)
173+
addressPrefixCollection, response, err := vpcClient.ListVPCAddressPrefixesWithContext(ctx, listVpcAddressPrefixesOptions)
167174
if err != nil {
168-
log.Printf("[DEBUG] ListVpcAddressPrefixesWithContext failed %s\n%s", err, response)
169-
return diag.FromErr(fmt.Errorf("ListVpcAddressPrefixesWithContext failed %s\n%s", err, response))
175+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("ListVPCAddressPrefixesWithContext failed %s\n%s", err, response), "ibm_is_vpc_address_prefix", "read")
176+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
177+
return tfErr.GetDiag()
170178
}
171179
start = flex.GetNext(addressPrefixCollection.Next)
172180
allrecs = append(allrecs, addressPrefixCollection.AddressPrefixes...)
@@ -183,45 +191,63 @@ func dataSourceIBMIsVPCAddressPrefixRead(context context.Context, d *schema.Reso
183191
}
184192
}
185193
if !address_prefix_found {
186-
log.Printf("[DEBUG] Address Prefix with given name not found %s\n", address_prefix_name)
187-
return diag.FromErr(fmt.Errorf("Address Prefix with given name not found %s\n", address_prefix_name))
194+
err = fmt.Errorf("Address Prefix with given name not found %s", address_prefix_name)
195+
tfErr := flex.TerraformErrorf(err, err.Error(), "ibm_is_vpc_address_prefix", "read")
196+
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
197+
return tfErr.GetDiag()
188198
}
189199
}
190200
d.SetId(*addressPrefix.ID)
191201
if err = d.Set("cidr", addressPrefix.CIDR); err != nil {
192-
return diag.FromErr(fmt.Errorf("Error setting cidr: %s", err))
202+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting cidr"), "ibm_is_vpc_address_prefix", "read")
203+
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
204+
return tfErr.GetDiag()
193205
}
194206

195207
if err = d.Set("created_at", flex.DateTimeToString(addressPrefix.CreatedAt)); err != nil {
196-
return diag.FromErr(fmt.Errorf("Error setting created_at: %s", err))
208+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting created_at"), "ibm_is_vpc_address_prefix", "read")
209+
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
210+
return tfErr.GetDiag()
197211
}
198212

199213
if err = d.Set("has_subnets", addressPrefix.HasSubnets); err != nil {
200-
return diag.FromErr(fmt.Errorf("Error setting has_subnets: %s", err))
214+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting has_subnets"), "ibm_is_vpc_address_prefix", "read")
215+
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
216+
return tfErr.GetDiag()
201217
}
202218

203219
if err = d.Set("href", addressPrefix.Href); err != nil {
204-
return diag.FromErr(fmt.Errorf("Error setting href: %s", err))
220+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting href"), "ibm_is_vpc_address_prefix", "read")
221+
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
222+
return tfErr.GetDiag()
205223
}
206224

207225
if err = d.Set("is_default", addressPrefix.IsDefault); err != nil {
208-
return diag.FromErr(fmt.Errorf("Error setting is_default: %s", err))
226+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting is_default"), "ibm_is_vpc_address_prefix", "read")
227+
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
228+
return tfErr.GetDiag()
209229
}
210230

211231
if err = d.Set("name", addressPrefix.Name); err != nil {
212-
return diag.FromErr(fmt.Errorf("Error setting name: %s", err))
232+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting name"), "ibm_is_vpc_address_prefix", "read")
233+
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
234+
return tfErr.GetDiag()
213235
}
214236

215237
zone := []map[string]interface{}{}
216238
if addressPrefix.Zone != nil {
217239
modelMap, err := dataSourceIBMIsVPCAddressPrefixZoneReferenceToMap(addressPrefix.Zone)
218240
if err != nil {
219-
return diag.FromErr(err)
241+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting zone"), "ibm_is_vpc_address_prefix", "read")
242+
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
243+
return tfErr.GetDiag()
220244
}
221245
zone = append(zone, modelMap)
222246
}
223247
if err = d.Set("zone", zone); err != nil {
224-
return diag.FromErr(fmt.Errorf("Error setting zone %s", err))
248+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting zone"), "ibm_is_vpc_address_prefix", "read")
249+
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
250+
return tfErr.GetDiag()
225251
}
226252

227253
return nil

‎ibm/service/vpc/data_source_ibm_is_vpc_address_prefixes.go‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,13 @@ func DataSourceIbmIsVpcAddressPrefixes() *schema.Resource {
9999
}
100100
}
101101

102-
func dataSourceIbmIsVpcAddressPrefixRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
102+
func dataSourceIbmIsVpcAddressPrefixRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
103103

104104
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
105105
if err != nil {
106-
return diag.FromErr(err)
106+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("vpcClient creation failed: %s", err.Error()), "(Data) ibm_is_vpc_address_prefixes", "read")
107+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
108+
return tfErr.GetDiag()
107109
}
108110

109111
start := ""
@@ -116,10 +118,11 @@ func dataSourceIbmIsVpcAddressPrefixRead(context context.Context, d *schema.Reso
116118
if start != "" {
117119
listVpcAddressPrefixesOptions.Start = &start
118120
}
119-
addressPrefixCollection, response, err := vpcClient.ListVPCAddressPrefixesWithContext(context, listVpcAddressPrefixesOptions)
121+
addressPrefixCollection, response, err := vpcClient.ListVPCAddressPrefixesWithContext(ctx, listVpcAddressPrefixesOptions)
120122
if err != nil {
121-
log.Printf("[DEBUG] ListVpcAddressPrefixesWithContext failed %s\n%s", err, response)
122-
return diag.FromErr(fmt.Errorf("ListVpcAddressPrefixesWithContext failed %s\n%s", err, response))
123+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("ListVpcAddressPrefixesWithContext failed %s\n%s", err, response), "ibm_is_vpc_address_prefixes", "read")
124+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
125+
return tfErr.GetDiag()
123126
}
124127
start = flex.GetNext(addressPrefixCollection.Next)
125128
allrecs = append(allrecs, addressPrefixCollection.AddressPrefixes...)
@@ -147,7 +150,10 @@ func dataSourceIbmIsVpcAddressPrefixRead(context context.Context, d *schema.Reso
147150

148151
if suppliedFilter {
149152
if len(matchAddressPrefixes) == 0 {
150-
return diag.FromErr(fmt.Errorf("no AddressPrefixes found with name %s", name))
153+
err = fmt.Errorf("no AddressPrefixes found with name %s", name)
154+
tfErr := flex.TerraformErrorf(err, err.Error(), "ibm_is_vpc_address_prefixes", "read")
155+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
156+
return tfErr.GetDiag()
151157
}
152158
d.SetId(name)
153159
} else {
@@ -157,7 +163,9 @@ func dataSourceIbmIsVpcAddressPrefixRead(context context.Context, d *schema.Reso
157163
if matchAddressPrefixes != nil {
158164
err = d.Set("address_prefixes", dataSourceAddressPrefixCollectionFlattenAddressPrefixes(matchAddressPrefixes))
159165
if err != nil {
160-
return diag.FromErr(fmt.Errorf("[ERROR] Error setting address_prefixes %s", err))
166+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting address_prefixes"), "ibm_is_vpc_address_prefixes", "read")
167+
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
168+
return tfErr.GetDiag()
161169
}
162170
}
163171

0 commit comments

Comments
 (0)