Merge branch 'main' into aurora-postgresql-engine

aws · Oct 3, 2024 · 567ee28 · 567ee28
2 parents f503fb9 + b9e7855
commit 567ee28
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 48 deletions.
diff --git a/.../test/integ.function-url.js.snapshot/IntegTestDefaultTestDeployAssertE3E7D2A4.assets.json b/.../test/integ.function-url.js.snapshot/IntegTestDefaultTestDeployAssertE3E7D2A4.assets.json
diff --git a/...ng/framework-integ/test/aws-lambda/test/integ.function-url.js.snapshot/Stack1.assets.json b/...ng/framework-integ/test/aws-lambda/test/integ.function-url.js.snapshot/Stack1.assets.json
diff --git a/.../framework-integ/test/aws-lambda/test/integ.function-url.js.snapshot/Stack1.template.json b/.../framework-integ/test/aws-lambda/test/integ.function-url.js.snapshot/Stack1.template.json
@@ -37,13 +37,13 @@
     "Code": {
      "ZipFile": "def handler(event, context):\n  return \"success\""
     },
+    "Handler": "index.handler",
     "Role": {
      "Fn::GetAtt": [
       "IamAuthFunctionUrlsServiceRole35DF9DE0",
       "Arn"
      ]
     },
-    "Handler": "index.handler",
     "Runtime": "python3.10"
    },
    "DependsOn": [
@@ -99,13 +99,13 @@
     "Code": {
      "ZipFile": "def handler(event, context):\n  return \"success\""
     },
+    "Handler": "index.handler",
     "Role": {
      "Fn::GetAtt": [
       "NoAuthFunctionUrlsServiceRole7247E6F2",
       "Arn"
      ]
     },
-    "Handler": "index.handler",
     "Runtime": "python3.10"
    },
    "DependsOn": [
@@ -134,8 +134,8 @@
       "Arn"
      ]
     },
-    "Principal": "*",
-    "FunctionUrlAuthType": "NONE"
+    "FunctionUrlAuthType": "NONE",
+    "Principal": "*"
    }
   },
   "CorsFunctionUrlsServiceRole6227B597": {
@@ -175,13 +175,13 @@
     "Code": {
      "ZipFile": "def handler(event, context):\n  return \"success\""
     },
+    "Handler": "index.handler",
     "Role": {
      "Fn::GetAtt": [
       "CorsFunctionUrlsServiceRole6227B597",
       "Arn"
      ]
     },
-    "Handler": "index.handler",
     "Runtime": "python3.10"
    },
    "DependsOn": [
@@ -192,19 +192,19 @@
    "Type": "AWS::Lambda::Url",
    "Properties": {
     "AuthType": "NONE",
-    "TargetFunctionArn": {
-     "Fn::GetAtt": [
-      "CorsFunctionUrlsD81CF424",
-      "Arn"
-     ]
-    },
     "Cors": {
      "AllowMethods": [
       "*"
      ],
      "AllowOrigins": [
       "https://example.com"
      ]
+    },
+    "TargetFunctionArn": {
+     "Fn::GetAtt": [
+      "CorsFunctionUrlsD81CF424",
+      "Arn"
+     ]
     }
    }
   },
@@ -218,8 +218,8 @@
       "Arn"
      ]
     },
-    "Principal": "*",
-    "FunctionUrlAuthType": "NONE"
+    "FunctionUrlAuthType": "NONE",
+    "Principal": "*"
    }
   },
   "StreamFunctionUrlsServiceRoleAF76EC5D": {
@@ -259,13 +259,13 @@
     "Code": {
      "ZipFile": "def handler(event, context):\n  return \"success\""
     },
+    "Handler": "index.handler",
     "Role": {
      "Fn::GetAtt": [
       "StreamFunctionUrlsServiceRoleAF76EC5D",
       "Arn"
      ]
     },
-    "Handler": "index.handler",
     "Runtime": "python3.10"
    },
    "DependsOn": [
@@ -276,13 +276,13 @@
    "Type": "AWS::Lambda::Url",
    "Properties": {
     "AuthType": "NONE",
+    "InvokeMode": "RESPONSE_STREAM",
     "TargetFunctionArn": {
      "Fn::GetAtt": [
       "StreamFunctionUrlsAAB55C9C",
       "Arn"
      ]
-    },
-    "InvokeMode": "RESPONSE_STREAM"
+    }
    }
   },
   "StreamFunctionUrlsinvokefunctionurl4FD8689D": {
@@ -295,8 +295,8 @@
       "Arn"
      ]
     },
-    "Principal": "*",
-    "FunctionUrlAuthType": "NONE"
+    "FunctionUrlAuthType": "NONE",
+    "Principal": "*"
    }
   }
  },

diff --git a/...s-cdk-testing/framework-integ/test/aws-lambda/test/integ.function-url.js.snapshot/cdk.out b/...s-cdk-testing/framework-integ/test/aws-lambda/test/integ.function-url.js.snapshot/cdk.out
diff --git a/...dk-testing/framework-integ/test/aws-lambda/test/integ.function-url.js.snapshot/integ.json b/...dk-testing/framework-integ/test/aws-lambda/test/integ.function-url.js.snapshot/integ.json
diff --git a/...testing/framework-integ/test/aws-lambda/test/integ.function-url.js.snapshot/manifest.json b/...testing/framework-integ/test/aws-lambda/test/integ.function-url.js.snapshot/manifest.json
diff --git a/...cdk-testing/framework-integ/test/aws-lambda/test/integ.function-url.js.snapshot/tree.json b/...cdk-testing/framework-integ/test/aws-lambda/test/integ.function-url.js.snapshot/tree.json
diff --git a/packages/aws-cdk-lib/aws-ec2/lib/vpc-endpoint.ts b/packages/aws-cdk-lib/aws-ec2/lib/vpc-endpoint.ts
@@ -548,6 +548,7 @@ export class InterfaceVpcEndpointAwsService implements IInterfaceVpcEndpointServ
   public static readonly S3_OUTPOSTS = new InterfaceVpcEndpointAwsService('s3-outposts');
   public static readonly S3_MULTI_REGION_ACCESS_POINTS = new InterfaceVpcEndpointAwsService('s3-global.accesspoint', 'com.amazonaws', undefined, { global: true });
   public static readonly SAGEMAKER_API = new InterfaceVpcEndpointAwsService('sagemaker.api');
+  public static readonly SAGEMAKER_EXPERIMENTS = new InterfaceVpcEndpointAwsService('experiments', 'aws.sagemaker');
   public static readonly SAGEMAKER_FEATURESTORE_RUNTIME = new InterfaceVpcEndpointAwsService('sagemaker.featurestore-runtime');
   public static readonly SAGEMAKER_GEOSPATIAL = new InterfaceVpcEndpointAwsService('sagemaker-geospatial');
   public static readonly SAGEMAKER_METRICS = new InterfaceVpcEndpointAwsService('sagemaker.metrics');

diff --git a/packages/aws-cdk-lib/aws-lambda/lib/function-url.ts b/packages/aws-cdk-lib/aws-lambda/lib/function-url.ts
@@ -202,6 +202,11 @@ export class FunctionUrl extends Resource implements IFunctionUrl {
    */
   public readonly functionArn: string;
 
+  /**
+   * The authentication type used for this Function URL
+   */
+  public readonly authType: FunctionUrlAuthType;
+
   private readonly function: IFunction;
 
   constructor(scope: Construct, id: string, props: FunctionUrlProps) {
@@ -217,8 +222,10 @@ export class FunctionUrl extends Resource implements IFunctionUrl {
       ? { targetFunction: props.function.version.lambda, alias: props.function }
       : { targetFunction: props.function, alias: undefined };
 
+    this.authType = props.authType ?? FunctionUrlAuthType.AWS_IAM;
+
     const resource: CfnUrl = new CfnUrl(this, 'Resource', {
-      authType: props.authType ?? FunctionUrlAuthType.AWS_IAM,
+      authType: this.authType,
       cors: props.cors ? this.renderCors(props.cors) : undefined,
       invokeMode: props.invokeMode,
       targetFunctionArn: targetFunction.functionArn,