nixfmt

input-output-hk · Nov 17, 2020 · 9a81bd4 · 9a81bd4
1 parent 7b9dcc7
commit 9a81bd4
Show file tree

Hide file tree

Showing 9 changed files with 146 additions and 121 deletions.
diff --git a/clusters/mantis/testnet/default.nix b/clusters/mantis/testnet/default.nix
@@ -179,9 +179,7 @@ in {
         privateIP = "172.16.0.20";
         subnet = cluster.vpc.subnets.core-1;
         volumeSize = 500;
-        route53.domains = [
-          "*.${cluster.domain}"
-        ];
+        route53.domains = [ "*.${cluster.domain}" ];
 
         modules = let
           extraConfig = pkgs.writeText "extra-config.nix" ''
@@ -201,7 +199,8 @@ in {
         ];
 
         securityGroupRules = {
-          inherit (securityGroupRules) internet internal ssh http mantis-server-public;
+          inherit (securityGroupRules)
+            internet internal ssh http mantis-server-public;
         };
       };
     };

diff --git a/clusters/mantis/testnet/seaweedfs.nix b/clusters/mantis/testnet/seaweedfs.nix
@@ -21,9 +21,7 @@ in {
 
   services.seaweedfs.mount = {
     enable = true;
-    mounts = {
-      nomad = "nomad";
-    };
+    mounts = { nomad = "nomad"; };
   };
 
   services.nomad.client = {

diff --git a/docker/darkhttpd.nix b/docker/darkhttpd.nix
@@ -1,4 +1,5 @@
-{ lib, mkEnv, buildLayeredImage, writeShellScript, darkhttpd, mime-types, mantis-explorer }:
+{ lib, mkEnv, buildLayeredImage, writeShellScript, darkhttpd, mime-types
+, mantis-explorer }:
 let
   entrypoint = writeShellScript "darkhttpd" ''
     set -exuo pipefail

diff --git a/docker/mantis.nix b/docker/mantis.nix
@@ -1,4 +1,5 @@
-{ lib, mkEnv, buildLayeredImage, writeShellScript, mantis, mantis-faucet, coreutils, gnused, gnugrep }:
+{ lib, mkEnv, buildLayeredImage, writeShellScript, mantis, mantis-faucet
+, coreutils, gnused, gnugrep }:
 let
   mantis-entrypoint = writeShellScript "mantis" ''
     set -exuo pipefail
@@ -42,7 +43,8 @@ in {
     config = {
       Entrypoint = [ mantis-entrypoint ];
 
-      Env = mkEnv { PATH = lib.makeBinPath [ coreutils gnugrep gnused mantis ]; };
+      Env =
+        mkEnv { PATH = lib.makeBinPath [ coreutils gnugrep gnused mantis ]; };
     };
   };
 
@@ -51,7 +53,9 @@ in {
     config = {
       Entrypoint = [ faucet-entrypoint ];
 
-      Env = mkEnv { PATH = lib.makeBinPath [ coreutils gnugrep gnused mantis-faucet ]; };
+      Env = mkEnv {
+        PATH = lib.makeBinPath [ coreutils gnugrep gnused mantis-faucet ];
+      };
     };
   };
 }
diff --git a/flake.nix b/flake.nix
@@ -11,7 +11,8 @@
     utils.url = "github:numtide/flake-utils";
     ops-lib.url = "github:input-output-hk/ops-lib/zfs-image?dir=zfs";
     midnight-automation = {
-      url = "git+ssh://github.com/input-output-hk/midnight-automation?ref=etcm-99-mantis-agen";
+      url =
+        "git+ssh://github.com/input-output-hk/midnight-automation?ref=etcm-99-mantis-agen";
       flake = false;
     };
     mantis-explorer = {
@@ -36,14 +37,14 @@
       inherit (legacyPackages) devShell;
 
       packages = {
-        inherit (legacyPackages) bitte nixFlakes sops generate-mantis-keys
-          terraform-with-plugins cfssl consul;
+        inherit (legacyPackages)
+          bitte nixFlakes sops generate-mantis-keys terraform-with-plugins cfssl
+          consul;
       };
 
       hydraJobs = packages // {
-        prebuilt-devshell = devShell.overrideAttrs (_: {
-          nobuildPhase = "touch $out";
-        });
+        prebuilt-devshell =
+          devShell.overrideAttrs (_: { nobuildPhase = "touch $out"; });
       };
 
       apps.bitte = utils.lib.mkApp { drv = legacyPackages.bitte; };

diff --git a/jobs/mantis-qa-fastsync.nix b/jobs/mantis-qa-fastsync.nix
@@ -5,30 +5,28 @@ let
 
   templatesFor = { name ? null, mining-enabled ? false }:
     let secret = key: ''{{ with secret "${key}" }}{{.Data.data.value}}{{end}}'';
-    in [
-      {
-        data = ''
-          include "${mantis}/conf/etc.conf"
-
-          logging.json-output = true
-          logging.logs-file = "logs"
-
-          mantis.client-id = "${name}"
-          mantis.sync.do-fast-sync = true
-          mantis.consensus.coinbase = "{{ with secret "kv/data/nomad-cluster/${namespace}/${name}/coinbase" }}{{ .Data.data.value }}{{ end }}"
-          mantis.node-key-file = "{{ env "NOMAD_SECRETS_DIR" }}/secret-key"
-          mantis.datadir = "/local/mantis"
-          mantis.ethash.ethash-dir = "/local/ethash"
-          mantis.metrics.enabled = true
-          mantis.metrics.port = {{ env "NOMAD_PORT_metrics" }}
-          mantis.network.rpc.http.interface = "0.0.0.0"
-          mantis.network.rpc.http.port = {{ env "NOMAD_PORT_rpc" }}
-          mantis.network.server-address.port = {{ env "NOMAD_PORT_server" }}
-        '';
-        destination = "local/mantis.conf";
-        changeMode = "noop";
-      }
-    ] ++ (lib.optional mining-enabled {
+    in [{
+      data = ''
+        include "${mantis}/conf/etc.conf"
+
+        logging.json-output = true
+        logging.logs-file = "logs"
+
+        mantis.client-id = "${name}"
+        mantis.sync.do-fast-sync = true
+        mantis.consensus.coinbase = "{{ with secret "kv/data/nomad-cluster/${namespace}/${name}/coinbase" }}{{ .Data.data.value }}{{ end }}"
+        mantis.node-key-file = "{{ env "NOMAD_SECRETS_DIR" }}/secret-key"
+        mantis.datadir = "/local/mantis"
+        mantis.ethash.ethash-dir = "/local/ethash"
+        mantis.metrics.enabled = true
+        mantis.metrics.port = {{ env "NOMAD_PORT_metrics" }}
+        mantis.network.rpc.http.interface = "0.0.0.0"
+        mantis.network.rpc.http.port = {{ env "NOMAD_PORT_rpc" }}
+        mantis.network.server-address.port = {{ env "NOMAD_PORT_server" }}
+      '';
+      destination = "local/mantis.conf";
+      changeMode = "noop";
+    }] ++ (lib.optional mining-enabled {
       data = ''
         ${secret "kv/data/nomad-cluster/${namespace}/${name}/secret-key"}
         ${secret "kv/data/nomad-cluster/${namespace}/${name}/enode-hash"}
@@ -158,7 +156,7 @@ let
         config = {
           image = dockerImages.mantis.id;
           args = [ "-Dconfig.file=running.conf" ];
-          ports = ["rpc" "server" "metrics"];
+          ports = [ "rpc" "server" "metrics" ];
           labels = [{
             inherit namespace name;
             imageTag = dockerImages.mantis.image.imageTag;
@@ -251,29 +249,27 @@ let
         };
       };
 
-      templates = [
-        {
-          data = ''
-            include "${mantis}/conf/etc.conf"
-
-            logging.json-output = true
-            logging.logs-file = "logs"
-
-            mantis.client-id = "${name}"
-            mantis.sync.do-fast-sync = true
-            mantis.consensus.mining-enabled = false
-            mantis.datadir = "/local/mantis"
-            mantis.ethash.ethash-dir = "/local/ethash"
-            mantis.metrics.enabled = true
-            mantis.metrics.port = {{ env "NOMAD_PORT_metrics" }}
-            mantis.network.rpc.http.interface = "0.0.0.0"
-            mantis.network.rpc.http.port = {{ env "NOMAD_PORT_rpc" }}
-            mantis.network.server-address.port = {{ env "NOMAD_PORT_server" }}
-          '';
-          changeMode = "restart";
-          destination = "local/mantis.conf";
-        }
-      ];
+      templates = [{
+        data = ''
+          include "${mantis}/conf/etc.conf"
+
+          logging.json-output = true
+          logging.logs-file = "logs"
+
+          mantis.client-id = "${name}"
+          mantis.sync.do-fast-sync = true
+          mantis.consensus.mining-enabled = false
+          mantis.datadir = "/local/mantis"
+          mantis.ethash.ethash-dir = "/local/ethash"
+          mantis.metrics.enabled = true
+          mantis.metrics.port = {{ env "NOMAD_PORT_metrics" }}
+          mantis.network.rpc.http.interface = "0.0.0.0"
+          mantis.network.rpc.http.port = {{ env "NOMAD_PORT_rpc" }}
+          mantis.network.server-address.port = {{ env "NOMAD_PORT_server" }}
+        '';
+        changeMode = "restart";
+        destination = "local/mantis.conf";
+      }];
     };
 
   amountOfMiners = 0;
@@ -307,4 +303,7 @@ in {
   };
 }
 
-// (import ./mantis-active-gen.nix { inherit mkNomadJob dockerImages; namespace = "mantis-qa-fastsync"; })
+// (import ./mantis-active-gen.nix {
+  inherit mkNomadJob dockerImages;
+  namespace = "mantis-qa-fastsync";
+})
diff --git a/jobs/mantis-qa-load.nix b/jobs/mantis-qa-load.nix
@@ -177,7 +177,7 @@ let
         config = {
           image = dockerImages.mantis.id;
           args = [ "-Dconfig.file=running.conf" ];
-          ports = ["rpc" "server" "metrics"];
+          ports = [ "rpc" "server" "metrics" ];
           labels = [{
             inherit namespace name;
             imageTag = dockerImages.mantis.image.imageTag;
@@ -534,4 +534,7 @@ in {
   };
 }
 
-// (import ./mantis-active-gen.nix { inherit mkNomadJob dockerImages; namespace = "mantis-qa-load"; })
+// (import ./mantis-active-gen.nix {
+  inherit mkNomadJob dockerImages;
+  namespace = "mantis-qa-load";
+})
diff --git a/jobs/mantis.nix b/jobs/mantis.nix
@@ -1,4 +1,5 @@
-{ mkNomadJob, lib, mantis, mantis-source, mantis-faucet, mantis-faucet-source, dockerImages }:
+{ mkNomadJob, lib, mantis, mantis-source, mantis-faucet, mantis-faucet-source
+, dockerImages }:
 let
   # NOTE: Copy this file and change the next line if you want to start your own cluster!
   namespace = "mantis-testnet";
@@ -177,7 +178,7 @@ let
         config = {
           image = dockerImages.mantis.id;
           args = [ "-Dconfig.file=running.conf" ];
-          ports = ["rpc" "server" "metrics"];
+          ports = [ "rpc" "server" "metrics" ];
           labels = [{
             inherit namespace name;
             imageTag = dockerImages.mantis.image.imageTag;
@@ -326,7 +327,8 @@ let
         ingressHost = "${name}.mantis.ws";
         ingressMode = "http";
         ingressBind = "*:443";
-        ingressIf = "! { path_beg -i /rpc/node } ! { path_beg -i /sockjs-node }";
+        ingressIf =
+          "! { path_beg -i /rpc/node } ! { path_beg -i /sockjs-node }";
         ingressServer = "_${name}._tcp.service.consul";
       };
 
@@ -380,7 +382,8 @@ let
         addressMode = "host";
         portLabel = "rpc";
 
-        tags = [ "ingress" namespace "faucet" faucetName mantis-faucet-source.rev ];
+        tags =
+          [ "ingress" namespace "faucet" faucetName mantis-faucet-source.rev ];
 
         meta = {
           name = faucetName;
@@ -394,7 +397,13 @@ let
       "${faucetName}-prometheus" = {
         addressMode = "host";
         portLabel = "metrics";
-        tags = [ "prometheus" namespace "faucet" faucetName mantis-faucet-source.rev ];
+        tags = [
+          "prometheus"
+          namespace
+          "faucet"
+          faucetName
+          mantis-faucet-source.rev
+        ];
       };
     };
 
@@ -403,7 +412,7 @@ let
         metrics.to = 7000;
         rpc.to = 8000;
       };
-     }];
+    }];
 
     tasks.telegraf = {
       driver = "docker";
@@ -473,7 +482,7 @@ let
       config = {
         image = dockerImages.mantis-faucet.id;
         args = [ "-Dconfig.file=running.conf" ];
-        ports = ["rpc" "metrics"];
+        ports = [ "rpc" "metrics" ];
         labels = [{
           inherit namespace;
           name = "faucet";
@@ -601,9 +610,9 @@ in {
       minHealthyTime = "30s";
       healthyDeadline = "5m";
       progressDeadline = "10m";
-      autoRevert = true;
-      autoPromote = true;
-      canary = 1;
+      autoRevert = false;
+      autoPromote = false;
+      canary = 0;
       stagger = "30s";
     };
 
@@ -629,4 +638,7 @@ in {
   };
 }
 
-// (import ./mantis-active-gen.nix { inherit mkNomadJob dockerImages; namespace = "mantis-testnet"; })
+// (import ./mantis-active-gen.nix {
+  inherit mkNomadJob dockerImages;
+  namespace = "mantis-testnet";
+})