cloudstrap 0.30.12.pre → 0.31.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abbe10d27d4f4e5bd183ba7556953ec02e5c3216
-  data.tar.gz: f9a76d71308b176b42115c3c4a06ac307ecad09a
+  metadata.gz: 74614e07862ccafa1e8a578fa6096f83193a82a1
+  data.tar.gz: 077627f919d13452fe56ec2a46721b1a081f261c
 SHA512:
-  metadata.gz: 3e35b8063403b05ce0e667b4cd740bad6e842910c9965c0d4fa08d231230ad39f4f7c7649a67b9389264cb97325fe39391a3d24662c14872d066d55afd646b0a
-  data.tar.gz: 7f7f2ba508fad6b7a43996fd92c104e703bb2dba7767d3ae8f71c3f80b3c2114e6c64c3b001396f7c919f94aa17b820ad5c176318eb56178d47398e6d208205d
+  metadata.gz: 141f91160f912706e61b4cda52a6abba92449120d94e65ade11cb876a9c4b474451053c514d49c794b757eb770442797b3d079133f53ab720dd57c23a2e4b019
+  data.tar.gz: 2ed68498c3fb49ab93feb1912cade807fdb36f822d74e9c253653aa383e41d48f31014a8c05f1f4ad63e1925a1209f962f0543868bd64e6ad4361e6115fc1ae5

data/bin/cloudstrap

@@ -65,6 +65,7 @@ BOOTSTRAP_WITHOUT_HUMAN_OVERSIGHT=#{!agent.requires_human_oversight?}
 #   These do not need configuration, and are presented as a debugging checklist
 
 # DNS Support Enabled for VPC? #{agent.enable_dns_support}
+# DNS Hostnames Enabled for VPC? #{agent.enable_dns_hostnames}
 # Public IPs Enabled in Public Subnet? #{agent.enable_public_ips}
 # Gateway Attached to VPC? #{agent.attach_gateway}
 # Route to Internet via Gateway? #{agent.default_route}

data/lib/cloudstrap/amazon.rb

@@ -1,2 +1,4 @@
 require_relative 'amazon/ec2'
+require_relative 'amazon/elb'
 require_relative 'amazon/iam'
+require_relative 'amazon/route53'

data/lib/cloudstrap/amazon/ec2.rb

@@ -25,6 +25,16 @@ module Cloudstrap
         call_api(:modify_vpc_attribute, vpc_id: vpc_id, enable_dns_support: { value: true }).successful?
       end
 
+      Contract String => Bool
+      def vpc_supports_dns_hostnames?(vpc_id)
+        call_api(:describe_vpc_attribute, vpc_id: vpc_id, attribute: "enableDnsHostnames").enable_dns_hostnames.value
+      end
+
+      Contract String => Bool
+      def enable_dns_hostnames(vpc_id)
+        call_api(:modify_vpc_attribute, vpc_id: vpc_id, enable_dns_hostnames: { value: true }).successful?
+      end
+
       Contract None => ArrayOf[::Aws::EC2::Types::Subnet]
       def subnets
         @subnets ||= subnets!

data/lib/cloudstrap/amazon/elb.rb

@@ -0,0 +1,45 @@
+require 'aws-sdk'
+require 'contracts'
+require_relative 'service'
+
+module Cloudstrap
+  module Amazon
+    class ELB < Service
+      include ::Contracts::Core
+      include ::Contracts::Builtin
+
+      Contract None => ArrayOf[::Aws::ElasticLoadBalancing::Types::LoadBalancerDescription]
+      def list
+        @list ||= list!
+      end
+
+      Contract None => ArrayOf[::Aws::ElasticLoadBalancing::Types::LoadBalancerDescription]
+      def list!
+        @list = call_api(:describe_load_balancers).load_balancer_descriptions
+      end
+
+      Tags = HashOf[String, String]
+
+      Contract Args[String] => HashOf[String, Tags]
+      def tags(*elb_names)
+        describe_tags(*elb_names).each_with_object({}) do |description, hash|
+          hash[description.load_balancer_name] = description
+                                                   .tags
+                                                   .map(&:to_a)
+                                                   .to_h
+        end
+      end
+
+      private
+
+      Contract Args[String] => ArrayOf[::Aws::ElasticLoadBalancing::Types::TagDescription]
+      def describe_tags(*elb_names)
+        call_api(:describe_tags, load_balancer_names: elb_names).tag_descriptions
+      end
+
+      def client
+        ::Aws::ElasticLoadBalancing::Client
+      end
+    end
+  end
+end

data/lib/cloudstrap/amazon/route53.rb

@@ -0,0 +1,42 @@
+require 'aws-sdk'
+require 'contracts'
+require_relative 'service'
+
+module Cloudstrap
+  module Amazon
+    class Route53 < Service
+      include ::Contracts::Core
+      include ::Contracts::Builtin
+
+      Contract None => ArrayOf[::Aws::Route53::Types::HostedZone]
+      def zones
+        @zones ||= zones!
+      end
+
+      Contract None => ArrayOf[::Aws::Route53::Types::HostedZone]
+      def zones!
+        @zones = call_api(:list_hosted_zones).hosted_zones
+      end
+
+      Contract String => Maybe[::Aws::Route53::Types::HostedZone]
+      def zone(name)
+        name.tap { |string| string.concat('.') unless string.end_with?('.') }
+
+        zones.find { |zone| zone.name == name }
+      end
+
+      Contract String => Maybe[String]
+      def zone_id(name)
+        return unless zone = zone(name)
+
+        zone(name).id.split('/').last
+      end
+
+      private
+
+      def client
+        ::Aws::Route53::Client
+      end
+    end
+  end
+end

data/lib/cloudstrap/amazon/support/rate_limit_handler.rb

@@ -19,7 +19,10 @@ module Cloudstrap
         Contract Symbol, Args[Any] => Any
         def call_api(method, *args)
           with_retries(
-            rescue: Aws::EC2::Errors::RequestLimitExceeded,
+            rescue: [
+              Aws::EC2::Errors::RequestLimitExceeded,
+              Aws::Route53::Errors::ThrottlingException
+            ],
             handler: request_limit_exceeded_handler,
             base_sleep_seconds: 1.0,
             max_sleep_seconds: 8.0

data/lib/cloudstrap/bootstrap_agent.rb

@@ -255,6 +255,11 @@ module Cloudstrap
       ec2.vpc_supports_dns?(vpc) || ec2.enable_dns_support(vpc)
     end
 
+    Contract None => Bool
+    def enable_dns_hostnames
+      ec2.vpc_supports_dns_hostnames?(vpc) || ec2.enable_dns_hostnames(vpc)
+    end
+
     Contract None => String
     def create_jumpbox
       upload_ssh_key

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstrap
 version: !ruby/object:Gem::Version
-  version: 0.30.12.pre
+  version: 0.31.1.pre
 platform: ruby
 authors:
 - Chris Olstrom
@@ -205,7 +205,9 @@ files:
 - lib/cloudstrap.rb
 - lib/cloudstrap/amazon.rb
 - lib/cloudstrap/amazon/ec2.rb
+- lib/cloudstrap/amazon/elb.rb
 - lib/cloudstrap/amazon/iam.rb
+- lib/cloudstrap/amazon/route53.rb
 - lib/cloudstrap/amazon/service.rb
 - lib/cloudstrap/amazon/support/rate_limit_handler.rb
 - lib/cloudstrap/bootstrap_agent.rb