Fix lint

commons/api_path.go

@@ -170,16 +170,16 @@ var ApiPath = struct {
 		return fmt.Sprintf("/v1/xplat/database/management/cluster/detail/%s", databaseId)
 	},
 	DatabaseCreate: func() string {
-		return fmt.Sprintf("/v1/xplat/database/provision/create")
+		return "/v1/xplat/database/provision/create"
 	},
 	DatabaseDelete: func(databaseId string) string {
 		return fmt.Sprintf("/v1/xplat/database/provision/delete/%s", databaseId)
 	},
 	DatabaseStop: func() string {
-		return fmt.Sprintf("/v1/xplat/database/management/cluster/stop")
+		return "/v1/xplat/database/management/cluster/stop"
 	},
 	DatabaseStart: func() string {
-		return fmt.Sprintf("/v1/xplat/database/management/cluster/start")
+		return "/v1/xplat/database/management/cluster/start"
 	},
 
 	DedicatedFKEList: func(vpcId string, page, pageSize int) string {

fptcloud/database/resource_database_status.go

@@ -129,7 +129,6 @@ func (r *resourceDatabaseStatus) Delete(ctx context.Context, request resource.De
 	if response.Diagnostics.HasError() {
 		return
 	}
-	return
 }
 
 func (r *resourceDatabaseStatus) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) {
@@ -229,6 +228,9 @@ func (r *resourceDatabaseStatus) getDatabaseCurrentStatus(ctx context.Context, d
 		if d.Code != "200" {
 			return status, fmt.Errorf("Database not found")
 		}
+		if err != nil {
+			return "", err
+		}
 		cluster = d.Data.Cluster
 
 		tflog.Info(ctx, "Waiting for database to be provisioned. Time waited: "+strconv.Itoa(int(time.Since(timeStart).Seconds()))+" seconds.")

fptcloud/dfke/datasource_dfke.go

@@ -44,17 +44,7 @@ func (d *datasourceDedicatedKubernetesEngine) Configure(ctx context.Context, req
 	}
 
 	d.client = client
-	a, err := newDfkeApiClient(client)
-	if err != nil {
-		response.Diagnostics.AddError(
-			"Error configuring API client",
-			fmt.Sprintf("%s", err.Error()),
-		)
-
-		return
-	}
-
-	d.dfkeClient = a
+	d.dfkeClient = newDfkeApiClient(client)
 
 	t := NewTenancyApiClient(client)
 	d.tenancyApiClient = t
@@ -273,7 +263,7 @@ func (d *datasourceDedicatedKubernetesEngine) internalRead(ctx context.Context,
 	return &readResponse, nil
 }
 
-func (d *datasourceDedicatedKubernetesEngine) findClusterUUID(ctx context.Context, vpcId string, clusterId string) (string, error) {
+func (d *datasourceDedicatedKubernetesEngine) findClusterUUID(_ context.Context, vpcId string, clusterId string) (string, error) {
 	total := 1
 	found := 0
 

fptcloud/dfke/dfke_service.go

@@ -15,10 +15,8 @@ type dfkeApiClient struct {
 	*commons.Client
 }
 
-func newDfkeApiClient(c *commons.Client) (*dfkeApiClient, error) {
-	return &dfkeApiClient{
-		Client: c,
-	}, nil
+func newDfkeApiClient(c *commons.Client) *dfkeApiClient {
+	return &dfkeApiClient{Client: c}
 }
 
 type edgeListResponse struct {

fptcloud/dfke/resource_dfke.go

@@ -371,17 +371,7 @@ func (r *resourceDedicatedKubernetesEngine) Configure(ctx context.Context, reque
 	}
 
 	r.client = client
-	a, err := newDfkeApiClient(client)
-	if err != nil {
-		response.Diagnostics.AddError(
-			"Error configuring API client",
-			fmt.Sprintf("%s", err.Error()),
-		)
-
-		return
-	}
-
-	r.dfkeClient = a
+	r.dfkeClient = newDfkeApiClient(client)
 
 	t := NewTenancyApiClient(client)
 	r.tenancyApiClient = t
@@ -462,7 +452,7 @@ func (r *resourceDedicatedKubernetesEngine) checkForError(a []byte) *diag2.Error
 
 	if errorField, ok := re["error"]; ok {
 		e2, isBool := errorField.(bool)
-		if isBool && e2 != false {
+		if isBool && e2 {
 			res := diag2.NewErrorDiagnostic(
 				fmt.Sprintf("Response contained an error field and value was %t", e2),
 				"Response body was "+string(a),
@@ -524,7 +514,7 @@ func (r *resourceDedicatedKubernetesEngine) diff(ctx context.Context, from *dedi
 	// status: EXTENDING
 	if master != master2 {
 		if master2 < master {
-			d := diag2.NewErrorDiagnostic("Wrong master disk size", "Disk cannot be shrinked")
+			d := diag2.NewErrorDiagnostic("Wrong master disk size", "Disk cannot be shrunk")
 			return &d
 		}
 
@@ -557,7 +547,7 @@ func (r *resourceDedicatedKubernetesEngine) diff(ctx context.Context, from *dedi
 	// status: EXTENDING
 	if worker != worker2 {
 		if worker2 < worker {
-			d := diag2.NewErrorDiagnostic("Wrong worker disk size", "Disk cannot be shrinked")
+			d := diag2.NewErrorDiagnostic("Wrong worker disk size", "Disk cannot be shrunk")
 			return &d
 		}
 

fptcloud/dfke/resource_dfke_state.go

@@ -38,7 +38,7 @@ func (r *resourceDedicatedKubernetesEngineState) ImportState(ctx context.Context
 	// TODO fix
 	state.VpcId = types.StringValue("188af427-269b-418a-90bb-0cb27afc6c1e")
 
-	_, err := r.internalRead(ctx, request.ID, &state)
+	err := r.internalRead(ctx, request.ID, &state)
 	if err != nil {
 		response.Diagnostics.Append(diag2.NewErrorDiagnostic("Error calling API", err.Error()))
 		return
@@ -51,8 +51,7 @@ func (r *resourceDedicatedKubernetesEngineState) ImportState(ctx context.Context
 	}
 
 	// lack of ability to import without VPC ID
-	//response.Diagnostics.Append(diag2.NewErrorDiagnostic("Unimplemented", "Importing DFKE clusters isn't currently supported"))
-	//return
+	response.Diagnostics.Append(diag2.NewErrorDiagnostic("Unimplemented", "Importing DFKE clusters isn't currently supported"))
 }
 
 func (r *resourceDedicatedKubernetesEngineState) Metadata(ctx context.Context, request resource.MetadataRequest, response *resource.MetadataResponse) {
@@ -90,7 +89,7 @@ func (r *resourceDedicatedKubernetesEngineState) Create(ctx context.Context, req
 		return
 	}
 
-	if _, err := r.internalRead(ctx, state.Id.ValueString(), &state); err != nil {
+	if err := r.internalRead(ctx, state.Id.ValueString(), &state); err != nil {
 		response.Diagnostics.Append(diag2.NewErrorDiagnostic("Error reading cluster state", err.Error()))
 		return
 	}
@@ -111,7 +110,7 @@ func (r *resourceDedicatedKubernetesEngineState) Read(ctx context.Context, reque
 		return
 	}
 
-	if _, err := r.internalRead(ctx, state.Id.ValueString(), &state); err != nil {
+	if err := r.internalRead(ctx, state.Id.ValueString(), &state); err != nil {
 		response.Diagnostics.Append(diag2.NewErrorDiagnostic("Error reading cluster state", err.Error()))
 		return
 	}
@@ -149,33 +148,33 @@ func (r *resourceDedicatedKubernetesEngineState) Configure(ctx context.Context,
 	r.client = client
 }
 
-func (r *resourceDedicatedKubernetesEngineState) internalRead(ctx context.Context, clusterId string, state *dedicatedKubernetesEngineState) (*dedicatedKubernetesEngineReadResponse, error) {
+func (r *resourceDedicatedKubernetesEngineState) internalRead(ctx context.Context, clusterId string, state *dedicatedKubernetesEngineState) error {
 	vpcId := state.VpcId.ValueString()
 	tflog.Info(ctx, "Reading state of cluster ID "+clusterId+", VPC ID "+vpcId)
 
 	a, err := r.client.SendGetRequest(commons.ApiPath.DedicatedFKEGet(vpcId, clusterId))
 
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	var d dedicatedKubernetesEngineReadResponse
 	err = json.Unmarshal(a, &d)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	data := d.Cluster
-	if data.Status != "STOPPED" && data.IsRunning == false {
-		return &d, errors.New("cluster is not running, but status is " + data.Status + " instead of STOPPED")
+	if data.Status != "STOPPED" && !data.IsRunning {
+		return errors.New("cluster is not running, but status is " + data.Status + " instead of STOPPED")
 	}
 
-	if data.Status != "SUCCEEDED" && data.IsRunning == true {
-		return &d, errors.New("cluster is running, but status is " + data.Status + " instead of SUCCEEDED")
+	if data.Status != "SUCCEEDED" && data.IsRunning {
+		return errors.New("cluster is running, but status is " + data.Status + " instead of SUCCEEDED")
 	}
 
 	state.IsRunning = types.BoolValue(data.IsRunning)
-	return &d, nil
+	return nil
 }
 
 type dedicatedKubernetesEngineState struct {

fptcloud/edge_gateway/datasource_edge_gateway.go

@@ -112,7 +112,7 @@ func (d *datasourceEdgeGateway) Configure(ctx context.Context, request datasourc
 	d.client = client
 }
 
-func (d *datasourceEdgeGateway) internalRead(ctx context.Context, state *edge_gateway) (*[]edgeGatewayData, error) {
+func (d *datasourceEdgeGateway) internalRead(_ context.Context, state *edge_gateway) (*[]edgeGatewayData, error) {
 	vpcId := state.VpcId.ValueString()
 
 	res, err := d.client.SendGetRequest(common.ApiPath.EdgeGatewayList(vpcId))

fptcloud/mfke/datasource_mfke.go

@@ -131,7 +131,7 @@ func (d *datasourceManagedKubernetesEngine) internalRead(ctx context.Context, id
 	}
 
 	if response.Error {
-		return nil, errors.New(fmt.Sprintf("Error: %v", response.Mess))
+		return nil, fmt.Errorf("error: %v", response.Mess)
 	}
 
 	data := response.Data
@@ -153,7 +153,7 @@ func (d *datasourceManagedKubernetesEngine) internalRead(ctx context.Context, id
 		for _, pool := range state.Pools {
 			name := pool.WorkerPoolID.ValueString()
 			if _, ok := existingPool[name]; ok {
-				return nil, errors.New(fmt.Sprintf("Pool %s already exists", name))
+				return nil, fmt.Errorf("pool %s already exists", name)
 			}
 
 			existingPool[name] = pool

fptcloud/mfke/resource_mfke.go

@@ -115,6 +115,10 @@ func (r *resourceManagedKubernetesEngine) Create(ctx context.Context, request re
 	}
 
 	platform, err := r.tenancyClient.GetVpcPlatform(ctx, state.VpcId.ValueString())
+	if err != nil {
+		response.Diagnostics.Append(diag2.NewErrorDiagnostic("Error getting VPC platform", err.Error()))
+		return
+	}
 
 	if strings.ToLower(platform) == "osp" {
 		if state.NetworkID.ValueString() == "" {
@@ -548,10 +552,7 @@ func (r *resourceManagedKubernetesEngine) diff(ctx context.Context, from *manage
 		from.NetworkNodePrefix = to.NetworkNodePrefix
 	}
 
-	editGroup, err := r.diffPool(ctx, from, to)
-	if err != nil {
-		return err
-	}
+	editGroup := r.diffPool(ctx, from, to)
 
 	if editGroup {
 		d, err := r.internalRead(ctx, from.Id.ValueString(), from)
@@ -604,9 +605,9 @@ func (r *resourceManagedKubernetesEngine) diff(ctx context.Context, from *manage
 	return nil
 }
 
-func (r *resourceManagedKubernetesEngine) diffPool(ctx context.Context, from *managedKubernetesEngine, to *managedKubernetesEngine) (bool, *diag2.ErrorDiagnostic) {
-	var fromPool map[string]*managedKubernetesEnginePool
-	var toPool map[string]*managedKubernetesEnginePool
+func (r *resourceManagedKubernetesEngine) diffPool(_ context.Context, from *managedKubernetesEngine, to *managedKubernetesEngine) bool {
+	fromPool := map[string]*managedKubernetesEnginePool{}
+	toPool := map[string]*managedKubernetesEnginePool{}
 
 	for _, pool := range from.Pools {
 		fromPool[pool.WorkerPoolID.ValueString()] = pool
@@ -617,18 +618,18 @@ func (r *resourceManagedKubernetesEngine) diffPool(ctx context.Context, from *ma
 	}
 
 	if len(fromPool) != len(toPool) {
-		return true, nil
+		return true
 	}
 
 	for _, pool := range from.Pools {
 		f := fromPool[pool.WorkerPoolID.ValueString()]
 		t := toPool[pool.WorkerPoolID.ValueString()]
 		if f.ScaleMin != t.ScaleMin || f.ScaleMax != t.ScaleMax {
-			return true, nil
+			return true
 		}
 	}
 
-	return false, nil
+	return false
 }
 
 func (r *resourceManagedKubernetesEngine) internalRead(ctx context.Context, id string, state *managedKubernetesEngine) (*managedKubernetesEngineReadResponse, error) {
@@ -655,7 +656,7 @@ func (r *resourceManagedKubernetesEngine) internalRead(ctx context.Context, id s
 	}
 
 	if d.Error {
-		return nil, errors.New(fmt.Sprintf("Error: %v", d.Mess))
+		return nil, fmt.Errorf("error: %v", d.Mess)
 	}
 
 	data := d.Data
@@ -677,7 +678,7 @@ func (r *resourceManagedKubernetesEngine) internalRead(ctx context.Context, id s
 		for _, pool := range state.Pools {
 			name := pool.WorkerPoolID.ValueString()
 			if _, ok := existingPool[name]; ok {
-				return nil, errors.New(fmt.Sprintf("Pool %s already exists", name))
+				return nil, fmt.Errorf("pool %s already exists", name)
 			}
 
 			existingPool[name] = pool
@@ -702,7 +703,6 @@ func (r *resourceManagedKubernetesEngine) internalRead(ctx context.Context, id s
 			continue
 		}
 
-		// TODO: OSP does not have flavor ID
 		flavorPoolKey := "fptcloud.com/flavor_pool_" + name
 		flavorId, ok := data.Metadata.Labels[flavorPoolKey]
 		if !ok {