cf integration git auth (#316)

Author: andrii-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.292
+VERSION=v0.0.293
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

cmd/commands/integrations.go

@@ -17,9 +17,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"os"
-	"strings"
-
 	"github.com/codefresh-io/cli-v2/pkg/log"
 	"github.com/codefresh-io/cli-v2/pkg/store"
 	"github.com/codefresh-io/cli-v2/pkg/util"
@@ -29,6 +26,8 @@ import (
 	"github.com/juju/ansiterm"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"os"
+	"strings"
 )
 
 type (
@@ -87,6 +86,7 @@ func NewGitIntegrationCommand(client *sdk.AppProxyAPI) *cobra.Command {
 	cmd.AddCommand(NewGitIntegrationRemoveCommand(client))
 	cmd.AddCommand(NewGitIntegrationRegisterCommand(client))
 	cmd.AddCommand(NewGitIntegrationDeregisterCommand(client))
+	cmd.AddCommand(NewGitAuthCommand())
 
 	return cmd
 }
@@ -405,6 +405,39 @@ func getAppProxyClient(runtime *string, client *sdk.AppProxyAPI) func(*cobra.Com
 	}
 }
 
+func NewGitAuthCommand() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "auth",
+		Short: "Authenticate user",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return RunGitAuthCommand(cmd.Context(), cmd)
+		},
+	}
+
+	return cmd
+}
+
+func RunGitAuthCommand(ctx context.Context, cmd *cobra.Command) error {
+	var err error
+	user, err := cfConfig.GetCurrentContext().GetUser(ctx)
+	if err != nil {
+		return err
+	}
+
+	accountId, err := util.CurrentAccount(user)
+	if err != nil {
+		return err
+	}
+
+	runtimeName := cmd.Flag("runtime").Value.String()
+	runtime, err := cfConfig.NewClient().V2().Runtime().Get(ctx, runtimeName)
+	if err != nil {
+		return err
+	}
+
+	return util.OpenBrowserForGitLogin(*runtime.IngressHost, user.ID, accountId)
+}
+
 func printIntegration(i interface{}, format string) error {
 	var (
 		data []byte

docs/commands/cli-v2_integration_git.md

@@ -27,6 +27,7 @@ cli-v2 integration git [flags]
 
 * [cli-v2 integration](cli-v2_integration.md)	 - Manage integrations with git providers, container registries and more
 * [cli-v2 integration git add](cli-v2_integration_git_add.md)	 - Add a new git integration
+* [cli-v2 integration git auth](cli-v2_integration_git_auth.md)	 - Authenticate user
 * [cli-v2 integration git deregister](cli-v2_integration_git_deregister.md)	 - Deregister user from a git integrations
 * [cli-v2 integration git edit](cli-v2_integration_git_edit.md)	 - Edit a git integration
 * [cli-v2 integration git get](cli-v2_integration_git_get.md)	 - Retrieve a git integration

docs/commands/cli-v2_integration_git_auth.md

@@ -0,0 +1,29 @@
+## cli-v2 integration git auth
+
+Authenticate user
+
+```
+cli-v2 integration git auth [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for auth
+```
+
+### Options inherited from parent commands
+
+```
+      --auth-context string        Run the next command using a specific authentication context
+      --cfconfig string            Custom path for authentication contexts config file (default "/home/user")
+      --insecure                   Disable certificate validation for TLS connections (e.g. to g.codefresh.io)
+      --insecure-ingress-host      Disable certificate validation of ingress host (default: false)
+      --request-timeout duration   Request timeout (default 30s)
+      --runtime string             Name of runtime to use
+```
+
+### SEE ALSO
+
+* [cli-v2 integration git](cli-v2_integration_git.md)	 - Manage your git integrations
+

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.292/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.293/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.292/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.293/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

go.mod

@@ -22,6 +22,7 @@ require (
 	github.com/manifoldco/promptui v0.8.0
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/openshift/api v3.9.0+incompatible
+	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/rkrmr33/checklist v0.0.5
 	github.com/segmentio/backo-go v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.8.1

go.sum

@@ -1083,6 +1083,8 @@ github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4 v2.5.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
+github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -1626,6 +1628,7 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220222200937-f2425489ef4c h1:sSIdNI2Dd6vGv47bKc/xArpfxVmEz2+3j0E6I484xC4=

manifests/app-proxy/kustomization.yaml

@@ -3,7 +3,7 @@ kind: Kustomization
 images:
   - name: quay.io/codefresh/cap-app-proxy
     newName: quay.io/codefresh/cap-app-proxy
-    newTag: 1.944.0
+    newTag: 1.951.0
 resources:
   - app-proxy.deploy.yaml
   - app-proxy.svc.yaml

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.1
-  version: 0.0.292
+  version: 0.0.293
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/util/util.go

@@ -15,8 +15,11 @@
 package util
 
 import (
+	"bytes"
 	"context"
 	"fmt"
+	"github.com/pkg/browser"
+	"net/url"
 	"os"
 	"os/signal"
 	"regexp"
@@ -29,6 +32,7 @@ import (
 	"github.com/codefresh-io/cli-v2/pkg/log"
 	"github.com/codefresh-io/cli-v2/pkg/reporter"
 	"github.com/codefresh-io/cli-v2/pkg/store"
+	"github.com/codefresh-io/go-sdk/pkg/codefresh"
 
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
@@ -171,7 +175,7 @@ func kubeConfig() *clientcmdapi.Config {
 }
 
 type kubeContext struct {
-	Name string
+	Name    string
 	Current bool
 }
 
@@ -181,7 +185,7 @@ func KubeContexts() []kubeContext {
 	i := 0
 	for key := range conf.Contexts {
 		contexts[i] = kubeContext{
-			Name: key,
+			Name:    key,
 			Current: key == conf.CurrentContext,
 		}
 		i += 1
@@ -218,6 +222,39 @@ func KubeCurrentServer() (string, error) {
 	return KubeServerByContextName("")
 }
 
+func CurrentAccount(user *codefresh.User) (string, error) {
+	for i := range user.Accounts {
+		if user.Accounts[i].Name == user.ActiveAccountName {
+			return user.Accounts[i].ID, nil
+		}
+	}
+	return "", fmt.Errorf("account id for \"%s\" not found", user.ActiveAccountName)
+}
+
+func OpenBrowserForGitLogin(ingressHost string, user string, account string) error {
+	var b bytes.Buffer
+	if !strings.HasPrefix(ingressHost, "http") {
+		b.WriteString("https://")
+	}
+	b.WriteString(ingressHost)
+	b.WriteString("/app-proxy/api/git-auth/github?userId=" + user + "&accountId=" + account)
+
+	url, err := url.Parse(b.String())
+	if err != nil {
+		return err
+	}
+
+	err = browser.OpenURL(url.String())
+	if err != nil {
+		return err
+	}
+
+	fmt.Println("Follow instructions in web browser")
+	time.Sleep(2 * time.Second)
+
+	return nil
+}
+
 func KubeContextNameByServer(server string) (string, error) {
 	conf := kubeConfig()
 	for contextName, context := range conf.Contexts {