From 1d1fc99c7f83f2cdbe85e04b451cf97678beb68e Mon Sep 17 00:00:00 2001
From: "0.618" <o.6180339@gmail.com>
Date: Mon, 1 Apr 2024 16:27:24 -0700
Subject: [PATCH] fix: fix Go runtime for al2023

---
 .../src/extensions/amplify-helpers/docs-manager.ts     |  8 ++++----
 .../src/constants.ts                                   |  4 ++--
 .../src/runtime.ts                                     | 10 ++--------
 .../amplify-go-function-template-provider/package.json |  2 +-
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/packages/amplify-cli/src/extensions/amplify-helpers/docs-manager.ts b/packages/amplify-cli/src/extensions/amplify-helpers/docs-manager.ts
index fb1b7e142b5..d118d8b2765 100644
--- a/packages/amplify-cli/src/extensions/amplify-helpers/docs-manager.ts
+++ b/packages/amplify-cli/src/extensions/amplify-helpers/docs-manager.ts
@@ -3,10 +3,10 @@ const ReadMeContent = `# Getting Started with Amplify CLI
 This directory was generated by [Amplify CLI](https://docs.amplify.aws/cli).
 
 Helpful resources:
-- Amplify documentation: https://docs.amplify.aws
-- Amplify CLI documentation: https://docs.amplify.aws/cli
-- More details on this folder & generated files: https://docs.amplify.aws/cli/reference/files
-- Join Amplify's community: https://amplify.aws/community/
+- Amplify documentation: https://docs.amplify.aws.
+- Amplify CLI documentation: https://docs.amplify.aws/cli.
+- More details on this folder & generated files: https://docs.amplify.aws/cli/reference/files.
+- Join Amplify's community: https://amplify.aws/community/.
 `;
 
 export function writeReadMeFile(readMeFilePath: string): void {
diff --git a/packages/amplify-go-function-runtime-provider/src/constants.ts b/packages/amplify-go-function-runtime-provider/src/constants.ts
index 49c97e57af0..d53eead0060 100644
--- a/packages/amplify-go-function-runtime-provider/src/constants.ts
+++ b/packages/amplify-go-function-runtime-provider/src/constants.ts
@@ -6,8 +6,8 @@ export const BIN = 'bin';
 export const SRC = 'src';
 export const DIST = 'dist';
 export const MAIN_SOURCE = 'main.go';
-export const MAIN_BINARY = 'main';
-export const MAIN_BINARY_WIN = 'main.exe';
+export const MAIN_BINARY = 'bootstrap';
+export const MAIN_BINARY_WIN = 'bootstrap.exe';
 
 export const BASE_PORT = 8900;
 export const MAX_PORT = 9999;
diff --git a/packages/amplify-go-function-runtime-provider/src/runtime.ts b/packages/amplify-go-function-runtime-provider/src/runtime.ts
index c6232281580..d22443a4288 100644
--- a/packages/amplify-go-function-runtime-provider/src/runtime.ts
+++ b/packages/amplify-go-function-runtime-provider/src/runtime.ts
@@ -86,7 +86,7 @@ export const buildResource = async ({ buildType, srcRoot, lastBuildTimeStamp }:
       fs.mkdirSync(outDir);
     }
 
-    const envVars: any = {};
+    const envVars: any = { GOPROXY: 'direct' };
 
     if (buildType === BuildType.PROD) {
       envVars.GOOS = 'linux';
@@ -102,13 +102,7 @@ export const buildResource = async ({ buildType, srcRoot, lastBuildTimeStamp }:
     executeCommand(['mod', 'tidy', '-v'], true, envVars, srcDir);
     // Execute the build command, cwd must be the source file directory (Windows requires it)
     // Details: https://github.com/aws/aws-lambda-go
-    executeCommand(['build', '-o', 'bootstrap', 'main.go'], true, envVars, srcDir);
-    // Compress this binary into a ZIP file deployment package, ready to deploy to Lambda
-    if (isWindows) {
-      executeCommand(['%USERPROFILE%Go\bin\build-lambda-zip.exe', '-o', 'lambda-handler.zip', 'bootstrap'], true, envVars, srcDir);
-    } else {
-      await execa('zip', ['lambda-handler.zip', 'bootstrap'], { cwd: srcDir, env: envVars });
-    }
+    executeCommand(['build', '-o', '../bin/bootstrap', 'main.go'], true, envVars, srcDir);
 
     rebuilt = true;
   }
diff --git a/packages/amplify-go-function-template-provider/package.json b/packages/amplify-go-function-template-provider/package.json
index 07c79392aa6..da667e46091 100644
--- a/packages/amplify-go-function-template-provider/package.json
+++ b/packages/amplify-go-function-template-provider/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@aws-amplify/amplify-go-function-template-provider",
   "version": "1.4.7",
-  "description": "Go 1.x templates supplied by the Amplify Team",
+  "description": "Go templates supplied by the Amplify Team",
   "repository": {
     "type": "git",
     "url": "https://github.com/aws-amplify/amplify-cli.git",