Merge master into feature/v2-to-v3-migration

Author: aws-toolkit-automation

.changes/next-release/tenant-id-local-invoke.json

@@ -0,0 +1,4 @@
+{
+    "type": "Feature",
+    "description": "Add conditional Tenant ID field to Local Invoke panel for multi-tenant Lambda functions. The field appears when SAM template contains TenancyConfig and passes the value to SAM CLI as --tenant-id argument."
+}

packages/core/package.nls.json

@@ -59,6 +59,7 @@
     "AWS.configuration.description.awssam.debug.memoryMb": "The amount of memory (in Mb) the Lambda function has access to.",
     "AWS.configuration.description.awssam.debug.runtime": "The Lambda Function's runtime",
     "AWS.configuration.description.awssam.debug.timeout": "The amount of time (in seconds) that Lambda allows a function to run before stopping it.",
+    "AWS.configuration.description.awssam.debug.tenantId": "Tenant ID for multi-tenant Lambda functions",
     "AWS.configuration.description.awssam.debug.aws": "AWS connection details",
     "AWS.configuration.description.awssam.debug.credentials": "The AWS credentials provider and name to use during the invocation. Example: credential profile \"default\" would be entered as `profile:default`.",
     "AWS.configuration.description.awssam.debug.credentials.cn": "The Amazon credentials provider and name to use during the invocation. Example: credential profile \"default\" would be entered as `profile:default`.",

packages/core/src/awsService/appBuilder/explorer/samProject.ts

@@ -41,6 +41,7 @@ export interface FunctionResourceEntity extends BaseResourceEntity {
     }
     CapacityProviderConfig?: string
     Architectures?: string
+    TenancyConfig?: string
 }
 
 export interface CapacityProviderResourceEntity extends BaseResourceEntity {
@@ -123,6 +124,7 @@ function createResourceEntity(logicalId: string, resource: any, template: any):
             CapacityProviderConfig:
                 resource.Properties?.CapacityProviderConfig ?? template?.Globals?.Function?.CapacityProviderConfig,
             Architectures: resource.Properties?.Architectures?.[0] ?? template?.Globals?.Function?.Architectures?.[0],
+            TenancyConfig: resource.Properties?.TenancyConfig ?? template?.Globals?.Function?.TenancyConfig,
         }
         return functionEntity
     }

packages/core/src/lambda/vue/configEditor/samInvokeBackend.ts

@@ -48,6 +48,7 @@ export interface ResourceData {
     runtime: string
     stackName: string
     source: string
+    hasTenancyConfig?: boolean
     environment?: {
         Variables: Record<string, any>
     }
@@ -456,6 +457,7 @@ export async function registerSamDebugInvokeVueCommand(
         stackName: resource.stackName ?? '',
         environment: resource.resource.Environment,
         source: source,
+        hasTenancyConfig: !!resource.resource.TenancyConfig,
     })
     await telemetry.sam_openConfigUi.run(async (span) => {
         telemetry.record({ source: 'AppBuilderDebugger' }),

packages/core/src/lambda/vue/configEditor/samInvokeComponent.vue

@@ -97,6 +97,21 @@
                         </div>
                     </div>
                 </div>
+                <div
+                    class="config-item"
+                    v-if="resourceData?.hasTenancyConfig && launchConfig.invokeTarget.target !== 'api'"
+                >
+                    <label for="tenant-id">Tenant ID</label>
+                    <input
+                        name="tenant-id"
+                        id="tenant-id"
+                        type="text"
+                        v-model="launchConfig.lambda.tenantId"
+                        placeholder="Enter tenant ID (required for invocation)"
+                        style="width: 100%"
+                    />
+                    <span class="data-view">Tenant ID from data: {{ launchConfig.lambda.tenantId }}</span>
+                </div>
                 <div class="config-item">
                     <label for="target-type-selector">Invoke target type</label>
                     <select name="target-types" id="target-type-selector" v-model="launchConfig.invokeTarget.target">

packages/core/src/lambda/vue/configEditor/samInvokeFrontend.ts

@@ -74,6 +74,7 @@ function newLaunchConfig(existingConfig?: AwsSamDebuggerConfiguration): AwsSamDe
             memoryMb: undefined,
             timeoutSec: undefined,
             environmentVariables: {},
+            tenantId: undefined,
             ...existingConfig?.lambda,
             payload: {
                 json: existingConfig?.lambda?.payload?.json ? existingConfig.lambda.payload.json : {},
@@ -430,6 +431,7 @@ export default defineComponent({
                         json: payloadJson,
                     },
                     environmentVariables: environmentVariablesJson,
+                    tenantId: launchConfig.lambda?.tenantId,
                 },
                 sam: {
                     ...launchConfig.sam,

packages/core/src/shared/sam/cli/samCliLocalInvoke.ts

@@ -222,6 +222,8 @@ export interface SamCliLocalInvokeInvocationArguments {
     region?: string
     /** Overrides the template-specified runtime. */
     runtime?: Runtime
+    /** Tenant ID for multi-tenant Lambda functions */
+    tenantId?: string
 }
 
 /**
@@ -262,6 +264,7 @@ export class SamCliLocalInvokeInvocation {
         pushIf(invokeArgs, !!this.args.debugArgs, '--debug-args', ...(this.args.debugArgs ?? []))
         pushIf(invokeArgs, !!this.args.containerEnvFile, '--container-env-vars', this.args.containerEnvFile)
         pushIf(invokeArgs, !!this.args.region, '--region', this.args.region)
+        pushIf(invokeArgs, !!this.args.tenantId, '--tenant-id', this.args.tenantId!)
 
         pushIf(
             invokeArgs,

packages/core/src/shared/sam/debugger/awsSamDebugConfiguration.gen.ts

@@ -138,6 +138,10 @@ export interface LambdaProperties {
    * The amount of time (in seconds) that Lambda allows a function to run before stopping it.
    */
   timeoutSec?: number;
+  /**
+   * Tenant ID for multi-tenant Lambda functions
+   */
+  tenantId?: string;
   pathMappings?: PathMapping[];
 }
 export interface PathMapping {

packages/core/src/shared/sam/localLambdaRunner.ts

@@ -249,6 +249,7 @@ async function invokeLambdaHandler(
             name: config.name,
             region: config.region,
             runtime: config.lambda?.runtime as Runtime,
+            tenantId: config.lambda?.tenantId,
         }
 
         // sam local invoke ...

packages/core/src/test/awsService/appBuilder/explorer/samProject.test.ts

@@ -17,6 +17,8 @@ import {
     samconfigInvalidData,
     validTemplateData,
     capacityProviderTemplateData,
+    functionLevelTenancyConfigTemplateData,
+    globalTenancyConfigTemplateData,
 } from '../../../shared/sam/samTestUtils'
 import { assertLogsContain } from '../../../globalSetup.test'
 import { getTestWindow } from '../../../shared/vscode/window'
@@ -186,5 +188,27 @@ describe('samProject', () => {
             assert('Fn::GetAtt' in config.Arn)
             assert.deepStrictEqual(config.Arn['Fn::GetAtt'], ['MyCapacityProvider', 'Arn'])
         })
+
+        it('detects TenancyConfig from function-level properties', async () => {
+            await testFolder.write('template.yaml', functionLevelTenancyConfigTemplateData)
+            const { resourceTree } = await getApp(mockSamAppLocation)
+
+            assert.strictEqual(resourceTree.length, 1)
+            const functionNode = resourceTree[0]
+            assert.strictEqual(functionNode.Type, 'AWS::Serverless::Function')
+            assert('TenancyConfig' in functionNode)
+            assert.deepStrictEqual(functionNode.TenancyConfig, { TenantIsolationMode: 'PER_TENANT' })
+        })
+
+        it('detects TenancyConfig from Globals section', async () => {
+            await testFolder.write('template.yaml', globalTenancyConfigTemplateData)
+            const { resourceTree } = await getApp(mockSamAppLocation)
+
+            assert.strictEqual(resourceTree.length, 1)
+            const functionNode = resourceTree[0]
+            assert.strictEqual(functionNode.Type, 'AWS::Serverless::Function')
+            assert('TenancyConfig' in functionNode)
+            assert.deepStrictEqual(functionNode.TenancyConfig, { TenantIsolationMode: 'PER_TENANT' })
+        })
     })
 })