customPartitionKey attribute name change

aws-amplify · Oct 31, 2022 · 968c63f · 968c63f
1 parent 0a41104
commit 968c63f
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 42 deletions.
diff --git a/...ex-transformer/src/__tests__/__snapshots__/amplify-graphql-index-transformer.test.ts.snap b/...ex-transformer/src/__tests__/__snapshots__/amplify-graphql-index-transformer.test.ts.snap
@@ -2138,8 +2138,8 @@ $util.qr($mergedValues.put(\\"__typename\\", \\"Test\\"))
   \\"operation\\": \\"PutItem\\",
   \\"attributeValues\\":   $util.dynamodb.toMapValues($mergedValues),
   \\"condition\\": $condition,
-  \\"customPrimaryKey\\": \\"email\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"email\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $args.condition )
   $util.qr($ctx.stash.conditions.add($args.condition))
@@ -2223,8 +2223,8 @@ $util.qr($ctx.stash.metadata.put(\\"modelObjectKey\\", {
 #set( $DeleteRequest = {
   \\"version\\": \\"2018-05-29\\",
   \\"operation\\": \\"DeleteItem\\",
-  \\"customPrimaryKey\\": \\"email\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"email\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $ctx.stash.metadata.modelObjectKey )
   #set( $Key = $ctx.stash.metadata.modelObjectKey )
@@ -2434,8 +2434,8 @@ $util.qr($update.put(\\"expression\\", \\"$expression\\"))
   \\"operation\\": \\"UpdateItem\\",
   \\"key\\": $Key,
   \\"update\\": $update,
-  \\"customPrimaryKey\\": \\"email\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"email\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $Conditions )
   #if( $keyConditionExprNames )
@@ -2856,8 +2856,8 @@ $util.qr($mergedValues.put(\\"__typename\\", \\"Item\\"))
   \\"operation\\": \\"PutItem\\",
   \\"attributeValues\\":   $util.dynamodb.toMapValues($mergedValues),
   \\"condition\\": $condition,
-  \\"customPrimaryKey\\": \\"orderId\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"orderId\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $args.condition )
   $util.qr($ctx.stash.conditions.add($args.condition))
@@ -2941,8 +2941,8 @@ $util.qr($ctx.stash.metadata.put(\\"modelObjectKey\\", {
 #set( $DeleteRequest = {
   \\"version\\": \\"2018-05-29\\",
   \\"operation\\": \\"DeleteItem\\",
-  \\"customPrimaryKey\\": \\"orderId\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"orderId\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $ctx.stash.metadata.modelObjectKey )
   #set( $Key = $ctx.stash.metadata.modelObjectKey )
@@ -3158,8 +3158,8 @@ $util.qr($update.put(\\"expression\\", \\"$expression\\"))
   \\"operation\\": \\"UpdateItem\\",
   \\"key\\": $Key,
   \\"update\\": $update,
-  \\"customPrimaryKey\\": \\"orderId\\",
-  \\"populateGSIFields\\":   true,
+  \\"customPartitionKey\\": \\"orderId\\",
+  \\"populateIndexFields\\":   true,
   \\"_version\\": $util.defaultIfNull($args.input[\\"_version\\"], 0)
 } )
 #if( $Conditions )
@@ -5542,8 +5542,8 @@ $util.qr($mergedValues.put(\\"__typename\\", \\"Item\\"))
   \\"operation\\": \\"PutItem\\",
   \\"attributeValues\\":   $util.dynamodb.toMapValues($mergedValues),
   \\"condition\\": $condition,
-  \\"customPrimaryKey\\": \\"orderId\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"orderId\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $args.condition )
   $util.qr($ctx.stash.conditions.add($args.condition))
@@ -5627,8 +5627,8 @@ $util.qr($ctx.stash.metadata.put(\\"modelObjectKey\\", {
 #set( $DeleteRequest = {
   \\"version\\": \\"2018-05-29\\",
   \\"operation\\": \\"DeleteItem\\",
-  \\"customPrimaryKey\\": \\"orderId\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"orderId\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $ctx.stash.metadata.modelObjectKey )
   #set( $Key = $ctx.stash.metadata.modelObjectKey )
@@ -5843,8 +5843,8 @@ $util.qr($update.put(\\"expression\\", \\"$expression\\"))
   \\"operation\\": \\"UpdateItem\\",
   \\"key\\": $Key,
   \\"update\\": $update,
-  \\"customPrimaryKey\\": \\"orderId\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"orderId\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $Conditions )
   #if( $keyConditionExprNames )

diff --git a/...nsformer/src/__tests__/__snapshots__/amplify-graphql-primary-key-transformer.test.ts.snap b/...nsformer/src/__tests__/__snapshots__/amplify-graphql-primary-key-transformer.test.ts.snap
@@ -49,8 +49,8 @@ $util.qr($mergedValues.put(\\"__typename\\", \\"Test\\"))
   \\"operation\\": \\"PutItem\\",
   \\"attributeValues\\":   $util.dynamodb.toMapValues($mergedValues),
   \\"condition\\": $condition,
-  \\"customPrimaryKey\\": \\"email\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"email\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $args.condition )
   $util.qr($ctx.stash.conditions.add($args.condition))
@@ -134,8 +134,8 @@ $util.qr($ctx.stash.metadata.put(\\"modelObjectKey\\", {
 #set( $DeleteRequest = {
   \\"version\\": \\"2018-05-29\\",
   \\"operation\\": \\"DeleteItem\\",
-  \\"customPrimaryKey\\": \\"email\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"email\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $ctx.stash.metadata.modelObjectKey )
   #set( $Key = $ctx.stash.metadata.modelObjectKey )
@@ -350,8 +350,8 @@ $util.qr($update.put(\\"expression\\", \\"$expression\\"))
   \\"operation\\": \\"UpdateItem\\",
   \\"key\\": $Key,
   \\"update\\": $update,
-  \\"customPrimaryKey\\": \\"email\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"email\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $Conditions )
   #if( $keyConditionExprNames )
@@ -701,8 +701,8 @@ $util.qr($mergedValues.put(\\"__typename\\", \\"Test\\"))
   \\"operation\\": \\"PutItem\\",
   \\"attributeValues\\":   $util.dynamodb.toMapValues($mergedValues),
   \\"condition\\": $condition,
-  \\"customPrimaryKey\\": \\"email\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"email\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $args.condition )
   $util.qr($ctx.stash.conditions.add($args.condition))
@@ -786,8 +786,8 @@ $util.qr($ctx.stash.metadata.put(\\"modelObjectKey\\", {
 #set( $DeleteRequest = {
   \\"version\\": \\"2018-05-29\\",
   \\"operation\\": \\"DeleteItem\\",
-  \\"customPrimaryKey\\": \\"email\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"email\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $ctx.stash.metadata.modelObjectKey )
   #set( $Key = $ctx.stash.metadata.modelObjectKey )
@@ -997,8 +997,8 @@ $util.qr($update.put(\\"expression\\", \\"$expression\\"))
   \\"operation\\": \\"UpdateItem\\",
   \\"key\\": $Key,
   \\"update\\": $update,
-  \\"customPrimaryKey\\": \\"email\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"email\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $Conditions )
   #if( $keyConditionExprNames )
@@ -1850,8 +1850,8 @@ $util.qr($mergedValues.put(\\"__typename\\", \\"Test\\"))
   \\"operation\\": \\"PutItem\\",
   \\"attributeValues\\":   $util.dynamodb.toMapValues($mergedValues),
   \\"condition\\": $condition,
-  \\"customPrimaryKey\\": \\"status\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"status\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $args.condition )
   $util.qr($ctx.stash.conditions.add($args.condition))
@@ -1935,8 +1935,8 @@ $util.qr($ctx.stash.metadata.put(\\"modelObjectKey\\", {
 #set( $DeleteRequest = {
   \\"version\\": \\"2018-05-29\\",
   \\"operation\\": \\"DeleteItem\\",
-  \\"customPrimaryKey\\": \\"status\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"status\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $ctx.stash.metadata.modelObjectKey )
   #set( $Key = $ctx.stash.metadata.modelObjectKey )
@@ -2146,8 +2146,8 @@ $util.qr($update.put(\\"expression\\", \\"$expression\\"))
   \\"operation\\": \\"UpdateItem\\",
   \\"key\\": $Key,
   \\"update\\": $update,
-  \\"customPrimaryKey\\": \\"status\\",
-  \\"populateGSIFields\\":   true
+  \\"customPartitionKey\\": \\"status\\",
+  \\"populateIndexFields\\":   true
 } )
 #if( $Conditions )
   #if( $keyConditionExprNames )

diff --git a/packages/amplify-graphql-model-transformer/src/resolvers/mutation.ts b/packages/amplify-graphql-model-transformer/src/resolvers/mutation.ts
@@ -134,8 +134,8 @@ export const generateUpdateRequestTemplate = (modelName: string, isSyncEnabled:
         key: ref('Key'),
         update: ref('update'),
         ...(hasCustomPrimaryKey && {
-          customPrimaryKey: str(`${partitionKey}`),
-          populateGSIFields: raw(`${hasCustomPrimaryKey}`),
+          customPartitionKey: str(`${partitionKey}`),
+          populateIndexFields: raw(`${hasCustomPrimaryKey}`),
         }), 
         ...(isSyncEnabled && { _version: ref('util.defaultIfNull($args.input["_version"], 0)') }),
       }),
@@ -187,8 +187,8 @@ export const generateCreateRequestTemplate = (modelName: string, modelIndexField
         attributeValues: methodCall(ref('util.dynamodb.toMapValues'), ref('mergedValues')),
         condition: ref('condition'),
         ...(hasCustomPrimaryKey && {
-          customPrimaryKey: str(`${partitionKey}`),
-          populateGSIFields: raw(`${hasCustomPrimaryKey}`),
+          customPartitionKey: str(`${partitionKey}`),
+          populateIndexFields: raw(`${hasCustomPrimaryKey}`),
         }),
       }),
     ),
@@ -273,8 +273,8 @@ export const generateDeleteRequestTemplate = (isSyncEnabled: boolean, hasCustomP
         version: str('2018-05-29'),
         operation: str('DeleteItem'),
         ...(hasCustomPrimaryKey && {
-          customPrimaryKey: str(`${partitionKey}`),
-          populateGSIFields: raw(`${hasCustomPrimaryKey}`),
+          customPartitionKey: str(`${partitionKey}`),
+          populateIndexFields: raw(`${hasCustomPrimaryKey}`),
         }),
       }),
     ),