cleanup lint

Author: mjudeikis

cli/pkg/kubectl/base/options.go

@@ -23,10 +23,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/kube-bind/kube-bind/cli/pkg/config"
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/tools/clientcmd"
+
+	"github.com/kube-bind/kube-bind/cli/pkg/config"
 )
 
 // Options contains options common to most CLI plugins.

cli/pkg/kubectl/bind-login/plugin/login.go

@@ -144,7 +144,7 @@ func (o *LoginOptions) Run(ctx context.Context, authURLCh chan<- string) error {
 
 	// Get provider information
 	fmt.Fprintf(o.Streams.ErrOut, "Connecting to kube-bind server %s...\n", o.Options.Server)
-	provider, err := o.getProvider()
+	provider, err := o.getProvider(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to get provider information: %w", err)
 	}
@@ -238,7 +238,7 @@ func (o *LoginOptions) Run(ctx context.Context, authURLCh chan<- string) error {
 	return nil
 }
 
-func (o *LoginOptions) getProvider() (*kubebindv1alpha2.BindingProvider, error) {
+func (o *LoginOptions) getProvider(ctx context.Context) (*kubebindv1alpha2.BindingProvider, error) {
 	url, err := url.Parse(o.Options.Server)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse server URL: %w", err)
@@ -248,9 +248,14 @@ func (o *LoginOptions) getProvider() (*kubebindv1alpha2.BindingProvider, error)
 		url.Path = "/api/exports"
 	}
 
-	resp, err := o.loginClient.Get(url.String())
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url.String(), nil)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+
+	resp, err := o.loginClient.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to send request: %w", err)
 	}
 	defer resp.Body.Close()
 

cli/pkg/kubectl/bind/plugin/bind.go

@@ -379,20 +379,6 @@ func (b *BindOptions) startCallbackServer(resultCh chan<- *BindResult, errCh cha
 	return server, port, nil
 }
 
-// getBaseURLFromExportURL removes /api/exports path from the URL
-func getBaseURLFromExportURL(exportURL string) string {
-	parsedURL, err := url.Parse(exportURL)
-	if err != nil {
-		return exportURL
-	}
-
-	// Remove /api/exports from the path
-	parsedURL.Path = strings.TrimSuffix(parsedURL.Path, "/api/exports")
-	parsedURL.Path = strings.TrimSuffix(parsedURL.Path, "/")
-
-	return parsedURL.String()
-}
-
 // generateRandomString generates a random string of the specified length
 func generateRandomString(length int) (string, error) {
 	bytes := make([]byte, length)

contrib/kcp/test/e2e/binding.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kube-bind/kube-bind/test/e2e/framework"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -14,6 +13,7 @@ import (
 
 	bindapiservice "github.com/kube-bind/kube-bind/cli/pkg/kubectl/bind-apiservice/plugin"
 	kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2"
+	"github.com/kube-bind/kube-bind/test/e2e/framework"
 )
 
 func performBinding(

contrib/kcp/test/e2e/kcp_test.go

@@ -44,12 +44,12 @@ import (
 // We need to refactor config machienery to allow multiple servers to be used in parallel tests
 
 func TestKCPClusterScope(t *testing.T) {
-	//	t.Parallel()
+	// t.Parallel()
 	testKcpIntegration(t, "cc", kubebindv1alpha2.ClusterScope)
 }
 
 func TestKCPNamespacedScope(t *testing.T) {
-	//t.Parallel()
+	// t.Parallel()
 	testKcpIntegration(t, "nc", kubebindv1alpha2.NamespacedScope)
 }
 
@@ -68,7 +68,6 @@ func testKcpIntegration(t *testing.T, name string, scope kubebindv1alpha2.Inform
 	// consumer
 	t.Log("Create consumer workspace")
 	consumerWsName := fmt.Sprintf("%s-consumer-%s", name, suffix)
-	//consumerWsPath := logicalcluster.NewPath("root").Join(consumerWsName)
 	consumerCfg, consumerKubeconfigPath := framework.NewWorkspace(t, framework.ClientConfig(t), framework.WithStaticName(consumerWsName))
 
 	t.Log("Start konnector for consumer workspace")

test/e2e/framework/bind.go

@@ -25,18 +25,24 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
 	"github.com/kube-bind/kube-bind/cli/pkg/client"
+	"github.com/kube-bind/kube-bind/cli/pkg/config"
 	loginplugin "github.com/kube-bind/kube-bind/cli/pkg/kubectl/bind-login/plugin"
 )
 
 func GetKubeBindRestClient(t *testing.T, configFile string) client.Client {
 	t.Helper()
 
-	c, err := client.NewClient(configFile)
+	c, err := config.LoadConfigFromFile(configFile)
 	require.NoError(t, err)
 
-	c.WithInsecure()
+	server, _, err := c.GetCurrentServer()
+	require.NoError(t, err)
+	require.NotNil(t, server, "no current server configured in %s", configFile)
+
+	client, err := client.NewClient(*server, client.WithInsecure(true))
+	require.NoError(t, err)
 
-	return c
+	return client
 }
 
 func Login(t *testing.T, iostreams genericclioptions.IOStreams, authURLCh chan<- string, configFile, serverURL, clusterID string) {