formatron 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2fbc3682dfed44912c502471c91985385772edc
-  data.tar.gz: d47b4b18846677185d75bbe1caccb5d49d5e8711
+  metadata.gz: 151ab7174411866cef2baa32c55fc5369e005a01
+  data.tar.gz: 86caf9686fe667117f449703b28b991b0c86f4e0
 SHA512:
-  metadata.gz: a352259c2fa5fa21a28fff086e279bfacd8e1c7ab7a9dd435e15c673ea1907a56e2a669f46f9a22ae60f255441a46d0196d48206d3864b79917e5d123580d59f
-  data.tar.gz: c31fc3dd6d65b832b820db576e92e3ee28b9f98f430a23dc5993a3277e8a7608d3a8d1e9b6a4d340af0e9eeb1937036e8f90e65778f06794cddf71538be34976
+  metadata.gz: 09ba7c7372af63e0f1091e163d249f5da961a7168b83ef24d72e037414bae6df303e7acb1b597b7b9a588f85d2f730884727a0cb39142a5a412337d3a49689ad
+  data.tar.gz: eb0926ad7d887d84bb7690051f666adaab4fcb88b27d51758a8f6fb651ea7a7cf6c4391330e860166a897d93791a9dc9d56dba7b774d87a6fd2825b2f98bd9bb

data/exe/formatron

@@ -4,6 +4,8 @@ require 'formatron/cli'
 require 'formatron/cli/generators/credentials'
 require 'formatron/cli/generators/bootstrap'
 require 'formatron/cli/generators/instance'
+require 'formatron/cli/generators/guid'
+require 'formatron/cli/generators/databag_secret'
 require 'formatron/cli/deploy'
 require 'formatron/cli/destroy'
 require 'formatron/cli/provision'
@@ -12,6 +14,8 @@ require 'formatron/cli/completion'
 Formatron::CLI.include Formatron::CLI::Generators::Credentials
 Formatron::CLI.include Formatron::CLI::Generators::Bootstrap
 Formatron::CLI.include Formatron::CLI::Generators::Instance
+Formatron::CLI.include Formatron::CLI::Generators::GUID
+Formatron::CLI.include Formatron::CLI::Generators::DatabagSecret
 Formatron::CLI.include Formatron::CLI::Deploy
 Formatron::CLI.include Formatron::CLI::Destroy
 Formatron::CLI.include Formatron::CLI::Provision

data/lib/formatron/chef/knife.rb

@@ -109,15 +109,15 @@ class Formatron
       end
 
       def bootstrap(
-        environment:,
+        guid:,
         bastion_hostname:,
         cookbook:,
         hostname:
       )
         # rubocop:disable Metrics/LineLength
-        command = "knife bootstrap #{hostname} --sudo -x ubuntu -i #{@keys.ec2_key} -E #{environment} -r #{cookbook} -N #{environment} -c #{@knife_file.path}#{@ssl_verify ? '' : ' --node-ssl-verify-mode none'} --secret-file #{@databag_secret_file.path}"
+        command = "knife bootstrap #{hostname} --sudo -x ubuntu -i #{@keys.ec2_key} -E #{guid} -r #{cookbook} -N #{guid} -c #{@knife_file.path}#{@ssl_verify ? '' : ' --node-ssl-verify-mode none'} --secret-file #{@databag_secret_file.path}"
         command = "#{command} -G ubuntu@#{bastion_hostname}" unless bastion_hostname.eql? hostname
-        fail "failed to bootstrap instance: #{hostname}" unless Util::Shell.exec command
+        fail "failed to bootstrap instance: #{guid}" unless Util::Shell.exec command
         # rubocop:enable Metrics/LineLength
       end
 

data/lib/formatron/chef.rb

@@ -92,11 +92,12 @@ class Formatron
     # rubocop:disable Metrics/MethodLength
     def provision(
       sub_domain:,
+      guid:,
       cookbook:,
       bastion:
     )
       Formatron::LOG.info do
-        "Provision #{sub_domain} with Chef cookbook: #{cookbook}"
+        "Provision #{guid} with Chef cookbook: #{cookbook}"
       end
       bastion ||= @bastions.keys[0]
       bastion_hostname = _hostname(
@@ -111,11 +112,11 @@ class Formatron
       hostname = _hostname(
         sub_domain: sub_domain
       )
-      @knife.create_environment environment: sub_domain
-      @berkshelf.upload environment: sub_domain, cookbook: cookbook
+      @knife.create_environment environment: guid
+      @berkshelf.upload environment: guid, cookbook: cookbook
       @knife.bootstrap(
         bastion_hostname: bastion_hostname,
-        environment: sub_domain,
+        guid: guid,
         cookbook: cookbook_name,
         hostname: hostname
       )
@@ -123,13 +124,13 @@ class Formatron
     # rubocop:enable Metrics/ParameterLists
     # rubocop:enable Metrics/MethodLength
 
-    def destroy(sub_domain:)
+    def destroy(guid:)
       Formatron::LOG.info do
-        "Delete Chef configuration for node: #{sub_domain}"
+        "Delete Chef configuration for node: #{guid}"
       end
-      @knife.delete_node node: sub_domain
-      @knife.delete_client client: sub_domain
-      @knife.delete_environment environment: sub_domain
+      @knife.delete_node node: guid
+      @knife.delete_client client: guid
+      @knife.delete_environment environment: guid
     end
 
     def unlink

data/lib/formatron/cli/generators/databag_secret.rb

@@ -0,0 +1,25 @@
+require 'formatron/generators/util'
+
+class Formatron
+  class CLI
+    module Generators
+      # CLI command for databag secret generator
+      module DatabagSecret
+        def databag_secret_action(c)
+          c.action do |_args, _options|
+            puts Formatron::Generators::Util.databag_secret
+          end
+        end
+
+        def databag_secret_formatron_command
+          command :'generate data bag secret' do |c|
+            c.syntax = 'formatron generate data bag secret [options]'
+            c.summary = 'Generate a random data bag secret'
+            c.description = 'Generate a random data bag secret'
+            databag_secret_action c
+          end
+        end
+      end
+    end
+  end
+end

data/lib/formatron/cli/generators/guid.rb

@@ -0,0 +1,25 @@
+require 'formatron/generators/util'
+
+class Formatron
+  class CLI
+    module Generators
+      # CLI command for GUID generator
+      module GUID
+        def guid_action(c)
+          c.action do |_args, _options|
+            puts Formatron::Generators::Util.guid
+          end
+        end
+
+        def guid_formatron_command
+          command :'generate guid' do |c|
+            c.syntax = 'formatron generate guid [options]'
+            c.summary = 'Generate a random GUID'
+            c.description = 'Generate a random GUID'
+            guid_action c
+          end
+        end
+      end
+    end
+  end
+end

data/lib/formatron/cloud_formation/resources/ec2.rb

@@ -6,6 +6,8 @@ class Formatron
       # Generates CloudFormation template EC2 resources
       # rubocop:disable Metrics/ModuleLength
       module EC2
+        BLOCK_DEVICE_MAPPINGS = :BlockDeviceMappings
+
         def self.vpc(cidr:)
           {
             Type: 'AWS::EC2::VPC',
@@ -232,6 +234,42 @@ class Formatron
         end
         # rubocop:enable Metrics/MethodLength
 
+        def self.block_device_mapping(device:, size:, type:, iops:)
+          mapping = {
+            DeviceName: device,
+            Ebs: {
+              VolumeSize: size
+            }
+          }
+          mapping[:Ebs][:VolumeType] = type unless type.nil?
+          mapping[:Ebs][:Iops] = iops unless iops.nil?
+          mapping
+        end
+
+        def self.volume(size:, type:, iops:, availability_zone:)
+          volume = {
+            Type: 'AWS::EC2::Volume',
+            Properties: {
+              AvailabilityZone: availability_zone,
+              Size: size
+            }
+          }
+          volume[:Properties][:VolumeType] = type unless type.nil?
+          volume[:Properties][:Iops] = iops unless iops.nil?
+          volume
+        end
+
+        def self.volume_attachment(device:, instance:, volume:)
+          {
+            Type: 'AWS::EC2::VolumeAttachment',
+            Properties: {
+              Device: device,
+              InstanceId: Template.ref(instance),
+              VolumeId: Template.ref(volume)
+            }
+          }
+        end
+
         # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/ParameterLists
         # rubocop:disable Metrics/AbcSize

data/lib/formatron/cloud_formation/template/vpc/subnet/instance/block_devices.rb

@@ -0,0 +1,36 @@
+require 'formatron/cloud_formation/resources/ec2'
+
+class Formatron
+  module CloudFormation
+    class Template
+      class VPC
+        class Subnet
+          class Instance
+            # Adds block device mappings to an instance
+            class BlockDevices
+              def initialize(block_devices:)
+                @block_devices = block_devices
+              end
+
+              # rubocop:disable Metrics/MethodLength
+              def merge(properties:)
+                return if @block_devices.length == 0
+                block_device_mappings = @block_devices.map do |block_device|
+                  Resources::EC2.block_device_mapping(
+                    device: block_device.device,
+                    size: block_device.size,
+                    type: block_device.type,
+                    iops: block_device.iops
+                  )
+                end
+                properties[Resources::EC2::BLOCK_DEVICE_MAPPINGS] =
+                  block_device_mappings
+              end
+              # rubocop:enable Metrics/MethodLength
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/formatron/cloud_formation/template/vpc/subnet/instance.rb

@@ -5,6 +5,7 @@ require 'formatron/cloud_formation/resources/route53'
 require_relative 'instance/policy'
 require_relative 'instance/security_group'
 require_relative 'instance/setup'
+require_relative 'instance/block_devices'
 
 class Formatron
   module CloudFormation
@@ -21,6 +22,9 @@ class Formatron
             WAIT_CONDITION_PREFIX = 'waitCondition'
             PRIVATE_RECORD_SET_PREFIX = 'privateRecordSet'
             PUBLIC_RECORD_SET_PREFIX = 'publicRecordSet'
+            PUBLIC_ALIAS_RECORD_SET_PREFIX = 'publicAliasRecordSet'
+            VOLUME_PREFIX = 'volume'
+            VOLUME_ATTACHMENT_PREFIX = 'volumeAttachment'
 
             # rubocop:disable Metrics/MethodLength
             # rubocop:disable Metrics/AbcSize
@@ -43,6 +47,7 @@ class Formatron
               @instance = instance
               @guid = @instance.guid
               @setup = @instance.setup
+              @block_devices = @instance.block_device
               @instance_id = "#{INSTANCE_PREFIX}#{@guid}"
               @role_id = "#{ROLE_PREFIX}#{@guid}"
               @instance_profile_id = "#{INSTANCE_PROFILE_PREFIX}#{@guid}"
@@ -73,6 +78,8 @@ class Formatron
                 "#{PRIVATE_RECORD_SET_PREFIX}#{@guid}"
               @public_record_set_id =
                 "#{PUBLIC_RECORD_SET_PREFIX}#{@guid}"
+              @public_aliases = @instance.public_alias
+              @volumes = @instance.volume
               @bucket = bucket
               @name = name
               @target = target
@@ -125,6 +132,10 @@ class Formatron
                 hosted_zone_name: @hosted_zone_name
               )
               setup.merge instance: instance
+              block_devices = BlockDevices.new(
+                block_devices: @block_devices
+              )
+              block_devices.merge properties: instance[:Properties]
               resources[@instance_id] = instance
               outputs[@instance_id] = Template.output(
                 Template.ref(@instance_id)
@@ -150,9 +161,55 @@ class Formatron
                   instance: @instance_id,
                   attribute: 'PublicIp'
                 ) unless @public_hosted_zone_id.nil?
+              _add_public_aliases resources unless @public_hosted_zone_id.nil?
+              _add_volumes resources
             end
             # rubocop:enable Metrics/AbcSize
             # rubocop:enable Metrics/MethodLength
+
+            # rubocop:disable Metrics/MethodLength
+            def _add_public_aliases(resources)
+              @public_aliases.each_index do |index|
+                sub_domain = @public_aliases[index]
+                logical_id = "#{PUBLIC_ALIAS_RECORD_SET_PREFIX}#{index}#{@guid}"
+                resources[logical_id] = Resources::Route53.record_set(
+                  hosted_zone_id: @public_hosted_zone_id,
+                  sub_domain: sub_domain,
+                  hosted_zone_name: @hosted_zone_name,
+                  instance: @instance_id,
+                  attribute: 'PublicIp'
+                )
+              end
+            end
+            # rubocop:enable Metrics/MethodLength
+
+            # rubocop:disable Metrics/MethodLength
+            def _add_volumes(resources)
+              @volumes.each_index do |index|
+                volume = @volumes[index]
+                volume_id = "#{VOLUME_PREFIX}#{index}#{@guid}"
+                volume_attachment_id =
+                  "#{VOLUME_ATTACHMENT_PREFIX}#{index}#{@guid}"
+                resources[volume_id] = Resources::EC2.volume(
+                  availability_zone: @availability_zone,
+                  size: volume.size,
+                  type: volume.type,
+                  iops: volume.iops
+                )
+                resources[volume_attachment_id] =
+                  Resources::EC2.volume_attachment(
+                    device: volume.device,
+                    instance: "#{INSTANCE_PREFIX}#{@guid}",
+                    volume: volume_id
+                  )
+              end
+            end
+            # rubocop:enable Metrics/MethodLength
+
+            private(
+              :_add_public_aliases,
+              :_add_volumes
+            )
           end
           # rubocop:enable Metrics/ClassLength
         end

data/lib/formatron/dsl/formatron/vpc/subnet/instance/block_device.rb

@@ -0,0 +1,23 @@
+require 'formatron/util/dsl'
+
+class Formatron
+  class DSL
+    class Formatron
+      class VPC
+        class Subnet
+          class Instance
+            # Instance block device mappings
+            class BlockDevice
+              extend Util::DSL
+              dsl_initialize_block
+              dsl_property :device
+              dsl_property :size
+              dsl_property :type
+              dsl_property :iops
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/formatron/dsl/formatron/vpc/subnet/instance/volume.rb

@@ -0,0 +1,23 @@
+require 'formatron/util/dsl'
+
+class Formatron
+  class DSL
+    class Formatron
+      class VPC
+        class Subnet
+          class Instance
+            # Instance volume attachments
+            class Volume
+              extend Util::DSL
+              dsl_initialize_block
+              dsl_property :device
+              dsl_property :size
+              dsl_property :type
+              dsl_property :iops
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/formatron/dsl/formatron/vpc/subnet/instance.rb

@@ -2,6 +2,8 @@ require_relative 'instance/chef'
 require_relative 'instance/policy'
 require_relative 'instance/security_group'
 require_relative 'instance/setup'
+require_relative 'instance/volume'
+require_relative 'instance/block_device'
 require 'formatron/util/dsl'
 
 class Formatron
@@ -15,12 +17,15 @@ class Formatron
             dsl_initialize_hash
             dsl_property :guid
             dsl_property :sub_domain
+            dsl_array :public_alias
             dsl_property :source_dest_check
             dsl_property :instance_type
             dsl_block :chef, 'Chef'
             dsl_block :policy, 'Policy'
             dsl_block :security_group, 'SecurityGroup'
             dsl_block :setup, 'Setup'
+            dsl_block_array :volume, 'Volume'
+            dsl_block_array :block_device, 'BlockDevice'
           end
         end
       end

data/lib/formatron/generators/util.rb

@@ -7,7 +7,7 @@ class Formatron
       end
 
       def self.databag_secret
-        Random.rand(36**40).to_s(36).upcase
+        SecureRandom.random_number(36**40).to_s(36).upcase
       end
     end
   end

data/lib/formatron/version.rb

@@ -1,4 +1,4 @@
 # add version to class
 class Formatron
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/formatron.rb

@@ -159,7 +159,8 @@ class Formatron
       cookbook = dsl_chef.cookbook
       bastion = dsl_chef.bastion
       sub_domain = instance.sub_domain
-      _provision_instance chef, cookbook, sub_domain, bastion
+      guid = instance.guid
+      _provision_instance chef, cookbook, sub_domain, guid, bastion
     end
   ensure
     chef_clients.unlink
@@ -167,9 +168,10 @@ class Formatron
   # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/MethodLength
 
-  def _provision_instance(chef, cookbook, sub_domain, bastion)
+  def _provision_instance(chef, cookbook, sub_domain, guid, bastion)
     chef.provision(
       sub_domain: sub_domain,
+      guid: guid,
       cookbook: cookbook,
       bastion: bastion
     )
@@ -319,8 +321,8 @@ class Formatron
       dsl_chef = instance.chef
       next if dsl_chef.nil?
       chef = chef_clients.get dsl_chef.server
-      sub_domain = instance.sub_domain
-      _destroy_chef_instance chef, sub_domain
+      guid = instance.guid
+      _destroy_chef_instance chef, guid
     end
   rescue => error
     LOG.warn error
@@ -329,9 +331,9 @@ class Formatron
   end
   # rubocop:enable Metrics/MethodLength
 
-  def _destroy_chef_instance(chef, sub_domain)
+  def _destroy_chef_instance(chef, guid)
     chef.destroy(
-      sub_domain: sub_domain
+      guid: guid
     )
   rescue => error
     LOG.warn error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formatron
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Peter Halliday
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -314,6 +314,8 @@ files:
 - lib/formatron/cli/destroy.rb
 - lib/formatron/cli/generators/bootstrap.rb
 - lib/formatron/cli/generators/credentials.rb
+- lib/formatron/cli/generators/databag_secret.rb
+- lib/formatron/cli/generators/guid.rb
 - lib/formatron/cli/generators/instance.rb
 - lib/formatron/cli/provision.rb
 - lib/formatron/cloud_formation.rb
@@ -330,6 +332,7 @@ files:
 - lib/formatron/cloud_formation/template/vpc/subnet/bastion.rb
 - lib/formatron/cloud_formation/template/vpc/subnet/chef_server.rb
 - lib/formatron/cloud_formation/template/vpc/subnet/instance.rb
+- lib/formatron/cloud_formation/template/vpc/subnet/instance/block_devices.rb
 - lib/formatron/cloud_formation/template/vpc/subnet/instance/policy.rb
 - lib/formatron/cloud_formation/template/vpc/subnet/instance/security_group.rb
 - lib/formatron/cloud_formation/template/vpc/subnet/instance/setup.rb
@@ -348,12 +351,14 @@ files:
 - lib/formatron/dsl/formatron/vpc/subnet/chef_server.rb
 - lib/formatron/dsl/formatron/vpc/subnet/chef_server/organization.rb
 - lib/formatron/dsl/formatron/vpc/subnet/instance.rb
+- lib/formatron/dsl/formatron/vpc/subnet/instance/block_device.rb
 - lib/formatron/dsl/formatron/vpc/subnet/instance/chef.rb
 - lib/formatron/dsl/formatron/vpc/subnet/instance/policy.rb
 - lib/formatron/dsl/formatron/vpc/subnet/instance/policy/statement.rb
 - lib/formatron/dsl/formatron/vpc/subnet/instance/security_group.rb
 - lib/formatron/dsl/formatron/vpc/subnet/instance/setup.rb
 - lib/formatron/dsl/formatron/vpc/subnet/instance/setup/variable.rb
+- lib/formatron/dsl/formatron/vpc/subnet/instance/volume.rb
 - lib/formatron/external.rb
 - lib/formatron/external/dsl.rb
 - lib/formatron/external/outputs.rb