@storm-software/config-tools 1.48.0 → 1.50.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 1.50.0 (2024-06-02)
+
+
+### 🚀 Features
+
+- **config-tools:** Enhance the validations for the `cloudflareAccountId` configuration ([9fbc1954](https://github.com/storm-software/storm-ops/commit/9fbc1954))
+
+## 1.49.0 (2024-05-29)
+
+
+### 🚀 Features
+
+- **cloudflare-tools:** Update worker generator to add hono depenendency ([946a9e59](https://github.com/storm-software/storm-ops/commit/946a9e59))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
 ## 1.48.0 (2024-05-29)
 
 ### 🚀 Features

package/index.cjs

@@ -68257,7 +68257,7 @@ var StormConfigSchema = z2.object({
   ]).default("debug").describe(
     "The log level used to filter out lower priority log messages. If not provided, this is defaulted using the `environment` config value (if `environment` is set to `production` then `level` is `error`, else `level` is `debug`)."
   ),
-  cloudflareAccountId: z2.string().trim().nullable().default(null).describe("The default Cloudflare account ID of the workspace"),
+  cloudflareAccountId: z2.string().trim().toLowerCase().length(32).regex(/^([0-9a-fA-F]{32})$/i).nullable().default(null).describe("The default Cloudflare account ID of the workspace"),
   configFile: z2.string().trim().nullable().default(null).describe(
     "The filepath of the Storm config. When this field is null, no config file was found in the current workspace."
   ),
@@ -68850,7 +68850,7 @@ var getConfigEnv = () => {
     branch: process.env[`${prefix}BRANCH`],
     preid: process.env[`${prefix}PRE_ID`],
     externalPackagePatterns: process.env[`${prefix}EXTERNAL_PACKAGE_PATTERNS`] ? JSON.parse(process.env[`${prefix}EXTERNAL_PACKAGE_PATTERNS`]) : [],
-    cloudflareAccountId: process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`],
+    cloudflareAccountId: process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] ? process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] : process.env.CLOUDFLARE_ACCOUNT_ID ? process.env.CLOUDFLARE_ACCOUNT_ID : process.env.STORM_BOT_CLOUDFLARE_ACCOUNT,
     logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
       Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
     ) ? getLogLevelLabel(
@@ -69058,6 +69058,10 @@ var setConfigEnv = (config) => {
     );
   }
   if (config.cloudflareAccountId) {
+    process.env.STORM_BOT_CLOUDFLARE_ACCOUNT ??= String(
+      config.cloudflareAccountId
+    );
+    process.env.CLOUDFLARE_ACCOUNT_ID ??= String(config.cloudflareAccountId);
     process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] = String(
       config.cloudflareAccountId
     );

package/index.js

@@ -68214,7 +68214,7 @@ var StormConfigSchema = z2.object({
   ]).default("debug").describe(
     "The log level used to filter out lower priority log messages. If not provided, this is defaulted using the `environment` config value (if `environment` is set to `production` then `level` is `error`, else `level` is `debug`)."
   ),
-  cloudflareAccountId: z2.string().trim().nullable().default(null).describe("The default Cloudflare account ID of the workspace"),
+  cloudflareAccountId: z2.string().trim().toLowerCase().length(32).regex(/^([0-9a-fA-F]{32})$/i).nullable().default(null).describe("The default Cloudflare account ID of the workspace"),
   configFile: z2.string().trim().nullable().default(null).describe(
     "The filepath of the Storm config. When this field is null, no config file was found in the current workspace."
   ),
@@ -68807,7 +68807,7 @@ var getConfigEnv = () => {
     branch: process.env[`${prefix}BRANCH`],
     preid: process.env[`${prefix}PRE_ID`],
     externalPackagePatterns: process.env[`${prefix}EXTERNAL_PACKAGE_PATTERNS`] ? JSON.parse(process.env[`${prefix}EXTERNAL_PACKAGE_PATTERNS`]) : [],
-    cloudflareAccountId: process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`],
+    cloudflareAccountId: process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] ? process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] : process.env.CLOUDFLARE_ACCOUNT_ID ? process.env.CLOUDFLARE_ACCOUNT_ID : process.env.STORM_BOT_CLOUDFLARE_ACCOUNT,
     logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
       Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
     ) ? getLogLevelLabel(
@@ -69015,6 +69015,10 @@ var setConfigEnv = (config) => {
     );
   }
   if (config.cloudflareAccountId) {
+    process.env.STORM_BOT_CLOUDFLARE_ACCOUNT ??= String(
+      config.cloudflareAccountId
+    );
+    process.env.CLOUDFLARE_ACCOUNT_ID ??= String(config.cloudflareAccountId);
     process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] = String(
       config.cloudflareAccountId
     );