device/jita: block when opening URLs

Author: kimtore

cmd/devicecmd/jitacmd.go

@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/nais/cli/pkg/naisdevice"
 	"github.com/urfave/cli/v2"
 	"k8s.io/utils/strings/slices"
+
+	"github.com/nais/cli/pkg/naisdevice"
 )
 
 func jitaCommand() *cli.Command {
@@ -33,8 +34,7 @@ func jitaCommand() *cli.Command {
 		},
 		Action: func(context *cli.Context) error {
 			gateway := context.Args().First()
-			naisdevice.AccessPrivilegedGateway(gateway)
-			return nil
+			return naisdevice.AccessPrivilegedGateway(gateway)
 		},
 	}
 }

pkg/naisdevice/jita.go

@@ -4,12 +4,18 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/nais/device/pkg/device-agent/open"
 	"github.com/nais/device/pkg/pb"
+
+	"github.com/nais/cli/pkg/urlopen"
 )
 
-func AccessPrivilegedGateway(gatewayName string) {
-	open.Open(fmt.Sprintf("https://naisdevice-jita.external.prod-gcp.nav.cloud.nais.io/?gateway=%s", gatewayName))
+func AccessPrivilegedGateway(gatewayName string) error {
+	url := fmt.Sprintf("https://naisdevice-jita.external.prod-gcp.nav.cloud.nais.io/?gateway=%s", gatewayName)
+	err := urlopen.Open(url)
+	if err != nil {
+		return fmt.Errorf("unable to open your browser, please open this manually: %s", url)
+	}
+	return nil
 }
 
 func GetPrivilegedGateways(ctx context.Context) ([]string, error) {

pkg/urlopen/open.go

@@ -0,0 +1 @@
+package urlopen

pkg/urlopen/open_darwin.go

@@ -0,0 +1,9 @@
+package urlopen
+
+import (
+	"os/exec"
+)
+
+func Open(url string) error {
+	return exec.Command("open", url).Run()
+}

pkg/urlopen/open_linux.go

@@ -0,0 +1,9 @@
+package urlopen
+
+import (
+	"os/exec"
+)
+
+func Open(url string) error {
+	return exec.Command("xdg-open", url).Run()
+}

pkg/urlopen/open_windows.go

@@ -0,0 +1,9 @@
+package urlopen
+
+import (
+	"os/exec"
+)
+
+func Open(url string) error {
+	return exec.Command("rundll32", "url.dll,FileProtocolHandler", url).Run()
+}