@digitraffic/common 2022.12.22-3 → 2023.1.18-1

package/dist/aws/infra/stack/stack-checking-aspect.js

@@ -110,10 +110,11 @@ class StackCheckingAspect {
     checkBucket(node) {
         if (node instanceof aws_s3_1.CfnBucket) {
             const c = node.publicAccessBlockConfiguration;
-            if (c && (!c.blockPublicAcls ||
-                !c.blockPublicPolicy ||
-                !c.ignorePublicAcls ||
-                !c.restrictPublicBuckets)) {
+            if (c &&
+                (!c.blockPublicAcls ||
+                    !c.blockPublicPolicy ||
+                    !c.ignorePublicAcls ||
+                    !c.restrictPublicBuckets)) {
                 this.addAnnotation(node, ResourceType.bucketPublicity, "Check bucket publicity");
             }
         }

package/dist/aws/infra/stacks/db-stack.js

@@ -38,8 +38,8 @@ class DbStack extends aws_cdk_lib_1.Stack {
                 }),
                 parameters: {
                     "pg_stat_statements.track": "ALL",
-                    "random_page_cost": "1",
-                    "work_mem": "512MB"
+                    random_page_cost: "1",
+                    work_mem: "512MB",
                 },
             })
             : aws_rds_1.ParameterGroup.fromParameterGroupName(this, "ParameterGroup", `default.aurora-postgresql${configuration.dbVersion.auroraPostgresMajorVersion}`);

package/dist/utils/utils.js

@@ -72,4 +72,27 @@ function getEnvVariableSafe(key) {
     return { result: "ok", value };
 }
 exports.getEnvVariableSafe = getEnvVariableSafe;
+/**
+ * Gets environment variable. If environment variable is undefined, returns value of given function.
+ *
+ * @param key Environment key
+ * @param fn Alternative function
+ */
+function getEnvVariableOr(key, fn) {
+    const either = getEnvVariableSafe(key);
+    if (either.result === "ok") {
+        return either.value;
+    }
+    return fn();
+}
+/**
+ * Gets environment variable. If environment variable is undefined, returns given value.
+ * Use to return an explicit alternative value e.g. in cases where environment variable may be undefined.
+ *
+ * @param key Environment key
+ * @param orElse Alternative value
+ */
+function getEnvVariableOrElse(key, orElse) {
+    return getEnvVariableOr(key, () => orElse);
+}
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2022.12.22-3",
+  "version": "2023.01.18-1",
   "description": "",
   "repository": {
     "type": "git",
@@ -32,38 +32,38 @@
     "spex": "^3.0.0"
   },
   "devDependencies": {
-    "@aws-cdk/aws-synthetics-alpha": "2.50.0-alpha.0",
-    "@types/aws-lambda": "^8.10.106",
+    "@aws-cdk/aws-synthetics-alpha": "2.60.0-alpha.0",
+    "@types/aws-lambda": "^8.10.109",
     "@types/geojson": "^7946.0.10",
-    "@types/jest": "^29.0.3",
-    "@types/node": "^18.7.23",
-    "@types/ramda": "^0.28.15",
+    "@types/jest": "^29.2.5",
+    "@types/node": "^18.11.18",
+    "@types/ramda": "^0.28.21",
     "@types/sinon": "^10.0.13",
-    "@typescript-eslint/eslint-plugin": "^5.39.0",
-    "@typescript-eslint/parser": "^5.39.0",
-    "aws-cdk-lib": "^2.50.0",
-    "aws-sdk": "^2.1241.0",
-    "axios": "^0.21.1",
+    "@typescript-eslint/eslint-plugin": "^5.48.2",
+    "@typescript-eslint/parser": "^5.48.2",
+    "aws-cdk-lib": "^2.60.0",
+    "aws-sdk": "^2.1295.0",
+    "axios": "^1.2.2",
     "change-case": "^4.1.2",
-    "constructs": "^10.1.131",
-    "eslint": "^8.24.0",
-    "eslint-config-prettier": "^8.5.0",
+    "constructs": "^10.1.222",
+    "eslint": "^8.32.0",
+    "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-deprecation": "1.3.3",
     "geojson-validation": "^1.0.2",
-    "husky": ">=6",
+    "husky": "^8.0.3",
     "jest": "^29.1.1",
-    "jest-junit": "^14.0.1",
-    "lint-staged": ">=10",
+    "jest-junit": "^15.0.0",
+    "lint-staged": "^13.1.0",
     "moment": "^2.29.4",
     "node-ttl": "^0.2.0",
     "pg-native": "^3.0.1",
     "pg-promise": "^10.12.0",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.3",
     "ramda": "^0.28.0",
-    "rimraf": "^3.0.2",
-    "sinon": "^14.0.0",
-    "ts-jest": "^29.0.3",
-    "typescript": "^4.7.4"
+    "rimraf": "^4.1.0",
+    "sinon": "^15.0.1",
+    "ts-jest": "^29.0.5",
+    "typescript": "^4.9.4"
   },
   "externals": [
     "aws-sdk",

package/src/aws/infra/stack/stack-checking-aspect.ts

@@ -180,15 +180,17 @@ export class StackCheckingAspect implements IAspect {
 
     private checkBucket(node: IConstruct) {
         if (node instanceof CfnBucket) {
-            const c =
-                node.publicAccessBlockConfiguration as CfnBucket.PublicAccessBlockConfigurationProperty | undefined;
+            const c = node.publicAccessBlockConfiguration as
+                | CfnBucket.PublicAccessBlockConfigurationProperty
+                | undefined;
 
-            if (c && (
-                !c.blockPublicAcls ||
-                !c.blockPublicPolicy ||
-                !c.ignorePublicAcls ||
-                !c.restrictPublicBuckets
-            )) {
+            if (
+                c &&
+                (!c.blockPublicAcls ||
+                    !c.blockPublicPolicy ||
+                    !c.ignorePublicAcls ||
+                    !c.restrictPublicBuckets)
+            ) {
                 this.addAnnotation(
                     node,
                     ResourceType.bucketPublicity,

package/src/aws/infra/stacks/db-stack.ts

@@ -104,8 +104,8 @@ export class DbStack extends Stack {
                       }),
                       parameters: {
                           "pg_stat_statements.track": "ALL",
-                          "random_page_cost": "1",
-                          "work_mem": "512MB"
+                          random_page_cost: "1",
+                          work_mem: "512MB",
                       },
                   }
               )
@@ -157,9 +157,7 @@ export class DbStack extends Stack {
                 "Couldn't pull CfnDBInstances from the L1 constructs!"
             );
         }
-        cfnInstances.forEach(
-            (cfnInstance) => delete cfnInstance.engineVersion
-        );
+        cfnInstances.forEach((cfnInstance) => delete cfnInstance.engineVersion);
 
         return cluster;
     }

package/src/utils/utils.ts

@@ -103,3 +103,28 @@ export function getEnvVariableSafe(key: string): Either<string> {
     }
     return { result: "ok", value };
 }
+
+/**
+ * Gets environment variable. If environment variable is undefined, returns value of given function.
+ *
+ * @param key Environment key
+ * @param fn Alternative function
+ */
+function getEnvVariableOr<T>(key: string, fn: () => T): string | T {
+    const either = getEnvVariableSafe(key);
+    if (either.result === "ok") {
+        return either.value;
+    }
+    return fn();
+}
+
+/**
+ * Gets environment variable. If environment variable is undefined, returns given value.
+ * Use to return an explicit alternative value e.g. in cases where environment variable may be undefined.
+ *
+ * @param key Environment key
+ * @param orElse Alternative value
+ */
+function getEnvVariableOrElse<T>(key: string, orElse: T): string | T {
+    return getEnvVariableOr(key, () => orElse);
+}