dcl-ops-lib 9.8.0 → 9.9.1

package/README.md

@@ -2,6 +2,13 @@
 
 Used to compile pulumi projects
 
+## Releases
+
+Published to npm as `dcl-ops-lib` by GitHub Actions (`.github/workflows/release.yml`)
+via semantic-release, using npm OIDC trusted publishing:
+
+- push to `master` → stable release on the `latest` dist-tag
+- push to `next` → prerelease on the `next` dist-tag
 
 # License
 Published under Apache-2.0

package/StaticWebsite.d.ts

@@ -33,4 +33,13 @@ export type StaticWebsite = {
     responseHeadersPolicyId?: Input<string>;
     objectOwnership?: string;
     overrideContentBucketACL?: string;
+    /**
+     * Tags applied to the content bucket, logs bucket and CloudFront distribution.
+     * Optional: when omitted, no tags are set by buildStatic (existing behavior).
+     *
+     * When provided, each resource receives a default `Name` derived from the domain
+     * (content bucket & distribution: `<domain>`, logs bucket: `<domain>-logs`); a
+     * `Name` supplied here overrides that default.
+     */
+    tags?: Record<string, Input<string>>;
 };

package/buildStatic.js

@@ -20,6 +20,13 @@ function buildStatic(staticSite) {
         additionalDomains: staticSite.additionalDomains ? staticSite.additionalDomains : [],
     };
     const slug = staticSite.domain.replace(/\./g, "-") + "-";
+    // Tags for each resource. When the caller opts into tagging we default a per-resource
+    // `Name` derived from the domain (caller-provided `Name` wins). When `tags` is omitted
+    // the value stays `undefined`, preserving the original untagged behavior.
+    const makeTags = (name) => staticSite.tags && { Name: name, ...staticSite.tags };
+    const contentBucketTags = makeTags(staticSite.domain);
+    const logsBucketTags = makeTags(`${staticSite.domain}-logs`);
+    const cdnTags = makeTags(staticSite.domain);
     // contentBucket is the S3 bucket that the website's contents will be stored in.
     const bucketInfo = {
         acl: staticSite.overrideContentBucketACL ? staticSite.overrideContentBucketACL : "public-read",
@@ -29,7 +36,8 @@ function buildStatic(staticSite) {
             indexDocument: "index.html",
             errorDocument: staticSite.defaultPath ?? "404.html",
         },
-        forceDestroy: staticSite.destroy === true
+        forceDestroy: staticSite.destroy === true,
+        tags: contentBucketTags,
     };
     if (staticSite.corsRules !== undefined) {
         Object.assign(bucketInfo, { corsRules: staticSite.corsRules });
@@ -48,7 +56,8 @@ function buildStatic(staticSite) {
     // logsBucket is an S3 bucket that will contain the CDN's request logs.
     const logsBucket = new aws.s3.Bucket(slug + "logs", {
         acl: "private",
-        forceDestroy: staticSite.destroy === true
+        forceDestroy: staticSite.destroy === true,
+        tags: logsBucketTags,
     }, {
         protect,
     });
@@ -88,15 +97,19 @@ function buildStatic(staticSite) {
             },
             cachePolicyId: staticSite.cachePolicyId,
             responseHeadersPolicyId: staticSite.responseHeadersPolicyId,
-            minTtl: 0,
-            defaultTtl: tenMinutes,
-            maxTtl: aYear,
+            // Only set the legacy inline TTLs when there is no cache policy. When a
+            // cachePolicyId is provided the policy governs TTLs and CloudFront ignores
+            // these, so setting them produces a permanent no-op diff (0 => 600 / 0 => aYear)
+            // on every preview. Mirrors the forwardedValues handling above.
+            minTtl: staticSite.cachePolicyId ? undefined : 0,
+            defaultTtl: staticSite.cachePolicyId ? undefined : tenMinutes,
+            maxTtl: staticSite.cachePolicyId ? undefined : aYear,
             compress: true,
         },
         // "All" is the most broad distribution, and also the most expensive.
         // "100" is the least broad, and also the least expensive.
         priceClass: staticSite.priceClass || "PriceClass_100",
-        // You can customize error responses. When CloudFront recieves an error from the origin (e.g. S3 or some other
+        // You can customize error responses. When CloudFront receives an error from the origin (e.g. S3 or some other
         // web service) it can return a different error code, and return the response for a different resource.
         customErrorResponses: [{ errorCode: 404, responseCode: 404, responsePagePath: "/404.html" }],
         restrictions: {
@@ -113,6 +126,7 @@ function buildStatic(staticSite) {
             includeCookies: false,
             prefix: `${config.targetDomain}/`,
         },
+        tags: cdnTags,
     };
     const cdn = new aws.cloudfront.Distribution(slug + "cdn", distributionArgs);
     // Creates a new Route53 DNS record pointing the domain to the CloudFront distribution.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcl-ops-lib",
-  "version": "9.8.0",
+  "version": "9.9.1",
   "scripts": {
     "build": "tsc && cp bin/* . && node test.js",
     "test": "tsc -p tsconfig.test.json && ENVIRONMENT=dev node bin-test/rateLimiting.test.js",
@@ -21,14 +21,12 @@
         "name": "next",
         "prerelease": true
       }
-    ],
-    "extends": "@semantic-release/gitlab-config"
+    ]
   },
   "devDependencies": {
-    "@semantic-release/gitlab-config": "^14.0.1",
     "@types/mime": "^3.0.4",
     "@types/node": "20.9.3",
-    "semantic-release": "^24.2.9",
+    "semantic-release": "^25.0.5",
     "typescript": "5.3.2"
   },
   "dependencies": {