Merge pull request #116 from jhunkeler/breakdown

Breakdown & Bug fixes

5 files changed, 92 insertions, 2 deletions

diff --git a/src/lib/delivery/CMakeLists.txt b/src/lib/delivery/CMakeLists.txt
index 78ed20f..559b2dc 100644
--- a/src/lib/delivery/CMakeLists.txt
+++ b/src/lib/delivery/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_library(stasis_delivery STATIC
+        delivery_export.c
         delivery_postprocess.c
         delivery_conda.c
         delivery_docker.c
diff --git a/src/lib/delivery/delivery_export.c b/src/lib/delivery/delivery_export.c
new file mode 100644
index 0000000..d982ad5
--- /dev/null
+++ b/src/lib/delivery/delivery_export.c
@@ -0,0 +1,58 @@
+#include "delivery.h"
+
+static void delivery_export_configuration(const struct Delivery *ctx) {
+    msg(STASIS_MSG_L2, "Exporting delivery configuration\n");
+    if (!pushd(ctx->storage.cfgdump_dir)) {
+        char filename[PATH_MAX] = {0};
+        sprintf(filename, "%s.ini", ctx->info.release_name);
+        FILE *spec = fopen(filename, "w+");
+        if (!spec) {
+            msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "failed %s\n", filename);
+            exit(1);
+        }
+        ini_write(ctx->_stasis_ini_fp.delivery, &spec, INI_WRITE_RAW);
+        fclose(spec);
+
+        memset(filename, 0, sizeof(filename));
+        sprintf(filename, "%s-rendered.ini", ctx->info.release_name);
+        spec = fopen(filename, "w+");
+        if (!spec) {
+            msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "failed %s\n", filename);
+            exit(1);
+        }
+        ini_write(ctx->_stasis_ini_fp.delivery, &spec, INI_WRITE_PRESERVE);
+        fclose(spec);
+        popd();
+    } else {
+        SYSERROR("Failed to enter directory: %s", ctx->storage.delivery_dir);
+        exit(1);
+    }
+}
+
+void delivery_export(const struct Delivery *ctx, char *envs[]) {
+    delivery_export_configuration(ctx);
+
+    for (size_t i = 0; envs[i] != NULL; i++) {
+        char *name = envs[i];
+        msg(STASIS_MSG_L2, "Exporting %s\n", name);
+        if (conda_env_export(name, ctx->storage.delivery_dir, name)) {
+            msg(STASIS_MSG_ERROR | STASIS_MSG_L2, "failed %s\n", name);
+            exit(1);
+        }
+    }
+}
+
+void delivery_rewrite_stage1(struct Delivery *ctx, char *specfile) {
+    // Rewrite release environment output (i.e. set package origin(s) to point to the deployment server, etc.)
+    msg(STASIS_MSG_L3, "Rewriting release spec file (stage 1): %s\n", path_basename(specfile));
+    delivery_rewrite_spec(ctx, specfile, DELIVERY_REWRITE_SPEC_STAGE_1);
+
+    msg(STASIS_MSG_L1, "Rendering mission templates\n");
+    delivery_mission_render_files(ctx);
+}
+
+void delivery_rewrite_stage2(struct Delivery *ctx, char *specfile) {
+    msg(STASIS_MSG_L3, "Rewriting release spec file (stage 2): %s\n", path_basename(specfile));
+    delivery_rewrite_spec(ctx, specfile, DELIVERY_REWRITE_SPEC_STAGE_2);
+}
+
diff --git a/src/lib/delivery/delivery_init.c b/src/lib/delivery/delivery_init.c
index 56c591a..a60d6af 100644
--- a/src/lib/delivery/delivery_init.c
+++ b/src/lib/delivery/delivery_init.c
@@ -287,18 +287,25 @@ int delivery_init(struct Delivery *ctx, int render_mode) {
 
 int bootstrap_build_info(struct Delivery *ctx) {
     struct Delivery local = {0};
+    SYSDEBUG("ini_open(%s)", ctx->_stasis_ini_fp.cfg_path);
     local._stasis_ini_fp.cfg = ini_open(ctx->_stasis_ini_fp.cfg_path);
+    SYSDEBUG("ini_open(%s)", ctx->_stasis_ini_fp.delivery_path);
     local._stasis_ini_fp.delivery = ini_open(ctx->_stasis_ini_fp.delivery_path);
+
     if (delivery_init_platform(&local)) {
+        SYSDEBUG("%s", "delivery_init_platform failed");
         return -1;
     }
     if (populate_delivery_cfg(&local, INI_READ_RENDER)) {
+        SYSDEBUG("%s", "populate_delivery_cfg failed");
         return -1;
     }
     if (populate_delivery_ini(&local, INI_READ_RENDER)) {
+        SYSDEBUG("%s", "populate_delivery_ini failed");
         return -1;
     }
     if (populate_info(&local)) {
+        SYSDEBUG("%s", "populate_info failed");
         return -1;
     }
     ctx->info.build_name = strdup(local.info.build_name);
@@ -314,6 +321,7 @@ int bootstrap_build_info(struct Delivery *ctx) {
     memcpy(ctx->info.time_info, local.info.time_info, sizeof(*local.info.time_info));
     ctx->info.time_now = local.info.time_now;
     ctx->info.time_str_epoch = strdup(local.info.time_str_epoch);
+    SYSDEBUG("%s", "delivery_free local resources");
     delivery_free(&local);
     return 0;
 }
diff --git a/src/lib/delivery/delivery_populate.c b/src/lib/delivery/delivery_populate.c
index 84676f1..28b2480 100644
--- a/src/lib/delivery/delivery_populate.c
+++ b/src/lib/delivery/delivery_populate.c
@@ -55,6 +55,7 @@ int populate_info(struct Delivery *ctx) {
 int populate_delivery_cfg(struct Delivery *ctx, int render_mode) {
     struct INIFILE *cfg = ctx->_stasis_ini_fp.cfg;
     if (!cfg) {
+        SYSDEBUG("%s", "cfg is NULL");
         return -1;
     }
     int err = 0;
@@ -162,8 +163,6 @@ int populate_delivery_ini(struct Delivery *ctx, int render_mode) {
     // keys in the configuration
     RuntimeEnv *rt = runtime_copy(__environ);
     while ((rtdata = ini_getall(ini, "runtime")) != NULL) {
-        char rec[STASIS_BUFSIZ];
-        sprintf(rec, "%s=%s", lstrip(strip(rtdata->key)), lstrip(strip(rtdata->value)));
         runtime_set(rt, rtdata->key, rtdata->value);
     }
     runtime_apply(rt);
diff --git a/src/lib/delivery/include/delivery.h b/src/lib/delivery/include/delivery.h
index 26a5499..69ec089 100644
--- a/src/lib/delivery/include/delivery.h
+++ b/src/lib/delivery/include/delivery.h
@@ -459,4 +459,28 @@ int delivery_series_sync(struct Delivery *ctx);
  */
 int delivery_purge_packages(struct Delivery *ctx, const char *env_name, int use_pkg_manager);
 
+/**
+ * Export delivery environments
+ *
+ * @param ctx Delivery context
+ * @param envs array of conda environment names
+ */
+void delivery_export(const struct Delivery *ctx, char *envs[]);
+
+/**
+ * STAGE 1: Rewrite delivery-related strings in specfile
+ *
+ * @param ctx Delivery context
+ * @param specfile path to YAML spec file
+ */
+void delivery_rewrite_stage1(struct Delivery *ctx, char *specfile);
+
+/**
+ * STAGE 2: Rewrite delivery-related strings in specfile
+ *
+ * @param ctx Delivery context
+ * @param specfile path to YAML spec file
+ */
+void delivery_rewrite_stage2(struct Delivery *ctx, char *specfile);
+
 #endif //STASIS_DELIVERY_H