revert

Signed-off-by: Miguel Martinez <miguel@chainloop.dev>

Author: migmartri

app/cli/cmd/casbackend.go

@@ -18,7 +18,6 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/chainloop-dev/chainloop/app/cli/cmd/options"
 	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
 	"github.com/spf13/cobra"
 )
@@ -70,7 +69,7 @@ func newCASBackendUpdateCmd() *cobra.Command {
 
 // confirmDefaultCASBackendOverride asks the user to confirm the override of the default CAS backend
 // in the event that there is one already set and its not the same as the one we are setting
-func confirmDefaultCASBackendOverride(actionOpts *options.ActionsOpts, id string) (bool, error) {
+func confirmDefaultCASBackendOverride(actionOpts *action.ActionsOpts, id string) (bool, error) {
 	// get existing backends
 	backends, err := action.NewCASBackendList(actionOpts).Run()
 	if err != nil {
@@ -96,11 +95,11 @@ func confirmDefaultCASBackendOverride(actionOpts *options.ActionsOpts, id string
 }
 
 // If we are removing the default we confirm too
-func confirmDefaultCASBackendRemoval(actionOpts *options.ActionsOpts, name string) (bool, error) {
+func confirmDefaultCASBackendRemoval(actionOpts *action.ActionsOpts, name string) (bool, error) {
 	return confirmDefaultCASBackendUnset(name, "You are deleting the default CAS backend.", actionOpts)
 }
 
-func confirmDefaultCASBackendUnset(name, msg string, actionOpts *options.ActionsOpts) (bool, error) {
+func confirmDefaultCASBackendUnset(name, msg string, actionOpts *action.ActionsOpts) (bool, error) {
 	// get existing backends
 	backends, err := action.NewCASBackendList(actionOpts).Run()
 	if err != nil {
@@ -152,7 +151,7 @@ func captureUpdateFlags(cmd *cobra.Command) error {
 // handleDefaultUpdateConfirmation centralizes the confirmation logic when the --default flag
 // is provided. It returns (true, nil) when it's ok to proceed, (false, nil) when the user
 // declined confirmation, or (false, err) when an error happened.
-func handleDefaultUpdateConfirmation(actionOpts *options.ActionsOpts, name string) (bool, error) {
+func handleDefaultUpdateConfirmation(actionOpts *action.ActionsOpts, name string) (bool, error) {
 	if isDefaultCASBackendUpdateOption == nil {
 		return true, nil
 	}

app/cli/cmd/options/options.go

@@ -16,18 +16,10 @@
 package options
 
 import (
-	"github.com/rs/zerolog"
 	"github.com/spf13/cobra"
-	"google.golang.org/grpc"
 )
 
 type Interface interface {
 	// AddFlags adds this options' flags to the cobra command.
 	AddFlags(cmd *cobra.Command)
 }
-
-type ActionsOpts struct {
-	CPConnection *grpc.ClientConn
-	Logger       zerolog.Logger
-	AuthTokenRaw string
-}

app/cli/cmd/root.go

@@ -27,7 +27,6 @@ import (
 	"time"
 
 	"github.com/adrg/xdg"
-	"github.com/chainloop-dev/chainloop/app/cli/cmd/options"
 	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
 	"github.com/chainloop-dev/chainloop/app/cli/internal/telemetry"
 	"github.com/chainloop-dev/chainloop/app/cli/internal/telemetry/posthog"
@@ -45,7 +44,7 @@ var (
 	flagCfgFile        string
 	flagDebug          bool
 	flagOutputFormat   string
-	actionOpts         *options.ActionsOpts
+	actionOpts         *action.ActionsOpts
 	logger             zerolog.Logger
 	defaultCPAPI       = "api.cp.chainloop.dev:443"
 	defaultCASAPI      = "api.cas.chainloop.dev:443"
@@ -95,7 +94,7 @@ type RootCmd struct {
 	// in PersistentPreRunE and used across all subcommands. The double indirection
 	// ensures that when the global actionOpts is updated (e.g., with new connection),
 	// all references automatically point to the updated value.
-	ActionOpts **options.ActionsOpts
+	ActionOpts **action.ActionsOpts
 }
 
 func NewRootCmd(l zerolog.Logger) *RootCmd {
@@ -349,8 +348,8 @@ func initConfigFile() {
 	cobra.CheckErr(viper.ReadInConfig())
 }
 
-func newActionOpts(logger zerolog.Logger, conn *grpc.ClientConn, token string) *options.ActionsOpts {
-	return &options.ActionsOpts{CPConnection: conn, Logger: logger, AuthTokenRaw: token}
+func newActionOpts(logger zerolog.Logger, conn *grpc.ClientConn, token string) *action.ActionsOpts {
+	return &action.ActionsOpts{CPConnection: conn, Logger: logger, AuthTokenRaw: token}
 }
 
 func cleanup(conn *grpc.ClientConn) error {

app/cli/internal/action/action.go

@@ -25,6 +25,7 @@ import (
 	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter"
 	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter/statemanager/filesystem"
 	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter/statemanager/remote"
+	"github.com/rs/zerolog"
 	"google.golang.org/grpc"
 )
 
@@ -33,6 +34,12 @@ const (
 	PolicyViolationBlockingStrategyAdvisory = "ADVISORY"
 )
 
+type ActionsOpts struct {
+	CPConnection *grpc.ClientConn
+	Logger       zerolog.Logger
+	AuthTokenRaw string
+}
+
 type OffsetPagination struct {
 	Page       int `json:"page"`
 	PageSize   int `json:"pageSize"`

app/cli/internal/action/apitoken_create.go

@@ -21,16 +21,15 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/chainloop-dev/chainloop/app/cli/cmd/options"
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
 	"google.golang.org/protobuf/types/known/durationpb"
 )
 
 type APITokenCreate struct {
-	cfg *options.ActionsOpts
+	cfg *ActionsOpts
 }
 
-func NewAPITokenCreate(cfg *options.ActionsOpts) *APITokenCreate {
+func NewAPITokenCreate(cfg *ActionsOpts) *APITokenCreate {
 	return &APITokenCreate{cfg}
 }
 

app/cli/internal/action/apitoken_list.go

@@ -19,15 +19,14 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/chainloop-dev/chainloop/app/cli/cmd/options"
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
 )
 
 type APITokenList struct {
-	cfg *options.ActionsOpts
+	cfg *ActionsOpts
 }
 
-func NewAPITokenList(cfg *options.ActionsOpts) *APITokenList {
+func NewAPITokenList(cfg *ActionsOpts) *APITokenList {
 	return &APITokenList{cfg}
 }
 

app/cli/internal/action/apitoken_revoke.go

@@ -19,15 +19,14 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/chainloop-dev/chainloop/app/cli/cmd/options"
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
 )
 
 type APITokenRevoke struct {
-	cfg *options.ActionsOpts
+	cfg *ActionsOpts
 }
 
-func NewAPITokenRevoke(cfg *options.ActionsOpts) *APITokenRevoke {
+func NewAPITokenRevoke(cfg *ActionsOpts) *APITokenRevoke {
 	return &APITokenRevoke{cfg}
 }
 

app/cli/internal/action/artifact_download.go

@@ -25,7 +25,6 @@ import (
 	"path"
 	"time"
 
-	"github.com/chainloop-dev/chainloop/app/cli/cmd/options"
 	"github.com/chainloop-dev/chainloop/pkg/casclient"
 	"github.com/jedib0t/go-pretty/v6/progress"
 	"google.golang.org/grpc"
@@ -34,13 +33,13 @@ import (
 )
 
 type ArtifactDownload struct {
-	*options.ActionsOpts
+	*ActionsOpts
 	artifactsCASConn *grpc.ClientConn
 	stdout           io.Writer
 }
 
 type ArtifactDownloadOpts struct {
-	*options.ActionsOpts
+	*ActionsOpts
 	ArtifactsCASConn *grpc.ClientConn
 	Stdout           io.Writer
 }

app/cli/internal/action/artifact_upload.go

@@ -21,7 +21,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/chainloop-dev/chainloop/app/cli/cmd/options"
 	"github.com/chainloop-dev/chainloop/pkg/casclient"
 	"github.com/jedib0t/go-pretty/v6/progress"
 	"google.golang.org/grpc"
@@ -32,12 +31,12 @@ type CASArtifact struct {
 }
 
 type ArtifactUpload struct {
-	*options.ActionsOpts
+	*ActionsOpts
 	artifactsCASConn *grpc.ClientConn
 }
 
 type ArtifactUploadOpts struct {
-	*options.ActionsOpts
+	*ActionsOpts
 	ArtifactsCASConn *grpc.ClientConn
 }
 

app/cli/internal/action/attached_integration_add.go

@@ -19,15 +19,14 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/chainloop-dev/chainloop/app/cli/cmd/options"
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 
 // Attach a third party integration to a workflow
-type AttachedIntegrationAdd struct{ cfg *options.ActionsOpts }
+type AttachedIntegrationAdd struct{ cfg *ActionsOpts }
 
-func NewAttachedIntegrationAdd(cfg *options.ActionsOpts) *AttachedIntegrationAdd {
+func NewAttachedIntegrationAdd(cfg *ActionsOpts) *AttachedIntegrationAdd {
 	return &AttachedIntegrationAdd{cfg}
 }