fix: Integer field changes for aws-sdk-go-v2

Signed-off-by: jay-dee7 <[email protected]>
containerish · Nov 24, 2023 · f14ed42 · f14ed42
1 parent 1190cb8
commit f14ed42
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/dfs/filebase/filebase.go b/dfs/filebase/filebase.go
@@ -75,9 +75,9 @@ func (fb *filebase) UploadPart(
 		Bucket:            &fb.bucket,
 		ChecksumAlgorithm: s3types.ChecksumAlgorithmSha256,
 		ChecksumSHA256:    aws.String(digest),
-		ContentLength:     contentLength,
+		ContentLength:     &contentLength,
 		Key:               &layerKey,
-		PartNumber:        int32(partNumber),
+		PartNumber:        aws.Int32(int32(partNumber)),
 		UploadId:          &uploadId,
 	}
 
@@ -89,7 +89,7 @@ func (fb *filebase) UploadPart(
 	return s3types.CompletedPart{
 		ChecksumSHA256: &digest,
 		ETag:           resp.ETag,
-		PartNumber:     int32(partNumber),
+		PartNumber:     aws.Int32(int32(partNumber)),
 	}, nil
 }
 
@@ -163,7 +163,7 @@ func (fb *filebase) Upload(ctx context.Context, namespace, digest string, conten
 		Body:              bytes.NewBuffer(content),
 		ChecksumAlgorithm: s3types.ChecksumAlgorithmSha256,
 		ChecksumSHA256:    &digest,
-		ContentLength:     int64(len(content)),
+		ContentLength:     aws.Int64(int64(len(content))),
 		StorageClass:      s3types.StorageClassStandard,
 	}
 	if fb.env == config.CI {
@@ -251,7 +251,7 @@ func (fb *filebase) Metadata(identifier string) (*types.ObjectMetadata, error) {
 		ContentType:   *resp.ContentType,
 		Etag:          *resp.ETag,
 		DFSLink:       cid,
-		ContentLength: int(resp.ContentLength),
+		ContentLength: int(*resp.ContentLength),
 	}, nil
 }
 
@@ -267,7 +267,7 @@ func (fb *filebase) GetUploadProgress(identifier, uploadID string) (*types.Objec
 
 	var uploadedSize int64
 	for _, p := range partsResp.Parts {
-		uploadedSize += p.Size
+		uploadedSize += *p.Size
 	}
 
 	return &types.ObjectMetadata{

diff --git a/dfs/mock/mockFileSystem.go b/dfs/mock/mockFileSystem.go
@@ -10,6 +10,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/dfs"
@@ -89,7 +90,7 @@ func (ms *fileBasedMockStorage) UploadPart(
 	return s3types.CompletedPart{
 		ChecksumCRC32:  &digest,
 		ChecksumCRC32C: &layerKey,
-		PartNumber:     int32(partNumber),
+		PartNumber:     aws.Int32(int32(partNumber)),
 	}, nil
 }
 

diff --git a/dfs/mock/storage.go b/dfs/mock/storage.go
@@ -10,6 +10,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/dfs"
@@ -83,7 +84,7 @@ func (ms *memMappedMockStorage) UploadPart(
 	return s3types.CompletedPart{
 		ChecksumCRC32:  &digest,
 		ChecksumCRC32C: &layerKey,
-		PartNumber:     int32(partNumber),
+		PartNumber:     aws.Int32(int32(partNumber)),
 	}, nil
 }
 

diff --git a/dfs/storj/storj.go b/dfs/storj/storj.go
@@ -73,9 +73,9 @@ func (sj *storj) UploadPart(
 		Bucket:            &sj.bucket,
 		ChecksumAlgorithm: s3types.ChecksumAlgorithmSha256,
 		ChecksumSHA256:    aws.String(digest),
-		ContentLength:     contentLength,
+		ContentLength:     &contentLength,
 		Key:               &layerKey,
-		PartNumber:        int32(partNumber),
+		PartNumber:        aws.Int32(int32(partNumber)),
 		UploadId:          &uploadId,
 	}
 
@@ -87,7 +87,7 @@ func (sj *storj) UploadPart(
 	return s3types.CompletedPart{
 		ChecksumSHA256: &digest,
 		ETag:           resp.ETag,
-		PartNumber:     int32(partNumber),
+		PartNumber:     aws.Int32(int32(partNumber)),
 	}, nil
 }
 
@@ -142,7 +142,7 @@ func (sj *storj) Upload(ctx context.Context, identifier, digest string, content
 		Body:              bytes.NewBuffer(content),
 		ChecksumAlgorithm: s3types.ChecksumAlgorithmSha256,
 		ChecksumSHA256:    &digest,
-		ContentLength:     int64(len(content)),
+		ContentLength:     aws.Int64(int64(len(content))),
 		StorageClass:      s3types.StorageClassStandard,
 	}
 	if sj.env == config.CI {
@@ -225,7 +225,7 @@ func (sj *storj) Metadata(identifier string) (*types.ObjectMetadata, error) {
 		ContentType:   *resp.ContentType,
 		Etag:          *resp.ETag,
 		DFSLink:       identifier,
-		ContentLength: int(resp.ContentLength),
+		ContentLength: int(*resp.ContentLength),
 	}, nil
 }
 
@@ -241,7 +241,7 @@ func (sj *storj) GetUploadProgress(identifier, uploadID string) (*types.ObjectMe
 
 	var uploadedSize int64
 	for _, p := range partsResp.Parts {
-		uploadedSize += p.Size
+		uploadedSize += *p.Size
 	}
 
 	return &types.ObjectMetadata{

diff --git a/dfs/storj/uplink/uplink.go b/dfs/storj/uplink/uplink.go
@@ -7,6 +7,7 @@ import (
 	"log"
 	"time"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/dfs"
@@ -100,7 +101,7 @@ func (u *storjUplink) UploadPart(
 
 	return s3types.CompletedPart{
 		ETag:       &digest,
-		PartNumber: int32(partNumber),
+		PartNumber: aws.Int32(int32(partNumber)),
 	}, nil
 }