Merge pull request #159 from aws/develop

Merge changes for release

Author: valerena

THIRD-PARTY-LICENSES.md

@@ -4,9 +4,17 @@
 package main
 
 import (
+	"os"
+
+	"github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda-managed-instances/aws-lambda-rie/run"
+	"github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda-managed-instances/rapidcore/env"
 	"github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda/rie"
 )
 
 func main() {
+	if _, ok := os.LookupEnv(env.AWS_LAMBDA_MAX_CONCURRENCY); ok {
+		run.Run()
+		return
+	}
 	rie.Run()
 }

cmd/aws-lambda-rie/main.go

@@ -0,0 +1,50 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package agents
+
+import (
+	"log/slog"
+	"path"
+	"path/filepath"
+
+	"github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda-managed-instances/utils"
+)
+
+const (
+	ExtensionsDir = "/opt/extensions"
+)
+
+func ListExternalAgentPaths(fileutils utils.FileUtil, dir string, root string) []string {
+	var agentPaths []string
+	if !isCanonical(dir) || !isCanonical(root) {
+		slog.Warn("Agents base paths are not absolute and in canonical form", "dir", dir, "root", root)
+		return agentPaths
+	}
+	fullDir := path.Join(root, dir)
+	files, err := fileutils.ReadDirectory(fullDir)
+	if err != nil {
+		if fileutils.IsNotExist(err) {
+			slog.Info("The extension's directory does not exist, assuming no extensions to be loaded", "fullDir", fullDir)
+		} else {
+
+			slog.Error("Cannot list external agents", "err", err)
+		}
+
+		return agentPaths
+	}
+
+	for _, file := range files {
+		if !file.IsDir() {
+
+			p := path.Join("/", dir, file.Name())
+			agentPaths = append(agentPaths, p)
+		}
+	}
+	return agentPaths
+}
+
+func isCanonical(path string) bool {
+	absPath, err := filepath.Abs(path)
+	return err == nil && absPath == path
+}

internal/lambda-managed-instances/agents/agent.go

@@ -0,0 +1,225 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package agents
+
+import (
+	"os"
+	"path"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/aws/aws-lambda-runtime-interface-emulator/internal/lambda-managed-instances/utils"
+)
+
+type fileInfo struct {
+	name   string
+	mode   os.FileMode
+	size   int64
+	target string
+}
+
+func mkFile(name string, size int64, perm os.FileMode) fileInfo {
+	return fileInfo{
+		name:   name,
+		mode:   perm,
+		size:   size,
+		target: "",
+	}
+}
+
+func mkDir(name string, perm os.FileMode) fileInfo {
+	return fileInfo{
+		name:   name,
+		mode:   perm | os.ModeDir,
+		size:   0,
+		target: "",
+	}
+}
+
+func mkLink(name, target string) fileInfo {
+	return fileInfo{
+		name:   name,
+		mode:   os.ModeSymlink,
+		size:   0,
+		target: target,
+	}
+}
+
+func createFileTree(root string, fs []fileInfo) error {
+	for _, info := range fs {
+		filename := info.name
+		dir := path.Join(root, path.Dir(filename))
+		name := path.Base(filename)
+		err := os.MkdirAll(dir, 0o775)
+		if err != nil && !os.IsExist(err) {
+			return err
+		}
+		switch {
+		case os.ModeDir == info.mode&os.ModeDir:
+			err := os.Mkdir(path.Join(dir, name), info.mode&os.ModePerm)
+			if err != nil {
+				return err
+			}
+		case os.ModeSymlink == info.mode&os.ModeSymlink:
+			target := path.Join(root, info.target)
+			_, err = os.Stat(target)
+			if err != nil {
+				return err
+			}
+			err := os.Symlink(target, path.Join(dir, name))
+			if err != nil {
+				return err
+			}
+		default:
+			file, err := os.OpenFile(path.Join(dir, name), os.O_RDWR|os.O_CREATE, info.mode&os.ModePerm)
+			if err != nil {
+				return err
+			}
+			if err := file.Truncate(info.size); err != nil {
+				return err
+			}
+			if err := file.Close(); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func TestBaseEmpty(t *testing.T) {
+	assert := assert.New(t)
+
+	fs := []fileInfo{
+		mkDir("/opt/extensions", 0o777),
+	}
+
+	tmpDir, err := os.MkdirTemp("", "ext-")
+	require.NoError(t, err)
+
+	require.NoError(t, createFileTree(tmpDir, fs))
+	defer func() { require.NoError(t, os.RemoveAll(tmpDir)) }()
+
+	fileUtils := utils.NewFileUtil()
+
+	agents := ListExternalAgentPaths(fileUtils, path.Join(tmpDir, "/opt/extensions"), "/")
+	assert.Equal(0, len(agents))
+}
+
+func TestBaseNotExist(t *testing.T) {
+	assert := assert.New(t)
+
+	fileUtils := utils.NewFileUtil()
+
+	agents := ListExternalAgentPaths(fileUtils, "/path/which/does/not/exist", "/")
+	assert.Equal(0, len(agents))
+}
+
+func TestChrootNotExist(t *testing.T) {
+	assert := assert.New(t)
+
+	fileUtils := utils.NewFileUtil()
+
+	agents := ListExternalAgentPaths(fileUtils, "/bin", "/does/not/exist")
+	assert.Equal(0, len(agents))
+}
+
+func TestBaseNotDir(t *testing.T) {
+	assert := assert.New(t)
+
+	fs := []fileInfo{
+		mkFile("/opt/extensions", 1, 0o777),
+	}
+	tmpDir, err := os.MkdirTemp("", "ext-")
+	require.NoError(t, err)
+
+	require.NoError(t, createFileTree(tmpDir, fs))
+	defer func() { require.NoError(t, os.RemoveAll(tmpDir)) }()
+
+	path := path.Join(tmpDir, "/opt/extensions")
+
+	fileUtils := utils.NewFileUtil()
+	agents := ListExternalAgentPaths(fileUtils, path, "/")
+	assert.Equal(0, len(agents))
+}
+
+func TestFindAgentMixed(t *testing.T) {
+	assert := assert.New(t)
+
+	listed := []fileInfo{
+		mkFile("/opt/extensions/ok2", 1, 0o777),
+		mkFile("/opt/extensions/ok1", 1, 0o777),
+		mkFile("/opt/extensions/not_exec", 1, 0o666),
+		mkFile("/opt/extensions/not_read", 1, 0o333),
+		mkFile("/opt/extensions/empty_file", 0, 0o777),
+		mkLink("/opt/extensions/link", "/opt/extensions/ok1"),
+	}
+
+	unlisted := []fileInfo{
+		mkDir("/opt/extensions/empty_dir", 0o777),
+		mkDir("/opt/extensions/nonempty_dir", 0o777),
+		mkFile("/opt/extensions/nonempty_dir/notok", 1, 0o777),
+	}
+
+	fs := append([]fileInfo{}, listed...)
+	fs = append(fs, unlisted...)
+
+	tmpDir, err := os.MkdirTemp("", "ext-")
+	require.NoError(t, err)
+
+	require.NoError(t, createFileTree(tmpDir, fs))
+	defer func() { require.NoError(t, os.RemoveAll(tmpDir)) }()
+
+	path := path.Join(tmpDir, "/opt/extensions")
+	fileUtils := utils.NewFileUtil()
+	agentPaths := ListExternalAgentPaths(fileUtils, path, "/")
+	assert.Equal(len(listed), len(agentPaths))
+	last := ""
+	for index := range listed {
+		if len(last) > 0 {
+			assert.GreaterOrEqual(agentPaths[index], last)
+		}
+		last = agentPaths[index]
+	}
+}
+
+func TestFindAgentMixedInChroot(t *testing.T) {
+	assert := assert.New(t)
+
+	listed := []fileInfo{
+		mkFile("/opt/extensions/ok2", 1, 0o777),
+		mkFile("/opt/extensions/ok1", 1, 0o777),
+		mkFile("/opt/extensions/not_exec", 1, 0o666),
+		mkFile("/opt/extensions/not_read", 1, 0o333),
+		mkFile("/opt/extensions/empty_file", 0, 0o777),
+		mkLink("/opt/extensions/link", "/opt/extensions/ok1"),
+	}
+
+	unlisted := []fileInfo{
+		mkDir("/opt/extensions/empty_dir", 0o777),
+		mkDir("/opt/extensions/nonempty_dir", 0o777),
+		mkFile("/opt/extensions/nonempty_dir/notok", 1, 0o777),
+	}
+
+	fs := append([]fileInfo{}, listed...)
+	fs = append(fs, unlisted...)
+
+	rootDir, err := os.MkdirTemp("", "rootfs")
+	require.NoError(t, err)
+
+	require.NoError(t, createFileTree(rootDir, fs))
+	defer func() { require.NoError(t, os.RemoveAll(rootDir)) }()
+	fileUtils := utils.NewFileUtil()
+	agentPaths := ListExternalAgentPaths(fileUtils, "/opt/extensions", rootDir)
+	assert.Equal(len(listed), len(agentPaths))
+	last := ""
+	for index := range listed {
+		if len(last) > 0 {
+			assert.GreaterOrEqual(agentPaths[index], last)
+		}
+		last = agentPaths[index]
+	}
+}

internal/lambda-managed-instances/agents/agent_test.go

@@ -0,0 +1,79 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package appctx
+
+import (
+	"sync"
+)
+
+type Key int
+
+const (
+	AppCtxInvokeErrorTraceDataKey Key = iota
+
+	AppCtxRuntimeReleaseKey
+
+	AppCtxInteropServerKey
+
+	AppCtxResponseSenderKey
+
+	AppCtxFirstFatalErrorKey
+)
+
+type ApplicationContext interface {
+	Store(key Key, value interface{})
+	Load(key Key) (value interface{}, ok bool)
+	Delete(key Key)
+	GetOrDefault(key Key, defaultValue interface{}) interface{}
+	StoreIfNotExists(key Key, value interface{}) interface{}
+}
+
+type applicationContext struct {
+	mux *sync.Mutex
+	m   map[Key]interface{}
+}
+
+func (appCtx *applicationContext) Store(key Key, value interface{}) {
+	appCtx.mux.Lock()
+	defer appCtx.mux.Unlock()
+	appCtx.m[key] = value
+}
+
+func (appCtx *applicationContext) StoreIfNotExists(key Key, value interface{}) interface{} {
+	appCtx.mux.Lock()
+	defer appCtx.mux.Unlock()
+	existing, found := appCtx.m[key]
+	if found {
+		return existing
+	}
+	appCtx.m[key] = value
+	return nil
+}
+
+func (appCtx *applicationContext) Load(key Key) (value interface{}, ok bool) {
+	appCtx.mux.Lock()
+	defer appCtx.mux.Unlock()
+	value, ok = appCtx.m[key]
+	return value, ok
+}
+
+func (appCtx *applicationContext) Delete(key Key) {
+	appCtx.mux.Lock()
+	defer appCtx.mux.Unlock()
+	delete(appCtx.m, key)
+}
+
+func (appCtx *applicationContext) GetOrDefault(key Key, defaultValue interface{}) interface{} {
+	if value, ok := appCtx.Load(key); ok {
+		return value
+	}
+	return defaultValue
+}
+
+func NewApplicationContext() ApplicationContext {
+	return &applicationContext{
+		mux: &sync.Mutex{},
+		m:   make(map[Key]interface{}),
+	}
+}