@@ -57,6 +57,12 @@ func ResourceTencentCloudVpcSubnet() *schema.Resource {
5757 Default : true ,
5858 Description : "Indicates whether multicast is enabled. The default value is 'true'." ,
5959 },
60+ "cdc_id" : {
61+ Type : schema .TypeString ,
62+ Optional : true ,
63+ ForceNew : true ,
64+ Description : "ID of CDC instance." ,
65+ },
6066 "route_table_id" : {
6167 Type : schema .TypeString ,
6268 Optional : true ,
@@ -92,35 +98,38 @@ func ResourceTencentCloudVpcSubnet() *schema.Resource {
9298func resourceTencentCloudVpcSubnetCreate (d * schema.ResourceData , meta interface {}) error {
9399 defer tccommon .LogElapsed ("resource.tencentcloud_subnet.create" )()
94100
95- logId := tccommon .GetLogId (tccommon .ContextNil )
96- ctx := context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
97-
98- vpcService := VpcService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
99-
100101 var (
102+ logId = tccommon .GetLogId (tccommon .ContextNil )
103+ ctx = context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
104+ vpcService = VpcService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
101105 vpcId string
102106 availabilityZone string
103107 name string
104108 cidrBlock string
105109 isMulticast bool
106110 routeTableId string
111+ cdcId string
107112 tags map [string ]string
108113 )
114+
109115 if temp , ok := d .GetOk ("vpc_id" ); ok {
110116 vpcId = temp .(string )
111117 if len (vpcId ) < 1 {
112118 return fmt .Errorf ("vpc_id should be not empty string" )
113119 }
114120 }
121+
115122 if temp , ok := d .GetOk ("availability_zone" ); ok {
116123 availabilityZone = temp .(string )
117124 if len (availabilityZone ) < 1 {
118125 return fmt .Errorf ("availability_zone should be not empty string" )
119126 }
120127 }
128+
121129 if temp , ok := d .GetOk ("name" ); ok {
122130 name = temp .(string )
123131 }
132+
124133 if temp , ok := d .GetOk ("cidr_block" ); ok {
125134 cidrBlock = temp .(string )
126135 }
@@ -134,11 +143,16 @@ func resourceTencentCloudVpcSubnetCreate(d *schema.ResourceData, meta interface{
134143 }
135144 }
136145
146+ if temp , ok := d .GetOk ("cdc_id" ); ok {
147+ cdcId = temp .(string )
148+ }
149+
137150 if routeTableId != "" {
138151 _ , has , err := vpcService .IsRouteTableInVpc (ctx , routeTableId , vpcId )
139152 if err != nil {
140153 return err
141154 }
155+
142156 if has != 1 {
143157 err = fmt .Errorf ("error,route_table [%s] not found in vpc [%s]" , routeTableId , vpcId )
144158 log .Printf ("[CRITAL]%s %s" , logId , err .Error ())
@@ -150,10 +164,11 @@ func resourceTencentCloudVpcSubnetCreate(d *schema.ResourceData, meta interface{
150164 tags = temp
151165 }
152166
153- subnetId , err := vpcService .CreateSubnet (ctx , vpcId , name , cidrBlock , availabilityZone , tags )
167+ subnetId , err := vpcService .CreateSubnet (ctx , vpcId , name , cidrBlock , availabilityZone , cdcId , tags )
154168 if err != nil {
155169 return err
156170 }
171+
157172 d .SetId (subnetId )
158173
159174 err = vpcService .ModifySubnetAttribute (ctx , subnetId , name , isMulticast )
@@ -170,10 +185,8 @@ func resourceTencentCloudVpcSubnetCreate(d *schema.ResourceData, meta interface{
170185
171186 if tags := helper .GetTags (d , "tags" ); len (tags ) > 0 {
172187 tagService := svctag .NewTagService (meta .(tccommon.ProviderMeta ).GetAPIV3Conn ())
173-
174188 region := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().Region
175189 resourceName := fmt .Sprintf ("qcs::vpc:%s:uin/:subnet/%s" , region , subnetId )
176-
177190 if err := tagService .ModifyTags (ctx , resourceName , tags , nil ); err != nil {
178191 return err
179192 }
@@ -186,19 +199,18 @@ func resourceTencentCloudVpcSubnetRead(d *schema.ResourceData, meta interface{})
186199 defer tccommon .LogElapsed ("resource.tencentcloud_subnet.read" )()
187200 defer tccommon .InconsistentCheck (d , meta )()
188201
189- logId := tccommon .GetLogId (tccommon .ContextNil )
190- ctx := context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
191-
192- id := d .Id ()
193-
194- vpcService := VpcService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
195- tagService := svctag .NewTagService (meta .(tccommon.ProviderMeta ).GetAPIV3Conn ())
196- region := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().Region
197202 var (
198- info VpcSubnetBasicInfo
199- has int
200- e error
203+ logId = tccommon .GetLogId (tccommon .ContextNil )
204+ ctx = context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
205+ vpcService = VpcService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
206+ tagService = svctag .NewTagService (meta .(tccommon.ProviderMeta ).GetAPIV3Conn ())
207+ region = meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().Region
208+ id = d .Id ()
209+ info VpcSubnetBasicInfo
210+ has int
211+ e error
201212 )
213+
202214 err := resource .Retry (tccommon .ReadRetryTimeout , func () * resource.RetryError {
203215 info , has , e = vpcService .DescribeSubnet (ctx , id , nil , "" , "" )
204216 if e != nil {
@@ -216,14 +228,18 @@ func resourceTencentCloudVpcSubnetRead(d *schema.ResourceData, meta interface{})
216228 log .Printf ("[CRITAL]%s %s" , logId , errRet .Error ())
217229 return resource .NonRetryableError (errRet )
218230 }
231+
219232 return nil
220233 })
234+
221235 if err != nil {
222236 return err
223237 }
238+
224239 if has == 0 {
225240 return nil
226241 }
242+
227243 tags , err := tagService .DescribeResourceTags (ctx , "vpc" , "subnet" , region , id )
228244 if err != nil {
229245 return err
@@ -235,6 +251,7 @@ func resourceTencentCloudVpcSubnetRead(d *schema.ResourceData, meta interface{})
235251 _ = d .Set ("cidr_block" , info .cidr )
236252 _ = d .Set ("is_multicast" , info .isMulticast )
237253 _ = d .Set ("route_table_id" , info .routeTableId )
254+ _ = d .Set ("cdc_id" , info .cdcId )
238255 _ = d .Set ("is_default" , info .isDefault )
239256 _ = d .Set ("available_ip_count" , info .availableIpCount )
240257 _ = d .Set ("create_time" , info .createTime )
@@ -246,17 +263,15 @@ func resourceTencentCloudVpcSubnetRead(d *schema.ResourceData, meta interface{})
246263func resourceTencentCloudVpcSubnetUpdate (d * schema.ResourceData , meta interface {}) error {
247264 defer tccommon .LogElapsed ("resource.tencentcloud_subnet.update" )()
248265
249- logId := tccommon .GetLogId (tccommon .ContextNil )
250- ctx := context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
251-
252- id := d .Id ()
253-
254- service := VpcService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
255-
256266 var (
267+ logId = tccommon .GetLogId (tccommon .ContextNil )
268+ ctx = context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
269+ service = VpcService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
270+ id = d .Id ()
257271 name string
258272 isMulticast bool
259273 )
274+
260275 old , now := d .GetChange ("name" )
261276 if d .HasChange ("name" ) {
262277 name = now .(string )
@@ -287,6 +302,7 @@ func resourceTencentCloudVpcSubnetUpdate(d *schema.ResourceData, meta interface{
287302 if err != nil {
288303 return err
289304 }
305+
290306 if has != 1 {
291307 err = fmt .Errorf ("error,route_table [%s] not found in vpc [%s]" , routeTableId , d .Get ("vpc_id" ).(string ))
292308 log .Printf ("[CRITAL]%s %s" , logId , err .Error ())
@@ -301,16 +317,12 @@ func resourceTencentCloudVpcSubnetUpdate(d *schema.ResourceData, meta interface{
301317 if d .HasChange ("tags" ) {
302318 oldTags , newTags := d .GetChange ("tags" )
303319 replaceTags , deleteTags := svctag .DiffTags (oldTags .(map [string ]interface {}), newTags .(map [string ]interface {}))
304-
305320 tagService := svctag .NewTagService (meta .(tccommon.ProviderMeta ).GetAPIV3Conn ())
306-
307321 region := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().Region
308322 resourceName := fmt .Sprintf ("qcs::vpc:%s:uin/:subnet/%s" , region , id )
309-
310323 if err := tagService .ModifyTags (ctx , resourceName , replaceTags , deleteTags ); err != nil {
311324 return err
312325 }
313-
314326 }
315327
316328 d .Partial (false )
@@ -321,10 +333,11 @@ func resourceTencentCloudVpcSubnetUpdate(d *schema.ResourceData, meta interface{
321333func resourceTencentCloudVpcSubnetDelete (d * schema.ResourceData , meta interface {}) error {
322334 defer tccommon .LogElapsed ("resource.tencentcloud_subnet.delete" )()
323335
324- logId := tccommon .GetLogId (tccommon .ContextNil )
325- ctx := context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
326-
327- service := VpcService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
336+ var (
337+ logId = tccommon .GetLogId (tccommon .ContextNil )
338+ ctx = context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
339+ service = VpcService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
340+ )
328341
329342 err := resource .Retry (tccommon .WriteRetryTimeout , func () * resource.RetryError {
330343 if err := service .DeleteSubnet (ctx , d .Id ()); err != nil {
@@ -333,8 +346,10 @@ func resourceTencentCloudVpcSubnetDelete(d *schema.ResourceData, meta interface{
333346 return nil
334347 }
335348 }
349+
336350 return resource .RetryableError (err )
337351 }
352+
338353 return nil
339354 })
340355
0 commit comments