feat: configurable private location url

Signed-off-by: QuentinN42 <quentin@lieumont.fr>

Author: QuentinN42

pkg/api/api.go

@@ -32,7 +32,7 @@ func NewAPIClient(opts ...ClientOption) (*ClientWithResponses, error) {
 		}
 		transport.Proxy = http.ProxyURL(url)
 	}
-	
+
 	client := &http.Client{Transport: transport}
 	opts = append(opts, WithHTTPClient(client))
 	opts = append(opts, WithRequestEditorFn(func(ctx context.Context, req *http.Request) error {

pkg/locations/private/dialssh.go

@@ -35,9 +35,12 @@ func dialSSH(ctx context.Context, locationId string, sshPrivateKey ed25519.Priva
 		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
 	}
 
-	targetURL := "private-location.escape.tech:2222"
+	targetURL := os.Getenv("ESCAPE_PRIVATE_LOCATION_URL")
+	if targetURL == "" {
+		targetURL = "private-location.escape.tech:2222"
+	}
 	proxyURL := os.Getenv("ESCAPE_REPEATER_PROXY_URL")
-	
+
 	log.Info("Getting conn for target: %s", targetURL)
 	conn, err := getConn(ctx, targetURL, proxyURL)
 	if ctx.Err() != nil {
@@ -46,7 +49,7 @@ func dialSSH(ctx context.Context, locationId string, sshPrivateKey ed25519.Priva
 	if err != nil {
 		return fmt.Errorf("failed to get conn: %w", err)
 	}
-	
+
 	client, err := getClient(targetURL, conn, config)
 	if err != nil {
 		return fmt.Errorf("failed to create SSH client: %w", err)

pkg/locations/private/http.go

@@ -20,7 +20,6 @@ func (c *bufConn) Read(b []byte) (int, error) {
 	return c.r.Read(b)
 }
 
-
 func basicAuth(username, password string) string {
 	auth := username + ":" + password
 	return base64.StdEncoding.EncodeToString([]byte(auth))
@@ -67,4 +66,4 @@ func doHTTPConnectHandshake(ctx context.Context, conn net.Conn, backendAddr stri
 	}
 
 	return &bufConn{Conn: conn, r: r}, nil
-}
+}

pkg/locations/private/kube/main.go

@@ -20,7 +20,6 @@ const (
 	defaultStaticPrefix = "/static/"
 	defaultAPIPrefix    = "/"
 	defaultAddress      = "127.0.0.1"
-
 )
 
 func inferConfig() (*rest.Config, error) {
@@ -66,11 +65,11 @@ func connectAndRun(ctx context.Context, client *api.ClientWithResponses, cfg *re
 			return
 		}
 		log.Debug("Connected to k8s API")
-			log.Info("Upserting integration")
-			err = UpsertIntegration(ctx, client, locationId, locationName)
-			if err != nil {
-				log.Error("Error upserting integration: %s", err)
-				return
+		log.Info("Upserting integration")
+		err = UpsertIntegration(ctx, client, locationId, locationName)
+		if err != nil {
+			log.Error("Error upserting integration: %s", err)
+			return
 		}
 
 		<-ctx.Done()
@@ -85,7 +84,6 @@ func connectAndRun(ctx context.Context, client *api.ClientWithResponses, cfg *re
 	return nil
 }
 
-
 func Start(ctx context.Context, client *api.ClientWithResponses, locationId *types.UUID, locationName string, healthy *atomic.Bool) {
 	cfg, err := inferConfig()
 	if err != nil {
@@ -105,6 +103,4 @@ func Start(ctx context.Context, client *api.ClientWithResponses, locationId *typ
 		log.Info("Healthy: %t", healthy.Load())
 	}
 
-	
 }
-

pkg/locations/private/tcp.go

@@ -21,4 +21,4 @@ func netDialerWithTCPKeepalive() *net.Dialer {
 			})
 		},
 	}
-}
+}