chore: decouple cas-client file upload (#43)

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

Author: migmartri

app/cli/internal/action/artifact_upload.go

@@ -63,7 +63,7 @@ func (a *ArtifactUpload) Run(filePath string) (*CASArtifact, error) {
 	go renderOperationStatus(context.Background(), client.ProgressStatus, info.Size())
 	defer close(client.ProgressStatus)
 
-	res, err := client.Upload(context.Background(), filePath)
+	res, err := client.UploadFile(context.Background(), filePath)
 	if err != nil {
 		return nil, err
 	}

internal/attestation/crafter/materials/artifact.go

@@ -43,7 +43,7 @@ func NewArtifactCrafter(schema *schemaapi.CraftingSchema_Material, uploader casc
 
 // Craft will calculate the digest of the artifact, simulate an upload and return the material definition
 func (i *ArtifactCrafter) Craft(ctx context.Context, artifactPath string) (*api.Attestation_Material, error) {
-	result, err := i.uploader.Upload(ctx, artifactPath)
+	result, err := i.uploader.UploadFile(ctx, artifactPath)
 	if err != nil {
 		i.logger.Debug().Err(err)
 		return nil, err

internal/attestation/crafter/materials/artifact_test.go

@@ -64,7 +64,7 @@ func TestNewArtifactCrafter(t *testing.T) {
 	}
 }
 
-func TestArtifacftCraft(t *testing.T) {
+func TestArtifactCraft(t *testing.T) {
 	assert := assert.New(t)
 	schema := &contractAPI.CraftingSchema_Material{
 		Name: "test",
@@ -75,7 +75,7 @@ func TestArtifacftCraft(t *testing.T) {
 
 	// Mock uploader
 	uploader := mUploader.NewUploader(t)
-	uploader.On("Upload", context.TODO(), "file.txt").
+	uploader.On("UploadFile", context.TODO(), "file.txt").
 		Return(&casclient.UpDownStatus{
 			Digest:   "deadbeef",
 			Filename: "file.txt",

internal/attestation/crafter/materials/cyclonedxjson.go

@@ -64,7 +64,7 @@ func (i *CyclonedxJSONCrafter) Craft(ctx context.Context, filePath string) (*api
 		return nil, fmt.Errorf("invalid cyclonedx sbom file: %w", ErrInvalidMaterialType)
 	}
 
-	result, err := i.uploader.Upload(ctx, filePath)
+	result, err := i.uploader.UploadFile(ctx, filePath)
 	if err != nil {
 		i.logger.Debug().Err(err)
 		return nil, err

internal/attestation/crafter/materials/cyclonedxjson_test.go

@@ -102,7 +102,7 @@ func TestCyclonedxJSONCraft(t *testing.T) {
 			// Mock uploader
 			uploader := mUploader.NewUploader(t)
 			if tc.wantErr == "" {
-				uploader.On("Upload", context.TODO(), tc.filePath).
+				uploader.On("UploadFile", context.TODO(), tc.filePath).
 					Return(&casclient.UpDownStatus{
 						Digest:   "deadbeef",
 						Filename: "sbom.cyclonedx.json",

internal/attestation/crafter/materials/spdxjson.go

@@ -59,7 +59,7 @@ func (i *SPDXJSONCrafter) Craft(ctx context.Context, filePath string) (*api.Atte
 		return nil, fmt.Errorf("invalid spdx sbom file: %w", ErrInvalidMaterialType)
 	}
 
-	result, err := i.uploader.Upload(ctx, filePath)
+	result, err := i.uploader.UploadFile(ctx, filePath)
 	if err != nil {
 		i.logger.Debug().Err(err)
 		return nil, err

internal/attestation/crafter/materials/spdxjson_test.go

@@ -102,7 +102,7 @@ func TestSPDXJSONCraft(t *testing.T) {
 			// Mock uploader
 			uploader := mUploader.NewUploader(t)
 			if tc.wantErr == "" {
-				uploader.On("Upload", context.TODO(), tc.filePath).
+				uploader.On("UploadFile", context.TODO(), tc.filePath).
 					Return(&casclient.UpDownStatus{
 						Digest:   "deadbeef",
 						Filename: "sbom.spdx.json",

internal/casclient/casclient.go

@@ -24,8 +24,8 @@ import (
 )
 
 type UpDownStatus struct {
-	Filepath, Filename, Digest string
-	ProcessedBytes             int64
+	Filename, Digest string
+	ProcessedBytes   int64
 }
 
 type ResourceInfo struct {
@@ -35,7 +35,8 @@ type ResourceInfo struct {
 }
 
 type Uploader interface {
-	Upload(ctx context.Context, filepath string) (*UpDownStatus, error)
+	UploadFile(ctx context.Context, filepath string) (*UpDownStatus, error)
+	Upload(ctx context.Context, r io.Reader, digest, fileName string) (*UpDownStatus, error)
 }
 
 type Downloader interface {