dokku-compose 0.9.1 → 0.9.3

package/dist/index.js

@@ -68,15 +68,15 @@ var AppSchema = z.object({
   git: GitSchema.optional()
 });
 var ServiceBackupAuthSchema = z.object({
-  access_key_id: z.string(),
-  secret_access_key: z.string(),
-  region: z.string(),
-  signature_version: z.string(),
-  endpoint: z.string()
+  access_key_id: z.string().min(1),
+  secret_access_key: z.string().min(1),
+  region: z.string().min(1),
+  signature_version: z.string().min(1),
+  endpoint: z.string().min(1)
 });
 var ServiceBackupSchema = z.object({
-  schedule: z.string(),
-  bucket: z.string(),
+  schedule: z.string().min(1),
+  bucket: z.string().min(1),
   auth: ServiceBackupAuthSchema
 });
 var PostgresSchema = z.object({
@@ -113,7 +113,22 @@ function parseConfig(raw) {
 
 // src/core/config.ts
 function interpolateEnvVars(content) {
-  return content.replace(/\$\{([^}]+)\}/g, (_, name) => process.env[name] ?? "");
+  const missing = [];
+  const result = content.replace(/\$\{([^}]+)\}/g, (_, name) => {
+    const value = process.env[name];
+    if (value === void 0 || value === "") {
+      missing.push(name);
+      return "";
+    }
+    return value;
+  });
+  if (missing.length > 0) {
+    const unique = Array.from(new Set(missing));
+    throw new Error(
+      `Unset environment variable(s) referenced in config: ${unique.join(", ")}`
+    );
+  }
+  return result;
 }
 function loadConfig(filePath) {
   if (!fs.existsSync(filePath)) {
@@ -844,7 +859,6 @@ async function ensurePostgresBackups(ctx, services) {
       continue;
     }
     const { schedule, bucket, auth } = config.backup;
-    await ctx.run("postgres:backup-deauth", name);
     await ctx.run(
       "postgres:backup-auth",
       name,
@@ -855,6 +869,12 @@ async function ensurePostgresBackups(ctx, services) {
       auth.endpoint
     );
     await ctx.run("postgres:backup-schedule", name, schedule, bucket);
+    const cronOutput = await ctx.query("postgres:backup-schedule-cat", name);
+    if (!parseBackupSchedule(cronOutput)) {
+      throw new Error(
+        `Backup schedule for ${name} was not installed after backup-schedule ran`
+      );
+    }
     await ctx.run("config:set", "--global", `${hashKey}=${desiredHash}`);
     logDone();
   }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "dokku-compose",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "Docker Compose for Dokku — declare your entire server in a single YAML file.",
   "main": "dist/index.js",
   "exports": "./dist/index.js",
   "bin": {
-    "dokku-compose": "./dist/index.js"
+    "dokku-compose": "./bin/dokku-compose"
   },
   "files": [
     "dist/",