@getmonoceros/workbench 1.26.3 → 1.26.5

package/dist/bin.js

@@ -74,7 +74,7 @@ ${issues}`);
   }
   return result.data;
 }
-var SOLUTION_NAME_RE, APT_PACKAGE_NAME_RE, RUNTIME_VERSION_RE, FEATURE_REF_RE, INSTALL_URL_RE, REPO_URL_RE, REPO_PATH_RE, POSTGRES_URL_RE, REGEX, PROVIDER_VALUES, KNOWN_PROVIDER_HOSTS, CONFIG_SCHEMA_VERSION, FeatureOptionValueSchema, FeatureEntrySchema, EMAIL_RE, GitUserSchema, RepoEntrySchema, PortEntrySchema, RoutingSchema, SERVICE_NAME_RE, ServiceEnvValueSchema, ServiceHealthcheckSchema, SERVICE_RESTART_VALUES, ServiceObjectSchema, ExternalServicesSchema, LanguageOptionValueSchema, LanguageEntrySchema, SolutionConfigSchema;
+var SOLUTION_NAME_RE, APT_PACKAGE_NAME_RE, RUNTIME_VERSION_RE, FEATURE_REF_RE, INSTALL_URL_RE, REPO_URL_RE, REPO_PATH_RE, REGEX, PROVIDER_VALUES, KNOWN_PROVIDER_HOSTS, CONFIG_SCHEMA_VERSION, FeatureOptionValueSchema, FeatureEntrySchema, EMAIL_RE, GitUserSchema, RepoEntrySchema, PortEntrySchema, RoutingSchema, SERVICE_NAME_RE, ServiceEnvValueSchema, ServiceHealthcheckSchema, SERVICE_RESTART_VALUES, ServiceObjectSchema, LanguageOptionValueSchema, LanguageEntrySchema, SolutionConfigSchema;
 var init_schema = __esm({
   "src/config/schema.ts"() {
     "use strict";
@@ -85,15 +85,13 @@ var init_schema = __esm({
     INSTALL_URL_RE = /^https:\/\/[A-Za-z0-9.\-_~/:?#[\]@!&'()*+,;=%]+$/;
     REPO_URL_RE = /^https:\/\/[A-Za-z0-9@:/+_~.#=&?-]+$/;
     REPO_PATH_RE = /^[A-Za-z0-9._-]+(\/[A-Za-z0-9._-]+)*$/;
-    POSTGRES_URL_RE = /^postgres(ql)?:\/\//;
     REGEX = {
       solutionName: SOLUTION_NAME_RE,
       aptPackage: APT_PACKAGE_NAME_RE,
       featureRef: FEATURE_REF_RE,
       installUrl: INSTALL_URL_RE,
       repoUrl: REPO_URL_RE,
-      repoPath: REPO_PATH_RE,
-      postgresUrl: POSTGRES_URL_RE
+      repoPath: REPO_PATH_RE
     };
     PROVIDER_VALUES = [
       "github",
@@ -217,12 +215,6 @@ var init_schema = __esm({
       // are left untouched by `interpolateServices`.
       connectionEnv: z.record(z.string(), z.string()).optional()
     });
-    ExternalServicesSchema = z.object({
-      postgres: z.string().regex(
-        POSTGRES_URL_RE,
-        "Postgres URL must start with 'postgres://' or 'postgresql://'"
-      ).optional()
-    });
     LanguageOptionValueSchema = z.union([
       z.string(),
       z.number(),
@@ -269,7 +261,6 @@ var init_schema = __esm({
       services: z.array(ServiceObjectSchema).default([]),
       repos: z.array(RepoEntrySchema).default([]),
       routing: RoutingSchema.optional(),
-      externalServices: ExternalServicesSchema.default({}),
       git: z.object({
         user: GitUserSchema.optional()
       }).optional()
@@ -2798,7 +2789,6 @@ function normalizeOptions(opts) {
   const languages = [...new Set(opts.languages)].sort();
   const serviceByName = /* @__PURE__ */ new Map();
   for (const svc of opts.services) {
-    if (opts.postgresUrl && svc.name === "postgres") continue;
     serviceByName.set(svc.name, svc);
   }
   const services = [...serviceByName.values()].sort(
@@ -2819,7 +2809,6 @@ function normalizeOptions(opts) {
     languages,
     ...opts.languageOptions && Object.keys(opts.languageOptions).length > 0 ? { languageOptions: opts.languageOptions } : {},
     services,
-    postgresUrl: opts.postgresUrl,
     ...aptPackages.length > 0 ? { aptPackages } : {},
     ...features && Object.keys(features).length > 0 ? { features } : {},
     ...installUrls && installUrls.length > 0 ? { installUrls } : {},
@@ -5079,9 +5068,6 @@ function solutionConfigToCreateOptions(config, featureDefaults = {}) {
   if (Object.keys(languageOptions).length > 0) {
     result.languageOptions = languageOptions;
   }
-  if (config.externalServices.postgres !== void 0) {
-    result.postgresUrl = config.externalServices.postgres;
-  }
   if (config.aptPackages.length > 0) {
     result.aptPackages = [...config.aptPackages];
   }
@@ -7340,7 +7326,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.26.3" : "dev";
+    CLI_VERSION = true ? "1.26.5" : "dev";
   }
 });
 
@@ -9200,7 +9186,7 @@ async function runRemove(opts) {
       logger.info(
         `[remove] host-side rm hit ${code} on ${prettyPath(containerPath)}; using a throw-away alpine container to clean root-owned files\u2026`
       );
-      const { exitCode: exit } = await dockerExec([
+      const { exitCode: exit, stderr } = await dockerExec([
         "run",
         "--rm",
         "-v",
@@ -9212,12 +9198,14 @@ async function runRemove(opts) {
         "1",
         "-delete"
       ]);
-      if (exit !== 0) {
+      try {
+        await fs15.rm(containerPath, { recursive: true, force: true });
+      } catch (err2) {
+        const code2 = err2.code;
         throw new Error(
-          `docker-based cleanup of ${containerPath} exited ${exit}. Inspect with \`sudo ls -la ${containerPath}\` and clean manually.`
+          `docker-based cleanup of ${containerPath} did not fully clear it (alpine find exit ${exit}${stderr.trim() ? `: ${stderr.trim()}` : ""}; host rm: ${code2}). Inspect with \`sudo ls -la ${containerPath}\` and clean manually.`
         );
       }
-      await fs15.rm(containerPath, { recursive: true, force: true });
     }
   }
   logger.success(