fix integ test by adding dependency

open-constructs · Apr 18, 2024 · da52664 · da52664
1 parent 0bbc0a7
commit da52664
Show file tree

Hide file tree

Showing 11 changed files with 938 additions and 6 deletions.
diff --git a/API.md b/API.md
diff --git a/src/aws-cur/cost-report.ts b/src/aws-cur/cost-report.ts
@@ -32,7 +32,7 @@ export class ReportGranularity {
 export class CurFormat {
 
   /** GZIP compressed text or CSV format */
-  public static readonly TEXT: CurFormat = new CurFormat('GZIP', 'textORcsv');
+  public static readonly TEXT_OR_CSV: CurFormat = new CurFormat('GZIP', 'textORcsv');
   /** Parquet format */
   public static readonly PARQUET: CurFormat = new CurFormat('Parquet', 'Parquet');
 
@@ -124,9 +124,9 @@ export class CostReport extends Construct {
       resources: [this.reportBucket.bucketArn],
     }));
 
-    const format = props.format ?? CurFormat.TEXT;
+    const format = props.format ?? CurFormat.TEXT_OR_CSV;
 
-    this.createReportDefinition(this, 'Resource', {
+    const reportDefinition = this.createReportDefinition(this, 'Resource', {
       compression: format.compression,
       format: format.format,
       refreshClosedReports: false,
@@ -138,6 +138,7 @@ export class CostReport extends Construct {
       timeUnit: props.reportGranularity?.value ?? 'HOURLY',
       additionalSchemaElements: ['RESOURCES'],
     });
+    reportDefinition.node.addDependency(this.reportBucket.policy!);
 
   }
 

diff --git a/...ws-cur/integ.cost-report.ts.snapshot/CurReportDefaultTestDeployAssert2956AD14.assets.json b/...ws-cur/integ.cost-report.ts.snapshot/CurReportDefaultTestDeployAssert2956AD14.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "36.0.0",
+  "files": {
+    "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
+      "source": {
+        "path": "CurReportDefaultTestDeployAssert2956AD14.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}
diff --git a/...-cur/integ.cost-report.ts.snapshot/CurReportDefaultTestDeployAssert2956AD14.template.json b/...-cur/integ.cost-report.ts.snapshot/CurReportDefaultTestDeployAssert2956AD14.template.json
@@ -0,0 +1,36 @@
+{
+ "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/....snapshot/asset.b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6/index.js b/....snapshot/asset.b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6/index.js
diff --git a/test/aws-cur/integ.cost-report.ts.snapshot/cdk.out b/test/aws-cur/integ.cost-report.ts.snapshot/cdk.out
@@ -0,0 +1 @@
+{"version":"36.0.0"}
diff --git a/test/aws-cur/integ.cost-report.ts.snapshot/cur-report.assets.json b/test/aws-cur/integ.cost-report.ts.snapshot/cur-report.assets.json
@@ -0,0 +1,32 @@
+{
+  "version": "36.0.0",
+  "files": {
+    "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6": {
+      "source": {
+        "path": "asset.b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6",
+        "packaging": "zip"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "b7f33614a69548d6bafe224d751a7ef238cde19097415e553fe8b63a4c8fd8a6.zip",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    },
+    "ae9c3c5ffd6c1730f1c1a6319554d1637fade1f5910c4e0e87bcdc05e3d42ce7": {
+      "source": {
+        "path": "cur-report.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "ae9c3c5ffd6c1730f1c1a6319554d1637fade1f5910c4e0e87bcdc05e3d42ce7.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}