Merge branch 'mainline' into rishav-exampleReadme

aws · Jan 22, 2025 · 005f2f6 · 005f2f6
2 parents 578a644 + 714e177
commit 005f2f6
Show file tree

Hide file tree

Showing 131 changed files with 20,570 additions and 1,029 deletions.
diff --git a/.github/actions/polymorph_codegen/action.yml b/.github/actions/polymorph_codegen/action.yml
@@ -116,6 +116,12 @@ runs:
     #   run: |
     #     make polymorph_rust ${{ steps.dependencies.outputs.PROJECT_DEPENDENCIES }}
 
+    - name: Regenerate Go code using smithy-dafny
+      working-directory: ./${{ inputs.library }}
+      shell: bash
+      run: |
+        make polymorph_go
+
     - name: Check regenerated code against commited code
       # Composite action inputs seem to not actually support booleans properly for some reason
       if: inputs.diff-generated-code == 'true'

diff --git a/.github/workflows/library_codegen.yml b/.github/workflows/library_codegen.yml
@@ -20,6 +20,7 @@ jobs:
         # Note dotnet is only used for formatting generated code
         # in this workflow
         dotnet-version: ["6.0.x"]
+        go-version: [1.23]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     defaults:
@@ -61,6 +62,15 @@ jobs:
       - name: Install Smithy-Dafny codegen dependencies
         uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
 
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Install Go imports
+        run: |
+          go install golang.org/x/tools/cmd/goimports@latest
+
       - uses: ./.github/actions/polymorph_codegen
         with:
           dafny: ${{ env.DAFNY_VERSION }}

diff --git a/AwsEncryptionSDK/Makefile b/AwsEncryptionSDK/Makefile
@@ -66,14 +66,14 @@ SERVICE_DEPS_AwsEncryptionSdk := \
 	mpl/AwsCryptographicMaterialProviders/dafny/AwsCryptographicMaterialProviders \
 	mpl/AwsCryptographicMaterialProviders/dafny/AwsCryptographyKeyStore
 
-GO_MODULE_NAME="github.com/aws/aws-encryption-sdk"
+GO_MODULE_NAME="github.com/aws/aws-encryption-sdk/releases/go/encryption-sdk"
 
 GO_DEPENDENCY_MODULE_NAMES := \
-	--dependency-library-name=com.amazonaws.dynamodb=github.com/aws/aws-cryptographic-material-providers-library/dynamodb \
-	--dependency-library-name=com.amazonaws.kms=github.com/aws/aws-cryptographic-material-providers-library/kms \
-	--dependency-library-name=aws.cryptography.keyStore=github.com/aws/aws-cryptographic-material-providers-library/mpl \
-	--dependency-library-name=aws.cryptography.primitives=github.com/aws/aws-cryptographic-material-providers-library/primitives \
-	--dependency-library-name=aws.cryptography.materialProviders=github.com/aws/aws-cryptographic-material-providers-library/mpl \
+	--dependency-library-name=com.amazonaws.dynamodb=github.com/aws/aws-cryptographic-material-providers-library/releases/go/dynamodb \
+	--dependency-library-name=com.amazonaws.kms=github.com/aws/aws-cryptographic-material-providers-library/releases/go/kms \
+	--dependency-library-name=aws.cryptography.keyStore=github.com/aws/aws-cryptographic-material-providers-library/releases/go/mpl \
+	--dependency-library-name=aws.cryptography.primitives=github.com/aws/aws-cryptographic-material-providers-library/releases/go/primitives \
+	--dependency-library-name=aws.cryptography.materialProviders=github.com/aws/aws-cryptographic-material-providers-library/releases/go/mpl \
     	--dependency-library-name=sdk.com.amazonaws.dynamodb=github.com/aws/aws-sdk-go-v2/service/dynamodb \
     	--dependency-library-name=sdk.com.amazonaws.kms=github.com/aws/aws-sdk-go-v2/service/kms
 

diff --git a/AwsEncryptionSDK/codebuild/release/release-prod.yml b/AwsEncryptionSDK/codebuild/release/release-prod.yml
@@ -27,7 +27,7 @@ phases:
       - unzip -qq dafny.zip && rm dafny.zip
       - export PATH="$PWD/dafny:$PATH"
       # Switch back to the main directory
-      - cd aws-encryption-sdk-dafny/AwsEncryptionSDK
+      - cd aws-encryption-sdk/AwsEncryptionSDK
   pre_build:
     commands:
       # UNIQUE_ID should be passed in as an environment variable. It is used to tie

diff --git a/AwsEncryptionSDK/codebuild/release/release-staging.yml b/AwsEncryptionSDK/codebuild/release/release-staging.yml
@@ -37,7 +37,7 @@ phases:
       - sudo apt update
       - sudo apt-get install mono-devel -y
       # Switch back to the main directory
-      - cd aws-encryption-sdk-dafny/AwsEncryptionSDK
+      - cd aws-encryption-sdk/AwsEncryptionSDK
   pre_build:
     commands:
       # UNIQUE_ID should be passed in as an environment variable. It is used to tie

diff --git a/AwsEncryptionSDK/codebuild/release/sign.yml b/AwsEncryptionSDK/codebuild/release/sign.yml
@@ -12,7 +12,7 @@ phases:
       - unzip -qq dafny.zip && rm dafny.zip
       - export PATH="$PWD/dafny:$PATH"
       # Switch back to the main directory
-      - cd aws-encryption-sdk-dafny
+      - cd aws-encryption-sdk
   pre_build:
     commands:
       # UNIQUE_ID should be passed in as an environment variable. It is used to tie

diff --git a/AwsEncryptionSDK/codebuild/release/test-prod.yml b/AwsEncryptionSDK/codebuild/release/test-prod.yml
@@ -24,7 +24,7 @@ phases:
       - sudo apt update
       - sudo apt-get install mono-devel -y
       # Switch back to the main directory
-      - cd aws-encryption-sdk-dafny/AwsEncryptionSDK
+      - cd aws-encryption-sdk/AwsEncryptionSDK
   pre_build:
     commands:
       - make transpile_net

diff --git a/...runtimes/go/ImplementationFromDafny-go/WrappedAwsCryptographyEncryptionSdkService/shim.go b/...runtimes/go/ImplementationFromDafny-go/WrappedAwsCryptographyEncryptionSdkService/shim.go
diff --git a/...s/go/ImplementationFromDafny-go/awscryptographyencryptionsdksmithygenerated/api_client.go b/...s/go/ImplementationFromDafny-go/awscryptographyencryptionsdksmithygenerated/api_client.go