dcl-ops-lib 5.21.2 → 5.22.0

package/exposePublicService.d.ts

@@ -3,8 +3,15 @@ import * as aws from "@pulumi/aws";
 import * as awsx from "@pulumi/awsx";
 import * as cf from "@pulumi/cloudflare";
 import { ApplicationTargetGroupHealthCheck } from "@pulumi/awsx/lb";
-export declare type ExtraExposedServiceOptions = {
-    createCloudflareProxiedSubdomain?: boolean;
+export declare type ProxiedCloudflareDomain = {
+    createCloudflareProxiedSubdomain: true;
+};
+export declare type UnproxiedCloudflareDomain = {
+    createCloudflareDNSWithoutProxy: true;
+    ttl: number;
+};
+export declare type CloudflareDomainOptions = ProxiedCloudflareDomain | UnproxiedCloudflareDomain | {};
+export declare type ExtraExposedServiceOptions = CloudflareDomainOptions & {
     skipInternalDomain?: boolean;
     targetGroupConditions?: pulumi.Input<aws.types.input.alb.ListenerRuleCondition>[];
 };

package/exposePublicService.js

@@ -24,6 +24,12 @@ const DEFAULT_HEALTHCHECK_VALUES = {
     unhealthyThreshold: 5,
     healthyThreshold: 5,
 };
+function isProxiedDomain(v) {
+    return typeof v == "object" && v && v.createCloudflareProxiedSubdomain;
+}
+function isUnProxiedDomain(v) {
+    return typeof v == "object" && v && v.createCloudflareDNSWithoutProxy;
+}
 /**
  * Publicly expose a service on a given domain (with SSL). This will create a
  * Target Group and a Listener for your microservice. Additionally, it will
@@ -37,7 +43,9 @@ function exposePublicService(name, domain, port, healthCheck = {}, vpc, extraOpt
     return __awaiter(this, void 0, void 0, function* () {
         const { alb, listener } = yield (0, alb_1.getAlb)();
         const healthCheckValue = Object.assign({}, DEFAULT_HEALTHCHECK_VALUES, healthCheck);
-        const createCFProxy = extraOptions && extraOptions.createCloudflareProxiedSubdomain || domain.endsWith(`.${domain_1.publicDomain}`);
+        const isProxied = isProxiedDomain(extraOptions);
+        const isUnproxied = isUnProxiedDomain(extraOptions);
+        const createCloudflareRecord = isProxied || isUnproxied || domain.endsWith(`.${domain_1.publicDomain}`);
         const onlyCloudflare = (extraOptions && extraOptions.skipInternalDomain) || false;
         const createInternalDomain = !onlyCloudflare;
         const certificate = (0, certificate_1.getCertificateFor)(domain);
@@ -71,14 +79,25 @@ function exposePublicService(name, domain, port, healthCheck = {}, vpc, extraOpt
             });
             enabledHostnames.push(domain);
         }
-        if (createCFProxy) {
+        if (createCloudflareRecord) {
             enabledHostnames.push(domainParts.subdomain + "." + domain_1.publicDomain);
-            cloudflareRecord = yield (0, cloudflare_1.setRecord)({
-                recordName: domainParts.subdomain,
-                type: "CNAME",
-                value: alb.loadBalancer.dnsName,
-                proxied: true,
-            });
+            if (isUnProxiedDomain(extraOptions)) {
+                cloudflareRecord = yield (0, cloudflare_1.setRecord)({
+                    recordName: domainParts.subdomain,
+                    type: "CNAME",
+                    value: alb.loadBalancer.dnsName,
+                    proxied: false,
+                    ttl: extraOptions.ttl || 600,
+                });
+            }
+            else {
+                cloudflareRecord = yield (0, cloudflare_1.setRecord)({
+                    recordName: domainParts.subdomain,
+                    type: "CNAME",
+                    value: alb.loadBalancer.dnsName,
+                    proxied: true,
+                });
+            }
         }
         if (enabledHostnames.length) {
             new aws.alb.ListenerRule(`${domain_1.env}-ls-${slug}`, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcl-ops-lib",
-  "version": "5.21.2",
+  "version": "5.22.0",
   "scripts": {
     "build": "tsc && cp bin/* .",
     "clean": "rm *.d.ts *.js *.js.map"