add integ test

aws · mergify · Sep 10, 2024 · Sep 7, 2024 · Sep 7, 2024 · Sep 7, 2024
commit c4c52948a1f249a8a2ba19a5418e068883d7e4ab
diff --git a/packages/@aws-cdk/aws-iot-alpha/lib/logging.ts b/packages/@aws-cdk/aws-iot-alpha/lib/logging.ts
@@ -8,6 +8,7 @@ import * as iam from 'aws-cdk-lib/aws-iam';
  */
 export interface ILogging extends IResource {
   /**
+   * The log ID
    * @attribute
    */
   readonly logId: string;
@@ -61,9 +62,9 @@ export class Logging extends Resource implements ILogging {
    * @param id The construct's name.
    * @param logId AWS IoT Logging ID
    */
-  public static fromLogId(scope: Construct, id: string, logid: string): ILogging {
+  public static fromLogId(scope: Construct, id: string, logId: string): ILogging {
     class Import extends Resource implements ILogging {
-      public readonly logId = logid;
+      public readonly logId = logId;
     }
     return new Import(scope, id);
   }
@@ -74,7 +75,7 @@ export class Logging extends Resource implements ILogging {
    */
   public readonly logId: string;
 
-  constructor(scope: Construct, id: string, props: LoggingProps) {
+  constructor(scope: Construct, id: string, props?: LoggingProps) {
     super(scope, id);
 
     const accountId = Stack.of(this).account;
@@ -114,7 +115,7 @@ export class Logging extends Resource implements ILogging {
 
     const resource = new iot.CfnLogging(this, 'Resource', {
       accountId,
-      defaultLogLevel: props.logLevel ?? LogLevel.ERROR,
+      defaultLogLevel: props?.logLevel ?? LogLevel.ERROR,
       roleArn: role.roleArn,
     });
 

diff --git a/.../test/integ.logging.js.snapshot/IotLoggingTestDefaultTestDeployAssertB1DE3CEF.assets.json b/.../test/integ.logging.js.snapshot/IotLoggingTestDefaultTestDeployAssertB1DE3CEF.assets.json
diff --git a/...est/integ.logging.js.snapshot/IotLoggingTestDefaultTestDeployAssertB1DE3CEF.template.json b/...est/integ.logging.js.snapshot/IotLoggingTestDefaultTestDeployAssertB1DE3CEF.template.json
diff --git a/...ges/@aws-cdk/aws-iot-alpha/test/integ.logging.js.snapshot/IotLoggingTestStack.assets.json b/...ges/@aws-cdk/aws-iot-alpha/test/integ.logging.js.snapshot/IotLoggingTestStack.assets.json
diff --git a/...s/@aws-cdk/aws-iot-alpha/test/integ.logging.js.snapshot/IotLoggingTestStack.template.json b/...s/@aws-cdk/aws-iot-alpha/test/integ.logging.js.snapshot/IotLoggingTestStack.template.json
@@ -0,0 +1,117 @@
+{
+ "Resources": {
+  "LoggingRoleF8CB8FA1": {
+   "Type": "AWS::IAM::Role",
+   "Properties": {
+    "AssumeRolePolicyDocument": {
+     "Statement": [
+      {
+       "Action": "sts:AssumeRole",
+       "Effect": "Allow",
+       "Principal": {
+        "Service": "iot.amazonaws.com"
+       }
+      }
+     ],
+     "Version": "2012-10-17"
+    },
+    "Policies": [
+     {
+      "PolicyDocument": {
+       "Statement": [
+        {
+         "Action": [
+          "iot:DeleteV2LoggingLevel",
+          "iot:GetLoggingOptions",
+          "iot:GetV2LoggingOptions",
+          "iot:ListV2LoggingLevels",
+          "iot:SetLoggingOptions",
+          "iot:SetV2LoggingLevel",
+          "iot:SetV2LoggingOptions",
+          "logs:CreateLogGroup",
+          "logs:CreateLogStream",
+          "logs:PutLogEvents",
+          "logs:PutMetricFilter",
+          "logs:PutRetentionPolicy"
+         ],
+         "Effect": "Allow",
+         "Resource": {
+          "Fn::Join": [
+           "",
+           [
+            "arn:",
+            {
+             "Ref": "AWS::Partition"
+            },
+            ":logs:",
+            {
+             "Ref": "AWS::Region"
+            },
+            ":",
+            {
+             "Ref": "AWS::AccountId"
+            },
+            ":log-group:AWSIotLogsV2:*"
+           ]
+          ]
+         }
+        }
+       ],
+       "Version": "2012-10-17"
+      },
+      "PolicyName": "LoggingPolicy"
+     }
+    ]
+   }
+  },
+  "Logging019093B9": {
+   "Type": "AWS::IoT::Logging",
+   "Properties": {
+    "AccountId": {
+     "Ref": "AWS::AccountId"
+    },
+    "DefaultLogLevel": "DEBUG",
+    "RoleArn": {
+     "Fn::GetAtt": [
+      "LoggingRoleF8CB8FA1",
+      "Arn"
+     ]
+    }
+   }
+  }
+ },
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}
diff --git a/packages/@aws-cdk/aws-iot-alpha/test/integ.logging.js.snapshot/cdk.out b/packages/@aws-cdk/aws-iot-alpha/test/integ.logging.js.snapshot/cdk.out
diff --git a/packages/@aws-cdk/aws-iot-alpha/test/integ.logging.js.snapshot/integ.json b/packages/@aws-cdk/aws-iot-alpha/test/integ.logging.js.snapshot/integ.json
diff --git a/packages/@aws-cdk/aws-iot-alpha/test/integ.logging.js.snapshot/manifest.json b/packages/@aws-cdk/aws-iot-alpha/test/integ.logging.js.snapshot/manifest.json