@@ -31,6 +31,12 @@ func ResourceTencentCloudClsLogset() *schema.Resource {
31
31
Description : "Logset name, which must be unique." ,
32
32
},
33
33
34
+ "tags" : {
35
+ Type : schema .TypeMap ,
36
+ Optional : true ,
37
+ Description : "Tag description list." ,
38
+ },
39
+
34
40
"create_time" : {
35
41
Type : schema .TypeString ,
36
42
Computed : true ,
@@ -48,12 +54,6 @@ func ResourceTencentCloudClsLogset() *schema.Resource {
48
54
Computed : true ,
49
55
Description : "If assumer_uin is not empty, it indicates the service provider who creates the logset." ,
50
56
},
51
-
52
- "tags" : {
53
- Type : schema .TypeMap ,
54
- Optional : true ,
55
- Description : "Tag description list." ,
56
- },
57
57
},
58
58
}
59
59
}
@@ -62,11 +62,11 @@ func resourceTencentCloudClsLogsetCreate(d *schema.ResourceData, meta interface{
62
62
defer tccommon .LogElapsed ("resource.tencentcloud_cls_logset.create" )()
63
63
defer tccommon .InconsistentCheck (d , meta )()
64
64
65
- logId := tccommon .GetLogId (tccommon .ContextNil )
66
-
67
65
var (
66
+ logId = tccommon .GetLogId (tccommon .ContextNil )
67
+ ctx = context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
68
68
request = cls .NewCreateLogsetRequest ()
69
- response * cls.CreateLogsetResponse
69
+ response = cls .NewCreateLogsetResponse ()
70
70
)
71
71
72
72
if v , ok := d .GetOk ("logset_name" ); ok {
@@ -81,6 +81,11 @@ func resourceTencentCloudClsLogsetCreate(d *schema.ResourceData, meta interface{
81
81
log .Printf ("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n " ,
82
82
logId , request .GetAction (), request .ToJsonString (), result .ToJsonString ())
83
83
}
84
+
85
+ if result == nil || result .Response == nil {
86
+ return resource .NonRetryableError (fmt .Errorf ("Create cls logset failed, Response is nil." ))
87
+ }
88
+
84
89
response = result
85
90
return nil
86
91
})
@@ -90,9 +95,13 @@ func resourceTencentCloudClsLogsetCreate(d *schema.ResourceData, meta interface{
90
95
return err
91
96
}
92
97
98
+ if response .Response .LogsetId == nil {
99
+ return fmt .Errorf ("LogsetId is nil." )
100
+ }
101
+
93
102
logsetId := * response .Response .LogsetId
103
+ d .SetId (logsetId )
94
104
95
- ctx := context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
96
105
if tags := helper .GetTags (d , "tags" ); len (tags ) > 0 {
97
106
tagService := svctag .NewTagService (meta .(tccommon.ProviderMeta ).GetAPIV3Conn ())
98
107
region := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().Region
@@ -101,23 +110,22 @@ func resourceTencentCloudClsLogsetCreate(d *schema.ResourceData, meta interface{
101
110
return err
102
111
}
103
112
}
104
- d . SetId ( logsetId )
113
+
105
114
return resourceTencentCloudClsLogsetRead (d , meta )
106
115
}
107
116
108
117
func resourceTencentCloudClsLogsetRead (d * schema.ResourceData , meta interface {}) error {
109
118
defer tccommon .LogElapsed ("resource.tencentcloud_cls_logset.read" )()
110
119
defer tccommon .InconsistentCheck (d , meta )()
111
120
112
- logId := tccommon . GetLogId ( tccommon . ContextNil )
113
- ctx := context . WithValue ( context . TODO (), tccommon .LogIdKey , logId )
114
-
115
- service : = ClsService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
116
-
117
- logsetId := d . Id ( )
121
+ var (
122
+ logId = tccommon . GetLogId ( tccommon .ContextNil )
123
+ ctx = context . WithValue ( context . TODO (), tccommon . LogIdKey , logId )
124
+ service = ClsService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
125
+ logsetId = d . Id ()
126
+ )
118
127
119
128
logset , err := service .DescribeClsLogset (ctx , logsetId )
120
-
121
129
if err != nil {
122
130
return err
123
131
}
@@ -149,6 +157,7 @@ func resourceTencentCloudClsLogsetRead(d *schema.ResourceData, meta interface{})
149
157
if err != nil {
150
158
return err
151
159
}
160
+
152
161
_ = d .Set ("tags" , tags )
153
162
154
163
return nil
@@ -158,32 +167,33 @@ func resourceTencentCloudClsLogsetUpdate(d *schema.ResourceData, meta interface{
158
167
defer tccommon .LogElapsed ("resource.tencentcloud_cls_logset.update" )()
159
168
defer tccommon .InconsistentCheck (d , meta )()
160
169
161
- logId := tccommon .GetLogId (tccommon .ContextNil )
162
- ctx := context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
163
-
164
- request := cls .NewModifyLogsetRequest ()
165
-
166
- request .LogsetId = helper .String (d .Id ())
170
+ var (
171
+ logId = tccommon .GetLogId (tccommon .ContextNil )
172
+ ctx = context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
173
+ )
167
174
168
175
if d .HasChange ("logset_name" ) {
176
+ request := cls .NewModifyLogsetRequest ()
177
+ request .LogsetId = helper .String (d .Id ())
169
178
if v , ok := d .GetOk ("logset_name" ); ok {
170
179
request .LogsetName = helper .String (v .(string ))
171
180
}
172
- }
173
181
174
- err := resource .Retry (tccommon .WriteRetryTimeout , func () * resource.RetryError {
175
- result , e := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().UseClsClient ().ModifyLogset (request )
176
- if e != nil {
177
- return tccommon .RetryError (e )
178
- } else {
179
- log .Printf ("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n " ,
180
- logId , request .GetAction (), request .ToJsonString (), result .ToJsonString ())
181
- }
182
- return nil
183
- })
182
+ err := resource .Retry (tccommon .WriteRetryTimeout , func () * resource.RetryError {
183
+ result , e := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().UseClsClient ().ModifyLogset (request )
184
+ if e != nil {
185
+ return tccommon .RetryError (e )
186
+ } else {
187
+ log .Printf ("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n " ,
188
+ logId , request .GetAction (), request .ToJsonString (), result .ToJsonString ())
189
+ }
184
190
185
- if err != nil {
186
- return err
191
+ return nil
192
+ })
193
+
194
+ if err != nil {
195
+ return err
196
+ }
187
197
}
188
198
189
199
if d .HasChange ("tags" ) {
@@ -204,11 +214,12 @@ func resourceTencentCloudClsLogsetDelete(d *schema.ResourceData, meta interface{
204
214
defer tccommon .LogElapsed ("resource.tencentcloud_cls_logset.delete" )()
205
215
defer tccommon .InconsistentCheck (d , meta )()
206
216
207
- logId := tccommon .GetLogId (tccommon .ContextNil )
208
- ctx := context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
209
-
210
- service := ClsService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
211
- logsetId := d .Id ()
217
+ var (
218
+ logId = tccommon .GetLogId (tccommon .ContextNil )
219
+ ctx = context .WithValue (context .TODO (), tccommon .LogIdKey , logId )
220
+ service = ClsService {client : meta .(tccommon.ProviderMeta ).GetAPIV3Conn ()}
221
+ logsetId = d .Id ()
222
+ )
212
223
213
224
if err := service .DeleteClsLogsetById (ctx , logsetId ); err != nil {
214
225
return err
0 commit comments