Remove need for GitHub OAuth during init

lekkodev · Jul 11, 2024 · eb6ded6 · eb6ded6
1 parent 672762a
commit eb6ded6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cmd/lekko/init.go b/cmd/lekko/init.go
@@ -95,10 +95,10 @@ func initCmd() *cobra.Command {
 			if err := secrets.WithWriteSecrets(func(ws secrets.WriteSecrets) error {
 				auth := oauth.NewOAuth(lekko.NewBFFClient(ws))
 				fmt.Println("Logging in to Lekko...")
-				if err := auth.Login(ctx, ws); err != nil {
+				if err := auth.LoginLekko(ctx, ws); err != nil {
 					return errors.Wrap(err, "login")
 				}
-				fmt.Printf("\n")
+				fmt.Printf("%s Successfully logged in as %s!\n\n", successCheck, logging.Bold(ws.GetLekkoUsername()))
 
 				bff := lekko.NewBFFClient(ws)
 

diff --git a/pkg/oauth/oauth.go b/pkg/oauth/oauth.go
@@ -63,7 +63,7 @@ func NewOAuth(bff bffv1beta1connect.BFFServiceClient) *OAuth {
 // we will reinitiate oauath with that provider.
 func (a *OAuth) Login(ctx context.Context, ws secrets.WriteSecrets) error {
 	defer a.Status(ctx, true, ws)
-	if err := a.loginLekko(ctx, ws); err != nil {
+	if err := a.LoginLekko(ctx, ws); err != nil {
 		return errors.Wrap(err, "login lekko")
 	}
 	if err := a.loginGithub(ctx, ws); err != nil {
@@ -284,7 +284,7 @@ func (a *OAuth) authStatus(ctx context.Context, skipAuthCheck bool, rs secrets.R
 	return
 }
 
-func (a *OAuth) loginLekko(ctx context.Context, ws secrets.WriteSecrets) error {
+func (a *OAuth) LoginLekko(ctx context.Context, ws secrets.WriteSecrets) error {
 	if ws.HasLekkoToken() {
 		_, err := a.checkLekkoAuth(ctx)
 		if err == nil {

diff --git a/pkg/repo/cmd.go b/pkg/repo/cmd.go
@@ -169,7 +169,7 @@ func PrepareGithubRepo() (string, error) {
 				fmt.Println("failed to clone via ssh, trying via https")
 				fmt.Println(string(cloneOut))
 				fmt.Println(string(cloneOut2))
-				return "", errors.Wrapf(err2, "git cloning %s to %s with both https and ssh, your git setup may be unreachable, or you haven't created a Lekko account and linked to github Help @ https://docs.lekko.com", githubRepoURL, repoPath)
+				return "", errors.Wrapf(err2, "git cloning %s to %s with both https and ssh, your git setup may be unreachable, or you haven't created a Lekko account and linked to GitHub. Help @ https://docs.lekko.com", githubRepoURL, repoPath)
 			}
 		}
 	} else {