lint fix

HewlettPackard · Nov 24, 2023 · bfc947b · bfc947b
1 parent 243b995
commit bfc947b
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 13 deletions.
diff --git a/internal/acceptance_test/data_source_edge_cluster_test.go b/internal/acceptance_test/data_source_edge_cluster_test.go
@@ -3,6 +3,7 @@
 package acceptancetest
 
 import (
+	"context"
 	"testing"
 
 	api_client "github.com/HewlettPackard/hpegl-vmaas-cmp-go-sdk/pkg/client"
@@ -31,7 +32,7 @@ func TestAccDataSourceNetworkEdgeCluster(t *testing.T) {
 			if len(ServerResp.NetworkServices) == 0 {
 				return nil, err
 			}
-			nsxType, err := cmp.GetNsxTypeFromCMP(iClient.Client)
+			nsxType, err := cmp.GetNsxTypeFromCMP(context.Background(), iClient.Client)
 			if err != nil {
 				return nil, err
 			}

diff --git a/internal/cmp/data_source_lb_pool_member_group.go b/internal/cmp/data_source_lb_pool_member_group.go
@@ -34,7 +34,7 @@ func (n *poolMemberGroupds) Read(ctx context.Context, d *utils.Data, meta interf
 	if err := d.Error(); err != nil {
 		return err
 	}
-	nsxType, err := GetNsxTypeFromCMP(n.rClient.Client)
+	nsxType, err := GetNsxTypeFromCMP(ctx, n.rClient.Client)
 	if err != nil {
 		return err
 	}

diff --git a/internal/cmp/dhcp_server.go b/internal/cmp/dhcp_server.go
@@ -122,7 +122,7 @@ func (dhcp *dhcpServer) Delete(ctx context.Context, d *utils.Data, meta interfac
 func (dhcp *dhcpServer) dhcpServerAlignRequest(ctx context.Context, meta interface{},
 	createReq *models.CreateNetworkDhcpServerRequest) error {
 	// Get network service ID
-	nsxType, err := GetNsxTypeFromCMP(dhcp.rClient.Client)
+	nsxType, err := GetNsxTypeFromCMP(ctx, dhcp.rClient.Client)
 	if err != nil {
 		return err
 	}

diff --git a/internal/cmp/dhcp_server_datasource.go b/internal/cmp/dhcp_server_datasource.go
@@ -34,7 +34,7 @@ func (n *dhcpServerds) Read(ctx context.Context, d *utils.Data, meta interface{}
 	if err := d.Error(); err != nil {
 		return err
 	}
-	nsxType, err := GetNsxTypeFromCMP(n.rClient.Client)
+	nsxType, err := GetNsxTypeFromCMP(ctx, n.rClient.Client)
 	if err != nil {
 		return err
 	}

diff --git a/internal/cmp/edge_cluster.go b/internal/cmp/edge_cluster.go
@@ -24,7 +24,7 @@ func newEdgeCluster(tClient *client.RouterAPIService) *edgeCluster {
 }
 
 func (r *edgeCluster) Read(ctx context.Context, d *utils.Data, meta interface{}) error {
-	nsxType, err := GetNsxTypeFromCMP(r.tClient.Client)
+	nsxType, err := GetNsxTypeFromCMP(ctx, r.tClient.Client)
 	if err != nil {
 		return err
 	}

diff --git a/internal/cmp/helper.go b/internal/cmp/helper.go
@@ -40,21 +40,21 @@ func ParseVersion(version string) (int, error) {
 	return sum, nil
 }
 
-func GetCmpVersion(apiClient client.APIClientHandler) (int, error) {
+func GetCmpVersion(ctx context.Context, apiClient client.APIClientHandler) (int, error) {
 	c := client.CmpStatus{
 		Client: apiClient,
 	}
 
-	cmpVersion, err := c.GetCmpVersion(context.Background())
+	cmpVersion, err := c.GetCmpVersion(ctx)
 	if err != nil {
 		return 0, err
 	}
 
 	return ParseVersion(cmpVersion.Appliance.BuildVersion)
 }
 
-func GetNsxTypeFromCMP(apiClient client.APIClientHandler) (string, error) {
-	cmpVersion, err := GetCmpVersion(apiClient)
+func GetNsxTypeFromCMP(ctx context.Context, apiClient client.APIClientHandler) (string, error) {
+	cmpVersion, err := GetCmpVersion(ctx, apiClient)
 	if err != nil {
 		return "", err
 	}

diff --git a/internal/cmp/loadbalancer.go b/internal/cmp/loadbalancer.go
@@ -61,7 +61,7 @@ func (lb *loadBalancer) Update(ctx context.Context, d *utils.Data, meta interfac
 
 func (lb *loadBalancer) loadBalancerAlignRequest(ctx context.Context, meta interface{},
 	createReq *models.CreateLoadBalancerRequest) error {
-	nsxType, err := GetNsxTypeFromCMP(lb.rClient.Client)
+	nsxType, err := GetNsxTypeFromCMP(ctx, lb.rClient.Client)
 	if err != nil {
 		return err
 	}

diff --git a/internal/cmp/resource_network.go b/internal/cmp/resource_network.go
@@ -42,7 +42,7 @@ func (r *resNetwork) Read(ctx context.Context, d *utils.Data, meta interface{})
 }
 
 func (r *resNetwork) Create(ctx context.Context, d *utils.Data, meta interface{}) error {
-	nsxType, err := GetNsxTypeFromCMP(r.rClient.Client)
+	nsxType, err := GetNsxTypeFromCMP(ctx, r.rClient.Client)
 	if err != nil {
 		return err
 	}

diff --git a/internal/cmp/router.go b/internal/cmp/router.go
@@ -111,7 +111,7 @@ func (r *router) Delete(ctx context.Context, d *utils.Data, meta interface{}) er
 }
 
 func (r *router) routerAlignRouterRequest(ctx context.Context, meta interface{}, routerReq *models.CreateRouterRequest) error {
-	nsxType, err := GetNsxTypeFromCMP(r.rClient.Client)
+	nsxType, err := GetNsxTypeFromCMP(ctx, r.rClient.Client)
 	if err != nil {
 		return err
 	}

diff --git a/internal/cmp/transport_zone.go b/internal/cmp/transport_zone.go
@@ -23,7 +23,7 @@ func newTransportZone(tClient *client.RouterAPIService) *transportZone {
 }
 
 func (r *transportZone) Read(ctx context.Context, d *utils.Data, meta interface{}) error {
-	nsxType, err := GetNsxTypeFromCMP(r.tClient.Client)
+	nsxType, err := GetNsxTypeFromCMP(ctx, r.tClient.Client)
 	if err != nil {
 		return err
 	}