Skip to content

Commit 40d5206

Browse files
uibmuibm
committed
updated and fixed the build
1 parent af3f6b8 commit 40d5206

11 files changed

+13748
-11170
lines changed

‎common/github.com/IBM/vpc-go-sdk/vpcv1/vpc_v1.go‎

Lines changed: 13683 additions & 11102 deletions
Large diffs are not rendered by default.

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ replace github.com/hashicorp/vault => github.com/hashicorp/vault v1.18.2
232232

233233
replace github.com/hashicorp/vault/api/auth/approle => github.com/hashicorp/vault/api/auth/approle v0.8.0
234234

235-
replace github.com/IBM/vpc-go-sdk v0.74.1 => ./common/github.com/IBM/vpc-go-sdk
235+
replace github.com/IBM/vpc-go-sdk v0.75.0 => ./common/github.com/IBM/vpc-go-sdk
236236

237237

238238
exclude (

‎ibm/service/vpc/data_source_ibm_is_virtual_endpoint_gateway.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ func dataSourceIBMISEndpointGatewayRead(
209209
result := allrecs[0]
210210
d.SetId(*result.ID)
211211
d.Set(isVirtualEndpointGatewayName, result.Name)
212-
d.Set(isVirtualEndpointGatewayAllowDnsResolutionBinding, result.AllowDnsResolutionBinding)
212+
// d.Set(isVirtualEndpointGatewayAllowDnsResolutionBinding, result.AllowDnsResolutionBinding)
213213
d.Set(isVirtualEndpointGatewayCRN, result.CRN)
214214
d.Set(isVirtualEndpointGatewayHealthState, result.HealthState)
215215
d.Set(isVirtualEndpointGatewayCreatedAt, result.CreatedAt.String())

‎ibm/service/vpc/data_source_ibm_is_virtual_endpoint_gateways.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ func dataSourceIBMISEndpointGatewaysRead(context context.Context, d *schema.Reso
248248
endpointGatewayOutput[isVirtualEndpointGatewayResourceGroupID] = *endpointGateway.ResourceGroup.ID
249249
endpointGatewayOutput[isVirtualEndpointGatewayCRN] = *endpointGateway.CRN
250250
endpointGatewayOutput[isVirtualEndpointGatewayVpcID] = *endpointGateway.VPC.ID
251-
endpointGatewayOutput[isVirtualEndpointGatewayAllowDnsResolutionBinding] = endpointGateway.AllowDnsResolutionBinding
251+
// endpointGatewayOutput[isVirtualEndpointGatewayAllowDnsResolutionBinding] = endpointGateway.AllowDnsResolutionBinding
252252
endpointGatewayOutput[isVirtualEndpointGatewayTarget] =
253253
flattenEndpointGatewayTarget(endpointGateway.Target.(*vpcv1.EndpointGatewayTarget))
254254
if endpointGateway.SecurityGroups != nil {

‎ibm/service/vpc/data_source_ibm_is_volume_job.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/*
55
* IBM OpenAPI Terraform Generator Version: 3.107.1-41b0fbd0-20250825-080732
6-
*/
6+
*/
77

88
package vpc
99

@@ -18,7 +18,7 @@ import (
1818
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
1919
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
2020
"github.com/IBM/go-sdk-core/v5/core"
21-
"github.ibm.com/ibmcloud/vpc-go-sdk/vpcv1"
21+
"github.com/IBM/vpc-go-sdk/vpcv1"
2222
)
2323

2424
func DataSourceIBMIsVolumeJob() *schema.Resource {
@@ -153,7 +153,7 @@ func DataSourceIBMIsVolumeJob() *schema.Resource {
153153
}
154154

155155
func dataSourceIBMIsVolumeJobRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
156-
vpcClient, err := meta.(conns.ClientSession).VpcV1()
156+
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
157157
if err != nil {
158158
tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_volume_job", "read", "initialize-client")
159159
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())

‎ibm/service/vpc/data_source_ibm_is_volume_job_test.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,21 @@
33

44
/*
55
* IBM OpenAPI Terraform Generator Version: 3.107.1-41b0fbd0-20250825-080732
6-
*/
6+
*/
77

88
package vpc_test
99

1010
import (
1111
"fmt"
1212
"testing"
1313

14-
"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
15-
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
16-
14+
acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
1715
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/vpc"
1816
"github.com/IBM/go-sdk-core/v5/core"
17+
"github.com/IBM/vpc-go-sdk/vpcv1"
18+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
19+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1920
"github.com/stretchr/testify/assert"
20-
"github.ibm.com/ibmcloud/vpc-go-sdk/vpcv1"
21-
acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
2221
)
2322

2423
func TestAccIBMIsVolumeJobDataSourceBasic(t *testing.T) {

‎ibm/service/vpc/data_source_ibm_is_volume_jobs.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/*
55
* IBM OpenAPI Terraform Generator Version: 3.107.1-41b0fbd0-20250825-080732
6-
*/
6+
*/
77

88
package vpc
99

@@ -18,7 +18,7 @@ import (
1818

1919
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
2020
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
21-
"github.ibm.com/ibmcloud/vpc-go-sdk/vpcv1"
21+
"github.com/IBM/vpc-go-sdk/vpcv1"
2222
)
2323

2424
func DataSourceIBMIsVolumeJobs() *schema.Resource {
@@ -162,7 +162,7 @@ func DataSourceIBMIsVolumeJobs() *schema.Resource {
162162
}
163163

164164
func dataSourceIBMIsVolumeJobsRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
165-
vpcClient, err := meta.(conns.ClientSession).VpcV1()
165+
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
166166
if err != nil {
167167
tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_volume_jobs", "read", "initialize-client")
168168
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())

‎ibm/service/vpc/data_source_ibm_is_volume_jobs_test.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,22 @@
33

44
/*
55
* IBM OpenAPI Terraform Generator Version: 3.107.1-41b0fbd0-20250825-080732
6-
*/
6+
*/
77

88
package vpc_test
99

1010
import (
1111
"fmt"
1212
"testing"
1313

14-
"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
15-
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
16-
14+
acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
1715
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/vpc"
16+
. "github.com/IBM-Cloud/terraform-provider-ibm/ibm/unittest"
1817
"github.com/IBM/go-sdk-core/v5/core"
18+
"github.com/IBM/vpc-go-sdk/vpcv1"
19+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
20+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1921
"github.com/stretchr/testify/assert"
20-
"github.ibm.com/ibmcloud/vpc-go-sdk/vpcv1"
21-
. "github.com/IBM-Cloud/terraform-provider-ibm/ibm/unittest"
22-
acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
2322
)
2423

2524
func TestAccIBMIsVolumeJobsDataSourceBasic(t *testing.T) {

‎ibm/service/vpc/resource_ibm_is_virtual_endpoint_gateway.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -380,10 +380,10 @@ func resourceIBMisVirtualEndpointGatewayCreate(context context.Context, d *schem
380380

381381
}
382382
// dns resolution binding change
383-
if allowDnsResolutionBindingOk, ok := d.GetOkExists(isVirtualEndpointGatewayAllowDnsResolutionBinding); ok {
384-
allowDnsResolutionBinding := allowDnsResolutionBindingOk.(bool)
385-
opt.AllowDnsResolutionBinding = &allowDnsResolutionBinding
386-
}
383+
// if allowDnsResolutionBindingOk, ok := d.GetOkExists(isVirtualEndpointGatewayAllowDnsResolutionBinding); ok {
384+
// allowDnsResolutionBinding := allowDnsResolutionBindingOk.(bool)
385+
// opt.AllowDnsResolutionBinding = &allowDnsResolutionBinding
386+
// }
387387
endpointGateway, response, err := sess.CreateEndpointGateway(opt)
388388
if err != nil {
389389
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("[ERROR] Create Endpoint Gateway failed %s\n%s", err, response), "ibm_is_virtual_endpoint_gateway", "create")
@@ -456,10 +456,10 @@ func resourceIBMisVirtualEndpointGatewayUpdate(context context.Context, d *schem
456456
name := d.Get(isVirtualEndpointGatewayName).(string)
457457
endpointGatewayPatchModel.Name = core.StringPtr(name)
458458
}
459-
if d.HasChange(isVirtualEndpointGatewayAllowDnsResolutionBinding) {
460-
allowDnsResolutionBinding := d.Get(isVirtualEndpointGatewayAllowDnsResolutionBinding).(bool)
461-
endpointGatewayPatchModel.AllowDnsResolutionBinding = &allowDnsResolutionBinding
462-
}
459+
// if d.HasChange(isVirtualEndpointGatewayAllowDnsResolutionBinding) {
460+
// allowDnsResolutionBinding := d.Get(isVirtualEndpointGatewayAllowDnsResolutionBinding).(bool)
461+
// endpointGatewayPatchModel.AllowDnsResolutionBinding = &allowDnsResolutionBinding
462+
// }
463463
endpointGatewayPatchModelAsPatch, _ := endpointGatewayPatchModel.AsPatch()
464464
opt := sess.NewUpdateEndpointGatewayOptions(d.Id(), endpointGatewayPatchModelAsPatch)
465465
_, response, err := sess.UpdateEndpointGateway(opt)
@@ -574,7 +574,7 @@ func resourceIBMisVirtualEndpointGatewayRead(context context.Context, d *schema.
574574
if err := d.Set(isVirtualEndpointGatewayLifecycleReasons, resourceEGWFlattenLifecycleReasons(endpointGateway.LifecycleReasons)); err != nil {
575575
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("[ERROR] Error setting lifecycle_reasons: %s", err), "ibm_is_virtual_endpoint_gateway", "read", "set-lifecycle-reasons").GetDiag()
576576
}
577-
d.Set(isVirtualEndpointGatewayAllowDnsResolutionBinding, endpointGateway.AllowDnsResolutionBinding)
577+
// d.Set(isVirtualEndpointGatewayAllowDnsResolutionBinding, endpointGateway.AllowDnsResolutionBinding)
578578
d.Set(isVirtualEndpointGatewayResourceType, endpointGateway.ResourceType)
579579
d.Set(isVirtualEndpointGatewayCRN, endpointGateway.CRN)
580580
d.Set(isVirtualEndpointGatewayIPs, flattenIPs(endpointGateway.Ips))

‎ibm/service/vpc/resource_ibm_is_volume_job.go‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/*
55
* IBM OpenAPI Terraform Generator Version: 3.107.1-41b0fbd0-20250825-080732
6-
*/
6+
*/
77

88
package vpc
99

@@ -19,49 +19,49 @@ import (
1919
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
2020
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate"
2121
"github.com/IBM/go-sdk-core/v5/core"
22-
"github.ibm.com/ibmcloud/vpc-go-sdk/vpcv1"
22+
"github.com/IBM/vpc-go-sdk/vpcv1"
2323
)
2424

2525
func ResourceIBMIsVolumeJob() *schema.Resource {
2626
return &schema.Resource{
27-
CreateContext: resourceIBMIsVolumeJobCreate,
28-
ReadContext: resourceIBMIsVolumeJobRead,
29-
UpdateContext: resourceIBMIsVolumeJobUpdate,
30-
DeleteContext: resourceIBMIsVolumeJobDelete,
31-
Importer: &schema.ResourceImporter{},
27+
CreateContext: resourceIBMIsVolumeJobCreate,
28+
ReadContext: resourceIBMIsVolumeJobRead,
29+
UpdateContext: resourceIBMIsVolumeJobUpdate,
30+
DeleteContext: resourceIBMIsVolumeJobDelete,
31+
Importer: &schema.ResourceImporter{},
3232

3333
Schema: map[string]*schema.Schema{
3434
"volume_id": &schema.Schema{
35-
Type: schema.TypeString,
36-
Required: true,
37-
ForceNew: true,
35+
Type: schema.TypeString,
36+
Required: true,
37+
ForceNew: true,
3838
ValidateFunc: validate.InvokeValidator("ibm_is_volume_job", "volume_id"),
39-
Description: "The volume identifier.",
39+
Description: "The volume identifier.",
4040
},
4141
"start": &schema.Schema{
42-
Type: schema.TypeString,
43-
Optional: true,
42+
Type: schema.TypeString,
43+
Optional: true,
4444
ValidateFunc: validate.InvokeValidator("ibm_is_volume_job", "start"),
45-
Description: "A server-provided token determining what resource to start the page on.",
45+
Description: "A server-provided token determining what resource to start the page on.",
4646
},
4747
"limit": &schema.Schema{
48-
Type: schema.TypeInt,
49-
Optional: true,
50-
Default: 50,
48+
Type: schema.TypeInt,
49+
Optional: true,
50+
Default: 50,
5151
ValidateFunc: validate.InvokeValidator("ibm_is_volume_job", "limit"),
52-
Description: "The number of resources to return on a page.",
52+
Description: "The number of resources to return on a page.",
5353
},
5454
"job_type": &schema.Schema{
55-
Type: schema.TypeString,
56-
Required: true,
55+
Type: schema.TypeString,
56+
Required: true,
5757
ValidateFunc: validate.InvokeValidator("ibm_is_volume_job", "job_type"),
58-
Description: "The type of volume job.The enumerated values for this property may[expand](https://cloud.ibm.com/apidocs/vpc#property-value-expansion) in the future.",
58+
Description: "The type of volume job.The enumerated values for this property may[expand](https://cloud.ibm.com/apidocs/vpc#property-value-expansion) in the future.",
5959
},
6060
"name": &schema.Schema{
61-
Type: schema.TypeString,
62-
Optional: true,
61+
Type: schema.TypeString,
62+
Optional: true,
6363
ValidateFunc: validate.InvokeValidator("ibm_is_volume_job", "name"),
64-
Description: "The name for this volume job. The name must not be used by another volume job for this volume.",
64+
Description: "The name for this volume job. The name must not be used by another volume job for this volume.",
6565
},
6666
"parameters": &schema.Schema{
6767
Type: schema.TypeList,
@@ -233,7 +233,7 @@ func ResourceIBMIsVolumeJobValidator() *validate.ResourceValidator {
233233
}
234234

235235
func resourceIBMIsVolumeJobCreate(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
236-
vpcClient, err := meta.(conns.ClientSession).VpcV1()
236+
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
237237
if err != nil {
238238
tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_volume_job", "create", "initialize-client")
239239
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
@@ -277,7 +277,7 @@ func resourceIBMIsVolumeJobCreate(context context.Context, d *schema.ResourceDat
277277
}
278278

279279
func resourceIBMIsVolumeJobRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
280-
vpcClient, err := meta.(conns.ClientSession).VpcV1()
280+
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
281281
if err != nil {
282282
tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_volume_job", "read", "initialize-client")
283283
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
@@ -385,7 +385,7 @@ func resourceIBMIsVolumeJobRead(context context.Context, d *schema.ResourceData,
385385
}
386386

387387
func resourceIBMIsVolumeJobUpdate(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
388-
vpcClient, err := meta.(conns.ClientSession).VpcV1()
388+
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
389389
if err != nil {
390390
tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_volume_job", "update", "initialize-client")
391391
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
@@ -406,7 +406,7 @@ func resourceIBMIsVolumeJobUpdate(context context.Context, d *schema.ResourceDat
406406

407407
patchVals := &vpcv1.VolumeJobPatch{}
408408
if d.HasChange("volume_id") {
409-
errMsg := fmt.Sprintf("Cannot update resource property \"%s\" with the ForceNew annotation." +
409+
errMsg := fmt.Sprintf("Cannot update resource property \"%s\" with the ForceNew annotation."+
410410
" The resource must be re-created to update this property.", "volume_id")
411411
return flex.DiscriminatedTerraformErrorf(nil, errMsg, "ibm_is_volume_job", "update", "volume_id-forces-new").GetDiag()
412412
}
@@ -434,7 +434,7 @@ func resourceIBMIsVolumeJobUpdate(context context.Context, d *schema.ResourceDat
434434
}
435435

436436
func resourceIBMIsVolumeJobDelete(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
437-
vpcClient, err := meta.(conns.ClientSession).VpcV1()
437+
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
438438
if err != nil {
439439
tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_volume_job", "delete", "initialize-client")
440440
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())

0 commit comments

Comments
 (0)