feature(cli): Adding CLI Cloud Support (#3105)

* feature(cli): Adding CLI cloud login and auth logic (#3100) * feature(cli): adding CLI cloud login and auth logic * feature(cli): adding CLI cloud login and auth logic * feat(cloud): adding support for cloud resources (#3101) * feature(cli): adding CLI cloud login and auth logic * feature(cli): adding CLI cloud login and auth logic * feat(cloud): adding support for cloud resources * feat(cloud): adding select command for cloud resources * feat(cloud): Tracetest configure improvements (#3102) * feature(cli): adding CLI cloud login and auth logic * feature(cli): adding CLI cloud login and auth logic * feat(cloud): adding support for cloud resources * feat(cloud): adding select command for cloud resources * fixing CLI e2e * Fixing missing prefix and CLI e2e tests * removing deprecation tests for environments * downgrading the goreleaser version * fixing CLI e2e * fixing status code * fixing FE port * fixing FE port * Implementing tracetest configure command * cleanup * adding missing select cmd * adding path validation for configure * re adding missing tests * feat(cli): adding `tracetest start` command (#3114) * feat(cli): adding start command * feat(cli): adding start command * feat(cli): cleanup and dynamic endpoint support (#3121)
kubeshop · Sep 5, 2023 · 36579e7 · 36579e7
1 parent 336563b
commit 36579e7
Show file tree

Hide file tree

Showing 38 changed files with 1,045 additions and 225 deletions.
diff --git a/agent/cmd/start.go b/agent/cmd/start.go
@@ -20,6 +20,7 @@ var StartCmd = cobra.Command{
 	Short: "Start the local agent",
 	Long:  "Start the local agent",
 	Run: func(cmd *cobra.Command, args []string) {
+		ctx := cmd.Context()
 		cfg, err := config.LoadConfig()
 		if err != nil {
 			fmt.Fprintln(os.Stderr, err)
@@ -28,7 +29,11 @@ var StartCmd = cobra.Command{
 
 		log.Printf("starting agent [%s] connecting to %s", cfg.Name, cfg.ServerURL)
 
-		initialization.Start(cfg)
+		err = initialization.Start(ctx, cfg)
+		if err != nil {
+			fmt.Fprintln(os.Stderr, err)
+			ExitCLI(1)
+		}
 	},
 }
 

diff --git a/agent/initialization/start.go b/agent/initialization/start.go
@@ -3,7 +3,6 @@ package initialization
 import (
 	"context"
 	"fmt"
-	"log"
 
 	"github.com/kubeshop/tracetest/agent/client"
 	"github.com/kubeshop/tracetest/agent/config"
@@ -12,15 +11,14 @@ import (
 )
 
 // Start the agent with given configuration
-func Start(config config.Config) {
+func Start(ctx context.Context, config config.Config) error {
 	fmt.Println("Starting agent")
-	ctx := context.Background()
 	client, err := client.Connect(ctx, config.ServerURL,
 		client.WithAPIKey(config.APIKey),
 		client.WithAgentName(config.Name),
 	)
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 
 	triggerWorker := workers.NewTriggerWorker(client)
@@ -35,8 +33,10 @@ func Start(config config.Config) {
 
 	err = client.Start(ctx)
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 
+	fmt.Println("Agent started! Do not close the terminal.")
 	client.WaitUntilDisconnected()
+	return nil
 }
diff --git a/agent/workers/trigger.go b/agent/workers/trigger.go
@@ -30,6 +30,7 @@ func NewTriggerWorker(client *client.Client) *TriggerWorker {
 }
 
 func (w *TriggerWorker) Trigger(ctx context.Context, triggerRequest *proto.TriggerRequest) error {
+	fmt.Println("Trigger handled by agent")
 	triggerConfig := convertProtoToTrigger(triggerRequest.Trigger)
 	triggerer, err := w.registry.Get(triggerConfig.Type)
 	if err != nil {

diff --git a/api/version.yaml b/api/version.yaml
@@ -7,3 +7,11 @@ components:
         version:
           type: string
           example: 1.0.0
+        type:
+          type: string
+          enum:
+            - oss
+        uiEndpoint:
+          type: string
+        agentEndpoint:
+          type: string
diff --git a/cli/actions/configure_action.go b/cli/actions/configure_action.go
diff --git a/cli/cmd/config.go b/cli/cmd/config.go
@@ -5,12 +5,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/kubeshop/tracetest/cli/actions"
 	"github.com/kubeshop/tracetest/cli/analytics"
 	"github.com/kubeshop/tracetest/cli/config"
 	"github.com/kubeshop/tracetest/cli/formatters"
 	"github.com/kubeshop/tracetest/cli/openapi"
-	"github.com/kubeshop/tracetest/cli/utils"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
@@ -22,6 +20,9 @@ var (
 	openapiClient  = &openapi.APIClient{}
 	versionText    string
 	isVersionMatch bool
+
+	// only available in dev mode
+	isCloudEnabled = os.Getenv("TRACETEST_DEV") == "true"
 )
 
 type setupConfig struct {
@@ -75,7 +76,7 @@ func setupCommand(options ...setupOption) func(cmd *cobra.Command, args []string
 
 func overrideConfig() {
 	if overrideEndpoint != "" {
-		scheme, endpoint, err := config.ParseServerURL(overrideEndpoint)
+		scheme, endpoint, _, err := config.ParseServerURL(overrideEndpoint)
 		if err != nil {
 			msg := fmt.Sprintf("cannot parse endpoint %s", overrideEndpoint)
 			cliLogger.Error(msg, zap.Error(err))
@@ -87,7 +88,7 @@ func overrideConfig() {
 }
 
 func setupRunners() {
-	c := utils.GetAPIClient(cliConfig)
+	c := config.GetAPIClient(cliConfig)
 	*openapiClient = *c
 }
 
@@ -154,10 +155,10 @@ func teardownCommand(cmd *cobra.Command, args []string) {
 }
 
 func setupVersion() {
-	versionText, isVersionMatch = actions.GetVersion(
+	versionText, isVersionMatch = config.GetVersion(
 		context.Background(),
 		cliConfig,
-		utils.GetAPIClient(cliConfig),
+		config.GetAPIClient(cliConfig),
 	)
 }
 

diff --git a/cli/cmd/configure_cmd.go b/cli/cmd/configure_cmd.go
@@ -4,12 +4,16 @@ import (
 	"context"
 	"net/url"
 
-	"github.com/kubeshop/tracetest/cli/actions"
+	"github.com/kubeshop/tracetest/cli/config"
 	"github.com/spf13/cobra"
 )
 
 var configParams = &configureParameters{}
 
+var (
+	configurator = config.NewConfigurator(resources)
+)
+
 var configureCmd = &cobra.Command{
 	GroupID: cmdGroupConfig.ID,
 	Use:     "configure",
@@ -18,17 +22,17 @@ var configureCmd = &cobra.Command{
 	PreRun:  setupLogger,
 	Run: WithResultHandler(WithParamsHandler(configParams)(func(cmd *cobra.Command, _ []string) (string, error) {
 		ctx := context.Background()
-		action := actions.NewConfigureAction(cliConfig)
-
-		actionConfig := actions.ConfigureConfig{
-			Global: configParams.Global,
+		flags := config.ConfigFlags{}
+		config, err := config.LoadConfig("")
+		if err != nil {
+			return "", err
 		}
 
 		if flagProvided(cmd, "endpoint") {
-			actionConfig.SetValues.Endpoint = configParams.Endpoint
+			flags.Endpoint = configParams.Endpoint
 		}
 
-		err := action.Run(ctx, actionConfig)
+		err = configurator.Start(ctx, config, flags)
 		return "", err
 	})),
 	PostRun: teardownCommand,

diff --git a/cli/cmd/legacy_test_cmd.go b/cli/cmd/legacy_test_cmd.go
@@ -9,7 +9,7 @@ import (
 )
 
 var testCmd = &cobra.Command{
-	GroupID:    cmdGroupTests.ID,
+	GroupID:    cmdGroupResources.ID,
 	Use:        "test",
 	Short:      "Manage your tracetest tests",
 	Long:       "Manage your tracetest tests",

diff --git a/cli/cmd/middleware.go b/cli/cmd/middleware.go
@@ -16,15 +16,7 @@ func WithResultHandler(runFn RunFn) CobraRunFn {
 		res, err := runFn(cmd, args)
 
 		if err != nil {
-			fmt.Fprintf(os.Stderr, `
-Version
-%s
-
-An error ocurred when executing the command
-
-%s
-`, versionText, err.Error())
-			ExitCLI(1)
+			OnError(err)
 			return
 		}
 
@@ -34,6 +26,18 @@ An error ocurred when executing the command
 	}
 }
 
+func OnError(err error) {
+	fmt.Fprintf(os.Stderr, `
+Version
+%s
+
+An error ocurred when executing the command
+
+%s
+`, versionText, err.Error())
+	ExitCLI(1)
+}
+
 func WithParamsHandler(validators ...Validator) MiddlewareWrapper {
 	return func(runFn RunFn) RunFn {
 		return func(cmd *cobra.Command, args []string) (string, error) {

diff --git a/cli/cmd/resource_run_cmd.go b/cli/cmd/resource_run_cmd.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/kubeshop/tracetest/cli/config"
 	"github.com/kubeshop/tracetest/cli/openapi"
 	"github.com/kubeshop/tracetest/cli/runner"
-	"github.com/kubeshop/tracetest/cli/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -34,7 +34,7 @@ func init() {
 
 			orchestrator := runner.Orchestrator(
 				cliLogger,
-				utils.GetAPIClient(cliConfig),
+				config.GetAPIClient(cliConfig),
 				variableSetClient,
 			)