@@ -23,11 +23,20 @@ func ResourceTencentCloudVpcIpv6CidrBlock() *schema.Resource {
2323 },
2424 Schema : map [string ]* schema.Schema {
2525 "vpc_id" : {
26- Required : true ,
2726 Type : schema .TypeString ,
27+ Required : true ,
2828 ForceNew : true ,
2929 Description : "`VPC` instance `ID`, in the form of `vpc-f49l6u0z`." ,
3030 },
31+
32+ "address_type" : {
33+ Type : schema .TypeString ,
34+ Optional : true ,
35+ Computed : true ,
36+ ForceNew : true ,
37+ Description : "Apply for the type of IPv6 Cidr, GUA (Global Unicast Address), ULA (Unique Local Address)." ,
38+ },
39+
3140 "ipv6_cidr_block" : {
3241 Type : schema .TypeString ,
3342 Computed : true ,
@@ -41,26 +50,32 @@ func resourceTencentCloudVpcIpv6CidrBlockCreate(d *schema.ResourceData, meta int
4150 defer tccommon .LogElapsed ("resource.tencentcloud_vpc_ipv6_cidr_block.create" )()
4251 defer tccommon .InconsistentCheck (d , meta )()
4352
44- logId := tccommon .GetLogId (tccommon .ContextNil )
45-
4653 var (
54+ logId = tccommon .GetLogId (tccommon .ContextNil )
4755 request = vpc .NewAssignIpv6CidrBlockRequest ()
4856 vpcId string
4957 )
58+
5059 if v , ok := d .GetOk ("vpc_id" ); ok {
5160 vpcId = v .(string )
5261 request .VpcId = helper .String (vpcId )
5362 }
5463
64+ if v , ok := d .GetOk ("address_type" ); ok {
65+ request .AddressType = helper .String (v .(string ))
66+ }
67+
5568 err := resource .Retry (tccommon .WriteRetryTimeout , func () * resource.RetryError {
5669 result , e := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().UseVpcClient ().AssignIpv6CidrBlock (request )
5770 if e != nil {
5871 return tccommon .RetryError (e )
5972 } else {
6073 log .Printf ("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n " , logId , request .GetAction (), request .ToJsonString (), result .ToJsonString ())
6174 }
75+
6276 return nil
6377 })
78+
6479 if err != nil {
6580 log .Printf ("[CRITAL]%s create vpc ipv6CidrBlock failed, reason:%+v" , logId , err )
6681 return err
@@ -75,13 +90,12 @@ func resourceTencentCloudVpcIpv6CidrBlockRead(d *schema.ResourceData, meta inter
7590 defer tccommon .LogElapsed ("resource.tencentcloud_vpc_ipv6_cidr_block.read" )()
7691 defer tccommon .InconsistentCheck (d , meta )()
7792
78- logId := tccommon .GetLogId (tccommon .ContextNil )
79-
80- ctx := context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
81-
82- service := VpcService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
83-
84- vpcId := d .Id ()
93+ var (
94+ logId = tccommon .GetLogId (tccommon .ContextNil )
95+ ctx = context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
96+ service = VpcService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
97+ vpcId = d .Id ()
98+ )
8599
86100 instance , err := service .DescribeVpcById (ctx , vpcId )
87101 if err != nil {
@@ -98,6 +112,10 @@ func resourceTencentCloudVpcIpv6CidrBlockRead(d *schema.ResourceData, meta inter
98112 _ = d .Set ("vpc_id" , instance .VpcId )
99113 }
100114
115+ if instance .Ipv6CidrBlockSet != nil && len (instance .Ipv6CidrBlockSet ) != 0 {
116+ _ = d .Set ("address_type" , instance .Ipv6CidrBlockSet [0 ].AddressType )
117+ }
118+
101119 if instance .Ipv6CidrBlock != nil {
102120 _ = d .Set ("ipv6_cidr_block" , instance .Ipv6CidrBlock )
103121 }
@@ -109,11 +127,12 @@ func resourceTencentCloudVpcIpv6CidrBlockDelete(d *schema.ResourceData, meta int
109127 defer tccommon .LogElapsed ("resource.tencentcloud_vpc_ipv6_cidr_block.delete" )()
110128 defer tccommon .InconsistentCheck (d , meta )()
111129
112- logId := tccommon .GetLogId (tccommon .ContextNil )
113- ctx := context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
114-
115- service := VpcService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
116- vpcId := d .Id ()
130+ var (
131+ logId = tccommon .GetLogId (tccommon .ContextNil )
132+ ctx = context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
133+ service = VpcService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
134+ vpcId = d .Id ()
135+ )
117136
118137 if err := service .DeleteVpcIpv6CidrBlockById (ctx , vpcId ); err != nil {
119138 return err
0 commit comments