Merge branch 'main' into feat/service-accounts

Author: hamir-suspect

artifacthub/Makefile

@@ -4,7 +4,7 @@ include ../Makefile
 
 APP_NAME=artifacthub
 APP_ENV=prod
-INTERNAL_API_BRANCH=master
+INTERNAL_API_BRANCH?=master
 
 pb.gen:
 	rm -rf tmp && mkdir -p tmp

artifacthub/pkg/api/descriptors/artifacthub/artifacthub.pb.go

@@ -121,7 +121,7 @@ func ListTransferPath(ctx context.Context, client storage.Client, artifact *mode
 				return err
 			}
 
-			result = append(result, &artifacthub.ListItem{Name: item.Path, IsDirectory: item.IsDirectory})
+			result = append(result, &artifacthub.ListItem{Name: item.Path, IsDirectory: item.IsDirectory, Size: item.Size})
 		}
 
 		return nil

artifacthub/pkg/api/descriptors/artifacts/artifacts.v1.pb.go

@@ -303,8 +303,8 @@ func Test__ListPath(t *testing.T) {
 			response, err := server.ListPath(context.TODO(), request)
 			assert.Nil(t, err)
 			assert.Equal(t, []*artifacthub.ListItem{
-				{Name: "artifacts/projects/first/file1.txt", IsDirectory: false},
-				{Name: "artifacts/projects/first/dir/", IsDirectory: true},
+				{Name: "artifacts/projects/first/file1.txt", IsDirectory: false, Size: 5},
+				{Name: "artifacts/projects/first/dir/", IsDirectory: true, Size: 0},
 			}, response.Items)
 		})
 
@@ -318,9 +318,9 @@ func Test__ListPath(t *testing.T) {
 			response, err := server.ListPath(context.TODO(), request)
 			assert.Nil(t, err)
 			assert.Equal(t, []*artifacthub.ListItem{
-				{Name: "artifacts/projects/first/dir/subfile1.txt", IsDirectory: false},
-				{Name: "artifacts/projects/first/dir/subfile2.txt", IsDirectory: false},
-				{Name: "artifacts/projects/first/file1.txt", IsDirectory: false},
+				{Name: "artifacts/projects/first/dir/subfile1.txt", IsDirectory: false, Size: 5},
+				{Name: "artifacts/projects/first/dir/subfile2.txt", IsDirectory: false, Size: 5},
+				{Name: "artifacts/projects/first/file1.txt", IsDirectory: false, Size: 5},
 			}, response.Items)
 		})
 	})

artifacthub/pkg/api/private/privateapi.go

@@ -55,6 +55,7 @@ type PathItem struct {
 	Path        string
 	IsDirectory bool
 	Age         *time.Duration
+	Size        int64
 }
 
 type PathIterator interface {

artifacthub/pkg/server/private/privateserver_test.go

@@ -207,7 +207,7 @@ func (b *GcsBucket) DeleteObjects(paths []string) error {
 
 func (b *GcsBucket) ListPath(options ListOptions) (PathIterator, error) {
 	query := gcsstorage.Query{Prefix: pathutil.EndsInSlash(options.Path)}
-	err := query.SetAttrSelection([]string{"Name", "Created"})
+	err := query.SetAttrSelection([]string{"Name", "Created", "Size"})
 	if err != nil {
 		return nil, err
 	}
@@ -226,7 +226,7 @@ func (b *GcsBucket) ListPath(options ListOptions) (PathIterator, error) {
 
 func (b *GcsBucket) ListObjectsWithPagination(options ListOptions) (ObjectPager, error) {
 	query := gcsstorage.Query{Prefix: pathutil.EndsInSlash(options.Path)}
-	err := query.SetAttrSelection([]string{"Name", "Created"})
+	err := query.SetAttrSelection([]string{"Name", "Created", "Size"})
 	if err != nil {
 		return nil, err
 	}

artifacthub/pkg/storage/client.go

@@ -33,6 +33,7 @@ func (i *GcsPathIterator) Next() (*PathItem, error) {
 			Path:        attrs.Prefix,
 			IsDirectory: true,
 			Age:         nil,
+			Size:        0, // Directories don't have a size
 		}, nil
 	}
 
@@ -41,6 +42,7 @@ func (i *GcsPathIterator) Next() (*PathItem, error) {
 		Path:        attrs.Name,
 		IsDirectory: false,
 		Age:         &age,
+		Size:        attrs.Size,
 	}, nil
 }
 

artifacthub/pkg/storage/gcs_bucket.go

@@ -60,7 +60,7 @@ func (b *InMemoryBucket) Size() int {
 
 func (b *InMemoryBucket) Add(path string, age time.Time) error {
 	newAge := time.Since(age)
-	b.Objects = append(b.Objects, &PathItem{Path: "artifacts" + path, Age: &newAge})
+	b.Objects = append(b.Objects, &PathItem{Path: "artifacts" + path, Age: &newAge, Size: 1024}) // Default size for testing
 
 	return nil
 }
@@ -191,5 +191,11 @@ func (b *InMemoryBucket) SetCORS(ctx context.Context) error {
 }
 
 func (b *InMemoryBucket) CreateObject(ctx context.Context, name string, content []byte) error {
+	b.Objects = append(b.Objects, &PathItem{
+		Path:        name,
+		IsDirectory: false,
+		Age:         nil,
+		Size:        int64(len(content)),
+	})
 	return nil
 }

artifacthub/pkg/storage/gcs_object_iterator.go

@@ -82,6 +82,7 @@ func (i *S3PathIterator) nextAndIncrement() *PathItem {
 			Path:        i.removePathPrefix(*next.Key),
 			IsDirectory: false,
 			Age:         &age,
+			Size:        *next.Size,
 		}
 	}
 
@@ -92,6 +93,7 @@ func (i *S3PathIterator) nextAndIncrement() *PathItem {
 		Path:        i.removePathPrefix(*nextPrefix.Prefix),
 		IsDirectory: true,
 		Age:         nil,
+		Size:        0, // Directories don't have a size
 	}
 }