From e0f23133439ba833f672fff13e1e1b411be360da Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Thu, 28 Sep 2023 10:48:40 -0400 Subject: [PATCH 1/2] feat: dont use internal, because it is reserved in dotnet --- .../dafny/DynamoDbItemEncryptor/src/InternalLegacyOverride.dfy | 2 +- .../dynamodb/itemencryptor/internal/InternalLegacyOverride.java | 2 +- .../services/dynamodbv2/datamodeling/LegacyTestVectors.java | 2 +- DynamoDbEncryption/runtimes/net/Extern/InternalLegacyConfig.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DynamoDbEncryption/dafny/DynamoDbItemEncryptor/src/InternalLegacyOverride.dfy b/DynamoDbEncryption/dafny/DynamoDbItemEncryptor/src/InternalLegacyOverride.dfy index 53630e1c0..b55b50da8 100644 --- a/DynamoDbEncryption/dafny/DynamoDbItemEncryptor/src/InternalLegacyOverride.dfy +++ b/DynamoDbEncryption/dafny/DynamoDbItemEncryptor/src/InternalLegacyOverride.dfy @@ -3,7 +3,7 @@ include "../Model/AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorTypes.dfy" -module {:extern "software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.internal"} InternalLegacyOverride { +module {:extern "software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.Internal"} InternalLegacyOverride { import opened Wrappers import Types = AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorTypes import DDBE = AwsCryptographyDbEncryptionSdkDynamoDbTypes diff --git a/DynamoDbEncryption/runtimes/java/src/main/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/internal/InternalLegacyOverride.java b/DynamoDbEncryption/runtimes/java/src/main/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/internal/InternalLegacyOverride.java index aecca3665..fd6e3180f 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/internal/InternalLegacyOverride.java +++ b/DynamoDbEncryption/runtimes/java/src/main/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/internal/InternalLegacyOverride.java @@ -1,4 +1,4 @@ -package software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.internal; +package software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.Internal; /** * This file does *NOT* import a lot of things. diff --git a/DynamoDbEncryption/runtimes/java/src/test/sdkv1/com/amazonaws/services/dynamodbv2/datamodeling/LegacyTestVectors.java b/DynamoDbEncryption/runtimes/java/src/test/sdkv1/com/amazonaws/services/dynamodbv2/datamodeling/LegacyTestVectors.java index 33aa8d639..ba3724914 100644 --- a/DynamoDbEncryption/runtimes/java/src/test/sdkv1/com/amazonaws/services/dynamodbv2/datamodeling/LegacyTestVectors.java +++ b/DynamoDbEncryption/runtimes/java/src/test/sdkv1/com/amazonaws/services/dynamodbv2/datamodeling/LegacyTestVectors.java @@ -1,6 +1,6 @@ package com.amazonaws.services.dynamodbv2.datamodeling; -import software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.internal.InternalLegacyOverride; +import software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.Internal.InternalLegacyOverride; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.datamodeling.encryption.DynamoDBEncryptor; import com.amazonaws.services.dynamodbv2.model.*; diff --git a/DynamoDbEncryption/runtimes/net/Extern/InternalLegacyConfig.cs b/DynamoDbEncryption/runtimes/net/Extern/InternalLegacyConfig.cs index cd31bba73..8c1476e07 100644 --- a/DynamoDbEncryption/runtimes/net/Extern/InternalLegacyConfig.cs +++ b/DynamoDbEncryption/runtimes/net/Extern/InternalLegacyConfig.cs @@ -3,7 +3,7 @@ using software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types; -namespace software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.internal +namespace software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.Internal { public partial class InternalLegacyOverride From 7e68a1912210dc4826c6f6e3ac38658c5527ec94 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Thu, 28 Sep 2023 13:30:46 -0400 Subject: [PATCH 2/2] rename Internal to lagacy --- .../dafny/DynamoDbItemEncryptor/src/InternalLegacyOverride.dfy | 2 +- .../legacy}/InternalLegacyOverride.java | 2 +- .../services/dynamodbv2/datamodeling/LegacyTestVectors.java | 2 +- DynamoDbEncryption/runtimes/net/Extern/InternalLegacyConfig.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename DynamoDbEncryption/runtimes/java/src/main/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/{internal => internaldafny/legacy}/InternalLegacyOverride.java (99%) diff --git a/DynamoDbEncryption/dafny/DynamoDbItemEncryptor/src/InternalLegacyOverride.dfy b/DynamoDbEncryption/dafny/DynamoDbItemEncryptor/src/InternalLegacyOverride.dfy index b55b50da8..45baa5a5a 100644 --- a/DynamoDbEncryption/dafny/DynamoDbItemEncryptor/src/InternalLegacyOverride.dfy +++ b/DynamoDbEncryption/dafny/DynamoDbItemEncryptor/src/InternalLegacyOverride.dfy @@ -3,7 +3,7 @@ include "../Model/AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorTypes.dfy" -module {:extern "software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.Internal"} InternalLegacyOverride { +module {:extern "software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.legacy"} InternalLegacyOverride { import opened Wrappers import Types = AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorTypes import DDBE = AwsCryptographyDbEncryptionSdkDynamoDbTypes diff --git a/DynamoDbEncryption/runtimes/java/src/main/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/internal/InternalLegacyOverride.java b/DynamoDbEncryption/runtimes/java/src/main/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/internaldafny/legacy/InternalLegacyOverride.java similarity index 99% rename from DynamoDbEncryption/runtimes/java/src/main/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/internal/InternalLegacyOverride.java rename to DynamoDbEncryption/runtimes/java/src/main/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/internaldafny/legacy/InternalLegacyOverride.java index fd6e3180f..b654ea87a 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/internal/InternalLegacyOverride.java +++ b/DynamoDbEncryption/runtimes/java/src/main/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/internaldafny/legacy/InternalLegacyOverride.java @@ -1,4 +1,4 @@ -package software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.Internal; +package software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.legacy; /** * This file does *NOT* import a lot of things. diff --git a/DynamoDbEncryption/runtimes/java/src/test/sdkv1/com/amazonaws/services/dynamodbv2/datamodeling/LegacyTestVectors.java b/DynamoDbEncryption/runtimes/java/src/test/sdkv1/com/amazonaws/services/dynamodbv2/datamodeling/LegacyTestVectors.java index ba3724914..3ce8cf202 100644 --- a/DynamoDbEncryption/runtimes/java/src/test/sdkv1/com/amazonaws/services/dynamodbv2/datamodeling/LegacyTestVectors.java +++ b/DynamoDbEncryption/runtimes/java/src/test/sdkv1/com/amazonaws/services/dynamodbv2/datamodeling/LegacyTestVectors.java @@ -1,6 +1,6 @@ package com.amazonaws.services.dynamodbv2.datamodeling; -import software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.Internal.InternalLegacyOverride; +import software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.legacy.InternalLegacyOverride; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.datamodeling.encryption.DynamoDBEncryptor; import com.amazonaws.services.dynamodbv2.model.*; diff --git a/DynamoDbEncryption/runtimes/net/Extern/InternalLegacyConfig.cs b/DynamoDbEncryption/runtimes/net/Extern/InternalLegacyConfig.cs index 8c1476e07..193953967 100644 --- a/DynamoDbEncryption/runtimes/net/Extern/InternalLegacyConfig.cs +++ b/DynamoDbEncryption/runtimes/net/Extern/InternalLegacyConfig.cs @@ -3,7 +3,7 @@ using software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.types; -namespace software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.Internal +namespace software.amazon.cryptography.dbencryptionsdk.dynamodb.itemencryptor.internaldafny.legacy { public partial class InternalLegacyOverride