wombat-cli 0.6.1 → 0.6.2

data/lib/wombat/crypto.rb

@@ -1,66 +1,66 @@
-require 'openssl'
-require 'net/ssh'
-
-module Wombat
-  module Crypto
-    include Wombat::Common
-
-    def gen_x509_cert(hostname)
-      rsa_key = OpenSSL::PKey::RSA.new(2048)
-      public_key = rsa_key.public_key
-
-      subject = "/C=AU/ST=New South Wales/L=Sydney/O=#{wombat['org']}/OU=wombats/CN=#{wombat['domain_prefix']}#{hostname}.#{wombat['domain']}"
-
-      cert = OpenSSL::X509::Certificate.new
-      cert.subject = cert.issuer = OpenSSL::X509::Name.parse(subject)
-      cert.not_before = Time.now
-      cert.not_after = Time.now + 365 * 24 * 60 * 60
-      cert.public_key = public_key
-      cert.serial = 0x0
-      cert.version = 2
-
-      ef = OpenSSL::X509::ExtensionFactory.new
-      ef.subject_certificate = cert
-      ef.issuer_certificate = cert
-      cert.extensions = [
-        ef.create_extension('basicConstraints', 'CA:TRUE', true),
-        ef.create_extension('subjectKeyIdentifier', 'hash'),
-        ef.create_extension('subjectAltName', "DNS:#{wombat['domain_prefix']}#{hostname}.#{wombat['domain']},DNS:#{hostname}"),
-        # ef.create_extension("keyUsage", "cRLSign,keyCertSign", true),
-      ]
-      cert.add_extension ef.create_extension('authorityKeyIdentifier',
-                                            'keyid:always,issuer:always')
-
-      cert.sign(rsa_key, OpenSSL::Digest::SHA256.new)
-
-      Dir.mkdir(conf['key_dir'], 0755) unless File.exist?(conf['key_dir'])
-
-      if File.exist?("#{conf['key_dir']}/#{hostname}.crt") && File.exist?("#{conf['key_dir']}/#{hostname}.key")
-        puts "An x509 certificate already exists for #{hostname}"
-      else
-        File.open("#{conf['key_dir']}/#{hostname}.crt", 'w') { |file| file.puts cert.to_pem }
-        File.open("#{conf['key_dir']}/#{hostname}.key", 'w') { |file| file.puts rsa_key.to_pem }
-        puts "Certificate created for #{wombat['domain_prefix']}#{hostname}.#{wombat['domain']}"
-      end
-    end
-
-    def gen_ssh_key
-      rsa_key = OpenSSL::PKey::RSA.new 2048
-
-      type = rsa_key.ssh_type
-      data = [rsa_key.to_blob].pack('m0')
-
-      openssh_format = "#{type} #{data}"
-
-      Dir.mkdir(conf['key_dir'], 0755) unless File.exist?(conf['key_dir'])
-
-      if File.exist?("#{conf['key_dir']}/public.pub") && File.exist?("#{conf['key_dir']}/private.pem")
-        puts 'An SSH keypair already exists'
-      else
-        File.open("#{conf['key_dir']}/public.pub", 'w') { |file| file.puts openssh_format }
-        File.open("#{conf['key_dir']}/private.pem", 'w') { |file| file.puts rsa_key.to_pem }
-        puts 'SSH Keypair created'
-      end
-    end
-  end
+require 'openssl'
+require 'net/ssh'
+
+module Wombat
+  module Crypto
+    include Wombat::Common
+
+    def gen_x509_cert(hostname)
+      rsa_key = OpenSSL::PKey::RSA.new(2048)
+      public_key = rsa_key.public_key
+
+      subject = "/C=AU/ST=New South Wales/L=Sydney/O=#{wombat['org']}/OU=wombats/CN=#{wombat['domain_prefix']}#{hostname}.#{wombat['domain']}"
+
+      cert = OpenSSL::X509::Certificate.new
+      cert.subject = cert.issuer = OpenSSL::X509::Name.parse(subject)
+      cert.not_before = Time.now
+      cert.not_after = Time.now + 365 * 24 * 60 * 60
+      cert.public_key = public_key
+      cert.serial = 0x0
+      cert.version = 2
+
+      ef = OpenSSL::X509::ExtensionFactory.new
+      ef.subject_certificate = cert
+      ef.issuer_certificate = cert
+      cert.extensions = [
+        ef.create_extension('basicConstraints', 'CA:TRUE', true),
+        ef.create_extension('subjectKeyIdentifier', 'hash'),
+        ef.create_extension('subjectAltName', "DNS:#{wombat['domain_prefix']}#{hostname}.#{wombat['domain']},DNS:#{hostname}"),
+        # ef.create_extension("keyUsage", "cRLSign,keyCertSign", true),
+      ]
+      cert.add_extension ef.create_extension('authorityKeyIdentifier',
+                                            'keyid:always,issuer:always')
+
+      cert.sign(rsa_key, OpenSSL::Digest::SHA256.new)
+
+      Dir.mkdir(conf['key_dir'], 0755) unless File.exist?(conf['key_dir'])
+
+      if File.exist?("#{conf['key_dir']}/#{hostname}.crt") && File.exist?("#{conf['key_dir']}/#{hostname}.key")
+        puts "An x509 certificate already exists for #{hostname}"
+      else
+        File.open("#{conf['key_dir']}/#{hostname}.crt", 'w') { |file| file.puts cert.to_pem }
+        File.open("#{conf['key_dir']}/#{hostname}.key", 'w') { |file| file.puts rsa_key.to_pem }
+        puts "Certificate created for #{wombat['domain_prefix']}#{hostname}.#{wombat['domain']}"
+      end
+    end
+
+    def gen_ssh_key
+      rsa_key = OpenSSL::PKey::RSA.new 2048
+
+      type = rsa_key.ssh_type
+      data = [rsa_key.to_blob].pack('m0')
+
+      openssh_format = "#{type} #{data}"
+
+      Dir.mkdir(conf['key_dir'], 0755) unless File.exist?(conf['key_dir'])
+
+      if File.exist?("#{conf['key_dir']}/public.pub") && File.exist?("#{conf['key_dir']}/private.pem")
+        puts 'An SSH keypair already exists'
+      else
+        File.open("#{conf['key_dir']}/public.pub", 'w') { |file| file.puts openssh_format }
+        File.open("#{conf['key_dir']}/private.pem", 'w') { |file| file.puts rsa_key.to_pem }
+        puts 'SSH Keypair created'
+      end
+    end
+  end
 end

data/lib/wombat/delete.rb

@@ -1,68 +1,68 @@
-require 'wombat/common'
-require 'aws-sdk'
-require 'azure_mgmt_resources'
-
-module Wombat
-  class DeleteRunner
-    include Wombat::Common
-
-    attr_reader :stack, :cloud
-    attr_accessor :resource_management_client
-
-    def initialize(opts)
-      @stack = opts.stack
-      @cloud = opts.cloud.nil? ? "aws" : opts.cloud
-      @force = opts.force.nil? ? false : opts.force
-      @azure_async = opts.azure_async.nil? ? false : opts.azure_async
-      @wombat_yml = opts.wombat_yml unless opts.wombat_yml.nil?
-    end
-
-    def start
-      cfn_delete_stack(stack)
-    end
-
-    private
-
-    def cfn_delete_stack(stack)
-
-      # Delete the stack from the correct platform
-      case @cloud
-      when "aws"
-        cfn = ::Aws::CloudFormation::Client.new(region: lock['aws']['region'])
-
-        resp = cfn.delete_stack({
-          stack_name: stack,
-        })
-        banner("Deleted #{stack}")
-
-      when "azure"
-
-        # Configure the delete state
-        delete = false
-
-        # Connect to Azure
-        azure_conn = connect_azure()
-
-        # Create a resource client so that the resource group can be deleted
-        @resource_management_client = ::Azure::ARM::Resources::ResourceManagementClient.new(azure_conn)
-        @resource_management_client.subscription_id = ENV['AZURE_SUBSCRIPTION_ID']
-
-        # Check the stack that is being requested
-        # If it is the parent group display a warning before attempting to delete
-        if stack == wombat['name'] && !@force
-          warn("You are attempting to delete the resource group that contains your custom images.  If you wish to do this please specify the --force parameter on the command")
-        else
-          delete = true
-        end
-
-        if (delete)
-          banner(format("Deleting resource group: %s", stack))
-
-          resource_management_client.resource_groups.begin_delete(stack)
-
-          info "Destroy operation accepted and will continue in the background."
-        end
-      end
-    end
-  end
+require 'wombat/common'
+require 'aws-sdk'
+require 'azure_mgmt_resources'
+
+module Wombat
+  class DeleteRunner
+    include Wombat::Common
+
+    attr_reader :stack, :cloud
+    attr_accessor :resource_management_client
+
+    def initialize(opts)
+      @stack = opts.stack
+      @cloud = opts.cloud.nil? ? "aws" : opts.cloud
+      @force = opts.force.nil? ? false : opts.force
+      @azure_async = opts.azure_async.nil? ? false : opts.azure_async
+      @wombat_yml = opts.wombat_yml unless opts.wombat_yml.nil?
+    end
+
+    def start
+      cfn_delete_stack(stack)
+    end
+
+    private
+
+    def cfn_delete_stack(stack)
+
+      # Delete the stack from the correct platform
+      case @cloud
+      when "aws"
+        cfn = ::Aws::CloudFormation::Client.new(region: lock['aws']['region'])
+
+        resp = cfn.delete_stack({
+          stack_name: stack,
+        })
+        banner("Deleted #{stack}")
+
+      when "azure"
+
+        # Configure the delete state
+        delete = false
+
+        # Connect to Azure
+        azure_conn = connect_azure()
+
+        # Create a resource client so that the resource group can be deleted
+        @resource_management_client = ::Azure::ARM::Resources::ResourceManagementClient.new(azure_conn)
+        @resource_management_client.subscription_id = ENV['AZURE_SUBSCRIPTION_ID']
+
+        # Check the stack that is being requested
+        # If it is the parent group display a warning before attempting to delete
+        if stack == wombat['name'] && !@force
+          warn("You are attempting to delete the resource group that contains your custom images.  If you wish to do this please specify the --force parameter on the command")
+        else
+          delete = true
+        end
+
+        if (delete)
+          banner(format("Deleting resource group: %s", stack))
+
+          resource_management_client.resource_groups.begin_delete(stack)
+
+          info "Destroy operation accepted and will continue in the background."
+        end
+      end
+    end
+  end
 end

data/lib/wombat/deploy.rb

@@ -1,128 +1,128 @@
-require 'wombat/common'
-require 'aws-sdk'
-require 'azure_mgmt_resources'
-
-module Wombat
-  class DeployRunner
-    include Wombat::Common
-
-    attr_reader :stack, :stack_name, :cloud, :lock_opt, :template_opt, :nosuffix
-    attr_accessor :resource_management_client
-
-    def initialize(opts)
-      @stack = opts.stack
-      @stack_name = opts.stack_name
-      @cloud = opts.cloud.nil? ? "aws" : opts.cloud
-      @lock_opt = opts.update_lock
-      @template_opt = opts.update_template
-      @azure_async = opts.azure_async
-      @wombat_yml = opts.wombat_yml
-      @nosuffix = opts.nosuffix.nil? ? false : true
-    end
-
-    def start
-      update_lock(cloud) if lock_opt
-      update_template(cloud) if template_opt
-      create_stack(stack)
-    end
-
-    private
-
-    def create_stack(stack)
-
-      # determine the filename of the stack
-      filename = stack
-
-      # work out the name of the stack to be created
-      if !@stack_name.nil?
-
-        # As the stack name has been specified then set nosuffix
-        @nosuffix = true
-        stack = stack_name
-      end
-
-      # Deploy the template to the correct stack
-      case @cloud
-      when "aws"
-
-        template_file = File.read("#{conf['stack_dir']}/#{filename}.json")
-        cfn = ::Aws::CloudFormation::Client.new(region: lock['aws']['region'])
-
-        banner("Creating CloudFormation stack")
-        resp = cfn.create_stack({
-          stack_name: "#{stack}",
-          template_body: template_file,
-          capabilities: ["CAPABILITY_IAM"],
-          on_failure: "DELETE",
-          parameters: [
-            {
-              parameter_key: "KeyName",
-              parameter_value: lock['aws']['keypair'],
-            }
-          ]
-        })
-        puts "Created: #{resp.stack_id}"
-      when "azure"
-
-        banner("Creating Azure RM stack")
-
-        # determine the path to the arm template
-        template_file = File.read("#{conf['stack_dir']}/#{filename}.json")
-
-        # determine the name of the deployment
-        deployment_name = format('deploy-%s', Time.now().to_i)
-
-        # determine the name of the resource group
-        resource_group_name = stack
-        if !nosuffix
-          resource_group_name = format('%s-%s', resource_group_name, Time.now.strftime('%Y%m%d%H%M%S'))
-        end
-
-        # Connect to azure
-        azure_conn = connect_azure()
-
-        # Create a resource client so that the template can be deployed
-        @resource_management_client = Azure::ARM::Resources::ResourceManagementClient.new(azure_conn)
-        @resource_management_client.subscription_id = ENV['AZURE_SUBSCRIPTION_ID']
-
-        # Create the resource group for the deployment
-        create_resource_group(resource_management_client,
-                              resource_group_name,
-                              wombat['azure']['location'],
-                              wombat['owner'],
-                              wombat['azure']['tags'])
-
-        # Create the deployment definition
-        deployment = Azure::ARM::Resources::Models::Deployment.new
-        deployment.properties = Azure::ARM::Resources::Models::DeploymentProperties.new
-        deployment.properties.mode = Azure::ARM::Resources::Models::DeploymentMode::Incremental
-        deployment.properties.template = JSON.parse(template_file)
-
-        # Perform the deployment to the named resource group
-        begin
-          resource_management_client.deployments.begin_create_or_update_async(resource_group_name, deployment_name, deployment).value!
-        rescue MsRestAzure::AzureOperationError => operation_error
-          rest_error = operation_error.body['error']
-          deployment_active = rest_error['code'] == 'DeploymentActive'
-          if deployment_active
-            info format("Deployment for resource group '%s' is ongoing", resource_group_name)
-          else
-            warn rest_error
-            raise operation_error
-          end
-        end
-
-        # Monitor the deployment
-        if @azure_async
-          info "Deployment operation accepted.  Use the Azure Portal to check progress"
-        else
-          follow_azure_deployment(resource_group_name, deployment_name)
-        end
-
-      end
-    end
-
-
-
-  end
-end
+require 'wombat/common'
+require 'aws-sdk'
+require 'azure_mgmt_resources'
+
+module Wombat
+  class DeployRunner
+    include Wombat::Common
+
+    attr_reader :stack, :stack_name, :cloud, :lock_opt, :template_opt, :nosuffix
+    attr_accessor :resource_management_client
+
+    def initialize(opts)
+      @stack = opts.stack
+      @stack_name = opts.stack_name
+      @cloud = opts.cloud.nil? ? "aws" : opts.cloud
+      @lock_opt = opts.update_lock
+      @template_opt = opts.update_template
+      @azure_async = opts.azure_async
+      @wombat_yml = opts.wombat_yml
+      @nosuffix = opts.nosuffix.nil? ? false : true
+    end
+
+    def start
+      update_lock(cloud) if lock_opt
+      update_template(cloud) if template_opt
+      create_stack(stack)
+    end
+
+    private
+
+    def create_stack(stack)
+
+      # determine the filename of the stack
+      filename = stack
+
+      # work out the name of the stack to be created
+      if !@stack_name.nil?
+
+        # As the stack name has been specified then set nosuffix
+        @nosuffix = true
+        stack = stack_name
+      end
+
+      # Deploy the template to the correct stack
+      case @cloud
+      when "aws"
+
+        template_file = File.read("#{conf['stack_dir']}/#{filename}.json")
+        cfn = ::Aws::CloudFormation::Client.new(region: lock['aws']['region'])
+
+        banner("Creating CloudFormation stack")
+        resp = cfn.create_stack({
+          stack_name: "#{stack}",
+          template_body: template_file,
+          capabilities: ["CAPABILITY_IAM"],
+          on_failure: "DELETE",
+          parameters: [
+            {
+              parameter_key: "KeyName",
+              parameter_value: lock['aws']['keypair'],
+            }
+          ]
+        })
+        puts "Created: #{resp.stack_id}"
+      when "azure"
+
+        banner("Creating Azure RM stack")
+
+        # determine the path to the arm template
+        template_file = File.read("#{conf['stack_dir']}/#{filename}.json")
+
+        # determine the name of the deployment
+        deployment_name = format('deploy-%s', Time.now().to_i)
+
+        # determine the name of the resource group
+        resource_group_name = stack
+        if !nosuffix
+          resource_group_name = format('%s-%s', resource_group_name, Time.now.strftime('%Y%m%d%H%M%S'))
+        end
+
+        # Connect to azure
+        azure_conn = connect_azure()
+
+        # Create a resource client so that the template can be deployed
+        @resource_management_client = Azure::ARM::Resources::ResourceManagementClient.new(azure_conn)
+        @resource_management_client.subscription_id = ENV['AZURE_SUBSCRIPTION_ID']
+
+        # Create the resource group for the deployment
+        create_resource_group(resource_management_client,
+                              resource_group_name,
+                              wombat['azure']['location'],
+                              wombat['owner'],
+                              wombat['azure']['tags'])
+
+        # Create the deployment definition
+        deployment = Azure::ARM::Resources::Models::Deployment.new
+        deployment.properties = Azure::ARM::Resources::Models::DeploymentProperties.new
+        deployment.properties.mode = Azure::ARM::Resources::Models::DeploymentMode::Incremental
+        deployment.properties.template = JSON.parse(template_file)
+
+        # Perform the deployment to the named resource group
+        begin
+          resource_management_client.deployments.begin_create_or_update_async(resource_group_name, deployment_name, deployment).value!
+        rescue MsRestAzure::AzureOperationError => operation_error
+          rest_error = operation_error.body['error']
+          deployment_active = rest_error['code'] == 'DeploymentActive'
+          if deployment_active
+            info format("Deployment for resource group '%s' is ongoing", resource_group_name)
+          else
+            warn rest_error
+            raise operation_error
+          end
+        end
+
+        # Monitor the deployment
+        if @azure_async
+          info "Deployment operation accepted.  Use the Azure Portal to check progress"
+        else
+          follow_azure_deployment(resource_group_name, deployment_name)
+        end
+
+      end
+    end
+
+
+
+  end
+end

data/lib/wombat/init.rb

@@ -1,32 +1,32 @@
-require 'wombat/common'
-
-module Wombat
-  class InitRunner
-    include Wombat::Common
-
-    attr_reader :path
-
-    def initialize(opts)
-      @path = opts.path.nil? ? Dir.pwd : opts.path
-    end
-
-    def start
-      copy_files(path)
-    end
-
-    private
-
-    def copy_files(path)
-      p = path == Dir.pwd ? '.' : path
-      gen_dir = "#{File.expand_path("../..", File.dirname(__FILE__))}/generator_files"
-      Dir["#{gen_dir}/*"].each do |source|
-        if !File.exist?("#{p}/#{File.basename(source)}")
-          banner("create: #{p}/#{File.basename(source)}")
-          FileUtils.cp_r source, path
-        else
-          warn("#{p}/#{File.basename(source)} already exists")
-        end
-      end
-    end
-  end
-end
+require 'wombat/common'
+
+module Wombat
+  class InitRunner
+    include Wombat::Common
+
+    attr_reader :path
+
+    def initialize(opts)
+      @path = opts.path.nil? ? Dir.pwd : opts.path
+    end
+
+    def start
+      copy_files(path)
+    end
+
+    private
+
+    def copy_files(path)
+      p = path == Dir.pwd ? '.' : path
+      gen_dir = "#{File.expand_path("../..", File.dirname(__FILE__))}/generator_files"
+      Dir["#{gen_dir}/*"].each do |source|
+        if !File.exist?("#{p}/#{File.basename(source)}")
+          banner("create: #{p}/#{File.basename(source)}")
+          FileUtils.cp_r source, path
+        else
+          warn("#{p}/#{File.basename(source)} already exists")
+        end
+      end
+    end
+  end
+end

data/lib/wombat/latest.rb

@@ -1,27 +1,27 @@
-require "wombat/common"
-require "wombat/aws"
-
-# http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Client.html#describe_images-instance_method
-# https://github.com/test-kitchen/kitchen-ec2/blob/aa8e7f2cf9bfbb10fa4057f3297c2a20dc079f7b/lib/kitchen/driver/aws/standard_platform.rb
-# https://github.com/test-kitchen/kitchen-ec2/blob/aa8e7f2cf9bfbb10fa4057f3297c2a20dc079f7b/lib/kitchen/driver/aws/standard_platform/ubuntu.rb
-
-module Wombat
-  class LatestRunner
-    include Wombat::Common
-    include Wombat::Aws
-
-    attr_reader :stack, :cloud, :lock_opt, :template_opt
-
-    def initialize(opts)
-      @cloud = opts.cloud.nil? ? "aws" : opts.cloud
-    end
-
-    def start
-      if cloud =~ /aws/
-        find_latest_amis
-      else
-        puts "Unsupported for #{cloud}"
-      end
-    end
-  end
-end
+require "wombat/common"
+require "wombat/aws"
+
+# http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Client.html#describe_images-instance_method
+# https://github.com/test-kitchen/kitchen-ec2/blob/aa8e7f2cf9bfbb10fa4057f3297c2a20dc079f7b/lib/kitchen/driver/aws/standard_platform.rb
+# https://github.com/test-kitchen/kitchen-ec2/blob/aa8e7f2cf9bfbb10fa4057f3297c2a20dc079f7b/lib/kitchen/driver/aws/standard_platform/ubuntu.rb
+
+module Wombat
+  class LatestRunner
+    include Wombat::Common
+    include Wombat::Aws
+
+    attr_reader :stack, :cloud, :lock_opt, :template_opt
+
+    def initialize(opts)
+      @cloud = opts.cloud.nil? ? "aws" : opts.cloud
+    end
+
+    def start
+      if cloud =~ /aws/
+        find_latest_amis
+      else
+        puts "Unsupported for #{cloud}"
+      end
+    end
+  end
+end