Request name for GCS

Signed-off-by: Filip Petkovski <[email protected]>

Author: fpetkovski

objstore.go

@@ -246,16 +246,7 @@ type ObjectAttributes struct {
 
 type IterObjectAttributes struct {
 	Name         string
-	lastModified time.Time
-}
-
-func (i *IterObjectAttributes) SetLastModified(t time.Time) {
-	i.lastModified = t
-}
-
-// LastModified returns the timestamp the object was last modified. Returns false if the timestamp is not available.
-func (i *IterObjectAttributes) LastModified() (time.Time, bool) {
-	return i.lastModified, !i.lastModified.IsZero()
+	LastModified time.Time
 }
 
 // TryToGetSize tries to get upfront size from reader.

providers/azure/azure.go

@@ -221,7 +221,7 @@ func (b *Bucket) IterWithAttributes(ctx context.Context, dir string, f func(attr
 					Name: *blob.Name,
 				}
 				if params.LastModified {
-					attrs.SetLastModified(*blob.Properties.LastModified)
+					attrs.LastModified = *blob.Properties.LastModified
 				}
 				if err := f(attrs); err != nil {
 					return err
@@ -243,7 +243,7 @@ func (b *Bucket) IterWithAttributes(ctx context.Context, dir string, f func(attr
 				Name: *blobItem.Name,
 			}
 			if params.LastModified {
-				attrs.SetLastModified(*blobItem.Properties.LastModified)
+				attrs.LastModified = *blobItem.Properties.LastModified
 			}
 			if err := f(attrs); err != nil {
 				return err

providers/bos/bos.go

@@ -223,7 +223,7 @@ func (b *Bucket) IterWithAttributes(ctx context.Context, dir string, f func(attr
 				if err != nil {
 					return fmt.Errorf("iter: get last modified: %w", err)
 				}
-				attrs.SetLastModified(lastModified)
+				attrs.LastModified = lastModified
 			}
 
 			if err := f(attrs); err != nil {

providers/filesystem/filesystem.go

@@ -117,7 +117,7 @@ func (b *Bucket) IterWithAttributes(ctx context.Context, dir string, f func(attr
 			if err != nil {
 				return errors.Wrapf(err, "stat %s", name)
 			}
-			attrs.SetLastModified(stat.ModTime())
+			attrs.LastModified = stat.ModTime()
 		}
 		if err := f(attrs); err != nil {
 			return err

providers/gcs/gcs.go

@@ -204,10 +204,21 @@ func (b *Bucket) IterWithAttributes(ctx context.Context, dir string, f func(attr
 		delimiter = ""
 	}
 
-	it := b.bkt.Objects(ctx, &storage.Query{
+	query := &storage.Query{
 		Prefix:    dir,
 		Delimiter: delimiter,
-	})
+	}
+
+	if appliedOpts.LastModified {
+		if err := query.SetAttrSelection([]string{"Name", "Updated"}); err != nil {
+			return err
+		}
+	} else {
+		if err := query.SetAttrSelection([]string{"Name"}); err != nil {
+			return err
+		}
+	}
+	it := b.bkt.Objects(ctx, query)
 	for {
 		select {
 		case <-ctx.Done():
@@ -222,9 +233,9 @@ func (b *Bucket) IterWithAttributes(ctx context.Context, dir string, f func(attr
 			return err
 		}
 
-		objAttrs := objstore.IterObjectAttributes{Name: attrs.Prefix + attrs.Name}
-		if appliedOpts.LastModified {
-			objAttrs.SetLastModified(attrs.Updated)
+		objAttrs := objstore.IterObjectAttributes{
+			Name:         attrs.Prefix + attrs.Name,
+			LastModified: attrs.Updated,
 		}
 		if err := f(objAttrs); err != nil {
 			return err

providers/s3/s3.go

@@ -428,7 +428,7 @@ func (b *Bucket) IterWithAttributes(ctx context.Context, dir string, f func(attr
 			Name: object.Key,
 		}
 		if appliedOpts.LastModified {
-			attr.SetLastModified(object.LastModified)
+			attr.LastModified = object.LastModified
 		}
 
 		if err := f(attr); err != nil {