-
Notifications
You must be signed in to change notification settings - Fork 14
chore: Adopt SmithyDafnyMakefile.mk, progress towards fixing nightly build #797
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
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closing temporarily to avoid pointless CI, while I verify this works for Dafny nightly as well |
…amodb-java into robin-aws/use-smithy-dafny-makefile # Conflicts: # DynamoDbEncryption/dafny/DynamoDbEncryption/Model/AwsCryptographyDbEncryptionSdkDynamoDbTypes.dfy # DynamoDbEncryption/dafny/DynamoDbEncryption/src/Index.dfy # DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/Model/AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.dfy # DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/src/Index.dfy # DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/test/TestFixtures.dfy # DynamoDbEncryption/dafny/DynamoDbItemEncryptor/Model/AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorTypes.dfy # DynamoDbEncryption/dafny/DynamoDbItemEncryptor/src/Index.dfy # DynamoDbEncryption/dafny/StructuredEncryption/Model/AwsCryptographyDbEncryptionSdkStructuredEncryptionTypes.dfy # DynamoDbEncryption/dafny/StructuredEncryption/src/AwsCryptographyDbEncryptionSdkStructuredEncryptionOperations.dfy # DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/DynamoDbEncryption.java # DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/DynamoDbItemEncryptor.java # DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/ToDafny.java # DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/ToNative.java # DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/model/ParsedHeader.java # DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/DynamoDbEncryptionTransforms.java # DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/structuredencryption/StructuredEncryption.java # DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/structuredencryption/ToDafny.java # DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/structuredencryption/ToNative.java # DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/structuredencryption/model/ParsedHeader.java # DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryption/TypeConversion.cs # DynamoDbEncryption/runtimes/net/Generated/DynamoDbEncryptionTransforms/TypeConversion.cs # DynamoDbEncryption/runtimes/net/Generated/DynamoDbItemEncryptor/TypeConversion.cs # SharedMakefile.mk # TestVectors/dafny/DDBEncryption/src/JsonConfig.dfy
…amodb-java into robin-aws/use-smithy-dafny-makefile # Conflicts: # DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/Model/AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.dfy # DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/src/DdbMiddlewareConfig.dfy # Makefile # SharedMakefile.mk
ajewellamz
approved these changes
Apr 19, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
josecorella
pushed a commit
to josecorella/aws-database-encryption-sdk-dynamodb
that referenced
this pull request
Apr 23, 2024
## [3.4.0](v3.3.0...v3.4.0) (2024-04-23) ### Features * enforce Dafny formatting ([aws#865](https://github.com/josecorella/aws-database-encryption-sdk-dynamodb/issues/865)) ([dfc0dbd](dfc0dbd)) ### Maintenance * add verify test for test vectors ([aws#897](https://github.com/josecorella/aws-database-encryption-sdk-dynamodb/issues/897)) ([6c980e7](6c980e7)) * Adopt SmithyDafnyMakefile.mk, progress towards fixing nightly build ([aws#797](https://github.com/josecorella/aws-database-encryption-sdk-dynamodb/issues/797)) ([785481c](785481c)), closes [/github.com/aws/pull/797/files#diff-692e2b06d124c9775e2fcd9cd9dbd10e0c8ea470e08174ed0b258b0301622581R182](https://github.com/josecorella//github.com/aws/aws-database-encryption-sdk-dynamodb/pull/797/files/issues/diff-692e2b06d124c9775e2fcd9cd9dbd10e0c8ea470e08174ed0b258b0301622581R182) * **deps:** bump actions/setup-dotnet from 3 to 4 in /.github/workflows ([aws#943](https://github.com/josecorella/aws-database-encryption-sdk-dynamodb/issues/943)) ([f5d9748](f5d9748)) * **deps:** bump io.github.gradle-nexus.publish-plugin ([aws#903](https://github.com/josecorella/aws-database-encryption-sdk-dynamodb/issues/903)) ([04c6cc4](04c6cc4)) * **deps:** bump org.projectlombok:lombok ([aws#838](https://github.com/josecorella/aws-database-encryption-sdk-dynamodb/issues/838)) ([56f1cd1](56f1cd1)) * **deps:** bump rrainn/dynamodb-action in /.github/workflows ([aws#932](https://github.com/josecorella/aws-database-encryption-sdk-dynamodb/issues/932)) ([16e4d7b](16e4d7b)) * point to the correct readme ([aws#845](https://github.com/josecorella/aws-database-encryption-sdk-dynamodb/issues/845)) ([b950b4a](b950b4a)) * repair json file names ([aws#846](https://github.com/josecorella/aws-database-encryption-sdk-dynamodb/issues/846)) ([3ca955a](3ca955a)) * test "dotnet pack" in CI ([aws#851](https://github.com/josecorella/aws-database-encryption-sdk-dynamodb/issues/851)) ([75e44d0](75e44d0))
josecorella
pushed a commit
that referenced
this pull request
Apr 30, 2024
## [3.4.0](v3.3.0...v3.4.0) (2024-04-30) ### Features * enforce Dafny formatting ([#865](#865)) ([dfc0dbd](dfc0dbd)) * more test vectors ([#959](#959)) ([3ca15af](3ca15af)) ### Maintenance * add verify test for test vectors ([#897](#897)) ([6c980e7](6c980e7)) * Adopt SmithyDafnyMakefile.mk, progress towards fixing nightly build ([#797](#797)) ([785481c](785481c)), closes [/github.com//pull/797/files#diff-692e2b06d124c9775e2fcd9cd9dbd10e0c8ea470e08174ed0b258b0301622581R182](https://github.com/aws//github.com/aws/aws-database-encryption-sdk-dynamodb/pull/797/files/issues/diff-692e2b06d124c9775e2fcd9cd9dbd10e0c8ea470e08174ed0b258b0301622581R182) * **CI/CD:** add semantic release automation ([#949](#949)) ([3f22abc](3f22abc)) * **deps:** bump actions/setup-dotnet from 3 to 4 in /.github/workflows ([#943](#943)) ([f5d9748](f5d9748)) * **deps:** bump aws-actions/configure-aws-credentials ([#954](#954)) ([90d7d78](90d7d78)) * **deps:** bump io.github.gradle-nexus.publish-plugin ([#903](#903)) ([04c6cc4](04c6cc4)) * **deps:** bump org.projectlombok:lombok ([#838](#838)) ([56f1cd1](56f1cd1)) * **deps:** bump rrainn/dynamodb-action in /.github/workflows ([#932](#932)) ([16e4d7b](16e4d7b)) * **docs:** mention sign_and_include in javadoc for keyid supplier ([#966](#966)) ([2796693](2796693)) * point to the correct readme ([#845](#845)) ([b950b4a](b950b4a)) * repair json file names ([#846](#846)) ([3ca955a](3ca955a)) * test "dotnet pack" in CI ([#851](#851)) ([75e44d0](75e44d0)) * **test:** add tests for attribute names that seem structured ([#964](#964)) ([c4c0886](c4c0886)) * Update MPL to 1.3.0 ([#972](#972)) ([3d8acae](3d8acae))
Merged
josecorella
added a commit
that referenced
this pull request
May 1, 2024
* chore(release): 3.4.0 [skip ci] ## [3.4.0](v3.3.0...v3.4.0) (2024-04-30) ### Notes #### .NET - [#797](#797) ([785481c](785481c)) Enforces User input Constraints at Type Conversion. Prior to this fix, unset Integers defaulted to `0`, and unset Booleans defaulted to `false`. Now, all required fields MUST be set or a Runtime Exception will be thrown. This particularly effects Searchable Encryption's `ConstructorPart`, who's required field previously would have defaulted to false. Any configuration ever created for Searchable Encryption can be re-created with the fix, but they may look different. ### Features * **feat(.NET):** Validate user input #797 (785481c) ### Maintenance * **format:** enforce Dafny formatting ([#865](#865)) ([dfc0dbd](dfc0dbd)) * **test:** more test vectors ([#959](#959)) ([3ca15af](3ca15af)) * **CI** add verify test for test vectors ([#897](#897)) ([6c980e7](6c980e7)) * **CI/CD:** add semantic release automation ([#949](#949)) ([3f22abc](3f22abc)) * **deps:** bump actions/setup-dotnet from 3 to 4 in /.github/workflows ([#943](#943)) ([f5d9748](f5d9748)) * **deps:** bump aws-actions/configure-aws-credentials ([#954](#954)) ([90d7d78](90d7d78)) * **deps(Java):** bump io.github.gradle-nexus.publish-plugin ([#903](#903)) ([04c6cc4](04c6cc4)) * **deps(Java):** bump org.projectlombok:lombok ([#838](#838)) ([56f1cd1](56f1cd1)) * **deps:** bump rrainn/dynamodb-action in /.github/workflows ([#932](#932)) ([16e4d7b](16e4d7b)) * **docs:** mention sign_and_include in javadoc for keyid supplier ([#966](#966)) ([2796693](2796693)) * **docs:** point to the correct readme ([#845](#845)) ([b950b4a](b950b4a)) * **fix:** repair json file names ([#846](#846)) ([3ca955a](3ca955a)) * **test(.NET):** "dotnet pack" in CI ([#851](#851)) ([75e44d0](75e44d0)) * **test:** add tests for attribute names that seem structured ([#964](#964)) ([c4c0886](c4c0886)) * **deps(Java & .NET):** Update MPL to 1.3.0 ([#972](#972)) ([3d8acae](3d8acae)) Co-authored-by: semantic-release-bot <[email protected]> Co-authored-by: Tony Knapp <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
Replaces nearly all of the
SharedMakefile.mk
with the commonsmithy-dafny/SmithyDafnyMakefile.mk
makefile, just retaining configuration variables specific to this repo (such as the path to thesmithy-dafny
submodule). Uses the new features in that makefile andsmithy-dafny
itself to make the projects forwards-compatible with the latest Dafny nightly prerelease, and hence will MOSTLY fix the nightly build once merged. "Mostly" because I still need to fix some externs to make them use the pattern that avoids the Java TypeDescriptor differences between Dafny versions, but that can be fixed in a follow-up PR.Highlights of the changes:
smithy-dafny
to regenerate code, either to check that the output matches what's checked in (in a new separate codegen workflow) or to be compatible with newer versions of Dafny in the nightly build (in existing workflows).smithy-dafny
code generation automatically formats, all the generated has trivial layout changes.smithy-dafny
~ (the change in smithy-dafny was undone so this isn't necessary any more)Beacon.CheckBytesToHex()
from a "test lemma" to a dynamic test, because on the latest Dafny the verification got even more expensive, and this didn't seem to introduce any real additional risk.By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.