Skip to content

Commit a87ef0e

Browse files
ajewellamzajewellamz
authored
Merge branch 'main' into ajewell/more-context
2 parents 37fa00b + 5662be4 commit a87ef0e

File tree

8 files changed

+159
-11
lines changed

8 files changed

+159
-11
lines changed

‎.github/workflows/ci_duvet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
shell: bash
2424
run: |
2525
make duvet
26-
- uses: actions/upload-artifact@v3
26+
- uses: actions/upload-artifact@v4
2727
if: always()
2828
with:
2929
name: specification_compliance_report

‎.github/workflows/ci_examples_net.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
dotnet-version: ${{ matrix.dotnet-version }}
3939

4040
- name: Setup Dafny
41-
uses: dafny-lang/setup-dafny-action@v1.6.1
41+
uses: dafny-lang/setup-dafny-action@v1.7.0
4242
with:
4343
dafny-version: ${{ '4.2.0' }}
4444

@@ -47,7 +47,7 @@ jobs:
4747
run: make setup_net
4848

4949
- name: Configure AWS Credentials
50-
uses: aws-actions/configure-aws-credentials@v2
50+
uses: aws-actions/configure-aws-credentials@v4
5151
with:
5252
aws-region: us-west-2
5353
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2

‎.github/workflows/ci_test_vector_java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
contents: read
2323
steps:
2424
- name: Setup DynamoDB Local
25-
uses: rrainn/dynamodb-action@v2.0.1
25+
uses: rrainn/dynamodb-action@v3.0.0
2626
with:
2727
port: 8000
2828
cors: '*'

‎.github/workflows/ci_test_vector_net.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
contents: read
2323
steps:
2424
- name: Setup DynamoDB Local
25-
uses: rrainn/dynamodb-action@v2.0.1
25+
uses: rrainn/dynamodb-action@v3.0.0
2626
with:
2727
port: 8000
2828
cors: '*'
2929

3030
- name: Configure AWS Credentials
31-
uses: aws-actions/configure-aws-credentials@v2
31+
uses: aws-actions/configure-aws-credentials@v4
3232
with:
3333
aws-region: us-west-2
3434
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2
@@ -39,7 +39,7 @@ jobs:
3939
submodules: recursive
4040

4141
- name: Setup Dafny
42-
uses: dafny-lang/setup-dafny-action@v1.6.1
42+
uses: dafny-lang/setup-dafny-action@v1.7.0
4343
with:
4444
dafny-version: '4.2.0'
4545

‎DynamoDbEncryption/runtimes/java/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ dependencies {
8888
implementation("software.amazon.awssdk:dynamodb-enhanced")
8989
implementation("software.amazon.awssdk:kms")
9090

91-
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
92-
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
91+
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
92+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
9393

9494
// For the DDB-EC v1
9595
implementation("com.amazonaws:aws-java-sdk-dynamodb:1.12.658")

‎Examples/runtimes/java/DynamoDbEncryption/src/main/java/software/amazon/cryptography/examples/CreateKeyStoreKeyExample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static void main(final String[] args) {
5757
}
5858
final String keyStoreTableName = args[0];
5959
final String logicalKeyStoreName = args[1];
60-
final String kmsKeyArn = args[1];
60+
final String kmsKeyArn = args[2];
6161
KeyStoreCreateKey(keyStoreTableName, logicalKeyStoreName, kmsKeyArn);
6262
}
6363
}

‎TestVectors/runtimes/java/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ dependencies {
9595
implementation(platform("software.amazon.awssdk:bom:2.24.2"))
9696
implementation("software.amazon.awssdk:dynamodb")
9797
implementation("software.amazon.awssdk:dynamodb-enhanced")
98-
implementation("software.amazon.awssdk:core:2.22.7")
98+
implementation("software.amazon.awssdk:core:2.24.7")
9999
implementation("software.amazon.awssdk:kms")
100100
testImplementation("com.amazonaws:DynamoDBLocal:2.+")
101101
// This is where we gather the SQLLite files to copy over

‎cfn/CI.yaml

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,22 @@ Parameters:
1818
Type: String
1919
Description: Testing Keystore Table Name
2020
Default: CiKeystoreTestTable
21+
BasicTestJavaTableName:
22+
Type: String
23+
Description: Table Name for Basic Examples in Java
24+
Default: DynamoDbEncryptionInterceptorTestTable
25+
BasicTestDotNetTableName:
26+
Type: String
27+
Description: Table Name for Basic Examples in Dotnet
28+
Default: DynamoDbEncryptionInterceptorTestTableCS
29+
SearchTestJavaTableName:
30+
Type: String
31+
Description: Table Name for Search Examples in Java
32+
Default: UnitInspectionTestTable
33+
SearchTestDotnetTableName:
34+
Type: String
35+
Description: Table Name for Search Examples in Dotnet
36+
Default: UnitInspectionTestTableCS
2137
ProjectName:
2238
Type: String
2339
Description: A prefix that will be applied to any names
@@ -48,6 +64,132 @@ Resources:
4864
WriteCapacityUnits: "5"
4965
TableName: !Ref TableName
5066

67+
BasicTestJavaTable:
68+
Type: AWS::DynamoDB::Table
69+
Properties:
70+
AttributeDefinitions:
71+
- AttributeName: "partition_key"
72+
AttributeType: "S"
73+
- AttributeName: "sort_key"
74+
AttributeType: "N"
75+
KeySchema:
76+
- AttributeName: "partition_key"
77+
KeyType: "HASH"
78+
- AttributeName: "sort_key"
79+
KeyType: "RANGE"
80+
ProvisionedThroughput:
81+
ReadCapacityUnits: "5"
82+
WriteCapacityUnits: "5"
83+
TableName: !Ref BasicTestJavaTableName
84+
85+
BasicTestDotnetTable:
86+
Type: AWS::DynamoDB::Table
87+
Properties:
88+
AttributeDefinitions:
89+
- AttributeName: "partition_key"
90+
AttributeType: "S"
91+
- AttributeName: "sort_key"
92+
AttributeType: "N"
93+
KeySchema:
94+
- AttributeName: "partition_key"
95+
KeyType: "HASH"
96+
- AttributeName: "sort_key"
97+
KeyType: "RANGE"
98+
ProvisionedThroughput:
99+
ReadCapacityUnits: "5"
100+
WriteCapacityUnits: "5"
101+
TableName: !Ref BasicTestDotnetTableName
102+
103+
SearchTestJavaTable:
104+
Type: AWS::DynamoDB::Table
105+
Properties:
106+
AttributeDefinitions:
107+
- AttributeName: "aws_dbe_b_inspector_id_last4"
108+
AttributeType: "S"
109+
- AttributeName: "aws_dbe_b_last4UnitCompound"
110+
AttributeType: "S"
111+
- AttributeName: "aws_dbe_b_unit"
112+
AttributeType: "S"
113+
- AttributeName: "inspection_date"
114+
AttributeType: "S"
115+
- AttributeName: "work_id"
116+
AttributeType: "S"
117+
KeySchema:
118+
- AttributeName: "work_id"
119+
KeyType: "HASH"
120+
- AttributeName: "inspection_date"
121+
KeyType: "RANGE"
122+
ProvisionedThroughput:
123+
ReadCapacityUnits: "5"
124+
WriteCapacityUnits: "5"
125+
TableName: !Ref SearchTestJavaTableName
126+
GlobalSecondaryIndexes:
127+
- IndexName: "last4-unit-index"
128+
KeySchema:
129+
- AttributeName: "aws_dbe_b_inspector_id_last4"
130+
KeyType: "HASH"
131+
- AttributeName: "aws_dbe_b_unit"
132+
KeyType: "RANGE"
133+
Projection:
134+
ProjectionType: ALL
135+
ProvisionedThroughput:
136+
ReadCapacityUnits: "5"
137+
WriteCapacityUnits: "5"
138+
- IndexName: "last4UnitCompound-index"
139+
KeySchema:
140+
- AttributeName: "aws_dbe_b_last4UnitCompound"
141+
KeyType: "HASH"
142+
Projection:
143+
ProjectionType: ALL
144+
ProvisionedThroughput:
145+
ReadCapacityUnits: "5"
146+
WriteCapacityUnits: "5"
147+
148+
SearchTestDotnetTable:
149+
Type: AWS::DynamoDB::Table
150+
Properties:
151+
AttributeDefinitions:
152+
- AttributeName: "aws_dbe_b_inspector_id_last4"
153+
AttributeType: "S"
154+
- AttributeName: "aws_dbe_b_last4UnitCompound"
155+
AttributeType: "S"
156+
- AttributeName: "aws_dbe_b_unit"
157+
AttributeType: "S"
158+
- AttributeName: "inspection_date"
159+
AttributeType: "S"
160+
- AttributeName: "work_id"
161+
AttributeType: "S"
162+
KeySchema:
163+
- AttributeName: "work_id"
164+
KeyType: "HASH"
165+
- AttributeName: "inspection_date"
166+
KeyType: "RANGE"
167+
ProvisionedThroughput:
168+
ReadCapacityUnits: "5"
169+
WriteCapacityUnits: "5"
170+
TableName: !Ref SearchTestDotnetTableName
171+
GlobalSecondaryIndexes:
172+
- IndexName: "last4-unit-index"
173+
KeySchema:
174+
- AttributeName: "aws_dbe_b_inspector_id_last4"
175+
KeyType: "HASH"
176+
- AttributeName: "aws_dbe_b_unit"
177+
KeyType: "RANGE"
178+
Projection:
179+
ProjectionType: ALL
180+
ProvisionedThroughput:
181+
ReadCapacityUnits: "5"
182+
WriteCapacityUnits: "5"
183+
- IndexName: "last4UnitCompound-index"
184+
KeySchema:
185+
- AttributeName: "aws_dbe_b_last4UnitCompound"
186+
KeyType: "HASH"
187+
Projection:
188+
ProjectionType: ALL
189+
ProvisionedThroughput:
190+
ReadCapacityUnits: "5"
191+
WriteCapacityUnits: "5"
192+
51193
TestTableWithSimpleBeaconIndex:
52194
Type: AWS::DynamoDB::Table
53195
Properties:
@@ -241,6 +383,12 @@ Resources:
241383
- !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${TableWithComplexBeaconIndexName}/index/*"
242384
- !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${KeystoreTableName}"
243385
- !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${KeystoreTableName}/index/*"
386+
- !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${BasicTestJavaTableName}"
387+
- !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${BasicTestDotnetTableName}"
388+
- !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${SearchTestJavaTableName}"
389+
- !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${SearchTestJavaTableName}/index/*"
390+
- !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${SearchTestDotnetTableName}"
391+
- !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${SearchTestDotnetTableName}/index/*"
244392

245393
KMSUsage:
246394
Type: "AWS::IAM::ManagedPolicy"

0 commit comments

Comments
 (0)