diff --git a/src/feature_flags.ts b/src/feature_flags.ts index e72193ef2..4d397c845 100644 --- a/src/feature_flags.ts +++ b/src/feature_flags.ts @@ -27,9 +27,6 @@ export const defaultFlags = { // If multiple glob stars are in includedFiles, fail the build instead of warning. zisi_esbuild_fail_double_glob: false, - // drops the "runtimeVersion" override field - zisi_go_drop_runtime_override: false, - // fixes symlinks in included files zisi_fix_symlinks: false, } as const diff --git a/src/runtimes/go/index.ts b/src/runtimes/go/index.ts index 2d1542654..2a51b13ba 100644 --- a/src/runtimes/go/index.ts +++ b/src/runtimes/go/index.ts @@ -113,7 +113,6 @@ const zipFunction: ZipFunction = async function ({ srcPath, stat, isInternal, - featureFlags, }) { const destPath = join(destFolder, filename) const isSource = extname(mainFile) === '.go' @@ -138,7 +137,6 @@ const zipFunction: ZipFunction = async function ({ config, displayName: config?.name, generator: config?.generator || getInternalValue(isInternal), - runtimeVersion: featureFlags.zisi_go_drop_runtime_override ? undefined : 'provided.al2', } // If `zipGo` is enabled, we create a zip archive with the Go binary and the diff --git a/tests/main.test.ts b/tests/main.test.ts index c5eb7816a..e8d0756b0 100644 --- a/tests/main.test.ts +++ b/tests/main.test.ts @@ -1780,9 +1780,6 @@ describe('zip-it-and-ship-it', () => { zipGo: true, }, }, - featureFlags: { - zisi_go_drop_runtime_override: true, - }, }, }) const binaryPath = join(FIXTURES_DIR, fixtureName, 'test') @@ -1836,7 +1833,7 @@ describe('zip-it-and-ship-it', () => { const manifest = JSON.parse(await readFile(manifestPath, 'utf-8')) - expect(manifest.functions[0].runtimeVersion).toEqual('provided.al2') + expect(manifest.functions[0].runtimeVersion).toBeUndefined() // remove the binary before unzipping await rm(join(tmpDir, 'go-func-1'), { maxRetries: 10 }) @@ -1896,7 +1893,6 @@ describe('zip-it-and-ship-it', () => { path: expect.anything(), entryFilename: '', runtime: 'go', - runtimeVersion: 'provided.al2', }, { config: expect.anything(), @@ -1905,7 +1901,6 @@ describe('zip-it-and-ship-it', () => { path: expect.anything(), entryFilename: '', runtime: 'go', - runtimeVersion: 'provided.al2', }, ])