Skip to content

Commit ea9b480

Browse files
rishav-karanjitrishav-karanjit
committed
sortkeywritevalue
1 parent 4eb1d8a commit ea9b480

File tree

7 files changed

+35
-35
lines changed

7 files changed

+35
-35
lines changed

‎Examples/runtimes/go/migration/PlaintextToAWSDBE/awsdbe/step1_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@ func TestMigrationStep1(t *testing.T) {
1515
sortKeys := []string{"0", "1", "2", "3"}
1616

1717
// Successfully executes Step 1
18-
err := MigrationStep1(kmsKeyID, tableName, partitionKey, sortKeys[1])
18+
err := MigrationStep1(kmsKeyID, tableName, partitionKey, sortKeys[1], sortKeys[1])
1919
utils.HandleError(err)
2020

2121
// Given: Step 0 has succeeded
22-
err = plaintext.MigrationStep0(tableName, partitionKey, sortKeys[0])
22+
err = plaintext.MigrationStep0(tableName, partitionKey, sortKeys[0], sortKeys[0])
2323
utils.HandleError(err)
2424

2525
// When: Execute Step 1 with sortReadValue=0, Then: Success (i.e. can read plaintext values)
26-
err = MigrationStep1(kmsKeyID, tableName, partitionKey, sortKeys[0])
26+
err = MigrationStep1(kmsKeyID, tableName, partitionKey, sortKeys[1], sortKeys[0])
2727
utils.HandleError(err)
2828

2929
// Given: Step 2 has succeeded
30-
err = MigrationStep2(kmsKeyID, tableName, partitionKey, sortKeys[2])
30+
err = MigrationStep2(kmsKeyID, tableName, partitionKey, sortKeys[2], sortKeys[2])
3131
utils.HandleError(err)
3232

3333
// When: Execute Step 1 with sortReadValue=2, Then: Success (i.e. can read encrypted values)
34-
err = MigrationStep1(kmsKeyID, tableName, partitionKey, sortKeys[2])
34+
err = MigrationStep1(kmsKeyID, tableName, partitionKey, sortKeys[1], sortKeys[2])
3535
utils.HandleError(err)
3636

3737
// Given: Step 3 has succeeded
38-
err = MigrationStep3(kmsKeyID, tableName, partitionKey, sortKeys[3])
38+
err = MigrationStep3(kmsKeyID, tableName, partitionKey, sortKeys[3], sortKeys[3])
3939
utils.HandleError(err)
4040

4141
// When: Execute Step 1 with sortReadValue=3, Then: Success (i.e. can read encrypted values)
42-
err = MigrationStep1(kmsKeyID, tableName, partitionKey, sortKeys[3])
42+
err = MigrationStep1(kmsKeyID, tableName, partitionKey, sortKeys[1], sortKeys[3])
4343
utils.HandleError(err)
4444

4545
// Cleanup

‎Examples/runtimes/go/migration/PlaintextToAWSDBE/awsdbe/step2.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ primary key configuration:
3737
- Partition key is named "partition_key" with type (S)
3838
- Sort key is named "sort_key" with type (S)
3939
*/
40-
func MigrationStep2(kmsKeyID, ddbTableName, partitionKeyValue, sortKeyReadValue string) error {
40+
func MigrationStep2(kmsKeyID, ddbTableName, partitionKeyValue, sortKeyWriteValue, sortKeyReadValue string) error {
4141
cfg, err := config.LoadDefaultConfig(context.TODO())
4242
utils.HandleError(err)
4343

@@ -66,7 +66,7 @@ func MigrationStep2(kmsKeyID, ddbTableName, partitionKeyValue, sortKeyReadValue
6666
encryptedAndSignedValue := "this will be encrypted and signed"
6767
item := map[string]types.AttributeValue{
6868
"partition_key": &types.AttributeValueMemberS{Value: partitionKeyValue},
69-
"sort_key": &types.AttributeValueMemberN{Value: "2"},
69+
"sort_key": &types.AttributeValueMemberN{Value: sortKeyWriteValue},
7070
"attribute1": &types.AttributeValueMemberS{Value: encryptedAndSignedValue},
7171
"attribute2": &types.AttributeValueMemberS{Value: "this will never be encrypted, but it will be signed"},
7272
"attribute3": &types.AttributeValueMemberS{Value: "this will never be encrypted nor signed"},

‎Examples/runtimes/go/migration/PlaintextToAWSDBE/awsdbe/step2_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@ func TestMigrationStep2(t *testing.T) {
1515
sortKeys := []string{"0", "1", "2", "3"}
1616

1717
// Successfully executes Step 2
18-
err := MigrationStep2(kmsKeyID, tableName, partitionKey, sortKeys[2])
18+
err := MigrationStep2(kmsKeyID, tableName, partitionKey, sortKeys[2], sortKeys[2])
1919
utils.HandleError(err)
2020

2121
// Given: Step 0 has succeeded
22-
err = plaintext.MigrationStep0(tableName, partitionKey, sortKeys[0])
22+
err = plaintext.MigrationStep0(tableName, partitionKey, sortKeys[0], sortKeys[0])
2323
utils.HandleError(err)
2424

2525
// When: Execute Step 2 with sortReadValue=0, Then: Success (i.e. can read plaintext values)
26-
err = MigrationStep2(kmsKeyID, tableName, partitionKey, sortKeys[0])
26+
err = MigrationStep2(kmsKeyID, tableName, partitionKey, sortKeys[2], sortKeys[0])
2727
utils.HandleError(err)
2828

2929
// Given: Step 1 has succeeded
30-
err = MigrationStep1(kmsKeyID, tableName, partitionKey, sortKeys[1])
30+
err = MigrationStep1(kmsKeyID, tableName, partitionKey, sortKeys[1], sortKeys[1])
3131
utils.HandleError(err)
3232

3333
// When: Execute Step 2 with sortReadValue=1, Then: Success (i.e. can read encrypted values)
34-
err = MigrationStep2(kmsKeyID, tableName, partitionKey, sortKeys[1])
34+
err = MigrationStep2(kmsKeyID, tableName, partitionKey, sortKeys[2], sortKeys[1])
3535
utils.HandleError(err)
3636

3737
// Given: Step 3 has succeeded
38-
err = MigrationStep3(kmsKeyID, tableName, partitionKey, sortKeys[3])
38+
err = MigrationStep3(kmsKeyID, tableName, partitionKey, sortKeys[3], sortKeys[3])
3939
utils.HandleError(err)
4040

4141
// When: Execute Step 2 with sortReadValue=3, Then: Success (i.e. can read encrypted values)
42-
err = MigrationStep2(kmsKeyID, tableName, partitionKey, sortKeys[3])
42+
err = MigrationStep2(kmsKeyID, tableName, partitionKey, sortKeys[2], sortKeys[3])
4343
utils.HandleError(err)
4444

4545
// Cleanup

‎Examples/runtimes/go/migration/PlaintextToAWSDBE/awsdbe/step3.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ primary key configuration:
3333
- Partition key is named "partition_key" with type (S)
3434
- Sort key is named "sort_key" with type (S)
3535
*/
36-
func MigrationStep3(kmsKeyID, ddbTableName, partitionKeyValue, sortKeyReadValue string) error {
36+
func MigrationStep3(kmsKeyID, ddbTableName, partitionKeyValue, sortKeyWriteValue, sortKeyReadValue string) error {
3737
cfg, err := config.LoadDefaultConfig(context.TODO())
3838
utils.HandleError(err)
3939

@@ -66,7 +66,7 @@ func MigrationStep3(kmsKeyID, ddbTableName, partitionKeyValue, sortKeyReadValue
6666
encryptedAndSignedValue := "this will be encrypted and signed"
6767
item := map[string]types.AttributeValue{
6868
"partition_key": &types.AttributeValueMemberS{Value: partitionKeyValue},
69-
"sort_key": &types.AttributeValueMemberN{Value: "3"},
69+
"sort_key": &types.AttributeValueMemberN{Value: sortKeyWriteValue},
7070
"attribute1": &types.AttributeValueMemberS{Value: encryptedAndSignedValue},
7171
"attribute2": &types.AttributeValueMemberS{Value: "this will never be encrypted, but it will be signed"},
7272
"attribute3": &types.AttributeValueMemberS{Value: "this will never be encrypted nor signed"},

‎Examples/runtimes/go/migration/PlaintextToAWSDBE/awsdbe/step3_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@ func TestMigrationStep3(t *testing.T) {
1515
sortKeys := []string{"0", "1", "2", "3"}
1616

1717
// Successfully executes Step 3
18-
err := MigrationStep3(kmsKeyID, tableName, partitionKey, sortKeys[3])
18+
err := MigrationStep3(kmsKeyID, tableName, partitionKey, sortKeys[3], sortKeys[3])
1919
utils.HandleError(err)
2020

2121
// Given: Step 0 has succeeded
22-
err = plaintext.MigrationStep0(tableName, partitionKey, sortKeys[0])
22+
err = plaintext.MigrationStep0(tableName, partitionKey, sortKeys[0], sortKeys[0])
2323
utils.HandleError(err)
2424

2525
// When: Execute Step 3 with sortReadValue=0, Then: should panic (cannot read plaintext values)
26-
err = MigrationStep3(kmsKeyID, tableName, partitionKey, sortKeys[0])
26+
err = MigrationStep3(kmsKeyID, tableName, partitionKey, sortKeys[3], sortKeys[0])
2727
utils.AssertServiceError(err, "DynamoDB", "GetItem", "Encrypted item missing expected header and footer attributes")
2828

2929
// Given: Step 1 has succeeded
30-
err = MigrationStep1(kmsKeyID, tableName, partitionKey, sortKeys[1])
30+
err = MigrationStep1(kmsKeyID, tableName, partitionKey, sortKeys[1], sortKeys[1])
3131
utils.HandleError(err)
3232

3333
// When: Execute Step 3 with sortReadValue=1, Then: should error out (cannot read plaintext values)
34-
err = MigrationStep3(kmsKeyID, tableName, partitionKey, sortKeys[1])
34+
err = MigrationStep3(kmsKeyID, tableName, partitionKey, sortKeys[3], sortKeys[1])
3535
utils.AssertServiceError(err, "DynamoDB", "GetItem", "Encrypted item missing expected header and footer attributes")
3636

3737
// Given: Step 2 has succeeded
38-
err = MigrationStep2(kmsKeyID, tableName, partitionKey, sortKeys[2])
38+
err = MigrationStep2(kmsKeyID, tableName, partitionKey, sortKeys[2], sortKeys[2])
3939
utils.HandleError(err)
4040

4141
// When: Execute Step 3 with sortReadValue=2, Then: Success (can read encrypted values)
42-
err = MigrationStep3(kmsKeyID, tableName, partitionKey, sortKeys[2])
42+
err = MigrationStep3(kmsKeyID, tableName, partitionKey, sortKeys[3], sortKeys[2])
4343
utils.HandleError(err)
4444

4545
// Cleanup

‎Examples/runtimes/go/migration/PlaintextToAWSDBE/plaintext/step0.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ primary key configuration:
3030
- Partition key is named "partition_key" with type (S)
3131
- Sort key is named "sort_key" with type (S)
3232
*/
33-
func MigrationStep0(ddbTableName, partitionKeyValue, sortKeyValue string) error {
33+
func MigrationStep0(ddbTableName, partitionKeyValue, sortKeyWriteValue, sortKeyReadValue string) error {
3434
// 1. Create a standard DynamoDB client
3535
cfg, err := config.LoadDefaultConfig(context.TODO())
3636
utils.HandleError(err)
@@ -40,7 +40,7 @@ func MigrationStep0(ddbTableName, partitionKeyValue, sortKeyValue string) error
4040
// This item will be stored in plaintext.
4141
item := map[string]types.AttributeValue{
4242
"partition_key": &types.AttributeValueMemberS{Value: partitionKeyValue},
43-
"sort_key": &types.AttributeValueMemberN{Value: "0"},
43+
"sort_key": &types.AttributeValueMemberN{Value: sortKeyWriteValue},
4444
"attribute1": &types.AttributeValueMemberS{Value: "this will be encrypted and signed"},
4545
"attribute2": &types.AttributeValueMemberS{Value: "this will never be encrypted, but it will be signed"},
4646
"attribute3": &types.AttributeValueMemberS{Value: "this will never be encrypted nor signed"},
@@ -64,7 +64,7 @@ func MigrationStep0(ddbTableName, partitionKeyValue, sortKeyValue string) error
6464
// your dynamodb client (this is configured from Step 1 onwards).
6565
key := map[string]types.AttributeValue{
6666
"partition_key": &types.AttributeValueMemberS{Value: partitionKeyValue},
67-
"sort_key": &types.AttributeValueMemberN{Value: sortKeyValue},
67+
"sort_key": &types.AttributeValueMemberN{Value: sortKeyReadValue},
6868
}
6969

7070
getInput := &dynamodb.GetItemInput{

‎Examples/runtimes/go/migration/PlaintextToAWSDBE/plaintext/step0_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,29 @@ func TestMigrationStep0(t *testing.T) {
1515
sortKeys := []string{"0", "1", "2", "3"}
1616

1717
// Successfully executes step 0
18-
err := MigrationStep0(tableName, partitionKey, sortKeys[0])
18+
err := MigrationStep0(tableName, partitionKey, sortKeys[0], sortKeys[0])
1919
utils.HandleError(err)
2020

2121
// Given: Step 1 has succeeded
22-
err = awsdbe.MigrationStep1(kmsKeyID, tableName, partitionKey, sortKeys[1])
22+
err = awsdbe.MigrationStep1(kmsKeyID, tableName, partitionKey, sortKeys[1], sortKeys[1])
2323
utils.HandleError(err)
2424

2525
// When: Execute Step 0 with sortReadValue=1, Then: Success (i.e. can read plaintext values)
26-
err = MigrationStep0(tableName, partitionKey, sortKeys[1])
26+
err = MigrationStep0(tableName, partitionKey, sortKeys[0], sortKeys[1])
2727
utils.HandleError(err)
2828

2929
// Given: Step 2 has succeeded
30-
err = awsdbe.MigrationStep2(kmsKeyID, tableName, partitionKey, sortKeys[2])
30+
err = awsdbe.MigrationStep2(kmsKeyID, tableName, partitionKey, sortKeys[2], sortKeys[2])
3131
utils.HandleError(err)
3232

3333
// When: Execute Step 0 with sortReadValue=2, Then: should error out when reading encrypted items.
34-
err = MigrationStep0(tableName, partitionKey, sortKeys[2])
34+
err = MigrationStep0(tableName, partitionKey, sortKeys[0], sortKeys[2])
3535
utils.AssertErrorMessage(err, "partition_key is not a string attribute")
3636

3737
// Given: Step 3 has succeeded (if it exists)
38-
awsdbe.MigrationStep3(kmsKeyID, tableName, partitionKey, sortKeys[3])
38+
awsdbe.MigrationStep3(kmsKeyID, tableName, partitionKey, sortKeys[3], sortKeys[3])
3939
// When: Execute Step 0 with sortReadValue=3, Then: should error out
40-
err = MigrationStep0(tableName, partitionKey, sortKeys[3])
40+
err = MigrationStep0(tableName, partitionKey, sortKeys[0], sortKeys[3])
4141
utils.AssertErrorMessage(err, "partition_key is not a string attribute")
4242

4343
// Cleanup

0 commit comments

Comments
 (0)