Skip to content

Commit f2d543b

Browse files
committed
fix golint
1 parent d636d35 commit f2d543b

File tree

2 files changed

+62
-64
lines changed

2 files changed

+62
-64
lines changed

tencentcloud/data_source_tc_cfs_available_zone.go

Lines changed: 58 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -155,93 +155,91 @@ func dataSourceTencentCloudCfsAvailableZoneRead(d *schema.ResourceData, meta int
155155
ids := make([]string, 0, len(regionZones))
156156
tmpList := make([]map[string]interface{}, 0, len(regionZones))
157157

158-
if regionZones != nil {
159-
for _, availableRegion := range regionZones {
160-
availableRegionMap := map[string]interface{}{}
158+
for _, availableRegion := range regionZones {
159+
availableRegionMap := map[string]interface{}{}
161160

162-
if availableRegion.Region != nil {
163-
availableRegionMap["region"] = availableRegion.Region
164-
}
165-
166-
if availableRegion.RegionName != nil {
167-
availableRegionMap["region_name"] = availableRegion.RegionName
168-
}
161+
if availableRegion.Region != nil {
162+
availableRegionMap["region"] = availableRegion.Region
163+
}
169164

170-
if availableRegion.RegionStatus != nil {
171-
availableRegionMap["region_status"] = availableRegion.RegionStatus
172-
}
165+
if availableRegion.RegionName != nil {
166+
availableRegionMap["region_name"] = availableRegion.RegionName
167+
}
173168

174-
if availableRegion.Zones != nil {
175-
zonesList := []interface{}{}
176-
for _, zones := range availableRegion.Zones {
177-
zonesMap := map[string]interface{}{}
169+
if availableRegion.RegionStatus != nil {
170+
availableRegionMap["region_status"] = availableRegion.RegionStatus
171+
}
178172

179-
if zones.Zone != nil {
180-
zonesMap["zone"] = zones.Zone
181-
}
173+
if availableRegion.Zones != nil {
174+
zonesList := []interface{}{}
175+
for _, zones := range availableRegion.Zones {
176+
zonesMap := map[string]interface{}{}
182177

183-
if zones.ZoneId != nil {
184-
zonesMap["zone_id"] = zones.ZoneId
185-
}
178+
if zones.Zone != nil {
179+
zonesMap["zone"] = zones.Zone
180+
}
186181

187-
if zones.ZoneCnName != nil {
188-
zonesMap["zone_cn_name"] = zones.ZoneCnName
189-
}
182+
if zones.ZoneId != nil {
183+
zonesMap["zone_id"] = zones.ZoneId
184+
}
190185

191-
if zones.Types != nil {
192-
typesList := []interface{}{}
193-
for _, types := range zones.Types {
194-
typesMap := map[string]interface{}{}
186+
if zones.ZoneCnName != nil {
187+
zonesMap["zone_cn_name"] = zones.ZoneCnName
188+
}
195189

196-
if types.Protocols != nil {
197-
protocolsList := []interface{}{}
198-
for _, protocols := range types.Protocols {
199-
protocolsMap := map[string]interface{}{}
190+
if zones.Types != nil {
191+
typesList := []interface{}{}
192+
for _, types := range zones.Types {
193+
typesMap := map[string]interface{}{}
200194

201-
if protocols.SaleStatus != nil {
202-
protocolsMap["sale_status"] = protocols.SaleStatus
203-
}
195+
if types.Protocols != nil {
196+
protocolsList := []interface{}{}
197+
for _, protocols := range types.Protocols {
198+
protocolsMap := map[string]interface{}{}
204199

205-
if protocols.Protocol != nil {
206-
protocolsMap["protocol"] = protocols.Protocol
207-
}
200+
if protocols.SaleStatus != nil {
201+
protocolsMap["sale_status"] = protocols.SaleStatus
202+
}
208203

209-
protocolsList = append(protocolsList, protocolsMap)
204+
if protocols.Protocol != nil {
205+
protocolsMap["protocol"] = protocols.Protocol
210206
}
211207

212-
typesMap["protocols"] = protocolsList
208+
protocolsList = append(protocolsList, protocolsMap)
213209
}
214210

215-
if types.Type != nil {
216-
typesMap["type"] = types.Type
217-
}
211+
typesMap["protocols"] = protocolsList
212+
}
218213

219-
if types.Prepayment != nil {
220-
typesMap["prepayment"] = types.Prepayment
221-
}
214+
if types.Type != nil {
215+
typesMap["type"] = types.Type
216+
}
222217

223-
typesList = append(typesList, typesMap)
218+
if types.Prepayment != nil {
219+
typesMap["prepayment"] = types.Prepayment
224220
}
225221

226-
zonesMap["types"] = typesList
222+
typesList = append(typesList, typesMap)
227223
}
228224

229-
if zones.ZoneName != nil {
230-
zonesMap["zone_name"] = zones.ZoneName
231-
}
225+
zonesMap["types"] = typesList
226+
}
232227

233-
zonesList = append(zonesList, zonesMap)
228+
if zones.ZoneName != nil {
229+
zonesMap["zone_name"] = zones.ZoneName
234230
}
235231

236-
availableRegionMap["zones"] = zonesList
232+
zonesList = append(zonesList, zonesMap)
237233
}
238234

239-
if availableRegion.RegionCnName != nil {
240-
availableRegionMap["region_cn_name"] = availableRegion.RegionCnName
241-
}
242-
ids = append(ids, *availableRegion.Region)
243-
tmpList = append(tmpList, availableRegionMap)
235+
availableRegionMap["zones"] = zonesList
236+
}
237+
238+
if availableRegion.RegionCnName != nil {
239+
availableRegionMap["region_cn_name"] = availableRegion.RegionCnName
244240
}
241+
ids = append(ids, *availableRegion.Region)
242+
tmpList = append(tmpList, availableRegionMap)
245243
}
246244

247245
d.SetId(helper.DataResourceIdsHash(ids))

tencentcloud/resource_tc_cfs_sign_up_cfs_service.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ func resourceTencentCloudCfsSignUpCfsServiceCreate(d *schema.ResourceData, meta
5151
if e != nil {
5252
return retryError(e)
5353
} else {
54-
log.Println("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
54+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
5555
}
5656
response = result
5757
return nil
5858
})
5959
if err != nil {
60-
log.Println("[CRITAL]%s operate cfs signUpCfsService failed, reason:%+v", logId, err)
60+
log.Printf("[CRITAL]%s operate cfs signUpCfsService failed, reason:%+v", logId, err)
6161
return nil
6262
}
6363

@@ -82,13 +82,13 @@ func resourceTencentCloudCfsSignUpCfsServiceRead(d *schema.ResourceData, meta in
8282
if e != nil {
8383
return retryError(e)
8484
} else {
85-
log.Println("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
85+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
8686
}
8787
response = result
8888
return nil
8989
})
9090
if err != nil {
91-
log.Println("[CRITAL]%s operate cfs signUpCfsService failed, reason:%+v", logId, err)
91+
log.Printf("[CRITAL]%s operate cfs signUpCfsService failed, reason:%+v", logId, err)
9292
return nil
9393
}
9494

0 commit comments

Comments
 (0)