Merge pull request #133 from kaytu-io/feat-adds-help

fix: Adds login required
kaytu-io · May 17, 2024 · 94d1c5c · 94d1c5c
2 parents 72fcc52 + ba6142c
commit 94d1c5c
Show file tree

Hide file tree

Showing 4 changed files with 191 additions and 154 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -10,8 +10,10 @@ import (
 	"github.com/kaytu-io/kaytu/pkg/plugin/proto/src/golang"
 	"github.com/kaytu-io/kaytu/pkg/server"
 	"github.com/kaytu-io/kaytu/pkg/utils"
+	"github.com/kaytu-io/kaytu/pkg/version"
 	"github.com/kaytu-io/kaytu/preferences"
 	"github.com/kaytu-io/kaytu/view"
+	"github.com/rogpeppe/go-internal/semver"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 	"os"
@@ -149,6 +151,10 @@ func Execute() {
 						return fmt.Errorf("running plugin not found: %s", plg.Config.Name)
 					}
 
+					if semver.Compare(version.VERSION, runningPlg.Plugin.Config.MinKaytuVersion) == -1 {
+						return fmt.Errorf("plugin requires kaytu version %s, please update your Kaytu CLI", plg.Config.MinKaytuVersion)
+					}
+
 					flagValues := map[string]string{}
 					for _, flag := range cmd.GetFlags() {
 						value := utils.ReadStringFlag(c, flag.Name)
@@ -158,6 +164,20 @@ func Execute() {
 					for _, rcmd := range runningPlg.Plugin.Config.Commands {
 						if rcmd.Name == cmd.Name {
 							preferences.Update(rcmd.DefaultPreferences)
+
+							if rcmd.LoginRequired && cfg.AccessToken == "" {
+								// login
+								err := predef.LoginCmd.RunE(c, args)
+								if err != nil {
+									return err
+								}
+
+								cfg, err = server.GetConfig()
+								if err != nil {
+									return err
+								}
+							}
+							break
 						}
 					}
 

diff --git a/pkg/plugin/manager.go b/pkg/plugin/manager.go
@@ -6,6 +6,8 @@ import (
 	"fmt"
 	githubAPI "github.com/google/go-github/v62/github"
 	"github.com/kaytu-io/kaytu/controller"
+	"github.com/kaytu-io/kaytu/pkg/version"
+	"github.com/rogpeppe/go-internal/semver"
 	"github.com/schollz/progressbar/v3"
 	"io"
 	"net"
@@ -193,11 +195,11 @@ func (m *Manager) Install(addr, token string) error {
 		}
 
 		if asset.ID != nil && asset.Name != nil && r.MatchString(*asset.Name) {
-			version := strings.Split(*asset.Name, "_")[1]
-			if p, ok := plugins[addr]; ok && p.Config.Version == version {
+			assetVersion := strings.Split(*asset.Name, "_")[1]
+			if p, ok := plugins[addr]; ok && p.Config.Version == assetVersion {
 				return nil
 			}
-			fmt.Printf("Installing plugin %s, version %s\n", addr, version)
+			fmt.Printf("Installing plugin %s, version %s\n", addr, assetVersion)
 			fmt.Println("Downloading the plugin...")
 
 			rc, url, err := api.Repositories.DownloadReleaseAsset(context.Background(), owner, repository, *asset.ID, nil)
@@ -271,6 +273,10 @@ func (m *Manager) Install(addr, token string) error {
 			}
 
 			plugins[addr] = &m.GetPlugin(addr).Plugin
+
+			if semver.Compare(version.VERSION, plugins[addr].Config.MinKaytuVersion) == -1 {
+				return fmt.Errorf("plugin requires kaytu version %s, please update your Kaytu CLI", plugins[addr].Config.MinKaytuVersion)
+			}
 			break
 		}
 	}

diff --git a/pkg/plugin/proto/plugin.proto b/pkg/plugin/proto/plugin.proto
@@ -16,6 +16,7 @@ message Command {
   string description = 2;
   repeated Flag flags = 3;
   repeated PreferenceItem default_preferences = 4;
+  bool login_required = 5;
 }
 
 message RegisterConfig {