@servicevic-oss/cdk-cleanup-certificate-validation-records 1.3.60 → 1.3.61

package/.jsii

@@ -7,8 +7,8 @@
     ]
   },
   "bundled": {
-    "@aws-sdk/client-acm": "^3.1099.0",
-    "@aws-sdk/client-route-53": "^3.1099.0",
+    "@aws-sdk/client-acm": "^3.1101.0",
+    "@aws-sdk/client-route-53": "^3.1101.0",
     "@types/aws-lambda": "^8.10.162",
     "async-await-retry": "^2.1.0"
   },
@@ -8898,6 +8898,6 @@
       "symbolId": "src/index:CertificateWithCleanup"
     }
   },
-  "version": "1.3.60",
-  "fingerprint": "dah4Hk3NOs6UV/RB/4DJm01LA5WFgQ8FZPX/T5QSqW4="
+  "version": "1.3.61",
+  "fingerprint": "bfr4x1eqX+/HuMIFEst5o+Asq1IstI48ij9O6dpPNxI="
 }

package/lib/index.js

@@ -43,7 +43,7 @@ const constructs_1 = require("constructs");
  * leave behind when deleting a DNS validated certificate
  */
 class CertificateValidationRecordCleanup extends constructs_1.Construct {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateValidationRecordCleanup", version: "1.3.60" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateValidationRecordCleanup", version: "1.3.61" };
     static HANDLER_UID = 'CertRecordsCleanupHandler-2B663BAB-7981';
     static PROVIDER_UID = 'CertRecordsCleanupProvider-57EBF059-2E26';
     static LOG_GROUP_UID = 'CertRecordsCleanupLogGroup-57ABF051-1E25';
@@ -109,7 +109,7 @@ exports.CertificateValidationRecordCleanup = CertificateValidationRecordCleanup;
  * A wrapper class for a vanilla `Certificate` object with automatic cleanup attached
  */
 class CertificateWithCleanup extends cdk.aws_certificatemanager.Certificate {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup", version: "1.3.60" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@servicevic-oss/cdk-cleanup-certificate-validation-records.CertificateWithCleanup", version: "1.3.61" };
     constructor(scope, id, props) {
         super(scope, id, props);
         if (props.validation && props.validation.props.hostedZone && props.validation?.method == cdk.aws_certificatemanager.ValidationMethod.DNS) {

package/node_modules/@aws-sdk/client-acm/dist-cjs/index.js

@@ -71,7 +71,7 @@ const commonParams = {
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
 };
 
-var version = "3.1098.0";
+var version = "3.1100.0";
 var packageInfo = {
 	version: version};
 

package/node_modules/@aws-sdk/client-acm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/client-acm",
-  "version": "3.1099.0",
+  "version": "3.1101.0",
   "description": "AWS SDK for JavaScript Acm Client for Node.js, Browser and React Native",
   "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/clients/client-acm",
   "license": "Apache-2.0",
@@ -48,8 +48,8 @@
     "test:index": "tsc --noEmit ./test/index-types.ts && node ./test/index-objects.spec.mjs"
   },
   "dependencies": {
-    "@aws-sdk/core": "^3.977.3",
-    "@aws-sdk/credential-provider-node": "^3.972.75",
+    "@aws-sdk/core": "^3.977.4",
+    "@aws-sdk/credential-provider-node": "^3.972.76",
     "@aws-sdk/types": "^3.974.2",
     "@smithy/core": "^3.31.1",
     "@smithy/fetch-http-handler": "^5.6.13",

package/node_modules/@aws-sdk/client-route-53/dist-cjs/index.js

@@ -70,7 +70,7 @@ const commonParams = {
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
 };
 
-var version = "3.1098.0";
+var version = "3.1100.0";
 var packageInfo = {
 	version: version};
 

package/node_modules/@aws-sdk/client-route-53/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/client-route-53",
-  "version": "3.1099.0",
+  "version": "3.1101.0",
   "description": "AWS SDK for JavaScript Route 53 Client for Node.js, Browser and React Native",
   "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/clients/client-route-53",
   "license": "Apache-2.0",
@@ -52,8 +52,8 @@
     "test:index": "tsc --noEmit ./test/index-types.ts && node ./test/index-objects.spec.mjs"
   },
   "dependencies": {
-    "@aws-sdk/core": "^3.977.3",
-    "@aws-sdk/credential-provider-node": "^3.972.75",
+    "@aws-sdk/core": "^3.977.4",
+    "@aws-sdk/credential-provider-node": "^3.972.76",
     "@aws-sdk/middleware-sdk-route53": "^3.972.23",
     "@aws-sdk/types": "^3.974.2",
     "@smithy/core": "^3.31.1",

package/node_modules/@aws-sdk/core/dist-cjs/submodules/protocols/index.js

@@ -1022,14 +1022,20 @@ class JsonShapeDeserializer2 extends SerdeContextConfig {
         const reviver = needsReviver(schema) ? jsonReviver : undefined;
         let parsed;
         if (typeof data === "string") {
+            if (data.length === 0) {
+                return {};
+            }
             parsed = JSON.parse(data, reviver);
         }
         else if (data instanceof Uint8Array && detectBufferParsing()) {
+            if (data.byteLength === 0) {
+                return {};
+            }
             const buf = Buffer.isBuffer(data) ? data : Buffer.from(data.buffer, data.byteOffset, data.byteLength);
             parsed = JSON.parse(buf, reviver);
         }
         else {
-            parsed = await parseJsonBody(data, this.serdeContext);
+            parsed = await parseJsonBody(data, this.serdeContext, schema);
         }
         return this._read(schema, parsed);
     }
@@ -1045,19 +1051,23 @@ class JsonShapeDeserializer2 extends SerdeContextConfig {
             }
             if (Array.isArray(value) && ns.isListSchema()) {
                 const listMember = ns.getValueSchema();
-                for (let i = 0; i < value.length; ++i) {
-                    value[i] = this._read(listMember, value[i]);
+                if (this.needsTransform(listMember)) {
+                    for (let i = 0; i < value.length; ++i) {
+                        value[i] = this._read(listMember, value[i]);
+                    }
                 }
                 return value;
             }
             if (ns.isMapSchema()) {
                 const mapMember = ns.getValueSchema();
                 const map = value;
-                for (const k in map) {
-                    if (k === "__proto__") {
-                        writeKey(map);
+                if (this.needsTransform(mapMember)) {
+                    for (const k in map) {
+                        if (k === "__proto__") {
+                            writeKey(map);
+                        }
+                        map[k] = this._read(mapMember, map[k]);
                     }
-                    map[k] = this._read(mapMember, map[k]);
                 }
                 return map;
             }
@@ -1133,10 +1143,6 @@ class JsonShapeDeserializer2 extends SerdeContextConfig {
                         }
                     }
                 }
-                return value;
-            }
-            else {
-                return value;
             }
         }
         return value;
@@ -1144,9 +1150,10 @@ class JsonShapeDeserializer2 extends SerdeContextConfig {
     _readStruct(ns, record) {
         const union = ns.isUnionSchema();
         const out = {};
-        let nameMap = void 0;
+        let nameMap;
+        const hasType = typeof record.__type === "string";
         const { jsonName } = this.settings;
-        if (jsonName) {
+        if (jsonName && hasType) {
             nameMap = {};
         }
         let unionSerde;
@@ -1157,7 +1164,9 @@ class JsonShapeDeserializer2 extends SerdeContextConfig {
             let fromKey = memberName;
             if (jsonName) {
                 fromKey = memberSchema.getMergedTraits().jsonName ?? fromKey;
-                nameMap[fromKey] = memberName;
+                if (hasType) {
+                    nameMap[fromKey] = memberName;
+                }
             }
             if (union) {
                 unionSerde.mark(fromKey);
@@ -1169,7 +1178,7 @@ class JsonShapeDeserializer2 extends SerdeContextConfig {
         if (union) {
             unionSerde.writeUnknown();
         }
-        else if (typeof record.__type === "string") {
+        else if (hasType) {
             for (const k in record) {
                 const v = record[k];
                 const t = jsonName ? (nameMap[k] ?? k) : k;
@@ -1180,8 +1189,123 @@ class JsonShapeDeserializer2 extends SerdeContextConfig {
         }
         return out;
     }
+    needsTransform(ns) {
+        if (ns.isBlobSchema() || ns.isTimestampSchema() || ns.isBigIntegerSchema() || ns.isBigDecimalSchema()) {
+            return true;
+        }
+        if (ns.isDocumentSchema() || ns.isStructSchema() || ns.isListSchema() || ns.isMapSchema()) {
+            return true;
+        }
+        if (ns.isStringSchema() && ns.getMergedTraits().mediaType) {
+            return true;
+        }
+        return false;
+    }
 }
 
+class JsonBytesStringAdapter extends Uint8Array {
+    string = null;
+    static allocUnsafe(bytes) {
+        if (typeof Buffer === "function") {
+            const buffer = Buffer.allocUnsafe(bytes);
+            return new JsonBytesStringAdapter(buffer.buffer, buffer.byteOffset, buffer.byteLength);
+        }
+        return new JsonBytesStringAdapter(bytes);
+    }
+    toString() {
+        return this.s();
+    }
+    valueOf() {
+        return this.s();
+    }
+    includes(searchString, position) {
+        if (typeof searchString === "string") {
+            return this.s().includes(searchString, position);
+        }
+        return Uint8Array.prototype.includes.call(this, searchString, position);
+    }
+    indexOf(searchString, position) {
+        if (typeof searchString === "string") {
+            return this.s().indexOf(searchString, position);
+        }
+        return Uint8Array.prototype.indexOf.call(this, searchString, position);
+    }
+    lastIndexOf(searchString, position) {
+        if (typeof searchString === "string") {
+            return this.s().lastIndexOf(searchString, position);
+        }
+        const fn = Uint8Array.prototype.lastIndexOf;
+        if (position !== undefined) {
+            return fn.call(this, searchString, position);
+        }
+        return fn.call(this, searchString);
+    }
+    startsWith(searchString, position) {
+        return this.s().startsWith(searchString, position);
+    }
+    endsWith(searchString, endPosition) {
+        return this.s().endsWith(searchString, endPosition);
+    }
+    match(regexp) {
+        return this.s().match(regexp);
+    }
+    replace(searchValue, replaceValue) {
+        return this.s().replace(searchValue, replaceValue);
+    }
+    search(regexp) {
+        return this.s().search(regexp);
+    }
+    split(separator, limit) {
+        return this.s().split(separator, limit);
+    }
+    substring(start, end) {
+        return this.s().substring(start, end);
+    }
+    trim() {
+        return this.s().trim();
+    }
+    trimStart() {
+        return this.s().trimStart();
+    }
+    trimEnd() {
+        return this.s().trimEnd();
+    }
+    charAt(pos) {
+        return this.s().charAt(pos);
+    }
+    charCodeAt(index) {
+        return this.s().charCodeAt(index);
+    }
+    padStart(maxLength, fillString) {
+        return this.s().padStart(maxLength, fillString);
+    }
+    padEnd(maxLength, fillString) {
+        return this.s().padEnd(maxLength, fillString);
+    }
+    repeat(count) {
+        return this.s().repeat(count);
+    }
+    toUpperCase() {
+        return this.s().toUpperCase();
+    }
+    toLowerCase() {
+        return this.s().toLowerCase();
+    }
+    s() {
+        if (this.string == null) {
+            const n = Date.now();
+            if (n > warned + 60_000) {
+                console.warn("@aws-sdk/core/protocols - WARN - JsonCodec2: you have called a string method on a Uint8Array request body. " +
+                    "It has been automatically converted to string. In a future version this will throw an error.");
+                warned = n;
+            }
+            this.string = toUtf8(this);
+        }
+        return this.string;
+    }
+}
+var warned = 0;
+
 const encoder = new TextEncoder();
 const OPEN_BRACE = 0x7b;
 const CLOSE_BRACE = 0x7d;
@@ -1209,7 +1333,7 @@ for (let i = 0; i < 0x20; i++) {
 }
 const INITIAL_BUFFER_SIZE = 2048;
 function alloc(size) {
-    return typeof Buffer !== "undefined" ? Buffer.allocUnsafe(size) : new Uint8Array(size);
+    return JsonBytesStringAdapter.allocUnsafe(size);
 }
 class JsonShapeSerializer2 extends SerdeContextConfig {
     settings;
@@ -1227,10 +1351,7 @@ class JsonShapeSerializer2 extends SerdeContextConfig {
         this.i = 0;
         this.rawValue = value;
         this.rootSchema = NormalizedSchema.of(schema);
-        this.passthrough =
-            !this.rootSchema.isStructSchema() &&
-                !this.rootSchema.isDocumentSchema() &&
-                (this.rootSchema.isBlobSchema() || this.rootSchema.isStringSchema());
+        this.passthrough = this.rootSchema.isBlobSchema() || this.rootSchema.isStringSchema();
         if (!this.passthrough) {
             this.writeValue(this.rootSchema, value, undefined);
         }
@@ -1240,30 +1361,13 @@ class JsonShapeSerializer2 extends SerdeContextConfig {
         this.rootSchema = NormalizedSchema.of(schema);
         const ns = this.rootSchema;
         if (ns.isStructSchema() && value != null && typeof value === "object") {
-            this.ensure(2);
-            this.json[this.i++] = OPEN_BRACE;
-            this.writeAsciiQuoted("__type");
-            this.json[this.i++] = COLON;
-            this.writeAsciiQuoted(ns.getName(true) ?? "Unknown");
-            let wroteAny = true;
-            const { jsonName } = this.settings;
-            for (const [memberName, memberSchema] of ns.structIterator()) {
-                const item = value[memberName];
-                if (item == null && !memberSchema.isIdempotencyToken()) {
-                    continue;
-                }
-                if (wroteAny) {
-                    this.ensure(1);
-                    this.json[this.i++] = COMMA;
-                }
-                const targetKey = jsonName ? (memberSchema.getMergedTraits().jsonName ?? memberName) : memberName;
-                this.writeAsciiQuoted(targetKey);
-                this.json[this.i++] = COLON;
-                this.writeValue(memberSchema, item, ns);
-                wroteAny = true;
-            }
-            this.ensure(1);
-            this.json[this.i++] = CLOSE_BRACE;
+            this.writeValue(ns, value, undefined);
+            const prefix = `"__type":"${ns.getName(true) ?? "Unknown"}",`;
+            const z = prefix.length;
+            this.ensure(z);
+            this.json.copyWithin(1 + z, 1, this.i);
+            encoder.encodeInto(prefix, this.json.subarray(1));
+            this.i += z;
         }
         else {
             this.writeValue(ns, value, undefined);
@@ -1316,7 +1420,7 @@ class JsonShapeSerializer2 extends SerdeContextConfig {
         this.i = i;
     }
     writeJsonString(s) {
-        this.ensure(s.length * 2 + 2);
+        this.ensure(s.length * 3 + 2);
         this.json[this.i++] = QUOTE;
         const z = s.length;
         for (let j = 0; j < z; ++j) {
@@ -1343,7 +1447,7 @@ class JsonShapeSerializer2 extends SerdeContextConfig {
                     this.ensure(4);
                     const { written } = encoder.encodeInto(s.substring(j, j + 2), this.json.subarray(this.i));
                     this.i += written;
-                    j++;
+                    ++j;
                 }
                 else {
                     this.ensure(6);
@@ -1383,8 +1487,9 @@ class JsonShapeSerializer2 extends SerdeContextConfig {
     static B64 = (() => {
         const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
         const table = new Uint8Array(64);
-        for (let i = 0; i < 64; i++)
+        for (let i = 0; i < 64; ++i) {
             table[i] = chars.charCodeAt(i);
+        }
         return table;
     })();
     writeBase64(data) {
@@ -1511,14 +1616,16 @@ class JsonShapeSerializer2 extends SerdeContextConfig {
         }
         if (typeof value === "boolean") {
             this.ensure(5);
+            let { i, json } = this;
             if (value) {
-                this.json.set(TRUE, this.i);
-                this.i += 4;
+                json.set(TRUE, i);
+                i += 4;
             }
             else {
-                this.json.set(FALSE, this.i);
-                this.i += 5;
+                json.set(FALSE, i);
+                i += 5;
             }
+            this.i = i;
             return;
         }
         if (typeof value === "bigint") {
@@ -1530,7 +1637,6 @@ class JsonShapeSerializer2 extends SerdeContextConfig {
     writeStruct(ns, value) {
         this.ensure(2);
         this.json[this.i++] = OPEN_BRACE;
-        let first = true;
         let wroteAny = false;
         const hasType = typeof value.__type === "string";
         let writtenKeys;
@@ -1539,13 +1645,13 @@ class JsonShapeSerializer2 extends SerdeContextConfig {
         }
         for (const [memberName, memberSchema] of ns.structIterator()) {
             const item = value[memberName];
-            if (item == null && !memberSchema.isIdempotencyToken())
+            if (item == null && !memberSchema.isIdempotencyToken()) {
                 continue;
-            if (!first) {
+            }
+            if (wroteAny) {
                 this.ensure(1);
                 this.json[this.i++] = COMMA;
             }
-            first = false;
             wroteAny = true;
             const targetKey = this.settings.jsonName ? (memberSchema.getMergedTraits().jsonName ?? memberName) : memberName;
             if (writtenKeys) {
@@ -1568,17 +1674,17 @@ class JsonShapeSerializer2 extends SerdeContextConfig {
         }
         else if (hasType) {
             for (const k in value) {
-                const targetKey = this.settings.jsonName ? (writtenKeys.has(k) ? k : k) : k;
-                if (writtenKeys.has(targetKey))
+                if (writtenKeys.has(k)) {
                     continue;
-                writtenKeys.add(targetKey);
+                }
+                writtenKeys.add(k);
                 const v = value[k];
-                if (!first) {
+                if (wroteAny) {
                     this.ensure(1);
                     this.json[this.i++] = COMMA;
                 }
-                first = false;
-                this.writeAsciiQuoted(targetKey);
+                wroteAny = true;
+                this.writeAsciiQuoted(k);
                 this.ensure(1);
                 this.json[this.i++] = COLON;
                 this.writeValue(15, v, undefined);
@@ -1588,20 +1694,30 @@ class JsonShapeSerializer2 extends SerdeContextConfig {
         this.json[this.i++] = CLOSE_BRACE;
     }
     writeList(ns, value, isDocument) {
-        this.ensure(2);
-        this.json[this.i++] = OPEN_BRACKET;
         const sparse = !!ns.getMergedTraits().sparse;
         const valueSchema = ns.getValueSchema();
+        if (!isDocument) {
+            if (valueSchema.isStringSchema() || valueSchema.isNumericSchema() || valueSchema.isBooleanSchema()) {
+                const json = sparse ? JSON.stringify(value) : JSON.stringify(value.filter((_) => _ != null));
+                this.ensure(json.length * 3);
+                this.i += encoder.encodeInto(json, this.json.subarray(this.i)).written;
+                return;
+            }
+        }
+        this.ensure(2);
+        this.json[this.i++] = OPEN_BRACKET;
+        let wroteFirstItem = false;
         for (let i = 0; i < value.length; ++i) {
             const item = value[i];
             if (isDocument ? item === undefined : item == null && !sparse) {
                 continue;
             }
-            if (i !== 0) {
+            if (wroteFirstItem) {
                 this.ensure(1);
                 this.json[this.i++] = COMMA;
             }
             this.writeValue(valueSchema, item, undefined);
+            wroteFirstItem = true;
         }
         this.ensure(1);
         this.json[this.i++] = CLOSE_BRACKET;
@@ -1623,8 +1739,7 @@ class JsonShapeSerializer2 extends SerdeContextConfig {
                 }
                 const json = JSON.stringify(input);
                 this.ensure(json.length * 3);
-                const { written } = encoder.encodeInto(json, this.json.subarray(this.i));
-                this.i += written;
+                this.i += encoder.encodeInto(json, this.json.subarray(this.i)).written;
                 return;
             }
         }

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v2/JsonBytesStringAdapter.js

@@ -0,0 +1,103 @@
+import { toUtf8 } from "@smithy/core/serde";
+export class JsonBytesStringAdapter extends Uint8Array {
+    string = null;
+    static allocUnsafe(bytes) {
+        if (typeof Buffer === "function") {
+            const buffer = Buffer.allocUnsafe(bytes);
+            return new JsonBytesStringAdapter(buffer.buffer, buffer.byteOffset, buffer.byteLength);
+        }
+        return new JsonBytesStringAdapter(bytes);
+    }
+    toString() {
+        return this.s();
+    }
+    valueOf() {
+        return this.s();
+    }
+    includes(searchString, position) {
+        if (typeof searchString === "string") {
+            return this.s().includes(searchString, position);
+        }
+        return Uint8Array.prototype.includes.call(this, searchString, position);
+    }
+    indexOf(searchString, position) {
+        if (typeof searchString === "string") {
+            return this.s().indexOf(searchString, position);
+        }
+        return Uint8Array.prototype.indexOf.call(this, searchString, position);
+    }
+    lastIndexOf(searchString, position) {
+        if (typeof searchString === "string") {
+            return this.s().lastIndexOf(searchString, position);
+        }
+        const fn = Uint8Array.prototype.lastIndexOf;
+        if (position !== undefined) {
+            return fn.call(this, searchString, position);
+        }
+        return fn.call(this, searchString);
+    }
+    startsWith(searchString, position) {
+        return this.s().startsWith(searchString, position);
+    }
+    endsWith(searchString, endPosition) {
+        return this.s().endsWith(searchString, endPosition);
+    }
+    match(regexp) {
+        return this.s().match(regexp);
+    }
+    replace(searchValue, replaceValue) {
+        return this.s().replace(searchValue, replaceValue);
+    }
+    search(regexp) {
+        return this.s().search(regexp);
+    }
+    split(separator, limit) {
+        return this.s().split(separator, limit);
+    }
+    substring(start, end) {
+        return this.s().substring(start, end);
+    }
+    trim() {
+        return this.s().trim();
+    }
+    trimStart() {
+        return this.s().trimStart();
+    }
+    trimEnd() {
+        return this.s().trimEnd();
+    }
+    charAt(pos) {
+        return this.s().charAt(pos);
+    }
+    charCodeAt(index) {
+        return this.s().charCodeAt(index);
+    }
+    padStart(maxLength, fillString) {
+        return this.s().padStart(maxLength, fillString);
+    }
+    padEnd(maxLength, fillString) {
+        return this.s().padEnd(maxLength, fillString);
+    }
+    repeat(count) {
+        return this.s().repeat(count);
+    }
+    toUpperCase() {
+        return this.s().toUpperCase();
+    }
+    toLowerCase() {
+        return this.s().toLowerCase();
+    }
+    s() {
+        if (this.string == null) {
+            const n = Date.now();
+            if (n > warned + 60_000) {
+                console.warn("@aws-sdk/core/protocols - WARN - JsonCodec2: you have called a string method on a Uint8Array request body. " +
+                    "It has been automatically converted to string. In a future version this will throw an error.");
+                warned = n;
+            }
+            this.string = toUtf8(this);
+        }
+        return this.string;
+    }
+}
+var warned = 0;