vagrant-aws-dns-synchronous 0.2.6.6 → 0.2.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c870d09380bf477cbd20bca530fb80beab27d12
-  data.tar.gz: f29cde027a46fb16394fe8193f16fc67e22fb209
+  metadata.gz: 4fac03652b947cfd44911fe8d6509609a6c87c31
+  data.tar.gz: e71e64bb8b647c427c9269f5ef8d7d7e03625cde
 SHA512:
-  metadata.gz: aa07d3b9fbfe00307ae9f29e067848148c1a4102fab261a61e886f709dde4f81317163e3af5e10df50469568aba1bd4c3c30bce4d765fe285a683f7a7cb08326
-  data.tar.gz: 15b5f9030339c7275829a5b12ee419a5103dbe2147af3cfdba305d6a6d9dc6294545ecfe54b995a65de0abbc63fabb5ad704c16e3ae7bbb9d637f7ae22472955
+  metadata.gz: ed7f9aafc237a7ae49cd1a24b0514eb03de5aafab8e54605998ab8e612050048d396d968f5a96883d05a30f77aa547de68e465526827fbc1bf5f18bd3777cada
+  data.tar.gz: d0ae846d6ca4272047a949675506c623999ecf5791022f60e5719e25f15bcdf80cb3a92290cd858c4f1a34f63db68d57e27f0efa9d89d90725d0deb235f0ab84

data/README.md

@@ -66,6 +66,7 @@ Vagrant.configure("2") do |config|
 * `%w(HOSTED_ZONE_ID subdomain.domain.com CNAME domain2.com)` - This will set a record of type `subdomain.domain1.com. CNAME domain2.com.`.
 
 The ip may be omitted in which case the correct ip (private/public) will be chosen based on the type of the HOSTED_ZONE_ID.
+If the record type is CNAME and the value is not provided, the private/public AWS DNS name will be used instead. 
 
 ## FAQ
 

data/lib/vagrant-aws-dns-synchronous/action/base.rb

@@ -18,17 +18,19 @@ module VagrantPlugins
           @aws = AwsDns::Util::AwsUtil.new(@machine.provider_config.access_key_id,
                                            @machine.provider_config.secret_access_key,
                                            @machine.provider_config.region)
-          public_ip = @aws.get_public_ip(@machine.id)
-          private_ip = @aws.get_private_ip(@machine.id)
+          instance = @aws.instance_info(@machine.id)
 
           @machine.config.dns.record_sets.each do |record_set|
             hosted_zone_id, record, type, value = record_set
+            zone_type = @aws.get_zone_type(hosted_zone_id)
 
-            if @aws.is_private_zone(hosted_zone_id)
-               yield hosted_zone_id, record, type, value || private_ip  if block_given?
+            default_value = if type == 'CNAME'
+              instance.public_send("#{zone_type}_dns_name")
             else
-               yield hosted_zone_id, record, type, value || public_ip  if block_given?
+              instance.public_send("#{zone_type}_ip_address")
             end
+
+            yield hosted_zone_id, record, type, value || default_value if block_given?
           end
 
           @app.call(env)

data/lib/vagrant-aws-dns-synchronous/util/aws_util.rb

@@ -20,16 +20,13 @@ module VagrantPlugins
           )
         end
 
-        def get_public_ip(instance_id)
-          @ec2.describe_instances({instance_ids: [instance_id]}).reservations[0].instances[0].public_ip_address
+        def instance_info(instance_id)
+          @ec2.describe_instances({instance_ids: [instance_id]}).reservations[0].instances[0]
         end
 
-        def get_private_ip(instance_id)
-          @ec2.describe_instances({instance_ids: [instance_id]}).reservations[0].instances[0].private_ip_address
-        end
-
-        def is_private_zone(hosted_zone_id)
-	  @route53.get_hosted_zone({id: '/hostedzone/' + hosted_zone_id}).hosted_zone.config.private_zone
+        def get_zone_type(hosted_zone_id)
+          zone = @route53.get_hosted_zone({id: '/hostedzone/' + hosted_zone_id})
+          zone.hosted_zone.config.private_zone ? :private : :public
         end
 
         def add_record(hosted_zone_id, record, type, value)

data/lib/vagrant-aws-dns-synchronous/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module AwsDns
-    VERSION = "0.2.6.6"
+    VERSION = "0.2.6.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-aws-dns-synchronous
 version: !ruby/object:Gem::Version
-  version: 0.2.6.6
+  version: 0.2.6.7
 platform: ruby
 authors:
 - Nassim Kacha
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk