Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixops-aws
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c61356ff7337
Choose a base ref
...
head repository: NixOS/nixops-aws
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1bd5ee0c4d71
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 3, 2019

  1. route53: update docstring typos and remove unused imports

    @bhipple
    bhipple committed Nov 3, 2019
    Copy the full SHA
    3ebbd9f View commit details

Commits on Nov 4, 2019

  1. Merge pull request #15 from bhipple/feature/docstring-typos 

    route53: update docstring typos and remove unused imports
    @AmineChikhaoui
    AmineChikhaoui authored Nov 4, 2019
    Copy the full SHA
    1bd5ee0 View commit details
Showing with 3 additions and 6 deletions.
  1. +2 −2 nix/route53-recordset.nix
  2. +1 −4 nixopsaws/resources/route53_recordset.py
4 changes: 2 additions & 2 deletions nix/route53-recordset.nix
View file
Original file line number Diff line number Diff line change
@@ -86,8 +86,8 @@ with (import ./lib.nix lib);
apply = l: map (x: if (builtins.isString x) || ( x == null) then x else "res-" + x._name) l;

description = ''
The value of the DNS record
(e.g. IP adress in case of an A or AAA record type,
The value of the DNS record
(e.g. IP address in case of an A or AAA record type,
or a DNS name in case of a CNAME record type)
'';
};
5 changes: 1 addition & 4 deletions nixopsaws/resources/route53_recordset.py
View file
Original file line number Diff line number Diff line change
@@ -3,16 +3,14 @@
# Automatic provisioning of AWS Route53 RecordSets.

import os
import time
import botocore
import boto3
import nixops.util
import nixops.resources
import nixopsaws.ec2_utils
#boto3.set_stream_logger(name='botocore')

class Route53RecordSetDefinition(nixops.resources.ResourceDefinition):
"""Definition of an Route53 RecordSet."""
"""Definition of a Route53 RecordSet."""

@classmethod
def get_type(cls):
@@ -261,4 +259,3 @@ def create_after(self, resources, defn):
isinstance(r, nixopsaws.resources.route53_hosted_zone.Route53HostedZoneState) or
isinstance(r, nixopsaws.resources.route53_health_check.Route53HealthCheckState) or
isinstance(r, nixops.backends.MachineState)}