Merge branch 'tony/mutations-idempotent' into tony/mutations-fix-flag…

…-to-enum
aws · Nov 4, 2024 · 81cc98c · 81cc98c
2 parents c6fdedb + d4ba279
commit 81cc98c
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 8 deletions.
diff --git a/.github/workflows/library_dafny_verification.yml b/.github/workflows/library_dafny_verification.yml
@@ -53,7 +53,7 @@ jobs:
           dafny-version: ${{ inputs.dafny }}
 
       # dafny-reportgenerator requires next6
-      # but only 7.0 is installed on macos-12-large
+      # but only 7.0 is installed on macos-13-large
       - name: Setup .NET Core SDK '6.0.x'
         uses: actions/setup-dotnet@v3
         with:

diff --git a/.github/workflows/library_interop_tests.yml b/.github/workflows/library_interop_tests.yml
@@ -23,7 +23,7 @@ jobs:
             # https://taskei.amazon.dev/tasks/CrypTool-5283
             # windows-latest,
             ubuntu-latest,
-            macos-12,
+            macos-13,
           ]
         language: [java, net, python]
         # https://taskei.amazon.dev/tasks/CrypTool-5284
@@ -145,7 +145,7 @@ jobs:
             # TODO just test on mac and ubuntu for now
             # windows-latest,
             ubuntu-latest,
-            macos-12,
+            macos-13,
           ]
         encrypting_language: [java, net, python]
         decrypting_language: [java, net, python]

diff --git a/.github/workflows/library_java_tests.yml b/.github/workflows/library_java_tests.yml
@@ -32,7 +32,7 @@ jobs:
             # TODO just test on mac for now
             # windows-latest,
             ubuntu-latest,
-            macos-12,
+            macos-13,
           ]
     runs-on: ${{ matrix.os }}
     permissions:

diff --git a/.github/workflows/library_net_tests.yml b/.github/workflows/library_net_tests.yml
@@ -29,7 +29,7 @@ jobs:
             TestVectorsAwsCryptographicMaterialProviders,
           ]
         dotnet-version: ["6.0.x"]
-        os: [windows-latest, ubuntu-latest, macos-12]
+        os: [windows-latest, ubuntu-latest, macos-13]
     runs-on: ${{ matrix.os }}
     defaults:
       run:

diff --git a/.github/workflows/library_python_tests.yml b/.github/workflows/library_python_tests.yml
@@ -36,7 +36,7 @@ jobs:
             # Windows source code is tested downstream (ex. ESDK-Python CI).
             # windows-latest,
             ubuntu-latest,
-            macos-12,
+            macos-13,
           ]
     runs-on: ${{ matrix.os }}
     defaults:

diff --git a/.github/workflows/sem_ver.yml b/.github/workflows/sem_ver.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   semantic-release:
-    runs-on: macos-12
+    runs-on: macos-13
     permissions:
       id-token: write
       contents: read

diff --git a/.github/workflows/semantic_release.yml b/.github/workflows/semantic_release.yml
@@ -15,7 +15,7 @@ jobs:
     # privileged operation, so we must make sure this list of users is a subset of the users labeled as maintainers of
     # https://github.com/orgs/aws/teams/aws-crypto-tools
     if: contains('["seebees","texastony","ShubhamChaturvedi7","lucasmcdonald3","josecorella","imabhichow","rishav-karanjit","antonf-amzn","kessplas","RitvikKapila","ajewellamz"]', github.actor)
-    runs-on: macos-12
+    runs-on: macos-13
     permissions:
       id-token: write
       contents: write

diff --git a/...es/java/src/main/smithy-generated/software/amazon/cryptography/keystoreadmin/ToDafny.java b/...es/java/src/main/smithy-generated/software/amazon/cryptography/keystoreadmin/ToDafny.java
@@ -582,6 +582,37 @@ public static ApplyMutationResult ApplyMutationResult(
     );
   }
 
+  public static InitializeMutationFlag InitializeMutationFlag(
+    software.amazon.cryptography.keystoreadmin.model.InitializeMutationFlag nativeValue
+  ) {
+    if (Objects.nonNull(nativeValue.Created())) {
+      return InitializeMutationFlag.create_Created(
+        software.amazon.smithy.dafny.conversion.ToDafny.Simple.CharacterSequence(
+          nativeValue.Created()
+        )
+      );
+    }
+    if (Objects.nonNull(nativeValue.Resumed())) {
+      return InitializeMutationFlag.create_Resumed(
+        software.amazon.smithy.dafny.conversion.ToDafny.Simple.CharacterSequence(
+          nativeValue.Resumed()
+        )
+      );
+    }
+    if (Objects.nonNull(nativeValue.ResumedWithoutIndex())) {
+      return InitializeMutationFlag.create_ResumedWithoutIndex(
+        software.amazon.smithy.dafny.conversion.ToDafny.Simple.CharacterSequence(
+          nativeValue.ResumedWithoutIndex()
+        )
+      );
+    }
+    throw new IllegalArgumentException(
+      "Cannot convert " +
+      nativeValue +
+      " to software.amazon.cryptography.keystoreadmin.internaldafny.types.InitializeMutationFlag."
+    );
+  }
+
   public static KeyManagementStrategy KeyManagementStrategy(
     software.amazon.cryptography.keystoreadmin.model.KeyManagementStrategy nativeValue
   ) {

diff --git a/...s/java/src/main/smithy-generated/software/amazon/cryptography/keystoreadmin/ToNative.java b/...s/java/src/main/smithy-generated/software/amazon/cryptography/keystoreadmin/ToNative.java
@@ -560,6 +560,35 @@ public static ApplyMutationResult ApplyMutationResult(
     return nativeBuilder.build();
   }
 
+  public static InitializeMutationFlag InitializeMutationFlag(
+    software.amazon.cryptography.keystoreadmin.internaldafny.types.InitializeMutationFlag dafnyValue
+  ) {
+    InitializeMutationFlag.Builder nativeBuilder =
+      InitializeMutationFlag.builder();
+    if (dafnyValue.is_Created()) {
+      nativeBuilder.Created(
+        software.amazon.smithy.dafny.conversion.ToNative.Simple.String(
+          dafnyValue.dtor_Created()
+        )
+      );
+    }
+    if (dafnyValue.is_Resumed()) {
+      nativeBuilder.Resumed(
+        software.amazon.smithy.dafny.conversion.ToNative.Simple.String(
+          dafnyValue.dtor_Resumed()
+        )
+      );
+    }
+    if (dafnyValue.is_ResumedWithoutIndex()) {
+      nativeBuilder.ResumedWithoutIndex(
+        software.amazon.smithy.dafny.conversion.ToNative.Simple.String(
+          dafnyValue.dtor_ResumedWithoutIndex()
+        )
+      );
+    }
+    return nativeBuilder.build();
+  }
+
   public static KeyManagementStrategy KeyManagementStrategy(
     software.amazon.cryptography.keystoreadmin.internaldafny.types.KeyManagementStrategy dafnyValue
   ) {