Merge pull request #118 from glittershark/route53-eip

Allow Route53 recordsets to point at EIPs

Author: adisbladis

.github/workflows/ci.yaml

@@ -11,7 +11,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Nix
-        uses: cachix/install-nix-action@v8
+        uses: cachix/install-nix-action@v12
       - name: Build
         run: 'nix-build -I nixpkgs=channel:nixos-unstable --quiet release.nix -A nixops-aws.x86_64-linux --show-trace'
   # Run black v19.10b0 and ensure no diff, using a pinned channel to ensure the
@@ -25,24 +25,30 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Nix
-        uses: cachix/install-nix-action@v8
+        uses: cachix/install-nix-action@v12
       - name: Black
         run: 'nix-shell ./shell.nix --run "black --check ."'
+        env:
+          NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz"
   flake8:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Nix
-        uses: cachix/install-nix-action@v8
+        uses: cachix/install-nix-action@v12
       - name: Flake8
         run: 'nix-shell ./shell.nix --run "flake8 nixops_aws"'
+        env:
+          NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz"
   mypy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Nix
-        uses: cachix/install-nix-action@v8
+        uses: cachix/install-nix-action@v12
       - name: Mypy
         run: 'nix-shell ./shell.nix --run "mypy nixops_aws"'
+        env:
+          NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz"

nixops_aws/nix/route53-recordset.nix

@@ -81,7 +81,11 @@ with (import ./lib.nix lib);
     };
 
     recordValues = mkOption {
-      type = types.listOf (types.either types.str (resource "machine"));
+      type = types.listOf (types.oneOf [
+        types.str
+        (resource "machine")
+        (resource "elastic-ip")
+      ]);
 
       apply = l: map (x: if (builtins.isString x) || ( x == null) then x else "res-" + x._name) l;
 

nixops_aws/resources/route53_recordset.py

@@ -6,8 +6,9 @@
 import boto3
 import nixops.util
 import nixops.resources
+import nixops.deployment
 import nixops_aws.ec2_utils
-from . import route53_hosted_zone, route53_health_check
+from . import route53_hosted_zone, route53_health_check, elastic_ip
 from .route53_hosted_zone import Route53HostedZoneState
 from .route53_health_check import Route53HealthCheckState
 from nixops_aws.backends.ec2 import EC2State
@@ -218,18 +219,32 @@ def create(self, defn, check, allow_reboot, allow_recreate):  # noqa: C901
                 )
             )
 
-        def resolve_machine_ip(v):
+        def resolve_ip(v):
             if v.startswith("res-"):
-                m = self.depl.get_machine(v[4:], EC2State)
-                if not m.public_ipv4:
-                    raise Exception(
-                        "cannot create record set for a machine that has not yet been created"
-                    )
-                return m.public_ipv4
+                name = v[4:]
+                res = self.depl.active_resources.get(name)
+                if res is None:
+                    raise Exception(f"Resource ‘{name}’ does not exist")
+
+                if isinstance(res, EC2State):
+                    m: EC2State = res
+                    if not m.public_ipv4:
+                        raise Exception(
+                            "cannot create record set for a machine that has not yet been created"
+                        )
+                    return m.public_ipv4
+                elif isinstance(res, elastic_ip.ElasticIPState):
+                    eip: elastic_ip.ElasticIPState = res
+                    if not eip.public_ipv4:
+                        raise Exception(
+                            "cannot create record set for an ElasticIP that has not yet been created"
+                        )
+                    return eip.public_ipv4
+            # elif v.startswith
             else:
                 return v
 
-        defn.record_values = [resolve_machine_ip(m) for m in defn.record_values]
+        defn.record_values = [resolve_ip(m) for m in defn.record_values]
 
         changed = (
             self.record_values != defn.record_values
@@ -350,4 +365,5 @@ def create_after(self, resources, defn):
             if isinstance(r, route53_hosted_zone.Route53HostedZoneState)
             or isinstance(r, route53_health_check.Route53HealthCheckState)
             or isinstance(r, nixops.backends.MachineState)
+            or isinstance(r, elastic_ip.ElasticIPState)
         }