fix(SDK-Java): Generic SDK Error to Opaque & Back (#466)

aws · Jul 3, 2024 · f832ad1 · f832ad1
1 parent 5ec3c4b
commit f832ad1
Show file tree

Hide file tree

Showing 36 changed files with 20,386 additions and 1,103 deletions.
diff --git a/AwsCryptographicMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/cmms.smithy b/AwsCryptographicMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/cmms.smithy
@@ -19,13 +19,11 @@ resource CryptographicMaterialsManager {
   operations: [GetEncryptionMaterials, DecryptMaterials]
 }
 
-/////////////////
 // CMM Structures
 
 @reference(resource: CryptographicMaterialsManager)
 structure CryptographicMaterialsManagerReference {}
 
-/////////////////
 // CMM Operations
 
 operation GetEncryptionMaterials {
@@ -113,7 +111,6 @@ structure DecryptMaterialsOutput {
   decryptionMaterials: DecryptionMaterials 
 }
 
-///////////////////
 // CMM Constructors
 
 @positional

diff --git a/...viders/dafny/AwsCryptographicMaterialProviders/Model/cryptographic-materials-cache.smithy b/...viders/dafny/AwsCryptographicMaterialProviders/Model/cryptographic-materials-cache.smithy
@@ -125,7 +125,6 @@ structure EntryAlreadyExists {
   message: String,
 }
 
-///////////////////
 // Materials Cache Constructors
 
 @positional

diff --git a/AwsCryptographicMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/ddb.smithy b/AwsCryptographicMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/ddb.smithy
@@ -4,12 +4,10 @@ use aws.polymorph#reference
 
 use com.amazonaws.dynamodb#DynamoDB_20120810
 
-///////////////////
 // Basic structures
 
 string DdbTableArn
 
-///////////
 // Clients
 
 @reference(service: DynamoDB_20120810)

diff --git a/...graphicMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/identifiers.smithy b/...graphicMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/identifiers.smithy
@@ -1,6 +1,5 @@
 namespace aws.cryptography.materialProviders
 
-/////////////
 // Commitment
 
 //= aws-encryption-sdk-specification/framework/commitment-policy.md#supported-format-commitment-policy-enum
@@ -53,7 +52,6 @@ union CommitmentPolicy {
   DBE: DBECommitmentPolicy
 }
 
-//////////
 // Padding
 
 // Values come from: https://github.com/awslabs/aws-encryption-sdk-specification/blob/master/framework/raw-rsa-keyring.md#supported-padding-schemes
@@ -81,7 +79,6 @@ union CommitmentPolicy {
 ])
 string PaddingScheme
 
-//////////////////////////
 // AES wrapping algorithms
 @enum([
   {

diff --git a/...ptographicMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/keyrings.smithy b/...ptographicMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/keyrings.smithy
@@ -13,7 +13,6 @@ resource Keyring {
   operations: [OnEncrypt, OnDecrypt]
 }
 
-/////////////////////
 // Keyring Structures
 
 @reference(resource: Keyring)
@@ -45,7 +44,6 @@ list GrantTokenList {
 }
 
 
-/////////////////////
 // Keyring Operations
 
 //= aws-encryption-sdk-specification/framework/keyring-interface.md#onencrypt
@@ -89,7 +87,6 @@ structure OnDecryptOutput {
 }
 
 
-///////////////////////
 // Keyring Constructors
 
 @positional

diff --git a/AwsCryptographicMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/kms.smithy b/AwsCryptographicMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/kms.smithy
@@ -7,7 +7,6 @@ use aws.polymorph#javadoc
 
 use com.amazonaws.kms#TrentService
 
-///////////////////
 // Basic structures
 
 string KmsKeyId
@@ -28,13 +27,11 @@ list AccountIdList {
   member: AccountId
 }
 
-//////////
 // Clients
 
 @reference(service: TrentService)
 structure KmsClientReference {}
 
-///////////////////
 // Client Suppliers
 
 @extendable

diff --git a/...cMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/material-provider.smithy b/...cMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/material-provider.smithy
@@ -11,7 +11,6 @@ integer PositiveInteger
 @range(min: 0)
 long PositiveLong
 
-/////////////
 // AwsCryptographicMaterialProviders Creation
 @aws.polymorph#localService(
   sdkId: "MaterialProviders",
@@ -79,7 +78,6 @@ service AwsCryptographicMaterialProviders {
 
 structure MaterialProvidersConfig {}
 
-///////////////////
 // Errors
 
 @error("client")

diff --git a/...ographicMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/structures.smithy b/...ographicMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/structures.smithy
@@ -10,7 +10,6 @@ string Utf8Bytes
 //# While these structures will usually be represented as objects, lower level languages MAY represent
 //# these fields in a less strictly defined way as long as all field properties are still upheld.
 
-///////////////////////////////////
 // Encryption Materials 
 
 // In the future, we have several improvements we can consider here:

diff --git a/...ryptographicMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/suites.smithy b/...ryptographicMaterialProviders/dafny/AwsCryptographicMaterialProviders/Model/suites.smithy
@@ -1,6 +1,5 @@
 namespace aws.cryptography.materialProviders
 
-///////////////////////////////////
 // Algorithm Suites
 
 // For now, the actual properties of algorithm suites are only used by internal

diff --git a/AwsCryptographicMaterialProviders/dafny/AwsCryptographyKeyStore/Model/KeyStore.smithy b/AwsCryptographicMaterialProviders/dafny/AwsCryptographyKeyStore/Model/KeyStore.smithy
@@ -372,7 +372,6 @@ map EncryptionContext {
   value: Utf8Bytes,
 }
 
-///////////////////
 // Errors
 
 @error("client")

diff --git a/AwsCryptographicMaterialProviders/project.properties b/AwsCryptographicMaterialProviders/project.properties
@@ -1,3 +1,4 @@
 # This file stores the top level dafny version information.
 # All elements of the project need to agree on this version.
 dafnyVersion=4.2.0
+dafnyRuntimeJavaVersion=4.2.0
diff --git a/AwsCryptographyPrimitives/Model/primitives.smithy b/AwsCryptographyPrimitives/Model/primitives.smithy
@@ -40,7 +40,6 @@ service AwsCryptographicPrimitives {
 
 structure CryptoConfig {}
 
-///////////////////
 // Errors
 
 @error("client")

diff --git a/AwsCryptographyPrimitives/project.properties b/AwsCryptographyPrimitives/project.properties
@@ -1,3 +1,4 @@
 # This file stores the top level dafny version information.
 # All elements of the project need to agree on this version.
 dafnyVersion=4.2.0
+dafnyRuntimeJavaVersion=4.2.0
diff --git a/ComAmazonawsDynamodb/codegen-patches/java/dafny-4.1.0.patch b/ComAmazonawsDynamodb/codegen-patches/java/dafny-4.1.0.patch