Skip to content
This repository was archived by the owner on Mar 1, 2023. It is now read-only.

Commit deee04f

Browse files
author
Alexandr Sokolov
committed
linter minor fix
1 parent 93e67fa commit deee04f

7 files changed

+18
-25
lines changed

gcore/data_source_gcore_image.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func dataSourceImageRead(ctx context.Context, d *schema.ResourceData, m interfac
9999

100100
allImages, err := images.ListAll(client, images.ListOpts{})
101101
if err != nil {
102-
102+
return diag.FromErr(err)
103103
}
104104

105105
var found bool

gcore/provider_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ func objectInfo(resourceType string) string {
302302

303303
func CreateTestClient(provider *gcorecloud.ProviderClient, endpoint, version string) (*gcorecloud.ServiceClient, error) {
304304
projectID := 0
305-
err := fmt.Errorf("")
305+
var err error
306306
if strProjectID, exists := os.LookupEnv("TEST_PROJECT_ID"); exists {
307307
projectID, err = strconv.Atoi(strProjectID)
308308
if err != nil {
@@ -348,6 +348,9 @@ func createTestConfig() (*Config, error) {
348348
Password: os.Getenv("GCORE_PASSWORD"),
349349
AllowReauth: true,
350350
})
351+
if err != nil {
352+
return nil, err
353+
}
351354

352355
cdnProvider := gcdnProvider.NewClient(GCORE_CDN_URL, gcdnProvider.WithSignerFunc(func(req *http.Request) error {
353356
req.Header.Set("Authorization", "Bearer "+provider.AccessToken())

gcore/resource_gcore_baremetal.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ func resourceBmInstanceRead(ctx context.Context, d *schema.ResourceData, m inter
513513
} else {
514514
metadata := d.Get("metadata_map").(map[string]interface{})
515515
newMetadata := make(map[string]interface{}, len(metadata))
516-
for k, _ := range metadata {
516+
for k := range metadata {
517517
md, err := instances.MetadataGet(client, instanceID, k).Extract()
518518
if err != nil {
519519
return diag.Errorf("cannot get metadata with key: %s. Error: %s", instanceID, err)
@@ -604,7 +604,7 @@ func resourceBmInstanceUpdate(ctx context.Context, d *schema.ResourceData, m int
604604
} else if d.HasChange("metadata_map") {
605605
omd, nmd := d.GetChange("metadata_map")
606606
if len(omd.(map[string]interface{})) > 0 {
607-
for k, _ := range omd.(map[string]interface{}) {
607+
for k := range omd.(map[string]interface{}) {
608608
err := instances.MetadataDelete(client, instanceID, k).Err
609609
if err != nil {
610610
return diag.Errorf("cannot delete metadata key: %s. Error: %s", k, err)

gcore/resource_gcore_instance.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ func resourceInstanceRead(ctx context.Context, d *schema.ResourceData, m interfa
602602
} else {
603603
metadata := d.Get("metadata_map").(map[string]interface{})
604604
newMetadata := make(map[string]interface{}, len(metadata))
605-
for k, _ := range metadata {
605+
for k := range metadata {
606606
md, err := instances.MetadataGet(client, instanceID, k).Extract()
607607
if err != nil {
608608
return diag.Errorf("cannot get metadata with key: %s. Error: %s", instanceID, err)
@@ -710,7 +710,7 @@ func resourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter
710710
} else if d.HasChange("metadata_map") {
711711
omd, nmd := d.GetChange("metadata_map")
712712
if len(omd.(map[string]interface{})) > 0 {
713-
for k, _ := range omd.(map[string]interface{}) {
713+
for k := range omd.(map[string]interface{}) {
714714
err := instances.MetadataDelete(client, instanceID, k).Err
715715
if err != nil {
716716
return diag.Errorf("cannot delete metadata key: %s. Error: %s", k, err)

gcore/resource_gcore_router.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ func resourceRouterRead(ctx context.Context, d *schema.ResourceData, m interface
295295
ifs[i] = smap
296296
}
297297
if err := d.Set("interfaces", schema.NewSet(routerInterfaceUniqueID, ifs)); err != nil {
298-
298+
return diag.FromErr(err)
299299
}
300300

301301
rs := make([]map[string]string, len(router.Routes))

gcore/resource_gcore_volume.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,10 @@ func ExtendVolume(client *gcorecloud.ServiceClient, volumeID string, newSize int
319319
Size: newSize,
320320
}
321321
results, err := volumes.Extend(client, volumeID, opts).Extract()
322+
if err != nil {
323+
return err
324+
}
325+
322326
taskID := results.Tasks[0]
323327
log.Printf("[DEBUG] Task id (%s)", taskID)
324328
_, err = tasks.WaitTaskAndReturnResult(client, taskID, true, volumeExtending, func(task tasks.TaskID) (interface{}, error) {

gcore/utils.go

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,10 @@ func GetRegion(provider *gcorecloud.ProviderClient, regionID int, regionName str
387387
Project: 0,
388388
Version: "v1",
389389
})
390+
if err != nil {
391+
return 0, err
392+
}
393+
390394
rs, err := regions.ListAll(client)
391395
if err != nil {
392396
return 0, err
@@ -554,24 +558,6 @@ func extractHealthMonitorMap(d *schema.ResourceData) *lbpools.CreateHealthMonito
554558
return healthOpts
555559
}
556560

557-
func interfaceUniqueID(i interface{}) int {
558-
e := i.(map[string]interface{})
559-
h := md5.New()
560-
iType := e["type"].(string)
561-
io.WriteString(h, iType)
562-
iOrder, _ := e["order"].(int)
563-
io.WriteString(h, strconv.Itoa(iOrder))
564-
switch types.InterfaceType(iType) {
565-
case types.ReservedFixedIpType:
566-
io.WriteString(h, e["port_id"].(string))
567-
case types.AnySubnetInterfaceType:
568-
io.WriteString(h, e["network_id"].(string))
569-
case types.SubnetInterfaceType:
570-
io.WriteString(h, e["subnet_id"].(string))
571-
}
572-
return int(binary.BigEndian.Uint64(h.Sum(nil)))
573-
}
574-
575561
func routerInterfaceUniqueID(i interface{}) int {
576562
e := i.(map[string]interface{})
577563
h := md5.New()

0 commit comments

Comments
 (0)