Fix things and shiz

Aim-Educational · Mar 10, 2020 · eccf043 · eccf043
1 parent 2c953b6
commit eccf043
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/source/aim/deploy/commands.d b/source/aim/deploy/commands.d
@@ -196,6 +196,9 @@ final class AimDeployTriggerCheck : BaseCommand
     private IAimCliConfig!AimDeployConfig _deployConf;
     private ICommandLineInterface         _cli;
 
+    @CommandNamedArg("no-post-deploy", "Don't trigger post deployments for triggers. Useful for debugging.")
+    Nullable!bool noPostDeploy;
+
     this(IAimDeployTriggerFactory factory, IAimCliConfig!AimDeployConfig deployConf, ICommandLineInterface cli)
     {
         this._triggerFactory = factory;
@@ -231,9 +234,12 @@ final class AimDeployTriggerCheck : BaseCommand
             status = this._cli.parseAndExecute(["deploy", "trigger"], IgnoreFirstArg.no);
         else
             Shell.verboseLogfln("No triggers were successful");
-
-        foreach(trigger; successfulTriggers)
-            trigger.onPostDeploy(status == 0);
+
+        if(!this.noPostDeploy.get(false))
+        {
+            foreach(trigger; successfulTriggers)
+                trigger.onPostDeploy(status == 0);
+        }
 
         return status;
     }

diff --git a/source/aim/deploy/triggers.d b/source/aim/deploy/triggers.d
@@ -81,7 +81,7 @@ final class GithubAimDeployTrigger : IAimDeployTrigger
         this._githubConf.edit((scope ref conf)
         {
             if(conf.lastDeploymentTime.length == 0)
-                conf.lastDeploymentTime = Clock.currTime.toISOString();
+                conf.lastDeploymentTime = (new SysTime(0)).toISOExtString();
         });
     }
 
@@ -123,12 +123,12 @@ final class GithubAimDeployTrigger : IAimDeployTrigger
         ).readJson();
         Shell.verboseLogfln("Response: %s", response.toPrettyString());
 
-        auto lastDeployTime = SysTime.fromISOString(this._githubConf.value.lastDeploymentTime);
+        auto lastDeployTime = SysTime.fromISOExtString(this._githubConf.value.lastDeploymentTime);
         auto nodes = response["data"]["repository"]["deployments"]["nodes"];
         auto firstPendingProduction = nodes.byValue
                                            .filter!(v => v["environment"].to!string == "production" // TODO: This should be a config option.
                                                       && v["state"].to!string       == "PENDING"    // TODO: Arguably this too, but it's less important.
-                                                      && SysTime.fromISOExtString(v["createdAt"].to!string()) > lastDeployTime
+                                                      && SysTime.fromISOExtString(v["createdAt"].to!string()[0..$-1] ~ ".0000000" ~ "Z") > lastDeployTime
                                            );
 
         if(firstPendingProduction.empty)
@@ -145,7 +145,7 @@ final class GithubAimDeployTrigger : IAimDeployTrigger
         this._githubConf.edit((scope ref conf)
         {
             conf.deploymentId       = databaseId; // So onPostDeploy knows what ID to use.
-            conf.lastDeploymentTime = deployment["createdAt"].to!string();
+            conf.lastDeploymentTime = deployment["createdAt"].to!string()[0..$-1] ~ ".0000000" ~ "Z";
         });
 
         // Find the ref, as that's being used as the image tag.