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: Move InternalResult into StandardLibrary(Internal) #325

Merged
merged 2 commits into from
May 17, 2024

Conversation

robin-aws
Copy link
Contributor

Description of changes:

This internal helper class was defined in the wrong place, which makes it look strange to use it outside of the MPL.

Squash/merge commit message, if applicable:

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@robin-aws robin-aws requested a review from a team as a code owner May 17, 2024 01:02
texastony
texastony previously approved these changes May 17, 2024
@texastony texastony merged commit 7c3a00f into main May 17, 2024
56 checks passed
@texastony texastony deleted the robin-aws/relocate-internal-result branch May 17, 2024 02:46
texastony pushed a commit that referenced this pull request May 20, 2024
- **Keystore:** Introduce additional KMSConfiguration options ([#316](#316)) ([f3a0a52](f3a0a52))

The Hierarchical Keyring's Keystore now supports four (4) `KMSConfigurations`:

- kmsKeyArn
- kmsMRKeyArn
- discovery
- mrDiscovery

See our [JavaDocs](https://aws.github.io/aws-cryptographic-material-providers-library/index.html?software/amazon/cryptography/keystore/model/KMSConfiguration.html) for details
on how these options effect the relationship between
a Keystore and KMS.

- .NET : Bump dependency [BouncyCastle.Cryptography](https://github.com/bcgit/bc-csharp) from 2.2.1 to 2.3.1. ([#329](#329))
- .NET : Bump dependency [AWSSDK.Core](https://github.com/aws/aws-sdk-net) from 3.7.300.2 to 3.7.304.2. ([#329](#329))
- Java : Move InternalResult into StandardLibrary(Internal) ([#325](#325))
@texastony texastony mentioned this pull request May 20, 2024
texastony pushed a commit that referenced this pull request May 20, 2024
- **Keystore:** Introduce additional KMSConfiguration options ([#316](#316)) ([f3a0a52](f3a0a52))

The Hierarchical Keyring's Keystore now supports four (4) `KMSConfigurations`:

- kmsKeyArn
- kmsMRKeyArn
- discovery
- mrDiscovery

See our [JavaDocs](https://aws.github.io/aws-cryptographic-material-providers-library/index.html?software/amazon/cryptography/keystore/model/KMSConfiguration.html) for details
on how these options effect the relationship between
a Keystore and KMS.

- .NET : Bump dependency [BouncyCastle.Cryptography](https://github.com/bcgit/bc-csharp) from 2.2.1 to 2.3.1. ([#329](#329))
- .NET : Bump dependency [AWSSDK.Core](https://github.com/aws/aws-sdk-net) from 3.7.300.2 to 3.7.304.2. ([#329](#329))
- Java : Move InternalResult into StandardLibrary(Internal) ([#325](#325))
texastony pushed a commit that referenced this pull request May 20, 2024
- **Keystore:** Introduce additional KMSConfiguration options ([#316](#316)) ([f3a0a52](f3a0a52))

The Hierarchical Keyring's Keystore now supports four (4) `KMSConfigurations`:

- kmsKeyArn
- kmsMRKeyArn
- discovery
- mrDiscovery

See our [JavaDocs](https://aws.github.io/aws-cryptographic-material-providers-library/index.html?software/amazon/cryptography/keystore/model/KMSConfiguration.html) for details
on how these options effect the relationship between
a Keystore and KMS.

- .NET : Bump dependency [BouncyCastle.Cryptography](https://github.com/bcgit/bc-csharp) from 2.2.1 to 2.3.1. ([#329](#329))
- .NET : Bump dependency [AWSSDK.Core](https://github.com/aws/aws-sdk-net) from 3.7.300.2 to 3.7.304.2. ([#329](#329))
- Java : Move InternalResult into StandardLibrary(Internal) ([#325](#325))
@texastony texastony mentioned this pull request May 20, 2024
texastony added a commit that referenced this pull request May 20, 2024
* chore(release): 1.4.0

- **Keystore:** Introduce additional KMSConfiguration options ([#316](#316)) ([f3a0a52](f3a0a52))

The Hierarchical Keyring's Keystore now supports four (4) `KMSConfigurations`:

- kmsKeyArn
- kmsMRKeyArn
- discovery
- mrDiscovery

See our [JavaDocs](https://aws.github.io/aws-cryptographic-material-providers-library/index.html?software/amazon/cryptography/keystore/model/KMSConfiguration.html) for details
on how these options effect the relationship between
a Keystore and KMS.

- .NET : Bump dependency [BouncyCastle.Cryptography](https://github.com/bcgit/bc-csharp) from 2.2.1 to 2.3.1. ([#329](#329))
- .NET : Bump dependency [AWSSDK.Core](https://github.com/aws/aws-sdk-net) from 3.7.300.2 to 3.7.304.2. ([#329](#329))
- Java : Move InternalResult into StandardLibrary(Internal) ([#325](#325))

* chore: prettier CHANGELOG

---------

Co-authored-by: semantic-release-bot <[email protected]>
lucasmcdonald3 pushed a commit that referenced this pull request Jun 4, 2024
* chore(release): 1.4.0

- **Keystore:** Introduce additional KMSConfiguration options ([#316](#316)) ([f3a0a52](f3a0a52))

The Hierarchical Keyring's Keystore now supports four (4) `KMSConfigurations`:

- kmsKeyArn
- kmsMRKeyArn
- discovery
- mrDiscovery

See our [JavaDocs](https://aws.github.io/aws-cryptographic-material-providers-library/index.html?software/amazon/cryptography/keystore/model/KMSConfiguration.html) for details
on how these options effect the relationship between
a Keystore and KMS.

- .NET : Bump dependency [BouncyCastle.Cryptography](https://github.com/bcgit/bc-csharp) from 2.2.1 to 2.3.1. ([#329](#329))
- .NET : Bump dependency [AWSSDK.Core](https://github.com/aws/aws-sdk-net) from 3.7.300.2 to 3.7.304.2. ([#329](#329))
- Java : Move InternalResult into StandardLibrary(Internal) ([#325](#325))

* chore: prettier CHANGELOG

---------

Co-authored-by: semantic-release-bot <[email protected]>
ajewellamz pushed a commit that referenced this pull request Dec 18, 2024
Factors the content of `TestModels/SharedMakefile.mk` to a new top-level `SmithyDafnyMakefile.mk`, which is actually intended to be reused by any `smithy-dafny` project using the CLI through a submodule. Projects will still likely want their own repository-specific `SharedMakefile.mk` in order to set a few variables that are the same for all libraries, which is true for the `TestModels` subfolder here too.

Additional make targets and improvements from https://github.com/aws/aws-cryptographic-material-providers-library and general cleanup are also applied. Highlights:

* Delete `LIBRARIES`, which is unused and was replaced by `PROJECT_DEPENDENCIES`.
* Delete `SMITHY_NAMESPACE`, which is unused and was replaced by `SERVICE_NAMESPACE_<service>`
* Replace `STANDARD_LIBRARY_PATH` with `STD_LIBRARY`.
  * The test models were avoiding the same issue with the standard library trying to build itself by overriding the `transpile_***` targets to not build dependencies. Both mechanisms at once is redundant but safe.
* Introduce `MAX_RESOURCE_COUNT` with a default of `10000000`
* Tweak `GRADLEW` to be the variable to use for building Java runtimes, since the TestModels don't have a `gradlew` in each `runtimes/java` directory, but other projects like the MPL do. Running the smithy-dafny CLI always uses the copy in `codegen`.
* Don't also build `_polymorph_wrapped` by default, just have `TestModels/SharedMakefile.mk` add that instead.
* Invoke `_polymorph_dependencies` before building the current library, since that's necessary in some cases (and was already changed in MPL's makefile)

See smithy-lang/smithy-dafny#326 for a diff of SmithyDafnyMakefile.mk with the old contents of TestModels/SharedMakefile.mk.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants