feat(vpn-gateway): Fix update logic of asn

Author: keerthi-gp

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

@@ -35,6 +35,10 @@ import (
 	"github.com/go-openapi/strfmt"
 )
 
+const (
+	YYYYMMDD = "2006-01-02"
+)
+
 // VpcV1 : The IBM Cloud Virtual Private Cloud (VPC) API can be used to programmatically provision and manage virtual
 // server instances, along with subnets, volumes, load balancers, and more.
 //
@@ -102,6 +106,10 @@ func NewVpcV1UsingExternalConfig(options *VpcV1Options) (vpc *VpcV1, err error)
 		err = vpc.Service.SetServiceURL(options.URL)
 		err = core.RepurposeSDKProblem(err, "url-set-error")
 	}
+	now := time.Now().UTC()
+	if options.Version == nil {
+		options.Version = core.StringPtr(now.Format(YYYYMMDD))
+	}
 	return
 }
 
@@ -132,6 +140,11 @@ func NewVpcV1(options *VpcV1Options) (service *VpcV1, err error) {
 		}
 	}
 
+	now := time.Now().UTC()
+	if options.Version == nil {
+		options.Version = core.StringPtr(now.Format(YYYYMMDD))
+	}
+
 	service = &VpcV1{
 		Service:    baseService,
 		Generation: options.Generation,
@@ -237,7 +250,7 @@ func (vpc *VpcV1) CreateVPCWithContext(ctx context.Context, createVPCOptions *Cr
 	builder.AddHeader("Accept", "application/json")
 	builder.AddHeader("Content-Type", "application/json")
 
-	builder.AddQuery("version", fmt.Sprint(*vpc.Version))
+	builder.AddQuery("version", fmt.Sprint("2025-08-05"))
 	builder.AddQuery("generation", fmt.Sprint(*vpc.Generation))
 
 	body := make(map[string]interface{})

go.mod

@@ -238,7 +238,7 @@ replace github.com/dgrijalva/jwt-go v3.2.0+incompatible => github.com/golang-jwt
 // add sdk changes.
 replace github.com/portworx/sched-ops v0.0.0-20200831185134-3e8010dc7056 => github.com/portworx/sched-ops v0.20.4-openstorage-rc3 // required by rook v1.7
 
-replace github.com/IBM/vpc-go-sdk v0.64.0 => ./common/github.com/IBM/vpc-go-sdk
+replace github.com/IBM/vpc-go-sdk => ./common/github.com/IBM/vpc-go-sdk
 replace github.com/hashicorp/consul/api v1.1.0 => github.com/hashicorp/consul/api v1.30.0
 
 replace github.com/hashicorp/vault => github.com/hashicorp/vault v1.18.2

ibm/service/vpc/data_source_ibm_is_vpn_gateway.go

@@ -269,13 +269,13 @@ func DataSourceIBMISVPNGateway() *schema.Resource {
 			},
 			isVPNGatewayLocalAsn: {
 				Type:        schema.TypeInt,
-				Optional:    true,
+				Computed:    true,
 				Description: "The local autonomous system number (ASN) for this VPN gateway and its connections.",
 			},
 
 			isVPNGatewayAdvertisedCidrs: {
 				Type:        schema.TypeList,
-				Optional:    true,
+				Computed:    true,
 				Description: "The additional CIDRs advertised through any enabled routing protocol (for example, BGP). The routing protocol will advertise routes with these CIDRs and VPC prefixes as route destinations.",
 				Elem: &schema.Schema{
 					Type: schema.TypeString,

ibm/service/vpc/data_source_ibm_is_vpn_gateway_connection.go

@@ -281,6 +281,12 @@ func DataSourceIBMISVPNGatewayConnection() *schema.Resource {
 								Type: schema.TypeString,
 							},
 						},
+						"asn": &schema.Schema{
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Computed:    true,
+							Description: "The peer autonomous system number (ASN) for this VPN gateway connection.",
+						},
 					},
 				},
 			},

ibm/service/vpc/data_source_ibm_is_vpn_gateway_connections.go

@@ -200,6 +200,12 @@ func DataSourceIBMISVPNGatewayConnections() *schema.Resource {
 										Computed:    true,
 										Description: "The FQDN of the peer VPN gateway for this connection.",
 									},
+									"asn": &schema.Schema{
+										Type:        schema.TypeInt,
+										Optional:    true,
+										Computed:    true,
+										Description: "The peer autonomous system number (ASN) for this VPN gateway connection.",
+									},
 								},
 							},
 						},

ibm/service/vpc/data_source_ibm_is_vpn_gateways.go

@@ -176,12 +176,12 @@ func DataSourceIBMISVPNGateways() *schema.Resource {
 						},
 						isVPNGatewayLocalAsn: {
 							Type:        schema.TypeInt,
-							Optional:    true,
+							Computed:    true,
 							Description: "The local autonomous system number (ASN) for this VPN gateway and its connections.",
 						},
 						isVPNGatewayAdvertisedCidrs: {
 							Type:        schema.TypeList,
-							Optional:    true,
+							Computed:    true,
 							Description: "The additional CIDRs advertised through any enabled routing protocol (for example, BGP). The routing protocol will advertise routes with these CIDRs and VPC prefixes as route destinations.",
 							Elem: &schema.Schema{
 								Type: schema.TypeString,

ibm/service/vpc/resource_ibm_is_vpn_gateway.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
 	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate"
+	"github.com/IBM/go-sdk-core/v5/core"
 	"github.com/IBM/vpc-go-sdk/vpcv1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -687,9 +688,11 @@ func vpngwUpdate(d *schema.ResourceData, meta interface{}, id string, hasChanged
 	}
 
 	if d.HasChange(isVPNGatewayLocalAsn) {
-		localAsn := d.Get(isVPNGatewayLocalAsn).(int64)
-		vpnGatewayPatchModel.LocalAsn = &localAsn
-		hasChanged = true
+		if localAsnIntf, ok := d.GetOk(isVPNGatewayLocalAsn); ok {
+			localAsn := core.Int64Ptr(int64(localAsnIntf.(int)))
+			vpnGatewayPatchModel.LocalAsn = localAsn
+			hasChanged = true
+		}
 	}
 
 	if hasChanged {

ibm/service/vpc/resource_ibm_is_vpn_gateway_connections.go

@@ -920,6 +920,17 @@ func vpngwconUpdate(d *schema.ResourceData, meta interface{}, gID, gConnID strin
 
 	if d.HasChange("tunnel") {
 		log.Println("[INFO] inside tunnel block")
+		options := &vpcv1.GetVPNGatewayConnectionOptions{
+			VPNGatewayID: &gID,
+			ID:           &gConnID,
+		}
+		_, response, err := sess.GetVPNGatewayConnection(options)
+		if err != nil {
+			return fmt.Errorf("[ERROR] Error getting vpn conncetion: %s\n%s", err, response)
+		}
+		eTag := response.Headers.Get("ETag")
+		updateVpnGatewayConnectionOptions.IfMatch = &eTag
+
 		tunnelModels := []vpcv1.VPNGatewayConnectionTunnel{}
 		tunnelOk, _ := d.GetOk("tunnel")
 		for _, tunnelItem := range tunnelOk.([]interface{}) {
@@ -1329,8 +1340,9 @@ func resourceIBMIsVPNGatewayConnectionMapToVPNGatewayConnectionPeerPatch(modelMa
 	if modelMap["fqdn"] != nil && modelMap["fqdn"].(string) != "" {
 		model.Fqdn = core.StringPtr(modelMap["fqdn"].(string))
 	}
-	if modelMap["asn"] != nil && modelMap["asn"].(string) != "" {
-		model.Asn = core.Int64Ptr(modelMap["asn"].(int64))
+	if modelMap["asn"] != nil {
+		localAsn := core.Int64Ptr(int64(modelMap["asn"].(int)))
+		model.Asn = localAsn
 	}
 	return model, nil
 }
@@ -1768,7 +1780,7 @@ func setvpnGatewayConnectionIntfResource(d *schema.ResourceData, vpn_gateway_id
 			}
 			if !core.IsNil(vpnGatewayConnection.DistributeTraffic) {
 				if err = d.Set("distribute_traffic", vpnGatewayConnection.DistributeTraffic); err != nil {
-					return fmt.Errorf("Error setting distribute_traffic: %s", err)
+					return fmt.Errorf("[ERROR] setting distribute_traffic: %s", err)
 				}
 			}
 			if vpnGatewayConnection.DeadPeerDetection != nil {