[DEVOPS-732] refactor release.nix (input-output-hk#3041)

Author: cleverca22

default.nix

@@ -130,15 +130,19 @@ let
     }) { inherit pkgs; };
     inherit (pkgs) purescript;
     connectScripts = {
-      mainnetWallet = connect {};
-      mainnetExplorer = connect { executable = "explorer"; };
-      stagingWallet = connect { environment = "mainnet-staging"; };
+      mainnet = {
+        wallet = connect {};
+        explorer = connect { executable = "explorer"; };
+      };
+      staging = {
+        wallet = connect { environment = "mainnet-staging"; };
+        explorer = connect { executable = "explorer"; environment = "mainnet-staging"; };
+      };
       demoWallet = connect { environment = "demo"; };
-      stagingExplorer = connect { executable = "explorer"; environment = "mainnet-staging"; };
     };
     dockerImages = {
-      mainnetWallet = mkDocker { environment = "mainnet"; };
-      stagingWallet = mkDocker { environment = "mainnet-staging"; };
+      mainnet.wallet = mkDocker { environment = "mainnet"; };
+      staging.wallet = mkDocker { environment = "mainnet-staging"; };
     };
 
     daedalus-bridge = let

docs/exchange-onboarding.md

@@ -160,9 +160,9 @@ By default the wallet's local state goes in
 `./state-wallet-mainnet`.
 
 Build the wallet and generate the shell script to connect to
-mainnet (use `connectScripts.stagingWallet` for testnet)
+mainnet (use `connectScripts.staging.wallet` for testnet)
 
-    nix-build -A connectScripts.mainnetWallet -o "./launch_$(date -I)_$(git rev-parse --short HEAD)"
+    nix-build -A connectScripts.mainnet.wallet -o "./launch_$(date -I)_$(git rev-parse --short HEAD)"
 
 After the build finishes the generated connection script is
 available as a symlink called `./launch_2018-01-30_0d4f79eea`, or
@@ -172,9 +172,9 @@ similar. Run that symlink as a script to start the wallet.
 
 Follow the above instructions for customization and dependencies. To build a docker
 container and import the image run
-(use `connectScripts.stagingWallet` for testnet):
+(use `connectScripts.staging.wallet` for testnet):
 
-    docker load < $(nix-build --no-out-link -A dockerImages.mainnetWallet)
+    docker load < $(nix-build --no-out-link -A dockerImages.mainnet.wallet)
 
 This will create an image `cardano-container-mainnet:latest`
 (or `cardano-container-staging:latest` for testnet)

docs/how-to/connect-to-cluster.md

@@ -2,11 +2,11 @@
 
 1. Make sure you’ve follow [the instructions to build from source using Nix](build-cardano-sl-and-daedalus-from-source-code.md)
 2. Make sure you’re on latest `master` branch
-3. To build a script that will contain everything needed to connect to mainnet: `$ nix-build -A connectScripts.mainnetWallet -o connect-to-mainnet`
+3. To build a script that will contain everything needed to connect to mainnet: `$ nix-build -A connectScripts.mainnet.wallet -o connect-to-mainnet`
 4. Alternatively you can connect to different environments and different executables by building the scripts:
-- Explorer node with mainnet: `$ nix-build -A connectScripts.mainnetExplorer -o connect-explorer-to-mainnet
-- Wallet to staging: `$ nix-build -A connectScripts.stagingWallet -o connect-to-staging`
-- Explorer to staging: `$ nix-build -A connectScripts.stagingExplorer -o connect-explorer-to-staging`
+- Explorer node with mainnet: `$ nix-build -A connectScripts.mainnet.explorer -o connect-explorer-to-mainnet
+- Wallet to staging: `$ nix-build -A connectScripts.staging.wallet -o connect-to-staging`
+- Explorer to staging: `$ nix-build -A connectScripts.staging.explorer -o connect-explorer-to-staging`
 3. A runtime state folder will be automatically created relative to your current
    working directory, but you can override it using `$ export CARDANO_STATE_DIR=~/wallet-state`
 4. Run the script: `$ ./connect-to-mainnet`

docs/tls-authentication.md

@@ -43,7 +43,7 @@ usurp either the server or the clients identities**.
 
 > **NOTE** If you build the application using Nix 
 > 
-> e.g. `$ nix-build -A connectScripts.stagingWallet -o connect-to-staging`
+> e.g. `$ nix-build -A connectScripts.staging.wallet -o connect-to-staging`
 >
 > There's nothing to do, certificates will be generated upon launching the cluster
 > if they're missing, using the default configuration. 

nixos-tests/wallet-api.nix

@@ -22,7 +22,7 @@ import (pkgs.path + "/nixos/tests/make-test.nix") ({ pkgs, ... }: {
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       serviceConfig = {
-        ExecStart = cardano_sl.connectScripts.stagingWallet;
+        ExecStart = cardano_sl.connectScripts.staging.wallet;
         Type = "notify";
         NotifyAccess = "all";
         TimeoutStartSec = 600;
@@ -33,7 +33,7 @@ import (pkgs.path + "/nixos/tests/make-test.nix") ({ pkgs, ... }: {
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       serviceConfig = {
-        ExecStart = cardano_sl.connectScripts.stagingWallet.override ( { walletListen = "127.0.0.1:8091"; ekgListen = "127.0.0.1:8001"; stateDir = "cardano-state-staging-custom-port"; } );
+        ExecStart = cardano_sl.connectScripts.staging.wallet.override ( { walletListen = "127.0.0.1:8091"; ekgListen = "127.0.0.1:8001"; stateDir = "cardano-state-staging-custom-port"; } );
         Type = "notify";
         NotifyAccess = "all";
         TimeoutStartSec = 600;

release.nix

@@ -18,10 +18,16 @@ with (import (fixedNixpkgs + "/pkgs/top-level/release-lib.nix") {
 let
   iohkPkgs = import ./. { gitrev = cardano.rev; };
   pkgs = import fixedNixpkgs { config = {}; };
-  stagingWalletdockerImage = pkgs.runCommand "${iohkPkgs.dockerImages.stagingWallet.name}-hydra" {} ''
+  wrapDockerImage = cluster: let
+    images = {
+      mainnet = iohkPkgs.dockerImages.mainnet.wallet;
+      staging = iohkPkgs.dockerImages.staging.wallet;
+    };
+    image = images."${cluster}";
+  in pkgs.runCommand "${image.name}-hydra" {} ''
     mkdir -pv $out/nix-support/
     cat <<EOF > $out/nix-support/hydra-build-products
-    file dockerimage ${iohkPkgs.dockerImages.stagingWallet}
+    file dockerimage ${image}
     EOF
   '';
   platforms = {
@@ -35,21 +41,36 @@ let
     cardano-report-server-static = [ "x86_64-linux" ];
     stack2nix = supportedSystems;
     purescript = supportedSystems;
-    connectScripts.mainnetWallet   = [ "x86_64-linux" "x86_64-darwin" ];
-    connectScripts.mainnetExplorer = [ "x86_64-linux" "x86_64-darwin" ];
-    connectScripts.stagingWallet   = [ "x86_64-linux" "x86_64-darwin" ];
-    connectScripts.stagingExplorer = [ "x86_64-linux" "x86_64-darwin" ];
     daedalus-bridge = supportedSystems;
   };
+  platforms' = {
+    connectScripts.mainnet.wallet   = [ "x86_64-linux" "x86_64-darwin" ];
+    connectScripts.mainnet.explorer = [ "x86_64-linux" "x86_64-darwin" ];
+    connectScripts.staging.wallet   = [ "x86_64-linux" "x86_64-darwin" ];
+    connectScripts.staging.explorer = [ "x86_64-linux" "x86_64-darwin" ];
+  };
+  mapped = mapTestOn platforms;
+  mapped' = mapTestOn platforms';
+  makeConnectScripts = cluster: let
+  in {
+    inherit (mapped'.connectScripts."${cluster}") wallet explorer;
+  };
   nixosTests = import ./nixos-tests;
   shellcheckTests = iohkPkgs.shellcheckTests;
   swaggerSchemaValidation = iohkPkgs.swaggerSchemaValidation;
   walletIntegrationTests = iohkPkgs.buildWalletIntegrationTests;
-in (mapTestOn platforms) // {
-  inherit stagingWalletdockerImage walletIntegrationTests swaggerSchemaValidation shellcheckTests;
+  makeRelease = cluster: {
+    name = cluster;
+    value = {
+      dockerImage = wrapDockerImage cluster;
+      connectScripts = makeConnectScripts cluster;
+    };
+  };
+in mapped // {
+  inherit walletIntegrationTests swaggerSchemaValidation shellcheckTests;
   nixpkgs = let
     wrapped = pkgs.runCommand "nixpkgs" {} ''
       ln -sv ${fixedNixpkgs} $out
     '';
   in if 0 <= builtins.compareVersions builtins.nixVersion "1.12" then wrapped else fixedNixpkgs;
-}
+} // (builtins.listToAttrs (map makeRelease [ "mainnet" "staging" ]))