chore: refactor uploader interface (#41)

Signed-off-by: Miguel Martinez Trivino <[email protected]>

Author: migmartri

app/cli/cmd/artifact.go

@@ -19,6 +19,7 @@ import (
 	"context"
 
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
+	"github.com/chainloop-dev/chainloop/internal/grpcconn"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"google.golang.org/grpc"
@@ -44,5 +45,9 @@ func wrappedArtifactConn(cpConn *grpc.ClientConn, role pb.CASCredentialsServiceG
 		return nil, err
 	}
 
-	return newGRPCConnection(viper.GetString(confOptions.CASAPI.viperKey), resp.Result.Token, flagInsecure, logger)
+	if flagInsecure {
+		logger.Warn().Msg("API contacted in insecure mode")
+	}
+
+	return grpcconn.New(viper.GetString(confOptions.CASAPI.viperKey), resp.Result.Token, flagInsecure)
 }

app/cli/cmd/artifact_download.go

@@ -33,7 +33,7 @@ func newArtifactDownloadCmd() *cobra.Command {
 			var err error
 
 			// Retrieve temporary credentials for uploading
-			artifactCASConn, err = wrappedArtifactConn(actionOpts.CPConnecction,
+			artifactCASConn, err = wrappedArtifactConn(actionOpts.CPConnection,
 				pb.CASCredentialsServiceGetRequest_ROLE_DOWNLOADER)
 			if err != nil {
 				return err

app/cli/cmd/artifact_upload.go

@@ -33,7 +33,7 @@ func newArtifactUploadCmd() *cobra.Command {
 			var err error
 
 			// Retrieve temporary credentials for uploading
-			artifactCASConn, err = wrappedArtifactConn(actionOpts.CPConnecction, pb.CASCredentialsServiceGetRequest_ROLE_UPLOADER)
+			artifactCASConn, err = wrappedArtifactConn(actionOpts.CPConnection, pb.CASCredentialsServiceGetRequest_ROLE_UPLOADER)
 			if err != nil {
 				return err
 			}

app/cli/cmd/attestation_add.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
+	"github.com/chainloop-dev/chainloop/internal/grpcconn"
 )
 
 func newAttestationAddCmd() *cobra.Command {
@@ -42,13 +43,13 @@ func newAttestationAddCmd() *cobra.Command {
 
 			// Retrieve temporary credentials for uploading
 			// TODO: only do it for artifact uploads
-			client := pb.NewAttestationServiceClient(actionOpts.CPConnecction)
+			client := pb.NewAttestationServiceClient(actionOpts.CPConnection)
 			resp, err := client.GetUploadCreds(context.Background(), &pb.AttestationServiceGetUploadCredsRequest{})
 			if err != nil {
 				return newGracefulError(err)
 			}
 
-			artifactCASConn, err = newGRPCConnection(viper.GetString(confOptions.CASAPI.viperKey), resp.Result.Token, flagInsecure, logger)
+			artifactCASConn, err = grpcconn.New(viper.GetString(confOptions.CASAPI.viperKey), resp.Result.Token, flagInsecure)
 			if err != nil {
 				return newGracefulError(err)
 			}

app/cli/cmd/auth_login.go

@@ -180,7 +180,7 @@ func openbrowser(url string) error {
 
 // Retrieve loginURL from the control plane
 func retrieveLoginURL() (string, error) {
-	client := pb.NewStatusServiceClient(actionOpts.CPConnecction)
+	client := pb.NewStatusServiceClient(actionOpts.CPConnection)
 	resp, err := client.Infoz(context.Background(), &pb.InfozRequest{})
 	if err != nil {
 		return "", err

app/cli/cmd/root.go

@@ -16,22 +16,18 @@
 package cmd
 
 import (
-	"crypto/x509"
 	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
 
 	"github.com/adrg/xdg"
 	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
-	"github.com/chainloop-dev/chainloop/app/cli/internal/bearertoken"
-	grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
+	"github.com/chainloop-dev/chainloop/internal/grpcconn"
 	"github.com/rs/zerolog"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
-	grpc_insecure "google.golang.org/grpc/credentials/insecure"
 )
 
 var (
@@ -75,7 +71,11 @@ func NewRootCmd(l zerolog.Logger) *cobra.Command {
 				}
 			}
 
-			conn, err := newGRPCConnection(viper.GetString(confOptions.controlplaneAPI.viperKey), storedToken, flagInsecure, logger)
+			if flagInsecure {
+				logger.Warn().Msg("API contacted in insecure mode")
+			}
+
+			conn, err := grpcconn.New(viper.GetString(confOptions.controlplaneAPI.viperKey), storedToken, flagInsecure)
 			if err != nil {
 				return err
 			}
@@ -85,7 +85,7 @@ func NewRootCmd(l zerolog.Logger) *cobra.Command {
 			return nil
 		},
 		PersistentPostRunE: func(cmd *cobra.Command, args []string) error {
-			return cleanup(logger, actionOpts.CPConnecction)
+			return cleanup(logger, actionOpts.CPConnection)
 		},
 	}
 
@@ -163,42 +163,8 @@ func initConfigFile() {
 	cobra.CheckErr(viper.ReadInConfig())
 }
 
-func newGRPCConnection(uri, authToken string, insecure bool, logger zerolog.Logger) (*grpc.ClientConn, error) {
-	var opts []grpc.DialOption
-	if authToken != "" {
-		grpcCreds := bearertoken.NewTokenAuth(authToken, flagInsecure)
-
-		opts = []grpc.DialOption{
-			grpc.WithPerRPCCredentials(grpcCreds),
-			// Retry using default configuration
-			grpc.WithUnaryInterceptor(grpc_retry.UnaryClientInterceptor()),
-		}
-	}
-
-	var tlsDialOption grpc.DialOption
-	if insecure {
-		logger.Warn().Msg("API contacted in insecure mode")
-		tlsDialOption = grpc.WithTransportCredentials(grpc_insecure.NewCredentials())
-	} else {
-		certsPool, err := x509.SystemCertPool()
-		if err != nil {
-			return nil, err
-		}
-		tlsDialOption = grpc.WithTransportCredentials(credentials.NewClientTLSFromCert(certsPool, ""))
-	}
-
-	opts = append(opts, tlsDialOption)
-
-	conn, err := grpc.Dial(uri, opts...)
-	if err != nil {
-		return nil, err
-	}
-
-	return conn, nil
-}
-
 func newActionOpts(logger zerolog.Logger, conn *grpc.ClientConn) *action.ActionsOpts {
-	return &action.ActionsOpts{CPConnecction: conn, Logger: logger}
+	return &action.ActionsOpts{CPConnection: conn, Logger: logger}
 }
 
 func cleanup(logger zerolog.Logger, conn *grpc.ClientConn) error {

app/cli/internal/action/action.go

@@ -23,8 +23,8 @@ import (
 )
 
 type ActionsOpts struct {
-	CPConnecction *grpc.ClientConn
-	Logger        zerolog.Logger
+	CPConnection *grpc.ClientConn
+	Logger       zerolog.Logger
 }
 
 func toTimePtr(t time.Time) *time.Time {

app/cli/internal/action/artifact_download.go

@@ -52,7 +52,7 @@ func (a *ArtifactDownload) Run(downloadPath, digest string) error {
 		return fmt.Errorf("invalid digest: %w", err)
 	}
 
-	client := casclient.NewDownloader(a.artifactsCASConn)
+	client := casclient.New(a.artifactsCASConn)
 	ctx := context.Background()
 	info, err := client.Describe(ctx, h.Hex)
 	if err != nil {
@@ -81,10 +81,10 @@ func (a *ArtifactDownload) Run(downloadPath, digest string) error {
 	a.Logger.Info().Str("name", info.Filename).Str("to", downloadPath).Msg("downloading file")
 
 	// render progress bar
-	go renderOperationStatus(ctx, client.ProgressStatus, a.Logger)
+	go renderOperationStatus(ctx, client.ProgressStatus, a.Logger, info.Size)
 	defer close(client.ProgressStatus)
 
-	err = client.Download(ctx, w, h.Hex, info.Size)
+	err = client.Download(ctx, w, h.Hex)
 	if err != nil {
 		a.Logger.Debug().Err(err).Msg("problem downloading file")
 		return errors.New("problem downloading file")
@@ -103,7 +103,7 @@ func (a *ArtifactDownload) Run(downloadPath, digest string) error {
 	return nil
 }
 
-func renderOperationStatus(ctx context.Context, progressChan casclient.ProgressStatusChan, output io.Writer) {
+func renderOperationStatus(ctx context.Context, progressChan casclient.ProgressStatusChan, output io.Writer, totalSize int64) {
 	pw := progress.NewWriter()
 	pw.Style().Visibility.ETA = true
 	pw.Style().Visibility.Speed = true
@@ -127,8 +127,7 @@ func renderOperationStatus(ctx context.Context, progressChan casclient.ProgressS
 				// Hack: Add 1 to the total to make sure the tracker is not marked as done before the upload is finished
 				// this way the current value will never reach the total
 				// but instead the tracker will be marked as done by the defer statement
-				total := status.TotalSizeBytes + 1
-				tracker = &progress.Tracker{Total: total, Units: progress.UnitsBytes}
+				tracker = &progress.Tracker{Total: totalSize + 1, Units: progress.UnitsBytes}
 				defer tracker.MarkAsDone()
 				pw.AppendTracker(tracker)
 			}

app/cli/internal/action/artifact_upload.go

@@ -17,6 +17,8 @@ package action
 
 import (
 	"context"
+	"fmt"
+	"os"
 	"time"
 
 	"github.com/chainloop-dev/chainloop/internal/casclient"
@@ -43,9 +45,22 @@ func NewArtifactUpload(opts *ArtifactUploadOpts) *ArtifactUpload {
 }
 
 func (a *ArtifactUpload) Run(filePath string) (*CASArtifact, error) {
-	client := casclient.NewUploader(a.artifactsCASConn, casclient.WithLogger(a.Logger))
+	client := casclient.New(a.artifactsCASConn, casclient.WithLogger(a.Logger))
+
+	// open file and calculate size
+	f, err := os.Open(filePath)
+	if err != nil {
+		return nil, fmt.Errorf("can't open file to upload: %w", err)
+	}
+	defer f.Close()
+
+	info, err := f.Stat()
+	if err != nil {
+		return nil, fmt.Errorf("retrieving file information: %w", err)
+	}
+
 	// render progress bar
-	go renderOperationStatus(context.Background(), client.ProgressStatus, a.Logger)
+	go renderOperationStatus(context.Background(), client.ProgressStatus, a.Logger, info.Size())
 	defer close(client.ProgressStatus)
 
 	res, err := client.Upload(context.Background(), filePath)

app/cli/internal/action/attestation_add.go

@@ -39,7 +39,7 @@ func NewAttestationAdd(cfg *AttestationAddOpts) *AttestationAdd {
 		ActionsOpts: cfg.ActionsOpts,
 		c: crafter.NewCrafter(
 			crafter.WithLogger(&cfg.Logger),
-			crafter.WithUploader(casclient.NewUploader(cfg.ArtifactsCASConn, casclient.WithLogger(cfg.Logger))),
+			crafter.WithUploader(casclient.New(cfg.ArtifactsCASConn, casclient.WithLogger(cfg.Logger))),
 		),
 		artifactsCASConn: cfg.ArtifactsCASConn,
 	}