rollback some broken subdomain updates

stoked-cenv · Dec 23, 2023 · a51ef33 · a51ef33
1 parent df2ff13
commit a51ef33
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 23 deletions.
diff --git a/example/package.json b/example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stoked-cenv-web",
-  "version": "2.0.0-a.134",
+  "version": "2.0.0-a.135",
   "license": "MIT",
   "private": true,
   "scripts": {

diff --git a/example/packages/api/package.json b/example/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@stoked-cenv/web-api",
-  "version": "2.0.0-a.134",
+  "version": "2.0.0-a.135",
   "scripts": {
     "build": "nest build",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
@@ -17,8 +17,8 @@
     "@nestjs/config": "^3.0.0",
     "@nestjs/core": "^10.1.3",
     "@nestjs/platform-express": "^10.1.3",
-    "@stoked-cenv/cdk": "^2.0.0-a.134",
-    "@stoked-cenv/lib": "^2.0.0-a.134",
+    "@stoked-cenv/cdk": "^2.0.0-a.135",
+    "@stoked-cenv/lib": "^2.0.0-a.135",
     "express-oauth2-jwt-bearer": "^1.5.0",
     "helmet": "^6.2.0",
     "nocache": "^3.0.4",

diff --git a/example/packages/globals/package.json b/example/packages/globals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@stoked-cenv/globals",
-  "version": "2.0.0-a.134",
+  "version": "2.0.0-a.135",
   "cenv": {
     "globals": true
   }

diff --git a/example/packages/spa/package.json b/example/packages/spa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@stoked-cenv/web-spa",
-  "version": "2.0.0-a.134",
+  "version": "2.0.0-a.135",
   "dependencies": {
     "@auth0/auth0-react": "^2.2.0",
     "axios": "^0.27.2",

diff --git a/packages/cdk/src/stacks/cert/site-certificate-stack.ts b/packages/cdk/src/stacks/cert/site-certificate-stack.ts
@@ -1,7 +1,7 @@
 import { CfnOutput, Stack, StackProps } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
 import { HostedZone } from 'aws-cdk-lib/aws-route53';
-import { Certificate, CertificateValidation, DnsValidatedCertificate } from 'aws-cdk-lib/aws-certificatemanager';
+import { Certificate, CertificateValidation } from 'aws-cdk-lib/aws-certificatemanager';
 import { getDomains, stackPrefix, tagStack } from '../../index';
 
 export class SiteCertificateStack extends Stack {

diff --git a/packages/cdk/src/utils.ts b/packages/cdk/src/utils.ts
@@ -102,28 +102,15 @@ export function getDomains(subdomain?: string) {
   const appIfNotSameAsRoot = APP && rootDomainParts.shift() !== APP ? APP : undefined;
   console.log('appIfNotSameAsRoot', appIfNotSameAsRoot);
   const appMatchesRoot = !appIfNotSameAsRoot;
-  let subs = [];
-  if (subdomain) {
-    subs = subdomain.split(',').map(s => `${s}.`);
-  }
-  if (subs.length > 0) {
-    subdomain = subs[0];
-  }
+  subdomain = `${subdomain ? subdomain + '.' : ''}`;
   const app = appIfNotSameAsRoot ? `${APP}.${rootDomain}` : rootDomain;
-  if (subs.length > 1) {
-    for (let i = 1; i < subs.length; i++) {
-      subs[i] = `${subs[i]}${ENV}.${app}`;
-      subs[i] = `*.${subs[i]}`;
-    }
-  }
   const env = `${subdomain}${ENV}.${app}`;
   const sub = `*.${env}`;
-  const domains: {env: string, sub: string, app?: string, primary: string, alt: string[], root: string, www?: string} = { env, sub, primary: env, alt: subs, root: rootDomain }
+  const domains: {env: string, sub: string, app?: string, primary: string, alt: string[], root: string, www?: string} = { env, sub, primary: env, alt: [sub], root: rootDomain }
   if (ENV === 'prod') {
     domains.app = app;
     domains.primary = `${subdomain}${app}`;
     domains.alt = [`*.${app}`, env, sub];
-    domains.alt = domains.alt.concat(subs);
     if (appMatchesRoot) {
       domains.www = `www.${app}`;
       domains.alt.push(domains.www);

diff --git a/packages/lib/params/package.json b/packages/lib/params/package.json
@@ -20,7 +20,7 @@
   "author": "Brian Stoker",
   "license": "MIT",
   "dependencies": {
-    "@stoked-cenv/lib": "^2.0.0-a.134",
+    "@stoked-cenv/lib": "^2.0.0-a.135",
     "async-mutex": "^0.4.0",
     "build": "^0.1.4",
     "js-yaml": "^4.1.0",