@raisenow/tamaro-cli 1.6.0-dev.3 → 1.6.1

package/dist/{chunk-FI7KZAG6.js → chunk-5D6F3T2J.js}

@@ -74,7 +74,6 @@ import { basename, dirname, join, relative, resolve } from "path";
 import chalk2 from "chalk";
 import stripIndent2 from "strip-indent";
 import { getIfUtils } from "webpack-config-utils";
-import { z } from "zod";
 var require2 = createRequire(import.meta.url);
 var moduleFileExtensions = ["ts", "tsx", "js", "jsx"];
 var extensions = moduleFileExtensions.map((v) => `.${v}`);
@@ -140,7 +139,6 @@ var getPaths = (ifCore) => {
       appTsConfig: resolveApp("tsconfig.json"),
       appHtml: resolveApp("*.html"),
       appEnv: resolveApp(".env*"),
-      configYml: resolveApp("config.yml"),
       appTailwindConfig: void 0
     }
   );
@@ -187,55 +185,17 @@ var getIfCoreFns = ({
   );
   process.exit(1);
 };
-var resolveAccountUuidFromConfig = (rawConfig, field) => {
-  const epmsConfig = z.object({
-    [field]: z.object()
-  }).safeParse(rawConfig);
-  if (!epmsConfig.success) {
-    return void 0;
-  }
-  const simple = z.object({
-    [field]: z.object({
-      account_uuid: z.uuid()
-    })
-  }).safeParse(rawConfig);
-  if (simple.success) {
-    return simple.data[field].account_uuid;
-  }
-  const accountMapping = z.object({
-    [field]: z.object({
-      account_mapping: z.uuid()
-    })
-  }).safeParse(rawConfig);
-  if (accountMapping.success) {
-    return accountMapping.data[field].account_mapping;
-  }
-  halt(
-    stripIndent2(
-      `Could not extract EPMS account UUID(s) from config.yml. Please ensure that the "${field}" field is correctly formatted. Expected formats:
-      1. ${field}:
-           account_uuid: <UUID>
-      
-      2. ${field}:
-           account_mapping: <UUID>
-      `
-    )
-  );
-};
 
 // src/lib/constants.ts
-import envPaths from "env-paths";
 var DEFAULT_TAG = "latest";
 var DEFAULT_PORT = 1234;
 var AWS_S3_BUCKET_TAMARO = "tamaro.raisenow.com";
 var AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_STAGE = "rnw-stage-email-service";
 var AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD = "rnw-email-service";
-var EPMS_API_BASE_URL_STAGE = "https://api.stage.mesos.raisenow.net";
 var CORE_CONFIG_NAME = "tamaro-core";
 var AWS_CLOUDFRONT_DISTRIBUTION_ID = "EHJ1OM458YQ0I";
 var HTTPS_CRT_FILE = "localhost.crt";
 var HTTPS_KEY_FILE = "localhost.key";
-var CACHE_DIR = envPaths("tamaro-cli", { suffix: "" }).cache;
 
 // src/lib/env.ts
 import { createRequire as createRequire2 } from "module";
@@ -380,18 +340,15 @@ export {
   getPaths,
   getRelativePaths,
   getIfCoreFns,
-  resolveAccountUuidFromConfig,
   DEFAULT_TAG,
   DEFAULT_PORT,
   AWS_S3_BUCKET_TAMARO,
   AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_STAGE,
   AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD,
-  EPMS_API_BASE_URL_STAGE,
   CORE_CONFIG_NAME,
   AWS_CLOUDFRONT_DISTRIBUTION_ID,
   HTTPS_CRT_FILE,
   HTTPS_KEY_FILE,
-  CACHE_DIR,
   getEnvVars,
   assertEnvValid,
   applyEnv

package/dist/cli.js

@@ -4,11 +4,9 @@ import {
   AWS_S3_BUCKET_TAMARO,
   AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD,
   AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_STAGE,
-  CACHE_DIR,
   CORE_CONFIG_NAME,
   DEFAULT_PORT,
   DEFAULT_TAG,
-  EPMS_API_BASE_URL_STAGE,
   HTTPS_CRT_FILE,
   HTTPS_KEY_FILE,
   applyEnv,
@@ -23,11 +21,10 @@ import {
   logSuccess,
   logTitle,
   promptConfirmation,
-  resolveAccountUuidFromConfig,
   resolveBin,
   resolveOwn,
   runCommandSync
-} from "./chunk-FI7KZAG6.js";
+} from "./chunk-5D6F3T2J.js";
 
 // src/cli.ts
 import { createCommand } from "commander";
@@ -850,7 +847,7 @@ var undeploy = async (options) => {
   assertOptionsValid9(options);
   awsAuthenticate(options);
   const flags = prepareFlags(options);
-  const { tag, all, dryrun } = options;
+  const { tag = DEFAULT_TAG, all, dryrun } = options;
   const dryRunFlag = dryrun ? `--dryrun` : "";
   const deployUrl = all ? `s3://${AWS_S3_BUCKET_TAMARO}/${configName}/` : `s3://${AWS_S3_BUCKET_TAMARO}/${configName}/${tag}/`;
   const description = all ? `all tags of "${configName}"` : `tag "${tag}" of "${configName}"`;
@@ -859,7 +856,7 @@ var undeploy = async (options) => {
   }
   await promptConfirmation(
     `Are you sure you want to undeploy ${description}?`,
-    options.ci
+    options.yes
   );
   const cmd = `
     aws s3 rm ${deployUrl}
@@ -929,8 +926,19 @@ var undeployEmailConfig = async (options) => {
     assertProfilesPresent();
     options.profile = await promptProfile();
   }
+  if (options.ci) {
+    options.bucket = AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD;
+  }
   if (!options.bucket) {
-    options.bucket = options.ci ? AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD : await promptBucketTamaroEmailConfig2();
+    if (options.ci) {
+      options.bucket = AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD;
+    } else if (options.prod) {
+      options.bucket = AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD;
+    } else if (options.stage) {
+      options.bucket = AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_STAGE;
+    } else {
+      options.bucket = await promptBucketTamaroEmailConfig2();
+    }
   }
   assertOptionsValid10(options);
   awsAuthenticate(options);
@@ -1013,247 +1021,10 @@ var promptBucketTamaroEmailConfig2 = async () => {
   return bucket;
 };
 
-// src/commands/update-epms.ts
-import { readFileSync as readFileSync3 } from "fs";
-import { basename as basename3 } from "path";
-import { config as dotenvConfig } from "dotenv";
-import { globSync as globSync2 } from "glob";
-import yaml2 from "js-yaml";
-
-// src/lib/epms/assert.ts
-import { existsSync as existsSync6, readFileSync } from "fs";
-import yaml from "js-yaml";
-import stripIndent5 from "strip-indent";
-var assertEpmsCredentials = (configPath) => {
-  if (!existsSync6(configPath)) {
-    throw new Error(`Config file not found at path: ${configPath}`);
-  }
-  try {
-    const configContent = yaml.load(readFileSync(configPath, "utf8"));
-    assertEpmsCredentialsPresentStage(configContent);
-    assertEpmsCredentialsPresentProd(configContent);
-  } catch (e) {
-    throw new Error(
-      `Error parsing config file at path: ${configPath}. Details: ${e}`
-    );
-  }
-};
-var assertEpmsCredentialsPresentStage = (rawConfig) => {
-  const accountsUuidsStage = resolveAccountUuidFromConfig(
-    rawConfig,
-    "epms_stage"
-  );
-  if (!accountsUuidsStage) {
-    return;
-  }
-  if (!process.env.EPMS_CLIENT_ID_STAGE || !process.env.EPMS_CLIENT_SECRET_STAGE) {
-    halt(
-      stripIndent5(
-        `EPMS credentials for stage environment are missing.
-            - Please set EPMS_CLIENT_ID_STAGE and EPMS_CLIENT_SECRET_STAGE in your environment variables.
-            - Alternatively, remove the "epms_stage" fields from your config.yml
-`
-      )
-    );
-  }
-};
-var assertEpmsCredentialsPresentProd = (rawConfig) => {
-  const accountsUuidsProd = resolveAccountUuidFromConfig(rawConfig, "epms");
-  if (!accountsUuidsProd) {
-    return;
-  }
-  if (!process.env.EPMS_CLIENT_ID || !process.env.EPMS_CLIENT_SECRET) {
-    halt(
-      stripIndent5(
-        `EPMS credentials for prod environment are missing.
-            - Please set EPMS_CLIENT_ID and EPMS_CLIENT_SECRET in your environment variables.
-            - Alternatively, remove the "epms" fields from your config.yml
-`
-      )
-    );
-  }
-};
-
-// src/lib/epms/auth.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync } from "fs";
-import { dirname as dirname3, join } from "path";
-import ky from "ky";
-var DEFAULT_TIMEOUT = 1e4;
-function getCacheFilePath() {
-  return join(CACHE_DIR, "token.json");
-}
-function readCachedToken() {
-  try {
-    const filePath = getCacheFilePath();
-    if (!existsSync7(filePath)) {
-      return void 0;
-    }
-    const data = JSON.parse(readFileSync2(filePath, "utf-8"));
-    if (typeof data.token === "string" && typeof data.expirationTime === "number") {
-      return data;
-    }
-  } catch {
-  }
-  return void 0;
-}
-function writeCachedToken(cached) {
-  try {
-    const filePath = getCacheFilePath();
-    mkdirSync2(dirname3(filePath), { recursive: true });
-    writeFileSync(filePath, JSON.stringify(cached), { mode: 384 });
-  } catch {
-  }
-}
-var createAuthorizer = (baseUrl, clientId, clientSecret) => {
-  const apiUnauthorized = ky.extend({
-    headers: {
-      "Access-Control-Allow-Origin": "*"
-    },
-    prefixUrl: baseUrl,
-    timeout: DEFAULT_TIMEOUT
-  });
-  let expirationTime = void 0;
-  let token = void 0;
-  const cached = readCachedToken();
-  if (cached) {
-    token = cached.token;
-    expirationTime = cached.expirationTime;
-  }
-  const authorize = async () => {
-    const isExpired = (expirationTime ?? 0) - Date.now() < 5 * 60 * 1e3;
-    if (token && !isExpired) {
-      return token;
-    }
-    const data = await apiUnauthorized.post("oauth2/token", {
-      json: {
-        client_id: clientId,
-        client_secret: clientSecret,
-        grant_type: "client_credentials"
-      }
-    }).json();
-    token = `${data.token_type} ${data.access_token}`;
-    expirationTime = Date.now() + data.expires_in * 1e3;
-    writeCachedToken({ token, expirationTime });
-    return token;
-  };
-  return apiUnauthorized.extend({
-    hooks: {
-      beforeRequest: [
-        async (request) => {
-          request.headers.set("Authorization", await authorize());
-        }
-      ]
-    }
-  });
-};
-
-// src/lib/epms/client.ts
-var EpmsClient = class {
-  #epmsClient;
-  constructor(baseUrl, clientId, clientSecret) {
-    this.#epmsClient = createAuthorizer(baseUrl, clientId, clientSecret);
-  }
-  async getOrganisationIdByAccountUuid(accountUuid) {
-    const query = {
-      query: {
-        $and: [
-          { $term: { object_uuid: accountUuid } },
-          { $term: { object: "account" } }
-        ]
-      },
-      size: 1,
-      from: 0
-    };
-    const response = await this.#epmsClient.post("search/events", {
-      json: query
-    }).json();
-    if (response.hits.length === 0) {
-      throw new Error(`No events found for account UUID: ${accountUuid}`);
-    }
-    const organisationId = response.hits[0].organisation_uuid;
-    if (!organisationId) {
-      throw new Error(
-        `Organisation UUID not found for account UUID: ${accountUuid}`
-      );
-    }
-    return organisationId;
-  }
-  async updateTamaro(configName, tag, json) {
-    return this.#epmsClient.put(`products/tamaro/${configName}/tags/${tag}`, {
-      json
-    }).json();
-  }
-};
-
-// src/commands/update-epms.ts
-var updateEpms = async (options) => {
-  const { ifCore } = getIfCoreFns();
-  assertIsNotCore5(ifCore);
-  const paths = getPaths(ifCore);
-  const { tag, dryrun } = options;
-  const dryRunFlag = dryrun ? `--dryrun` : "";
-  const configName = getWidgetUuid();
-  const appEnvFiles = globSync2(paths.appEnv);
-  const filePath = appEnvFiles.find((file) => basename3(file) === ".env");
-  if (!filePath) {
-    halt(
-      'No ".env" file found. Please make sure to have a ".env" file with EPMS credentials in the root of your widget project.'
-    );
-  }
-  dotenvConfig({ path: filePath, quiet: true });
-  if (!("configYml" in paths)) {
-    halt("Fatal error, this should never happen");
-    throw new Error();
-  }
-  if (dryRunFlag) {
-    logTitle("\u{1F9EA} DRY RUN MODE - No actual changes will be made \u{1F9EA}");
-  }
-  assertTagValid(tag);
-  assertEpmsCredentials(paths.configYml);
-  const configContent = yaml2.load(readFileSync3(paths.configYml, "utf8"));
-  const accountUuidStage = resolveAccountUuidFromConfig(
-    configContent,
-    "epms_stage"
-  );
-  if (dryrun) {
-    logTitle(
-      `[DRY RUN] Would update EPMS for "${configName}" with tag "${tag}"`
-    );
-  } else {
-    if (accountUuidStage) {
-      const epmsClient = new EpmsClient(
-        EPMS_API_BASE_URL_STAGE,
-        process.env.EPMS_CLIENT_ID_STAGE,
-        process.env.EPMS_CLIENT_SECRET_STAGE
-      );
-      const organisationUuid = await epmsClient.getOrganisationIdByAccountUuid(accountUuidStage);
-      logTitle("Updating EPMS with the following details:");
-      const body = {
-        account_uuid: accountUuidStage,
-        organisation_uuid: organisationUuid,
-        configured_version: process.env.CORE_VERSION ?? "unknown",
-        read_only: false
-      };
-      logDataTable({
-        name: configName,
-        tag,
-        ...body
-      });
-      await epmsClient.updateTamaro(configName, tag, body);
-      logSuccess("\u2705 EPMS Stage is updated.");
-    }
-  }
-};
-var assertIsNotCore5 = (ifCore) => {
-  if (ifCore()) {
-    halt("You cannot update EPMS in the context of Tamaro Core.");
-  }
-};
-
 // package.json
 var package_default = {
   name: "@raisenow/tamaro-cli",
-  version: "1.6.0-dev.3",
+  version: "1.6.1",
   author: {
     name: "RaiseNow",
     email: "development@raisenow.com"
@@ -1316,7 +1087,6 @@ var package_default = {
     "css-loader": "^7.1.3",
     "css-minimizer-webpack-plugin": "^7.0.4",
     dotenv: "^17.2.3",
-    "env-paths": "^4.0.0",
     "escape-string-regexp": "^5.0.0",
     eslint: "^8.57.1",
     "eslint-config-prettier": "^10.1.8",
@@ -1336,9 +1106,7 @@ var package_default = {
     "handlebars-helpers": "^0.10.0",
     "html-loader": "^5.1.0",
     "html-webpack-plugin": "^5.6.6",
-    "js-yaml": "^4.1.1",
     "json-loader": "^0.5.7",
-    ky: "^1.14.3",
     lodash: "^4.17.23",
     "mini-css-extract-plugin": "^2.10.0",
     "node-notifier": "^10.0.1",
@@ -1366,11 +1134,7 @@ var package_default = {
     "webpack-cli": "^6.0.1",
     "webpack-config-utils": "^2.3.1",
     "webpack-dev-server": "^5.2.3",
-    "yaml-loader": "^0.9.0",
-    zod: "^4.3.6"
-  },
-  devDependencies: {
-    "@types/js-yaml": "^4.0.9"
+    "yaml-loader": "^0.9.0"
   }
 };
 
@@ -1459,7 +1223,7 @@ cli.command("deploy-email-config").description("Deploy a widget's email configur
 });
 cli.command("undeploy").description(
   "Undeploy a Tamaro Core or customer configuration bundle from AWS S3"
-).option("--profile <profile>", "AWS profile").option("--ci", "CI environment", false).option("--tag <tag>", "Tag which should be undeployed", DEFAULT_TAG).option("--all", "Undeploy all tags", false).option(
+).option("--profile <profile>", "AWS profile").option("--ci", "CI environment", false).option("--tag <tag>", "Tag which should be undeployed").option("--all", "Undeploy all tags", false).option(
   "--dryrun",
   "Displays the operations that would be performed without actually running them",
   false
@@ -1467,6 +1231,9 @@ cli.command("undeploy").description(
   await undeploy(options);
 });
 cli.command("undeploy-email-config").description("Undeploy a widget's email configuration from AWS S3").option("--profile <profile>", "AWS profile").option("--ci", "CI environment", false).option("--bucket <bucket>", "AWS bucket for email configs").option(
+  "--stage",
+  "Undeploy from stage environment (alternative to --bucket)"
+).option("--prod", "Undeploy from prod environment (alternative to --bucket)").option(
   "--dryrun",
   "Displays the operations that would be performed without actually running them",
   false
@@ -1491,13 +1258,6 @@ cli.command("unarchive").description(
 ).action((options) => {
   unarchive(options);
 });
-cli.command("update-epms").description("Update EPMS with the currently configured widget version.").option("--tag <tag>", "Tag which should be used for the update", DEFAULT_TAG).option(
-  "--dryrun",
-  "Displays the operations that would be performed without actually running them",
-  false
-).action(async (options) => {
-  await updateEpms(options);
-});
 cli.command("validate").description(
   "Validate the current Tamaro configuration to avoid common errors"
 ).action(async () => {

package/dist/webpack.config.js

@@ -10,7 +10,7 @@ import {
   logTitle,
   resolveApp,
   resolveEslintPluginConfig
-} from "./chunk-FI7KZAG6.js";
+} from "./chunk-5D6F3T2J.js";
 
 // src/webpack.config.ts
 import { existsSync } from "fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raisenow/tamaro-cli",
-  "version": "1.6.0-dev.3",
+  "version": "1.6.1",
   "author": {
     "name": "RaiseNow",
     "email": "development@raisenow.com"
@@ -48,7 +48,6 @@
     "css-loader": "^7.1.3",
     "css-minimizer-webpack-plugin": "^7.0.4",
     "dotenv": "^17.2.3",
-    "env-paths": "^4.0.0",
     "escape-string-regexp": "^5.0.0",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "^10.1.8",
@@ -68,9 +67,7 @@
     "handlebars-helpers": "^0.10.0",
     "html-loader": "^5.1.0",
     "html-webpack-plugin": "^5.6.6",
-    "js-yaml": "^4.1.1",
     "json-loader": "^0.5.7",
-    "ky": "^1.14.3",
     "lodash": "^4.17.23",
     "mini-css-extract-plugin": "^2.10.0",
     "node-notifier": "^10.0.1",
@@ -98,11 +95,7 @@
     "webpack-cli": "^6.0.1",
     "webpack-config-utils": "^2.3.1",
     "webpack-dev-server": "^5.2.3",
-    "yaml-loader": "^0.9.0",
-    "zod": "^4.3.6"
-  },
-  "devDependencies": {
-    "@types/js-yaml": "^4.0.9"
+    "yaml-loader": "^0.9.0"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",