update bitte-cli

input-output-hk · Aug 13, 2020 · 89562f2 · 89562f2
1 parent b7e9e04
commit 89562f2
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 5 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/terraform.nix b/modules/terraform.nix
@@ -295,7 +295,7 @@ let
 
         id = mkOption {
           type = str;
-          default = id "aws_vpc.${this.config.name}";
+          default = id "data.aws_vpc.${this.config.name}";
         };
 
         region = mkOption { type = enum regions; };

diff --git a/modules/terraform/clients.nix b/modules/terraform/clients.nix
@@ -5,6 +5,11 @@ let
   vpcs = pkgs.terralib.vpcs config.cluster;
 in {
   tf.clients.configuration = {
+    terraform.backend.remote = {
+      organization = "iohk-midnight";
+      workspaces = [{ prefix = "${config.cluster.name}_"; }];
+    };
+
     output.cluster = {
       value = {
         flake = self.outPath;

diff --git a/modules/terraform/consul.nix b/modules/terraform/consul.nix
@@ -1,5 +1,10 @@
 { config, lib, ... }: {
   tf.consul.configuration = {
+    terraform.backend.remote = {
+      organization = "iohk-midnight";
+      workspaces = [{ prefix = "${config.cluster.name}_"; }];
+    };
+
     provider.consul = {
       address = "https://consul.${config.cluster.domain}";
       datacenter = "eu-central-1";

diff --git a/modules/terraform/core.nix b/modules/terraform/core.nix
@@ -37,6 +37,11 @@ in {
   config = {
     tf = {
       core.configuration = {
+        terraform.backend.remote = {
+          organization = "iohk-midnight";
+          workspaces = [{ prefix = "${config.cluster.name}_"; }];
+        };
+
         output.cluster = {
           value = {
             flake = self.outPath;
@@ -149,6 +154,23 @@ in {
         #   };
         # };
 
+        data.aws_vpc = (lib.flip lib.mapAttrs' vpcs (region: vpc:
+          lib.nameValuePair vpc.name {
+            inherit (vpc) provider;
+            filter = {
+              name = "tag:Name";
+              values = [ vpc.name ];
+            };
+          })) // {
+            core = {
+              provider = awsProviderFor config.cluster.region;
+              filter = {
+                name = "tag:Name";
+                values = [ config.cluster.vpc.name ];
+              };
+            };
+          };
+
         resource.aws_security_group = {
           "${config.cluster.name}" = {
             provider = awsProviderFor config.cluster.region;

diff --git a/modules/terraform/network.nix b/modules/terraform/network.nix
@@ -8,7 +8,6 @@ let
   tags = { Cluster = config.cluster.name; };
 in {
   tf.network.configuration = {
-
     terraform.backend.remote = {
       organization = "iohk-midnight";
       workspaces = [{ prefix = "${config.cluster.name}_"; }];