Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ci): Fix nightly build #1468

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

11 changes: 11 additions & 0 deletions .github/actions/polymorph_codegen/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,17 @@ runs:
git pull
git submodule update --init --recursive

- name: Setup Java 17 for smithy-dafny
uses: actions/setup-java@v3
with:
distribution: "corretto"
java-version: 17

- name: Install smithy-dafny dependencies locally
shell: bash
run: |
make -C submodules/smithy-dafny mvn_local_deploy_polymorph_dependencies

- name: Update top-level project.properties file in MPL
if: inputs.update-and-regenerate-mpl == 'true'
shell: bash
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/ci_codegen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,6 @@ jobs:
- name: Create temporary global.json
run: echo '{"sdk":{"rollForward":"latestFeature","version":"6.0.0"}}' > ./global.json

- name: Setup Java 17 for codegen
uses: actions/setup-java@v3
with:
distribution: "corretto"
java-version: "17"

- name: Install Smithy-Dafny codegen dependencies
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies

- uses: ./.github/actions/polymorph_codegen
with:
dafny: ${{ inputs.dafny }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,45 +19,45 @@ jobs:
uses: ./.github/workflows/library_format.yml
with:
dafny: "nightly-latest"
regenerate-code: true
regenerate-code: false
dafny-nightly-verification:
# Don't run the cron builds on forks
if: github.event_name != 'schedule' || github.repository_owner == 'aws'
uses: ./.github/workflows/library_dafny_verification.yml
with:
dafny: "nightly-latest"
regenerate-code: true
regenerate-code: false
dafny-nightly-test-vector-verification:
# Don't run the cron builds on forks
if: github.event_name != 'schedule' || github.repository_owner == 'aws'
uses: ./.github/workflows/test_vector_verification.yml
with:
dafny: "nightly-latest"
regenerate-code: true
regenerate-code: false
dafny-nightly-java:
if: github.event_name != 'schedule' || github.repository_owner == 'aws'
uses: ./.github/workflows/ci_test_java.yml
with:
dafny: "nightly-latest"
regenerate-code: true
regenerate-code: false
dafny-nightly-test-vectors-java:
if: github.event_name != 'schedule' || github.repository_owner == 'aws'
uses: ./.github/workflows/ci_test_vector_java.yml
with:
dafny: "nightly-latest"
regenerate-code: true
regenerate-code: false
dafny-nightly-net:
if: github.event_name != 'schedule' || github.repository_owner == 'aws'
uses: ./.github/workflows/ci_test_net.yml
with:
dafny: "nightly-latest"
regenerate-code: true
regenerate-code: false
dafny-nightly-test-vectors-net:
if: github.event_name != 'schedule' || github.repository_owner == 'aws'
uses: ./.github/workflows/ci_test_vector_net.yml
with:
dafny: "nightly-latest"
regenerate-code: true
regenerate-code: false

cut-issue-on-failure:
runs-on: ubuntu-latest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ module DynamoDbGetEncryptedDataKeyDescriptionTest {
expect actualDataKeyDescription.EncryptedDataKeyDescriptionOutput[0].keyProviderInfo.value == "keyproviderInfo";
}

method {:test} TestDDBItemInputAwsKmsHDataKeyCase()
method {:test} {:isolate_assertions} TestDDBItemInputAwsKmsHDataKeyCase()
{
var expectedHead := CreatePartialHeader(testVersion, testFlavor0, testMsgID, testLegend, testEncContext, [testAwsKmsHDataKey]);
var serializedHeader := expectedHead.serialize() + expectedHead.msgID;
Expand Down
11 changes: 11 additions & 0 deletions DynamoDbEncryption/dafny/StructuredEncryption/src/Canonize.dfy
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,14 @@ module {:options "/functionSyntax:4" } Canonize {
exists x :: x in origData && Updated2(x, item, DoDecrypt)
}

ghost function Updated2Item(origData : AuthList, item : CanonCryptoItem) : (result : AuthItem)
requires Updated2Exists(origData, item)
ensures Updated2(result, item, DoDecrypt)
{
var r :| Updated2(r, item, DoDecrypt);
r
}

ghost predicate Updated5Exists(origData : CryptoList, item : CanonCryptoItem)
{
exists x :: x in origData && Updated5(x, item, DoEncrypt)
Expand Down Expand Up @@ -693,6 +701,9 @@ module {:options "/functionSyntax:4" } Canonize {
assert forall val <- input :: exists x :: x in origData && Updated2(x, val, DoDecrypt);
assert forall i | 0 <= i < |input| :: exists x :: x in origData && Updated2(x, input[i], DoDecrypt) by {
InputIsInput(origData, input);
forall i | 0 <= i < |input| ensures exists x :: x in origData && Updated2(x, input[i], DoDecrypt) {
var x := Updated2Item(origData, input[i]);
}
}
assert forall newVal <- output :: exists x :: x in origData && Updated3(x, newVal, DoDecrypt);
}
Expand Down
Loading