Skip to content

Commit 8a76a9d

Browse files
authored
chore: reformat and enforce formatting (#1035)
* chore: reformat and enforce formatting
1 parent cbde4ef commit 8a76a9d

File tree

358 files changed

+321854
-25072
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

358 files changed

+321854
-25072
lines changed

Diff for: .github/workflows/ci_codegen.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
library:
15-
[
16-
DynamoDbEncryption,
17-
TestVectors
18-
]
14+
library: [DynamoDbEncryption, TestVectors]
1915
# Note dotnet is only used for formatting generated code
2016
# in this workflow
2117
dotnet-version: ["6.0.x"]

Diff for: .github/workflows/ci_duvet.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# with respect to the specification
44
name: Duvet report
55

6-
on:
6+
on:
77
pull_request:
88
push:
99
branches:

Diff for: .github/workflows/ci_examples_java.yml

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow performs tests in Java.
22
name: Java Examples
33

4-
on:
4+
on:
55
pull_request:
66
push:
77
branches:
@@ -12,7 +12,7 @@ on:
1212
# (accordingly to the "nightly" parameter).
1313
inputs:
1414
nightly:
15-
description: 'Run the nightly build'
15+
description: "Run the nightly build"
1616
required: false
1717
type: boolean
1818
schedule:
@@ -30,10 +30,8 @@ jobs:
3030
strategy:
3131
max-parallel: 1
3232
matrix:
33-
java-version: [ 8, 11, 16, 17 ]
34-
os: [
35-
macos-12
36-
]
33+
java-version: [8, 11, 16, 17]
34+
os: [macos-12]
3735
runs-on: ${{ matrix.os }}
3836
permissions:
3937
id-token: write
@@ -48,12 +46,12 @@ jobs:
4846

4947
- uses: actions/checkout@v3
5048
with:
51-
submodules: recursive
49+
submodules: recursive
5250

5351
- name: Setup Java ${{ matrix.java-version }}
5452
uses: actions/setup-java@v4
5553
with:
56-
distribution: 'corretto'
54+
distribution: "corretto"
5755
java-version: ${{ matrix.java-version }}
5856

5957
- name: Setup Dafny
@@ -80,4 +78,3 @@ jobs:
8078
# Run migration examples
8179
gradle -p runtimes/java/Migration/PlaintextToAWSDBE test
8280
gradle -p runtimes/java/Migration/DDBECToAWSDBE test
83-

Diff for: .github/workflows/ci_examples_net.yml

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow performs tests in .NET.
22
name: dotnet examples
33

4-
on:
4+
on:
55
pull_request:
66
push:
77
branches:
@@ -13,13 +13,9 @@ jobs:
1313
if: (github.repository_owner == 'aws')
1414
strategy:
1515
matrix:
16-
library: [
17-
DynamoDbEncryption,
18-
]
19-
dotnet-version: [ '6.0.x' ]
20-
os: [
21-
macos-12,
22-
]
16+
library: [DynamoDbEncryption]
17+
dotnet-version: ["6.0.x"]
18+
os: [macos-12]
2319
runs-on: ${{ matrix.os }}
2420
permissions:
2521
id-token: write
@@ -30,7 +26,7 @@ jobs:
3026
steps:
3127
- uses: actions/checkout@v3
3228
with:
33-
submodules: recursive
29+
submodules: recursive
3430

3531
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
3632
uses: actions/setup-dotnet@v4
@@ -42,7 +38,7 @@ jobs:
4238
with:
4339
dafny-version: ${{ '4.2.0' }}
4440

45-
- name: Download Dependencies
41+
- name: Download Dependencies
4642
working-directory: ./${{ matrix.library }}
4743
run: make setup_net
4844

Diff for: .github/workflows/ci_test_java.yml

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow performs tests in Java.
22
name: Library Java tests
33

4-
on:
4+
on:
55
pull_request:
66
push:
77
branches:
@@ -12,7 +12,7 @@ on:
1212
# (accordingly to the "nightly" parameter).
1313
inputs:
1414
nightly:
15-
description: 'Run the nightly build'
15+
description: "Run the nightly build"
1616
required: false
1717
type: boolean
1818
schedule:
@@ -29,13 +29,9 @@ jobs:
2929
if: github.event_name != 'schedule' || github.repository_owner == 'aws'
3030
strategy:
3131
matrix:
32-
library: [
33-
DynamoDbEncryption
34-
]
35-
java-version: [ 8, 11, 16, 17 ]
36-
os: [
37-
macos-12
38-
]
32+
library: [DynamoDbEncryption]
33+
java-version: [8, 11, 16, 17]
34+
os: [macos-12]
3935
runs-on: ${{ matrix.os }}
4036
permissions:
4137
id-token: write
@@ -70,7 +66,7 @@ jobs:
7066
- name: Setup Java ${{ matrix.java-version }}
7167
uses: actions/setup-java@v4
7268
with:
73-
distribution: 'corretto'
69+
distribution: "corretto"
7470
java-version: ${{ matrix.java-version }}
7571

7672
- name: Build ${{ matrix.library }} implementation

Diff for: .github/workflows/ci_test_net.yml

+14-21
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow performs tests in .NET.
22
name: test dotnet
33

4-
on:
4+
on:
55
pull_request:
66
push:
77
branches:
@@ -12,7 +12,7 @@ on:
1212
# (accordingly to the "nightly" parameter).
1313
inputs:
1414
nightly:
15-
description: 'Run the nightly build'
15+
description: "Run the nightly build"
1616
required: false
1717
type: boolean
1818
schedule:
@@ -30,15 +30,9 @@ jobs:
3030
if: (github.event_name != 'schedule' || github.repository_owner == 'aws')
3131
strategy:
3232
matrix:
33-
library: [
34-
DynamoDbEncryption,
35-
]
36-
dotnet-version: [ '6.0.x' ]
37-
os: [
38-
macos-12,
39-
ubuntu-latest,
40-
windows-latest
41-
]
33+
library: [DynamoDbEncryption]
34+
dotnet-version: ["6.0.x"]
35+
os: [macos-12, ubuntu-latest, windows-latest]
4236
runs-on: ${{ matrix.os }}
4337
permissions:
4438
id-token: write
@@ -52,7 +46,7 @@ jobs:
5246
git config --global core.longpaths true
5347
- uses: actions/checkout@v3
5448
with:
55-
submodules: recursive
49+
submodules: recursive
5650

5751
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
5852
uses: actions/setup-dotnet@v4
@@ -73,8 +67,8 @@ jobs:
7367
library: ${{ matrix.library }}
7468
diff-generated-code: false
7569
update-and-regenerate-mpl: true
76-
77-
- name: Download Dependencies
70+
71+
- name: Download Dependencies
7872
working-directory: ./${{ matrix.library }}
7973
run: make setup_net
8074

@@ -92,16 +86,16 @@ jobs:
9286
# This works because `node` is installed by default on GHA runners
9387
CORES=$(node -e 'console.log(os.cpus().length)')
9488
make transpile_net CORES=$CORES
95-
89+
9690
- name: Test ${{ matrix.library }} net48
9791
if: matrix.os == 'windows-latest'
9892
working-directory: ./${{ matrix.library }}
9993
shell: bash
10094
run: |
101-
dotnet restore runtimes/net/tests
102-
dotnet build runtimes/net/tests
103-
make test_net FRAMEWORK=net48
104-
95+
dotnet restore runtimes/net/tests
96+
dotnet build runtimes/net/tests
97+
make test_net FRAMEWORK=net48
98+
10599
- name: Test ${{ matrix.library }} net6.0
106100
working-directory: ./${{ matrix.library }}
107101
shell: bash
@@ -113,12 +107,11 @@ jobs:
113107
else
114108
make test_net FRAMEWORK=net6.0
115109
fi
116-
110+
117111
- name: Test Build and Pack ${{ matrix.library}}
118112
shell: bash
119113
if: matrix.os != 'windows-latest'
120114
working-directory: ./${{ matrix.library }}
121115
run: |
122116
dotnet build runtimes/net /p:Configuration=Release -nowarn:CS0162,CS0168
123117
dotnet pack runtimes/net/DynamoDbEncryption.csproj --no-build /p:Configuration=Release --output build
124-

Diff for: .github/workflows/ci_test_vector_java.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow performs test vectors in Java.
22
name: Library Java Test Vectors
33

4-
on:
4+
on:
55
pull_request:
66
push:
77
branches:
@@ -11,11 +11,11 @@ jobs:
1111
testJava:
1212
strategy:
1313
matrix:
14-
java-version: [ 8, 11, 16, 17 ]
14+
java-version: [8, 11, 16, 17]
1515
os: [
16-
# Run on ubuntu image that comes pre-configured with docker
17-
ubuntu-latest
18-
]
16+
# Run on ubuntu image that comes pre-configured with docker
17+
ubuntu-latest,
18+
]
1919
runs-on: ${{ matrix.os }}
2020
permissions:
2121
id-token: write
@@ -25,7 +25,7 @@ jobs:
2525
uses: rrainn/[email protected]
2626
with:
2727
port: 8000
28-
cors: '*'
28+
cors: "*"
2929

3030
- name: Configure AWS Credentials
3131
uses: aws-actions/configure-aws-credentials@v4
@@ -41,12 +41,12 @@ jobs:
4141
- name: Setup Dafny
4242
uses: dafny-lang/[email protected]
4343
with:
44-
dafny-version: '4.2.0'
44+
dafny-version: "4.2.0"
4545

4646
- name: Setup Java ${{ matrix.java-version }}
4747
uses: actions/setup-java@v4
4848
with:
49-
distribution: 'corretto'
49+
distribution: "corretto"
5050
java-version: ${{ matrix.java-version }}
5151

5252
- name: Build TestVectors implementation

Diff for: .github/workflows/ci_test_vector_net.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow performs test vectors in DotNet.
22
name: Library DotNet Test Vectors
33

4-
on:
4+
on:
55
pull_request:
66
push:
77
branches:
@@ -11,11 +11,11 @@ jobs:
1111
testDotNet:
1212
strategy:
1313
matrix:
14-
dotnet-version: [ '6.0.x' ]
14+
dotnet-version: ["6.0.x"]
1515
os: [
16-
# Run on ubuntu image that comes pre-configured with docker
17-
ubuntu-latest
18-
]
16+
# Run on ubuntu image that comes pre-configured with docker
17+
ubuntu-latest,
18+
]
1919
runs-on: ${{ matrix.os }}
2020
permissions:
2121
id-token: write
@@ -25,7 +25,7 @@ jobs:
2525
uses: rrainn/[email protected]
2626
with:
2727
port: 8000
28-
cors: '*'
28+
cors: "*"
2929

3030
- name: Configure AWS Credentials
3131
uses: aws-actions/configure-aws-credentials@v4
@@ -41,7 +41,7 @@ jobs:
4141
- name: Setup Dafny
4242
uses: dafny-lang/[email protected]
4343
with:
44-
dafny-version: '4.2.0'
44+
dafny-version: "4.2.0"
4545

4646
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
4747
uses: actions/setup-dotnet@v4
@@ -62,4 +62,3 @@ jobs:
6262
dotnet run
6363
cp ../java/*.json .
6464
dotnet run --framework net6.0
65-

Diff for: .github/workflows/ci_todos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow prevents TODOs in code
22
name: Check TODOs in code
33

4-
on:
4+
on:
55
pull_request:
66
push:
77
branches:

Diff for: .github/workflows/ci_tv_verification.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
# (accordingly to the "nightly" parameter).
1313
inputs:
1414
nightly:
15-
description: 'Run the nightly build'
15+
description: "Run the nightly build"
1616
required: false
1717
type: boolean
1818
schedule:
@@ -31,12 +31,8 @@ jobs:
3131
matrix:
3232
# Break up verification between namespaces over multiple
3333
# actions to take advantage of parallelization
34-
service: [
35-
DDBEncryption
36-
]
37-
os: [
38-
macos-12,
39-
]
34+
service: [DDBEncryption]
35+
os: [macos-12]
4036
runs-on: ${{ matrix.os }}
4137
steps:
4238
- uses: actions/checkout@v3

0 commit comments

Comments
 (0)