@quadnix/octo-aws-cdk 0.2.0 → 0.2.1

package/dist/resources/s3-website/s3-website.resource.js

@@ -18,8 +18,8 @@ let S3Website = class S3Website extends ATerraformResource {
     /**
      * @internal
      */
-    constructor(resourceId, properties, parents = []) {
-        super(resourceId, properties, parents);
+    constructor(resourceId, properties) {
+        super(resourceId, properties, []);
         this.manifest = {};
         this.sourcePathDigests = {};
     }
@@ -32,46 +32,16 @@ let S3Website = class S3Website extends ATerraformResource {
         s3Website.sourcePathDigests = digests ? { ...digests } : {};
         return s3Website;
     }
-    /**
-     * Admits one CloudFront distribution to this bucket.
-     *
-     * The grant is a statement in the policy this bucket already owns, rather than a policy of the
-     * distribution's own: `aws_s3_bucket_policy` writes a bucket's whole policy, so two of them
-     * pointed at one bucket would take turns overwriting each other. Adding a statement leaves every
-     * other statement alone, and dropping a distribution drops only its own.
-     *
-     * The statement names the distribution by ARN, which AWS assigns, so this bucket becomes the
-     * distribution's child and reads it as a reference. The distribution does not reference the bucket
-     * back - it writes this bucket's hostname down instead - because two folders referencing each
-     * other is a cycle terragrunt cannot order.
-     *
-     * @internal
-     */
-    addCloudFrontAccess(distribution) {
-        const distributionResourceId = distribution.getActual().resourceId;
-        if (this.properties.distributionResourceIds.includes(distributionResourceId)) {
-            return;
-        }
-        const { childToParentDependency, parentToChildDependency } = distribution.addChild('resourceId', this, 'resourceId');
-        childToParentDependency.addBehavior('update-cloudfront-access', DiffAction.UPDATE, 'resourceId', DiffAction.ADD);
-        parentToChildDependency.addBehavior('resourceId', DiffAction.DELETE, 'update-cloudfront-access', DiffAction.UPDATE);
-        this.properties.distributionResourceIds.push(distributionResourceId);
-    }
     /**
      * @internal
      */
     async diffProperties(previous) {
-        if (!DiffUtility.isObjectDeepEquals(previous.properties, this.properties, ['distributionResourceIds'])) {
+        if (!DiffUtility.isObjectDeepEquals(previous.properties, this.properties)) {
             return [
                 new Diff(this, DiffAction.REPLACE, 'resourceId', this.getContext(), 'Bucket is force-new on aws_s3_bucket; a change recreates the bucket'),
             ];
         }
         const diffs = [];
-        // Putting a distribution in front of the bucket, or taking one away, rewrites how the bucket is
-        // reached and who may read it, without touching the bucket itself.
-        if (!DiffUtility.isObjectDeepEquals({ distributionResourceIds: [...previous.properties.distributionResourceIds].sort() }, { distributionResourceIds: [...this.properties.distributionResourceIds].sort() })) {
-            diffs.push(new Diff(this, DiffAction.UPDATE, 'update-cloudfront-access', [...this.properties.distributionResourceIds]));
-        }
         // Only propose a content update when the digests differ from what was last committed.
         if (!DiffUtility.isObjectDeepEquals(previous.sourcePathDigests, this.sourcePathDigests)) {
             diffs.push(new Diff(this, DiffAction.UPDATE, 'update-source-paths', JSON.parse(JSON.stringify(this.manifest))));
@@ -115,57 +85,33 @@ let S3Website = class S3Website extends ATerraformResource {
             awsRegionId: this.properties.awsRegionId,
             RegionalDomainName: terraform.raw(`${s3WebsiteTFResource.address}.bucket_regional_domain_name`),
         });
-        // A bucket with nothing in front of it is reached directly, and a bucket with a distribution in
-        // front of it is reached through that. There is no third way, and no separate input saying so.
-        const isPublic = this.properties.distributionResourceIds.length === 0;
-        // A website endpoint is reachable only over plain HTTP and only from a public bucket, so it is
-        // emitted for a public bucket alone. Behind a distribution the same two documents are served
-        // through its root object and error responses.
-        if (isPublic) {
-            s3WebsiteOctoResource.addTerraformResource('aws_s3_bucket_website_configuration', `${this.resourceId}_website_bucket_config`, {
-                bucket: terraform.raw(`${s3WebsiteTFResource.address}.id`),
-                error_document: { key: this.properties.ErrorDocument },
-                index_document: { suffix: this.properties.IndexDocument },
-            });
-        }
+        // A website endpoint is public and plain HTTP by nature: anyone may read the bucket.
+        s3WebsiteOctoResource.addTerraformResource('aws_s3_bucket_website_configuration', `${this.resourceId}_website_bucket_config`, {
+            bucket: terraform.raw(`${s3WebsiteTFResource.address}.id`),
+            error_document: { key: this.properties.ErrorDocument },
+            index_document: { suffix: this.properties.IndexDocument },
+        });
         s3WebsiteOctoResource.addTerraformResource('aws_s3_bucket_public_access_block', `${this.resourceId}_website_bucket_public_access`, {
-            block_public_acls: !isPublic,
-            block_public_policy: !isPublic,
+            block_public_acls: false,
+            block_public_policy: false,
             bucket: terraform.raw(`${s3WebsiteTFResource.address}.id`),
-            ignore_public_acls: !isPublic,
-            restrict_public_buckets: !isPublic,
+            ignore_public_acls: false,
+            restrict_public_buckets: false,
         });
-        // One policy, whatever is reading the bucket. A public bucket is one anonymous statement; a
-        // closed one is a statement per distribution, each naming that distribution alone, so no other
-        // distribution can read the bucket by pointing at it.
-        const statements = isPublic
-            ? [
-                {
-                    Action: ['s3:GetObject'],
-                    Effect: 'Allow',
-                    Principal: '*',
-                    Resource: [terraform.raw(`"\${${s3WebsiteTFResource.address}.arn}/*"`)],
-                    Sid: PolicyUtility.getSafeSid('PublicReadGetObject'),
-                },
-            ]
-            : this.properties.distributionResourceIds.map((distributionResourceId) => {
-                const distribution = this.parents.find((p) => p.getActual().resourceId === distributionResourceId);
-                return {
-                    Action: ['s3:GetObject'],
-                    Condition: {
-                        StringEquals: {
-                            'AWS:SourceArn': terraform.getRef(distribution, 'Arn'),
-                        },
-                    },
-                    Effect: 'Allow',
-                    Principal: { Service: 'cloudfront.amazonaws.com' },
-                    Resource: [terraform.raw(`"\${${s3WebsiteTFResource.address}.arn}/*"`)],
-                    Sid: PolicyUtility.getSafeSid(`AllowCloudFrontRead-${distributionResourceId}`),
-                };
-            });
         s3WebsiteOctoResource.addTerraformResource('aws_s3_bucket_policy', `${this.resourceId}_website_bucket_policy`, {
             bucket: terraform.raw(`${s3WebsiteTFResource.address}.id`),
-            policy: terraform.jsonencode({ Statement: statements, Version: '2012-10-17' }),
+            policy: terraform.jsonencode({
+                Statement: [
+                    {
+                        Action: ['s3:GetObject'],
+                        Effect: 'Allow',
+                        Principal: '*',
+                        Resource: [terraform.raw(`"\${${s3WebsiteTFResource.address}.arn}/*"`)],
+                        Sid: PolicyUtility.getSafeSid('PublicReadGetObject'),
+                    },
+                ],
+                Version: '2012-10-17',
+            }),
         });
         for (const [remotePath, { digest, filePath }] of Object.entries(this.manifest)) {
             if (digest === 'deleted') {
@@ -174,13 +120,14 @@ let S3Website = class S3Website extends ATerraformResource {
             const safeLabel = PolicyUtility.getSafeSid(remotePath);
             const contentType = mime.getType(remotePath) ?? 'application/octet-stream';
             const sourceHcl = terraform.localPath(filePath);
+            // Files upload in parallel: each waits only on the bucket it names.
             s3WebsiteOctoResource.addTerraformResource('aws_s3_object', `${this.resourceId}_file_${safeLabel}`, {
                 bucket: terraform.raw(`${s3WebsiteTFResource.address}.id`),
                 content_type: contentType,
                 etag: terraform.raw(`filemd5(${sourceHcl})`),
                 key: remotePath,
                 source: terraform.raw(sourceHcl),
-            });
+            }, { chain: false });
         }
         if (Object.keys(this.tags).length > 0) {
             s3WebsiteTFResource.attribute('tags', this.tags);
@@ -202,8 +149,8 @@ let S3Website = class S3Website extends ATerraformResource {
     }
 };
 S3Website = __decorate([
-    Resource('@octo', 's3-website', S3WebsiteSchema),
-    __metadata("design:paramtypes", [String, Object, Array])
+    Resource('@octo', 's3-website', S3WebsiteSchema, { uniqueProperties: [{ path: 'Bucket', within: [] }] }),
+    __metadata("design:paramtypes", [String, Object])
 ], S3Website);
 export { S3Website };
 //# sourceMappingURL=s3-website.resource.js.map

package/dist/resources/s3-website/s3-website.resource.js.map

@@ -1 +1 @@
-{"version":3,"file":"s3-website.resource.js","sourceRoot":"","sources":["../../../src/resources/s3-website/s3-website.resource.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACL,SAAS,EACT,kBAAkB,EAElB,IAAI,EACJ,UAAU,EACV,WAAW,EAEX,QAAQ,GAET,MAAM,eAAe,CAAC;AACvB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EAAE,eAAe,EAAkC,MAAM,mBAAmB,CAAC;AAOpF;;GAEG;AAEI,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,kBAA8C;IAQ3E;;OAEG;IACH,YACE,UAAkB,EAClB,UAAyC,EACzC,UAAyD,EAAE;QAE3D,KAAK,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QAZxB,aAAQ,GAAc,EAAE,CAAC;QAElC,sBAAiB,GAAyC,EAAE,CAAC;IAWrE,CAAC;IAED;;OAEG;IACH,MAAM,CAAU,KAAK,CAAC,OAAO,CAC3B,oBAAyB,EACzB,QAAW,EACX,mBAAqF;QAErF,MAAM,SAAS,GAAG,CAAC,MAAM,KAAK,CAAC,OAAO,CAAC,oBAAoB,EAAE,QAAQ,EAAE,mBAAmB,CAAC,CAAc,CAAC;QAC1G,MAAM,OAAO,GAAI,QAAuC,CAAC,iBAAiB,CAAC;QAC3E,SAAS,CAAC,iBAAiB,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,OAAO,SAAc,CAAC;IACxB,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,mBAAmB,CAAC,YAAyD;QAC3E,MAAM,sBAAsB,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC;QACnE,IAAI,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAC7E,OAAO;QACT,CAAC;QAED,MAAM,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,GAAG,YAAY,CAAC,QAAQ,CAChF,YAAY,EACZ,IAAI,EACJ,YAAY,CACb,CAAC;QACF,uBAAuB,CAAC,WAAW,CAAC,0BAA0B,EAAE,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;QACjH,uBAAuB,CAAC,WAAW,CAAC,YAAY,EAAE,UAAU,CAAC,MAAM,EAAE,0BAA0B,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;QAEpH,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IACvE,CAAC;IAED;;OAEG;IACM,KAAK,CAAC,cAAc,CAAC,QAAmB;QAC/C,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,yBAAyB,CAAC,CAAC,EAAE,CAAC;YACvG,OAAO;gBACL,IAAI,IAAI,CACN,IAAI,EACJ,UAAU,CAAC,OAAO,EAClB,YAAY,EACZ,IAAI,CAAC,UAAU,EAAE,EACjB,qEAAqE,CACtE;aACF,CAAC;QACJ,CAAC;QAED,MAAM,KAAK,GAAW,EAAE,CAAC;QAEzB,gGAAgG;QAChG,mEAAmE;QACnE,IACE,CAAC,WAAW,CAAC,kBAAkB,CAC7B,EAAE,uBAAuB,EAAE,CAAC,GAAG,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,IAAI,EAAE,EAAE,EACpF,EAAE,uBAAuB,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,IAAI,EAAE,EAAE,CACjF,EACD,CAAC;YACD,KAAK,CAAC,IAAI,CACR,IAAI,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,0BAA0B,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,CAC5G,CAAC;QACJ,CAAC;QAED,sFAAsF;QACtF,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,QAAQ,CAAC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACxF,KAAK,CAAC,IAAI,CACR,IAAI,IAAI,CACN,IAAI,EACJ,UAAU,CAAC,MAAM,EACjB,qBAAqB,EACrB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAC1C,CACF,CAAC;QACJ,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACM,UAAU,CAAC,IAAU;QAC5B,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,KAAK,YAAY,EAAE,CAAC;YAClE,MAAM,KAAK,GAAW,CAAC,IAAI,CAAC,CAAC;YAE7B,IAAI,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3D,KAAK,CAAC,IAAI,CACR,IAAI,IAAI,CACN,IAAI,EACJ,UAAU,CAAC,MAAM,EACjB,qBAAqB,EACrB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAC1C,CACF,CAAC;YACJ,CAAC;YAED,OAAO,KAAK,CAAC;QACf,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC;IACH,CAAC;IAED;;OAEG;IACM,KAAK;QACZ,OAAO;YACL,GAAG,KAAK,CAAC,KAAK,EAAE;YAChB,iBAAiB,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SACtE,CAAC;IACJ,CAAC;IAED;;OAEG;IACM,KAAK,CAAC,KAAK,CAAC,SAA+B;QAClD,MAAM,qBAAqB,GAAG,SAAS,CAAC,wBAAwB,CAAC,IAAiB,EAAE;YAClF,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE;SAC7F,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,oBAAoB,CACpE,eAAe,EACf,GAAG,IAAI,CAAC,UAAU,iBAAiB,EACnC,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CACnC,CAAC;QACF,qBAAqB,CAAC,MAAM,CAAC;YAC3B,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,mBAAmB,CAAC,OAAO,MAAM,CAAC;YACxD,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW;YACxC,kBAAkB,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,mBAAmB,CAAC,OAAO,8BAA8B,CAAC;SAChG,CAAC,CAAC;QAEH,gGAAgG;QAChG,+FAA+F;QAC/F,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,MAAM,KAAK,CAAC,CAAC;QAEtE,+FAA+F;QAC/F,6FAA6F;QAC7F,+CAA+C;QAC/C,IAAI,QAAQ,EAAE,CAAC;YACb,qBAAqB,CAAC,oBAAoB,CACxC,qCAAqC,EACrC,GAAG,IAAI,CAAC,UAAU,wBAAwB,EAC1C;gBACE,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,mBAAmB,CAAC,OAAO,KAAK,CAAC;gBAC1D,cAAc,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE;gBACtD,cAAc,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE;aAC1D,CACF,CAAC;QACJ,CAAC;QAED,qBAAqB,CAAC,oBAAoB,CACxC,mCAAmC,EACnC,GAAG,IAAI,CAAC,UAAU,+BAA+B,EACjD;YACE,iBAAiB,EAAE,CAAC,QAAQ;YAC5B,mBAAmB,EAAE,CAAC,QAAQ;YAC9B,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,mBAAmB,CAAC,OAAO,KAAK,CAAC;YAC1D,kBAAkB,EAAE,CAAC,QAAQ;YAC7B,uBAAuB,EAAE,CAAC,QAAQ;SACnC,CACF,CAAC;QAEF,4FAA4F;QAC5F,+FAA+F;QAC/F,sDAAsD;QACtD,MAAM,UAAU,GAAG,QAAQ;YACzB,CAAC,CAAC;gBACE;oBACE,MAAM,EAAE,CAAC,cAAc,CAAC;oBACxB,MAAM,EAAE,OAAO;oBACf,SAAS,EAAE,GAAG;oBACd,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,mBAAmB,CAAC,OAAO,UAAU,CAAC,CAAC;oBACvE,GAAG,EAAE,aAAa,CAAC,UAAU,CAAC,qBAAqB,CAAC;iBACrD;aACF;YACH,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,sBAAsB,EAAE,EAAE;gBACrE,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,UAAU,KAAK,sBAAsB,CAAE,CAAC;gBAEpG,OAAO;oBACL,MAAM,EAAE,CAAC,cAAc,CAAC;oBACxB,SAAS,EAAE;wBACT,YAAY,EAAE;4BACZ,eAAe,EAAE,SAAS,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,CAAC;yBACvD;qBACF;oBACD,MAAM,EAAE,OAAO;oBACf,SAAS,EAAE,EAAE,OAAO,EAAE,0BAA0B,EAAE;oBAClD,QAAQ,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,mBAAmB,CAAC,OAAO,UAAU,CAAC,CAAC;oBACvE,GAAG,EAAE,aAAa,CAAC,UAAU,CAAC,uBAAuB,sBAAsB,EAAE,CAAC;iBAC/E,CAAC;YACJ,CAAC,CAAC,CAAC;QAEP,qBAAqB,CAAC,oBAAoB,CAAC,sBAAsB,EAAE,GAAG,IAAI,CAAC,UAAU,wBAAwB,EAAE;YAC7G,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,mBAAmB,CAAC,OAAO,KAAK,CAAC;YAC1D,MAAM,EAAE,SAAS,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;SAC/E,CAAC,CAAC;QAEH,KAAK,MAAM,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/E,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,SAAS;YACX,CAAC;YAED,MAAM,SAAS,GAAG,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YACvD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,0BAA0B,CAAC;YAC3E,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAChD,qBAAqB,CAAC,oBAAoB,CAAC,eAAe,EAAE,GAAG,IAAI,CAAC,UAAU,SAAS,SAAS,EAAE,EAAE;gBAClG,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,mBAAmB,CAAC,OAAO,KAAK,CAAC;gBAC1D,YAAY,EAAE,WAAW;gBACzB,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,WAAW,SAAS,GAAG,CAAC;gBAC5C,GAAG,EAAE,UAAU;gBACf,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC;aACjC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,mBAAmB,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,YAAuB;QACpC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;YAE9C,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC3C,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;YACzD,CAAC;QACH,CAAC;IACH,CAAC;CACF,CAAA;AA1QY,SAAS;IADrB,QAAQ,CAAY,OAAO,EAAE,YAAY,EAAE,eAAe,CAAC;;GAC/C,SAAS,CA0QrB"}
+{"version":3,"file":"s3-website.resource.js","sourceRoot":"","sources":["../../../src/resources/s3-website/s3-website.resource.ts"],"names":[],"mappings":"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"}

package/dist/resources/security-group/security-group.resource.js

@@ -9,6 +9,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { ATerraformResource, Diff, DiffAction, DiffUtility, Resource, } from '@quadnix/octo';
 import { SecurityGroupSchema } from './index.schema.js';
+/**
+ * The description AWS shows against a rule in the console. `-1` is every protocol on every port, so
+ * naming a port range there would describe a narrower rule than the one being created.
+ *
+ * @internal
+ */
+function describeRule(rule) {
+    return rule.IpProtocol === '-1'
+        ? `all traffic ${rule.CidrBlock}`
+        : `${rule.IpProtocol} ${rule.FromPort}-${rule.ToPort} ${rule.CidrBlock}`;
+}
 /**
  * @internal
  */
@@ -50,7 +61,7 @@ let SecurityGroup = class SecurityGroup extends ATerraformResource {
             const r = ingressRules[i];
             const spec = {
                 cidr_ipv4: r.CidrBlock,
-                description: `${r.IpProtocol} ${r.FromPort}-${r.ToPort} ${r.CidrBlock}`,
+                description: describeRule(r),
                 ip_protocol: r.IpProtocol,
                 security_group_id: terraform.raw(`${sgTFResource.address}.id`),
             };
@@ -64,7 +75,7 @@ let SecurityGroup = class SecurityGroup extends ATerraformResource {
             const r = egressRules[i];
             const spec = {
                 cidr_ipv4: r.CidrBlock,
-                description: `${r.IpProtocol} ${r.FromPort}-${r.ToPort} ${r.CidrBlock}`,
+                description: describeRule(r),
                 ip_protocol: r.IpProtocol,
                 security_group_id: terraform.raw(`${sgTFResource.address}.id`),
             };

package/dist/resources/security-group/security-group.resource.js.map

@@ -1 +1 @@
-{"version":3,"file":"security-group.resource.js","sourceRoot":"","sources":["../../../src/resources/security-group/security-group.resource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"security-group.resource.js","sourceRoot":"","sources":["../../../src/resources/security-group/security-group.resource.ts"],"names":[],"mappings":"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"}

package/dist/services/docker/docker.service.d.ts

@@ -1,3 +1,11 @@
+/**
+ * Receives each line docker prints, with the docker command and the stream it came from. A resource
+ * action passes its own `log()`.
+ */
+type DockerLog = (line: string, metadata: {
+    command: string;
+    stream: 'stderr' | 'stdout';
+}) => void;
 /**
  * Runs the local docker CLI on behalf of a resource action.
  *
@@ -14,31 +22,43 @@ export declare class DockerService {
      */
     constructor(dockerBinary: string);
     /**
-     * Builds `imageReference` from the given build context, as a single manifest.
+     * Builds `imageReference` for a docker `platform` from the given build context, as a single manifest.
      *
      * Provenance and SBOM attestations are off because they turn the result into an image index, and
      * pushing an index writes its tag twice - once for the manifest and once for the index. A
      * repository with immutable tags rejects the second write, having already been given the first,
      * which leaves the tag pointing at half a push. Both flags need a buildx-backed `docker build`.
      *
+     * @param imageReference The `<repository>:<tag>` the built image is tagged as.
+     * @param platform The platform the image is built for.
      * @param dockerfilePath Absolute path of the Dockerfile.
      * @param contextDirectory Absolute path of the build context.
+     * @param options What the build is given besides its context.
+     * @param options.buildArguments Values passed as `--build-arg`.
+     * @param options.buildSecrets Secret ids, each mapped to the environment variable docker reads it from.
+     * @param log Receives each line docker prints.
      */
-    build(imageReference: string, dockerfilePath: string, contextDirectory: string): Promise<void>;
+    build(imageReference: string, platform: 'linux/amd64' | 'linux/arm64', dockerfilePath: string, contextDirectory: string, options: {
+        buildArguments: Record<string, string>;
+        buildSecrets: Record<string, string>;
+    }, log: DockerLog): Promise<void>;
     /**
      * Authenticates the docker CLI against a registry.
      *
      * The password is written to the child's stdin rather than passed as an argument, so it never
-     * appears in the process list or in terraform's echo of the `local-exec` command.
+     * appears in the process list, in terraform's echo of the `local-exec` command, or in `log`.
      */
-    login(registryUri: string, username: string, password: string): Promise<void>;
+    login(registryUri: string, username: string, password: string, log: DockerLog): Promise<void>;
     /**
      * Pushes an already built image reference to its registry.
      */
-    push(imageReference: string): Promise<void>;
+    push(imageReference: string, log: DockerLog): Promise<void>;
     /**
-     * @throws If docker is not on the PATH, or exits non-zero. The error carries docker's own stderr,
-     * which is the only thing that explains a failed build.
+     * Runs docker, handing each line it prints to `log` as it is printed, and keeping only the last
+     * {@link STDERR_TAIL_LENGTH} characters of its stderr.
+     *
+     * @throws If docker is not on the PATH, or exits non-zero. The error carries the end of docker's own
+     * stderr, which is the only thing that explains a failed build.
      */
     private run;
 }
@@ -52,3 +72,4 @@ export declare class DockerServiceFactory {
      */
     static create(dockerBinary?: string): Promise<DockerService>;
 }
+export {};

package/dist/services/docker/docker.service.js

@@ -6,6 +6,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { spawn } from 'node:child_process';
 import { Factory } from '@quadnix/octo';
+/**
+ * How much of docker's stderr is kept for the error a failure throws. Every line it prints goes to
+ * the caller's log as it is printed.
+ */
+const STDERR_TAIL_LENGTH = 64 * 1024;
 /**
  * Runs the local docker CLI on behalf of a resource action.
  *
@@ -23,19 +28,29 @@ export class DockerService {
         this.dockerBinary = dockerBinary;
     }
     /**
-     * Builds `imageReference` from the given build context, as a single manifest.
+     * Builds `imageReference` for a docker `platform` from the given build context, as a single manifest.
      *
      * Provenance and SBOM attestations are off because they turn the result into an image index, and
      * pushing an index writes its tag twice - once for the manifest and once for the index. A
      * repository with immutable tags rejects the second write, having already been given the first,
      * which leaves the tag pointing at half a push. Both flags need a buildx-backed `docker build`.
      *
+     * @param imageReference The `<repository>:<tag>` the built image is tagged as.
+     * @param platform The platform the image is built for.
      * @param dockerfilePath Absolute path of the Dockerfile.
      * @param contextDirectory Absolute path of the build context.
+     * @param options What the build is given besides its context.
+     * @param options.buildArguments Values passed as `--build-arg`.
+     * @param options.buildSecrets Secret ids, each mapped to the environment variable docker reads it from.
+     * @param log Receives each line docker prints.
      */
-    async build(imageReference, dockerfilePath, contextDirectory) {
-        await this.run([
+    async build(imageReference, platform, dockerfilePath, contextDirectory, options, log) {
+        await this.run(log, [
             'build',
+            ...Object.entries(options.buildArguments).flatMap(([name, value]) => ['--build-arg', `${name}=${value}`]),
+            ...Object.entries(options.buildSecrets).flatMap(([id, variable]) => ['--secret', `id=${id},env=${variable}`]),
+            '--platform',
+            platform,
             '--provenance',
             'false',
             '--sbom',
@@ -51,37 +66,58 @@ export class DockerService {
      * Authenticates the docker CLI against a registry.
      *
      * The password is written to the child's stdin rather than passed as an argument, so it never
-     * appears in the process list or in terraform's echo of the `local-exec` command.
+     * appears in the process list, in terraform's echo of the `local-exec` command, or in `log`.
      */
-    async login(registryUri, username, password) {
-        await this.run(['login', '--username', username, '--password-stdin', registryUri], password);
+    async login(registryUri, username, password, log) {
+        await this.run(log, ['login', '--username', username, '--password-stdin', registryUri], password);
     }
     /**
      * Pushes an already built image reference to its registry.
      */
-    async push(imageReference) {
-        await this.run(['push', imageReference]);
+    async push(imageReference, log) {
+        await this.run(log, ['push', imageReference]);
     }
     /**
-     * @throws If docker is not on the PATH, or exits non-zero. The error carries docker's own stderr,
-     * which is the only thing that explains a failed build.
+     * Runs docker, handing each line it prints to `log` as it is printed, and keeping only the last
+     * {@link STDERR_TAIL_LENGTH} characters of its stderr.
+     *
+     * @throws If docker is not on the PATH, or exits non-zero. The error carries the end of docker's own
+     * stderr, which is the only thing that explains a failed build.
      */
-    run(args, stdin) {
+    run(log, args, stdin) {
         return new Promise((resolve, reject) => {
             const child = spawn(this.dockerBinary, args, { stdio: ['pipe', 'pipe', 'pipe'] });
-            let stdout = '';
-            let stderr = '';
-            child.stdout.on('data', (chunk) => (stdout += chunk.toString()));
-            child.stderr.on('data', (chunk) => (stderr += chunk.toString()));
+            // Log each whole line, holding back the end of a chunk until the line it starts is whole.
+            const partialLines = { stderr: '', stdout: '' };
+            let stderrTail = '';
+            for (const stream of ['stdout', 'stderr']) {
+                child[stream].setEncoding('utf8');
+                child[stream].on('data', (chunk) => {
+                    if (stream === 'stderr') {
+                        stderrTail = (stderrTail + chunk).slice(-STDERR_TAIL_LENGTH);
+                    }
+                    const lines = (partialLines[stream] + chunk).split('\n');
+                    partialLines[stream] = lines.pop();
+                    for (const line of lines) {
+                        log(line, { command: args[0], stream });
+                    }
+                });
+            }
             child.on('error', (error) => {
                 reject(new Error(`Could not run "${this.dockerBinary} ${args[0]}"! ${error.message}`));
             });
             child.on('close', (exitCode) => {
+                // Log what is left of each stream, which ended without a newline.
+                for (const stream of ['stdout', 'stderr']) {
+                    if (partialLines[stream]) {
+                        log(partialLines[stream], { command: args[0], stream });
+                    }
+                }
                 if (exitCode === 0) {
-                    resolve(stdout);
+                    resolve();
                 }
                 else {
-                    reject(new Error(`"${this.dockerBinary} ${args[0]}" exited with ${exitCode}!\n${stderr || stdout}`));
+                    reject(new Error(`"${this.dockerBinary} ${args[0]}" exited with ${exitCode}!\n${stderrTail}`));
                 }
             });
             if (stdin !== undefined) {

package/dist/services/docker/docker.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker.service.js","sourceRoot":"","sources":["../../../src/services/docker/docker.service.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC;;;;;;;;GAQG;AACH,MAAM,OAAO,aAAa;IACxB;;OAEG;IACH,YAA6B,YAAoB;QAApB,iBAAY,GAAZ,YAAY,CAAQ;IAAG,CAAC;IAErD;;;;;;;;;;OAUG;IACH,KAAK,CAAC,KAAK,CAAC,cAAsB,EAAE,cAAsB,EAAE,gBAAwB;QAClF,MAAM,IAAI,CAAC,GAAG,CAAC;YACb,OAAO;YACP,cAAc;YACd,OAAO;YACP,QAAQ;YACR,OAAO;YACP,QAAQ;YACR,cAAc;YACd,OAAO;YACP,cAAc;YACd,gBAAgB;SACjB,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,KAAK,CAAC,WAAmB,EAAE,QAAgB,EAAE,QAAgB;QACjE,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,kBAAkB,EAAE,WAAW,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC/F,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI,CAAC,cAAsB;QAC/B,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACK,GAAG,CAAC,IAAc,EAAE,KAAc;QACxC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;YAElF,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YACjE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YAEjE,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC1B,MAAM,CAAC,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YACzF,CAAC,CAAC,CAAC;YACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE;gBAC7B,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;oBACnB,OAAO,CAAC,MAAM,CAAC,CAAC;gBAClB,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,iBAAiB,QAAQ,MAAM,MAAM,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC;gBACvG,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC;YACD,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QACpB,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED;;GAEG;AAEI,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAG/B;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,eAAuB,QAAQ;QACjD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,aAAa,CAAC,YAAY,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF,CAAA;AAZY,oBAAoB;IADhC,OAAO,CAAgB,aAAa,CAAC;GACzB,oBAAoB,CAYhC"}
+{"version":3,"file":"docker.service.js","sourceRoot":"","sources":["../../../src/services/docker/docker.service.ts"],"names":[],"mappings":"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"}

package/dist/utilities/aws-region/aws-region.utility.d.ts

@@ -0,0 +1,15 @@
+/**
+ * @internal
+ */
+export declare class AwsRegionUtility {
+    /**
+     * Splits an octo region id naming one availability zone, `aws-us-east-1a`, into the zone,
+     * `us-east-1a`, and the AWS region it is in, `us-east-1`.
+     *
+     * @internal
+     */
+    static getRegionIdParts(regionId: string): {
+        awsRegionAZ: string;
+        awsRegionId: string;
+    };
+}

package/dist/utilities/aws-region/aws-region.utility.js

@@ -0,0 +1,19 @@
+/**
+ * @internal
+ */
+export class AwsRegionUtility {
+    /**
+     * Splits an octo region id naming one availability zone, `aws-us-east-1a`, into the zone,
+     * `us-east-1a`, and the AWS region it is in, `us-east-1`.
+     *
+     * @internal
+     */
+    static getRegionIdParts(regionId) {
+        const regionIdParts = regionId.split('-');
+        regionIdParts.shift();
+        const awsRegionAZ = regionIdParts.join('-');
+        const awsRegionId = awsRegionAZ.substring(0, awsRegionAZ.length - 1);
+        return { awsRegionAZ, awsRegionId };
+    }
+}
+//# sourceMappingURL=aws-region.utility.js.map

package/dist/utilities/aws-region/aws-region.utility.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"aws-region.utility.js","sourceRoot":"","sources":["../../../src/utilities/aws-region/aws-region.utility.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAC3B;;;;;OAKG;IACH,MAAM,CAAC,gBAAgB,CAAC,QAAgB;QACtC,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,aAAa,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACrE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;IACtC,CAAC;CACF"}

package/dist/utilities/file/file.utility.d.ts

@@ -2,10 +2,6 @@
  * @internal
  */
 export declare class FileUtility {
-    /**
-     * @internal
-     */
-    static base64Decode(base64EncodedString: string): string;
     /**
      * @internal
      */

package/dist/utilities/file/file.utility.js

@@ -6,12 +6,6 @@ import { join, parse, resolve } from 'path';
  * @internal
  */
 export class FileUtility {
-    /**
-     * @internal
-     */
-    static base64Decode(base64EncodedString) {
-        return Buffer.from(base64EncodedString, 'base64').toString('ascii');
-    }
     /**
      * @internal
      */

package/dist/utilities/file/file.utility.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.utility.js","sourceRoot":"","sources":["../../../src/utilities/file/file.utility.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,IAAI,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE5C;;GAEG;AACH,MAAM,OAAO,WAAW;IACtB;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,mBAA2B;QAC7C,OAAO,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACtE,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAgB;QAChC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;YAChC,MAAM,MAAM,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YAC1C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7C,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACjD,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,OAAe,EAAE,IAAI,GAAG,EAAE;QAC9D,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAE3B,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC1B,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC5C,OAAO,QAAQ,CAAC,WAAW,EAAE;gBAC3B,CAAC,CAAC,WAAW,CAAC,wBAAwB,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC;gBAC1D,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC,CAAC,CACH,CAAC;QACF,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;CACF"}
+{"version":3,"file":"file.utility.js","sourceRoot":"","sources":["../../../src/utilities/file/file.utility.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,IAAI,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE5C;;GAEG;AACH,MAAM,OAAO,WAAW;IACtB;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAgB;QAChC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;YAChC,MAAM,MAAM,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YAC1C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7C,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACjD,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,OAAe,EAAE,IAAI,GAAG,EAAE;QAC9D,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAE3B,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC1B,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC5C,OAAO,QAAQ,CAAC,WAAW,EAAE;gBAC3B,CAAC,CAAC,WAAW,CAAC,wBAAwB,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC;gBAC1D,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC,CAAC,CACH,CAAC;QACF,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;CACF"}

package/dist/utilities/retry/retry.utility.d.ts

@@ -9,18 +9,14 @@ interface IRetryOptions {
  * @internal
  */
 export declare class RetryUtility {
-    private static DEFAULT_BACK_OFF_FACTOR;
-    private static DEFAULT_INITIAL_DELAY_IN_MS;
-    private static DEFAULT_MAX_RETRIES;
-    private static DEFAULT_RETRY_DELAY_IN_MS;
-    private static DEFAULT_THROW_ON_ERROR;
+    private static readonly DEFAULT_BACK_OFF_FACTOR;
+    private static readonly DEFAULT_INITIAL_DELAY_IN_MS;
+    private static readonly DEFAULT_MAX_RETRIES;
+    private static readonly DEFAULT_RETRY_DELAY_IN_MS;
+    private static readonly DEFAULT_THROW_ON_ERROR;
     /**
      * @internal
      */
     static retryPromise(operation: () => Promise<boolean>, { backOffFactor, initialDelayInMs, maxRetries, retryDelayInMs, throwOnError, }?: IRetryOptions): Promise<void>;
-    /**
-     * @internal
-     */
-    static setDefaults(options: Partial<IRetryOptions>): void;
 }
 export {};

package/dist/utilities/retry/retry.utility.js

@@ -32,25 +32,5 @@ export class RetryUtility {
         } while (maxRetries >= 0);
         throw new Error('Exhausted all retries for the operation!');
     }
-    /**
-     * @internal
-     */
-    static setDefaults(options) {
-        if (options.backOffFactor !== undefined) {
-            this.DEFAULT_BACK_OFF_FACTOR = options.backOffFactor;
-        }
-        if (options.initialDelayInMs !== undefined) {
-            this.DEFAULT_INITIAL_DELAY_IN_MS = options.initialDelayInMs;
-        }
-        if (options.maxRetries !== undefined) {
-            this.DEFAULT_MAX_RETRIES = options.maxRetries;
-        }
-        if (options.retryDelayInMs !== undefined) {
-            this.DEFAULT_RETRY_DELAY_IN_MS = options.retryDelayInMs;
-        }
-        if (options.throwOnError !== undefined) {
-            this.DEFAULT_THROW_ON_ERROR = options.throwOnError;
-        }
-    }
 }
 //# sourceMappingURL=retry.utility.js.map

package/dist/utilities/retry/retry.utility.js.map

@@ -1 +1 @@
-{"version":3,"file":"retry.utility.js","sourceRoot":"","sources":["../../../src/utilities/retry/retry.utility.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,MAAM,OAAO,YAAY;aACR,4BAAuB,GAAG,CAAC,CAAC;aAC5B,gCAA2B,GAAG,KAAK,CAAC;aACpC,wBAAmB,GAAG,CAAC,CAAC;aACxB,8BAAyB,GAAG,KAAK,CAAC;aAClC,2BAAsB,GAAG,IAAI,CAAC;IAE7C;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,YAAY,CACvB,SAAiC,EACjC,EACE,aAAa,GAAG,YAAY,CAAC,uBAAuB,EACpD,gBAAgB,GAAG,YAAY,CAAC,2BAA2B,EAC3D,UAAU,GAAG,YAAY,CAAC,mBAAmB,EAC7C,cAAc,GAAG,YAAY,CAAC,yBAAyB,EACvD,YAAY,GAAG,YAAY,CAAC,sBAAsB,MACjC,EAAE;QAErB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAEtE,GAAG,CAAC;YACF,IAAI,CAAC;gBACH,MAAM,oBAAoB,GAAG,MAAM,SAAS,EAAE,CAAC;gBAC/C,IAAI,oBAAoB,EAAE,CAAC;oBACzB,OAAO;gBACT,CAAC;gBAED,UAAW,IAAI,CAAC,CAAC;gBACjB,cAAe,IAAI,aAAc,CAAC;YACpC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,YAAY,EAAE,CAAC;oBACjB,MAAM,KAAK,CAAC;gBACd,CAAC;YACH,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;YACtE,CAAC;QACH,CAAC,QAAQ,UAAW,IAAI,CAAC,EAAE;QAE3B,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,OAA+B;QAChD,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YACxC,IAAI,CAAC,uBAAuB,GAAG,OAAO,CAAC,aAAa,CAAC;QACvD,CAAC;QACD,IAAI,OAAO,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;YAC3C,IAAI,CAAC,2BAA2B,GAAG,OAAO,CAAC,gBAAgB,CAAC;QAC9D,CAAC;QACD,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACrC,IAAI,CAAC,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC;QAChD,CAAC;QACD,IAAI,OAAO,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACzC,IAAI,CAAC,yBAAyB,GAAG,OAAO,CAAC,cAAc,CAAC;QAC1D,CAAC;QACD,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACvC,IAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC,YAAY,CAAC;QACrD,CAAC;IACH,CAAC"}
+{"version":3,"file":"retry.utility.js","sourceRoot":"","sources":["../../../src/utilities/retry/retry.utility.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,MAAM,OAAO,YAAY;aACC,4BAAuB,GAAG,CAAC,CAAC;aAC5B,gCAA2B,GAAG,KAAK,CAAC;aACpC,wBAAmB,GAAG,CAAC,CAAC;aACxB,8BAAyB,GAAG,KAAK,CAAC;aAClC,2BAAsB,GAAG,IAAI,CAAC;IAEtD;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,YAAY,CACvB,SAAiC,EACjC,EACE,aAAa,GAAG,YAAY,CAAC,uBAAuB,EACpD,gBAAgB,GAAG,YAAY,CAAC,2BAA2B,EAC3D,UAAU,GAAG,YAAY,CAAC,mBAAmB,EAC7C,cAAc,GAAG,YAAY,CAAC,yBAAyB,EACvD,YAAY,GAAG,YAAY,CAAC,sBAAsB,MACjC,EAAE;QAErB,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAEtE,GAAG,CAAC;YACF,IAAI,CAAC;gBACH,MAAM,oBAAoB,GAAG,MAAM,SAAS,EAAE,CAAC;gBAC/C,IAAI,oBAAoB,EAAE,CAAC;oBACzB,OAAO;gBACT,CAAC;gBAED,UAAW,IAAI,CAAC,CAAC;gBACjB,cAAe,IAAI,aAAc,CAAC;YACpC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,YAAY,EAAE,CAAC;oBACjB,MAAM,KAAK,CAAC;gBACd,CAAC;YACH,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;YACtE,CAAC;QACH,CAAC,QAAQ,UAAW,IAAI,CAAC,EAAE;QAE3B,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC"}