add etag

server/internal/adapter/gql/resolver_mutation_asset.go

@@ -102,6 +102,7 @@ func (r *mutationResolver) CreateAssetUpload(ctx context.Context, input gqlmodel
 		Filename:      lo.FromPtr(input.Filename),
 		ContentLength: int64(lo.FromPtr(input.ContentLength)),
 		Cursor:        lo.FromPtr(input.Cursor),
+		ETags:         input.Etags,
 	}, getOperator(ctx))
 	if err != nil {
 		return nil, err

server/internal/infrastructure/aws/file.go

@@ -15,6 +15,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
+	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/google/uuid"
 	"github.com/reearth/reearth-cms/server/internal/usecase/gateway"
 	"github.com/reearth/reearth-cms/server/pkg/asset"
@@ -151,10 +152,18 @@ func (f *fileRepo) IssueUploadAssetLink(ctx context.Context, param gateway.Issue
 		}
 		uploaded := maxPartSize * (cursor.Part - 1)
 		if completed := param.ContentLength <= uploaded; completed {
+			var mu types.CompletedMultipartUpload
+			for i, etag := range param.ETags {
+				mu.Parts = append(mu.Parts, types.CompletedPart{
+					ETag:       aws.String(etag),
+					PartNumber: aws.Int32(int32(i + 1)),
+				})
+			}
 			if _, err := f.s3Client.CompleteMultipartUpload(ctx, &s3.CompleteMultipartUploadInput{
-				Bucket:   aws.String(f.bucketName),
-				Key:      aws.String(p),
-				UploadId: aws.String(cursor.UploadID),
+				Bucket:          aws.String(f.bucketName),
+				Key:             aws.String(p),
+				UploadId:        aws.String(cursor.UploadID),
+				MultipartUpload: &mu,
 			}); err != nil {
 				return nil, fmt.Errorf("complete multipart uplaod: %w", err)
 			}

server/internal/usecase/gateway/file.go

@@ -41,6 +41,7 @@ type IssueUploadAssetParam struct {
 	ExpiresAt     time.Time
 
 	Cursor string
+	ETags  []string
 }
 
 func (p IssueUploadAssetParam) ContentType() string {

server/internal/usecase/interactor/asset.go

@@ -303,6 +303,7 @@ func (i *Asset) CreateUpload(ctx context.Context, inp interfaces.CreateAssetUplo
 			ContentLength: au.ContentLength(),
 			ExpiresAt:     au.ExpiresAt(),
 			Cursor:        wrapped.Cursor,
+			ETags:         inp.ETags,
 		}
 	}
 

server/internal/usecase/interfaces/asset.go

@@ -34,6 +34,7 @@ type CreateAssetUploadParam struct {
 	ContentLength int64
 
 	Cursor string
+	ETags  []string
 }
 
 var (

server/schemas/asset.graphql

@@ -66,6 +66,7 @@ input CreateAssetUploadInput {
 
   # Required if uploading in multiple parts.
   cursor: String
+  etags: [String!]
 }
 
 input UpdateAssetInput {

web/src/components/organisms/Project/Asset/AssetList/hooks.ts

@@ -117,6 +117,7 @@ export default (isItemsRequired: boolean) => {
               let cursor = "";
               let offset = 0;
               let uploadToken = "";
+              const etags: string[] = [];
               // eslint-disable-next-line no-constant-condition
               while (true) {
                 const createAssetUploadResult = await createAssetUploadMutation({
@@ -125,6 +126,7 @@ export default (isItemsRequired: boolean) => {
                     filename: file.name,
                     contentLength: file.size ?? 0,
                     cursor,
+                    etags,
                   },
                 });
                 if (
@@ -142,14 +144,16 @@ export default (isItemsRequired: boolean) => {
                   break;
                 }
                 const headers = contentType ? { "content-type": contentType } : undefined;
-                await fetch(url, {
+                const res = await fetch(url, {
                   method: "PUT",
                   body: (file as any).slice(offset, offset + contentLength),
                   headers,
                 });
                 if (!next) {
                   break;
                 }
+                const etag = res.headers.get("ETag");
+                if (etag) etags.push(etag);
                 cursor = next;
                 offset += contentLength;
               }

web/src/gql/graphql-client-api.tsx

@@ -244,6 +244,7 @@ export type CreateAssetPayload = {
 export type CreateAssetUploadInput = {
   contentLength?: InputMaybe<Scalars['Int']>;
   cursor?: InputMaybe<Scalars['String']>;
+  etags?: InputMaybe<Array<Scalars['String']>>;
   filename?: InputMaybe<Scalars['String']>;
   projectId: Scalars['ID'];
 };
@@ -2228,6 +2229,7 @@ export type CreateAssetUploadMutationVariables = Exact<{
   filename: Scalars['String'];
   cursor: Scalars['String'];
   contentLength: Scalars['Int'];
+  etags?: InputMaybe<Array<Scalars['String']> | Scalars['String']>;
 }>;
 
 
@@ -3489,9 +3491,9 @@ export type DecompressAssetMutationHookResult = ReturnType<typeof useDecompressA
 export type DecompressAssetMutationResult = Apollo.MutationResult<DecompressAssetMutation>;
 export type DecompressAssetMutationOptions = Apollo.BaseMutationOptions<DecompressAssetMutation, DecompressAssetMutationVariables>;
 export const CreateAssetUploadDocument = gql`
-    mutation CreateAssetUpload($projectId: ID!, $filename: String!, $cursor: String!, $contentLength: Int!) {
+    mutation CreateAssetUpload($projectId: ID!, $filename: String!, $cursor: String!, $contentLength: Int!, $etags: [String!]) {
   createAssetUpload(
-    input: {projectId: $projectId, filename: $filename, cursor: $cursor, contentLength: $contentLength}
+    input: {projectId: $projectId, filename: $filename, cursor: $cursor, contentLength: $contentLength, etags: $etags}
   ) {
     url
     token
@@ -3520,6 +3522,7 @@ export type CreateAssetUploadMutationFn = Apollo.MutationFunction<CreateAssetUpl
  *      filename: // value for 'filename'
  *      cursor: // value for 'cursor'
  *      contentLength: // value for 'contentLength'
+ *      etags: // value for 'etags'
  *   },
  * });
  */

web/src/gql/graphql.schema.json

@@ -2061,6 +2061,26 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "etags",
+            "description": null,
+            "type": {
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "filename",
             "description": null,

web/src/gql/queries/assets.ts

@@ -126,8 +126,22 @@ export const DECOMPRESS_ASSET = gql`
 `;
 
 export const CREATE_ASSET_UPLOAD = gql`
-  mutation CreateAssetUpload($projectId: ID!, $filename: String!, $cursor: String!, $contentLength: Int!) {
-    createAssetUpload(input: { projectId: $projectId, filename: $filename, cursor: $cursor, contentLength: $contentLength }) {
+  mutation CreateAssetUpload(
+    $projectId: ID!
+    $filename: String!
+    $cursor: String!
+    $contentLength: Int!
+    $etags: [String!]
+  ) {
+    createAssetUpload(
+      input: {
+        projectId: $projectId
+        filename: $filename
+        cursor: $cursor
+        contentLength: $contentLength
+        etags: $etags
+      }
+    ) {
       url
       token
       contentType