dcl-ops-lib 9.9.1 → 9.9.3

package/buildStatic.js

@@ -44,6 +44,11 @@ function buildStatic(staticSite) {
     }
     const contentBucket = new aws.s3.Bucket(slug + "contentBucket", bucketInfo, {
         protect,
+        // buildStatic never sets the legacy bucket's inline `lifecycleRules`. Ignore that field
+        // so a standalone aws.s3.BucketLifecycleConfigurationV2 (defined by the consumer) can own
+        // the bucket lifecycle — otherwise this resource reads it back on refresh and deletes it,
+        // which flaps against the standalone resource on every `pulumi up`.
+        ignoreChanges: ["lifecycleRules"],
     });
     if (staticSite.objectOwnership) {
         new aws.s3.BucketOwnershipControls(`${contentBucket.bucket}OwnershipControls`, {
@@ -60,6 +65,9 @@ function buildStatic(staticSite) {
         tags: logsBucketTags,
     }, {
         protect,
+        // See contentBucket: ignore the legacy inline lifecycleRules so a standalone
+        // lifecycle resource can own it without flapping.
+        ignoreChanges: ["lifecycleRules"],
     });
     const distributionArgs = {
         enabled: true,

package/createFargateTask.js

@@ -272,8 +272,11 @@ async function createFargateTask(serviceName, dockerImage, dockerListeningPort,
         }
     }
     // NLB mappings: expose UDP/TCP ports via the shared Network Load Balancer
+    const nlbDnsDomains = new Set();
     for (let nlbMapping of nlbMappings) {
-        const exposedNlb = await (0, exposeNlbService_1.exposeNlbService)(`${serviceName}-${nlbMapping.port}-${version}`, hostname, nlbMapping.port, nlbMapping.protocol, vpc.id, nlbMapping.healthCheck, nlbMapping.separateDomain);
+        const nlbDnsDomain = nlbMapping.separateDomain || hostname;
+        const exposedNlb = await (0, exposeNlbService_1.exposeNlbService)(`${serviceName}-${nlbMapping.port}-${version}`, hostname, nlbMapping.port, nlbMapping.protocol, vpc.id, nlbMapping.healthCheck, nlbMapping.separateDomain, nlbDnsDomains.has(nlbDnsDomain));
+        nlbDnsDomains.add(nlbDnsDomain);
         targetGroups.push(exposedNlb.targetGroup);
         if (!extraPortMappings.find((p) => p.hostPort === nlbMapping.port)) {
             extraPortMappings.push({

package/exposeNlbService.d.ts

@@ -28,8 +28,9 @@ export type NLBMapping = {
  * @param vpcId VPC ID for the target group
  * @param healthCheck health check config for the NLB target group
  * @param separateDomain if provided, creates DNS on this domain instead of the main one
+ * @param skipDnsRecord skip the Cloudflare record (another mapping on the same domain already created it)
  */
-export declare function exposeNlbService(name: string, domain: string, port: number, protocol: "udp" | "tcp", vpcId: string, healthCheck?: NLBMapping["healthCheck"], separateDomain?: string): Promise<{
+export declare function exposeNlbService(name: string, domain: string, port: number, protocol: "udp" | "tcp", vpcId: string, healthCheck?: NLBMapping["healthCheck"], separateDomain?: string, skipDnsRecord?: boolean): Promise<{
     targetGroup: import("@pulumi/aws/lb/targetGroup").TargetGroup;
     listener: import("@pulumi/aws/lb/listener").Listener;
     cloudflareRecord: import("@pulumi/cloudflare/record").Record | undefined;

package/exposeNlbService.js

@@ -25,8 +25,9 @@ const DEFAULT_NLB_HEALTHCHECK = {
  * @param vpcId VPC ID for the target group
  * @param healthCheck health check config for the NLB target group
  * @param separateDomain if provided, creates DNS on this domain instead of the main one
+ * @param skipDnsRecord skip the Cloudflare record (another mapping on the same domain already created it)
  */
-async function exposeNlbService(name, domain, port, protocol, vpcId, healthCheck, separateDomain) {
+async function exposeNlbService(name, domain, port, protocol, vpcId, healthCheck, separateDomain, skipDnsRecord = false) {
     if (port < 7700 || port > 7799) {
         throw new Error(`NLB port ${port} is outside the allowed range (7700-7799). Update the NLB security group in supra to allow a wider range if needed.`);
     }
@@ -71,7 +72,7 @@ async function exposeNlbService(name, domain, port, protocol, vpcId, healthCheck
     const dnsDomain = separateDomain || domain;
     const domainParts = (0, getDomainAndSubdomain_1.getDomainAndSubdomain)(dnsDomain);
     let cloudflareRecord;
-    if (dnsDomain.endsWith(`.${domain_1.publicDomain}`)) {
+    if (!skipDnsRecord && dnsDomain.endsWith(`.${domain_1.publicDomain}`)) {
         cloudflareRecord = await (0, cloudflare_1.setRecord)({
             recordName: domainParts.subdomain,
             type: "CNAME",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcl-ops-lib",
-  "version": "9.9.1",
+  "version": "9.9.3",
   "scripts": {
     "build": "tsc && cp bin/* . && node test.js",
     "test": "tsc -p tsconfig.test.json && ENVIRONMENT=dev node bin-test/rateLimiting.test.js",