skyed 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdc2aafbb0979d101620f458cbd8f17d9b06b240
-  data.tar.gz: 92c11933e258486e5a232535454bd55350c8c0ba
+  metadata.gz: 2c46e5e72681a7be284fd66a907566388b020efa
+  data.tar.gz: 8ef8a62b6fb7dcb24252f74d514244c1299a4fe2
 SHA512:
-  metadata.gz: c2bd1237fc72ad8c25c7969ea2bf69d6fda97e307311ba4b30c05437e1794760aaf83406e922f2e1af83b674bc50edfc296ba627f76a1391952e0c0a57ed5a61
-  data.tar.gz: 7098f09576a42add8f0ce5391f420eff038e4d7331d030b23a0b5506c2a65e3a22a1cc999b0946a75453f0331f54a7fb035f18f179bc454ec17ff0fab8576653
+  metadata.gz: e1d94f210a7f91c6844e876c45f7b7650cde0b53f85483555f691f981ff9932b4a9d57a3e34909f91d1603d773457fdacf8a0d97f7181f6b65c9ca18eea875c8
+  data.tar.gz: 2623193f4441a5d00d29ad7a691fed3291b69eb9e42fa7f56c745dd3b8048818903c960530ee2335ecdb8e1b2dac9fcd4e04efa18a697fc06501b5b4cf979bed

data/lib/skyed.rb

@@ -1,3 +1,5 @@
+require 'skyed/utils'
+require 'skyed/aws'
 require 'skyed/destroy'
 require 'skyed/run'
 require 'skyed/deploy'
@@ -6,5 +8,5 @@ require 'skyed/settings'
 
 # Skyed is a set of tools for cloud computing
 module Skyed
-  VERSION = '0.1.2'
+  VERSION = '0.1.5'
 end

data/lib/skyed/aws.rb

@@ -0,0 +1,195 @@
+require 'aws-sdk'
+require 'highline/import'
+
+ACCESS_QUESTION = 'What is your AWS Access Key? '
+SECRET_QUESTION = 'What is your AWS Secret Key? '
+
+module Skyed
+  # This module encapsulates all the AWS related functions.
+  module AWS
+    class << self
+      def region
+        ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
+      end
+
+      def set_credentials(access, secret, skip_question = true)
+        access = ask(ACCESS_QUESTION) unless Skyed::AWS.valid_credential?(
+          'AWS_ACCESS_KEY') && skip_question
+        secret = ask(SECRET_QUESTION) unless Skyed::AWS.valid_credential?(
+          'AWS_SECRET_KEY') && skip_question
+        if Skyed::AWS.confirm_credentials?(access, secret)
+          Skyed::Settings.access_key = access
+          Skyed::Settings.secret_key = secret
+        else
+          set_credentials(access, secret, false)
+        end
+      end
+
+      def valid_credential?(env_var_name)
+        ENV[env_var_name] != '' && !ENV[env_var_name].nil?
+      end
+
+      def confirm_credentials?(access, secret)
+        client = Skyed::AWS::IAM.login(access, secret)
+        client.get_account_summary
+        true
+      rescue Aws::IAM::Errors::InvalidClientTokenId
+        false
+      end
+    end
+
+    # This module encapsulates all the OpsWorks related functions.
+    module OpsWorks
+      STACK = {
+        name: '',
+        region: '',
+        service_role_arn: '',
+        default_instance_profile_arn: '',
+        default_os: 'Ubuntu 12.04 LTS',
+        default_ssh_key_name: '',
+        custom_cookbooks_source: {
+          type: 'git'
+        },
+        configuration_manager: {
+          name: 'Chef',
+          version: '11.10'
+        },
+        use_custom_cookbooks: true,
+        use_opsworks_security_groups: false
+      }
+      LAYER = {
+        stack_id: nil,
+        type: 'custom',
+        name: '',
+        shortname: '',
+        custom_security_group_ids: []
+      }
+
+      class << self
+        def create_layer(layer_params, opsworks)
+          layer = opsworks.create_layer(layer_params)
+          Skyed::Settings.layer_id = layer.data[:layer_id]
+        end
+
+        def create_stack(stack_params, opsworks)
+          stack = opsworks.create_stack(stack_params)
+          Skyed::Settings.stack_id = stack.data[:stack_id]
+        end
+
+        def delete_stack(stack_name, opsworks)
+          total = count_instances(stack_name, opsworks)
+          error_msg = "Stack with name #{stack_name}"
+          error_msg += ' exists and contains instances'
+          fail error_msg unless total == 0
+          stack = stack_by_name(stack_name, opsworks)
+          opsworks.delete_stack(stack_id: stack[:stack_id])
+        end
+
+        def count_instances(stack_name, opsworks)
+          stack_summary = stack_summary_by_name(stack_name, opsworks)
+          return nil if stack_summary.nil?
+          total = stack_summary[:instances_count].values.compact.inject(:+) || 0
+          total
+        end
+
+        def stack_summary_by_name(stack_name, opsworks)
+          stack = stack_by_name(stack_name, opsworks)
+          opsworks.describe_stack_summary(
+            stack_id: stack[:stack_id])[:stack_summary] unless stack.nil?
+        end
+
+        def stack_by_name(stack_name, opsworks)
+          stacks(opsworks).select { |x| x[:name] == stack_name }[0] || nil
+        end
+
+        def stacks(opsworks)
+          opsworks.describe_stacks[:stacks]
+        end
+
+        def basic_stack_params
+          params = STACK
+          params[:name] = ENV['USER']
+          params[:region] = Skyed::AWS.region
+          params[:service_role_arn] = Skyed::Settings.role_arn
+          params[:default_instance_profile_arn] = Skyed::Settings.profile_arn
+          params[:default_ssh_key_name] = Skyed::Settings.aws_key_name
+          params
+        end
+
+        def custom_cookbooks_source(base_source)
+          base_source[:url] = Skyed::Settings.remote_url
+          base_source[:revision] = Skyed::Settings.branch
+          base_source[:ssh_key] = Skyed::Utils.read_key_file(
+            Skyed::Settings.opsworks_git_key)
+          base_source
+        end
+
+        def configuration_manager(base_config, options)
+          base_config[:name] = 'Chef'
+          base_config[:version] = options[:chef_version] || '11.10'
+          base_config
+        end
+
+        def generate_params(stack_id = nil, options = {})
+          params = generate_layer_params(stack_id) unless stack_id.nil?
+          params = generate_stack_params(options) if stack_id.nil?
+          params
+        end
+
+        def generate_layer_params(stack_id)
+          params = LAYER
+          params[:stack_id] = stack_id
+          params[:name] = "test-#{ENV['USER']}"
+          params[:shortname] = "test-#{ENV['USER']}"
+          params[:custom_security_group_ids] = ['sg-f1cc2498']
+          params
+        end
+
+        def generate_stack_params(options)
+          params = basic_stack_params
+          params[:custom_cookbooks_source] = custom_cookbooks_source(
+            STACK[:custom_cookbooks_source])
+          params[:configuration_manager] = configuration_manager(
+            STACK[:configuration_manager], options)
+          puts params
+          params
+        end
+
+        def login(
+          access = Skyed::Settings.access_key,
+          secret = Skyed::Settings.secret_key,
+          region = Skyed::AWS.region)
+          Aws::OpsWorks::Client.new(
+            access_key_id: access,
+            secret_access_key: secret,
+            region: region)
+        end
+
+        def set_arns(service_role = nil, instance_profile = nil)
+          iam = Skyed::AWS::IAM.login
+          Skyed::Settings.role_arn = service_role || iam.get_role(
+            role_name: 'aws-opsworks-service-role')[:role][:arn]
+          Skyed::Settings.profile_arn = instance_profile || iam
+            .get_instance_profile(
+              instance_profile_name: 'aws-opsworks-ec2-role'
+            )[:instance_profile][:arn]
+        end
+      end
+    end
+
+    # This module encapsulates all the IAM related functions.
+    module IAM
+      class << self
+        def login(
+          access = Skyed::Settings.access_key,
+          secret = Skyed::Settings.secret_key,
+          region = Skyed::AWS.region)
+          Aws::IAM::Client.new(
+            access_key_id: access,
+            secret_access_key: secret,
+            region: region)
+        end
+      end
+    end
+  end
+end

data/lib/skyed/commands.rb

@@ -5,6 +5,9 @@ command :init do |cmd|
   cmd.flag :remote, default_value: nil,
                     type: String,
                     desc: 'Remote to use in OpsWorks'
+  cmd.flag :chef_version, default_value: '11.10',
+                          type: String,
+                          desc: 'Chef version to use in OpsWorks'
   cmd.action do |global_options, options|
     Skyed::Init.execute(global_options, options)
   end

data/lib/skyed/destroy.rb

@@ -6,7 +6,7 @@ module Skyed
         repo_path = Skyed::Settings.repo
         hostname = `cd #{repo_path} && vagrant ssh -c hostname`.strip
         `cd #{repo_path} && vagrant destroy -f`
-        ow = Skyed::Init.ow_client
+        ow = Skyed::AWS::OpsWorks.login
         instances = ow.describe_instances(stack_id: Skyed::Settings.stack_id)
         instances[:instances].each do |instance|
           if instance[:hostname] == hostname

data/lib/skyed/init.rb

@@ -6,26 +6,6 @@ require 'aws-sdk'
 require 'highline/import'
 require 'digest/sha1'
 
-ACCESS_QUESTION = 'What is your AWS Access Key? '
-SECRET_QUESTION = 'What is your AWS Secret Key? '
-
-STACK = { name: '',
-          region: '',
-          service_role_arn: '',
-          default_instance_profile_arn: '',
-          default_os: 'Ubuntu 12.04 LTS',
-          default_ssh_key_name: '',
-          custom_cookbooks_source: {
-            type: 'git'
-          },
-          configuration_manager: {
-            name: 'Chef',
-            version: '11.10'
-          },
-          use_custom_cookbooks: true,
-          use_opsworks_security_groups: false
-        }
-
 module Skyed
   # This module encapsulates all the init command steps.
   module Init
@@ -36,86 +16,26 @@ module Skyed
         branch global_options, options
         credentials
         opsworks_git_key
-        opsworks
+        opsworks options
         vagrant
         Skyed::Settings.save
       end
 
-      def opsworks
-        opsworks = ow_client
-        params = stack_params
+      def opsworks(options = {})
+        opsworks = Skyed::AWS::OpsWorks.login
+        params = Skyed::AWS::OpsWorks.generate_params nil, options
         check_stack(opsworks, params[:name])
-        stack = opsworks.create_stack(params).data[:stack_id]
-        Skyed::Settings.stack_id = stack
-        Skyed::Settings.layer_id = opsworks.create_layer(
-          layer_params(stack)).data[:layer_id]
+        Skyed::AWS::OpsWorks.create_stack(params, opsworks)
+        params = Skyed::AWS::OpsWorks.generate_params(Skyed::Settings.stack_id)
+        Skyed::AWS::OpsWorks.create_layer(params, opsworks)
       end
 
       def check_stack(ow, name)
-        stacks = ow.describe_stacks[:stacks]
-        stack = stacks.select { |x| x[:name] == name }[0] || return
-        stack_summ = ow.describe_stack_summary(stack_id: stack[:stack_id])
-        delete_stack(ow, stack_summ[:stack_summary])
-      end
-
-      def delete_stack(ow, stack_summ)
-        total = stack_summ[:instances_count].values.compact.inject(:+)
-        total ||= 0
-        error_msg = "Stack with name #{stack_summ[:name]}"
-        error_msg += ' exists and contains instances'
-        fail error_msg unless total == 0
-        ow.delete_stack(stack_id: stack_summ[:stack_id])
+        stack = Skyed::AWS::OpsWorks.stack_summary_by_name(name, ow)
+        Skyed::AWS::OpsWorks.delete_stack(stack[:name], ow) unless stack.nil?
         File.delete(vagrantfile) if File.exist?(vagrantfile)
       end
 
-      def layer_params(stack_id)
-        # TODO: Include extra layer parameters
-        { stack_id: stack_id,
-          type: 'custom',
-          name: "test-#{ENV['USER']}",
-          shortname: "test-#{ENV['USER']}",
-          custom_security_group_ids: ['sg-f1cc2498'] }
-      end
-
-      def stack_params
-        # TODO: Include extra stack parameters
-        result = STACK
-        result[:name]                         = ENV['USER']
-        result[:region]                       = region
-        result[:service_role_arn]             = Skyed::Settings.role_arn
-        result[:default_instance_profile_arn] = Skyed::Settings.profile_arn
-        result[:default_ssh_key_name]         = Skyed::Settings.aws_key_name
-        result[:custom_cookbooks_source]      = custom_cookbooks_source(
-          STACK[:custom_cookbooks_source])
-        result
-      end
-
-      def custom_cookbooks_source(base_source)
-        base_source[:url] = Skyed::Settings.remote_url
-        base_source[:revision] = Skyed::Settings.branch
-        base_source[:ssh_key] = read_key_file(Skyed::Settings.opsworks_git_key)
-        base_source
-      end
-
-      def read_key_file(key_file)
-        File.open(key_file, 'rb').read
-      end
-
-      def region
-        ENV['DEFAULT_REGION'] || 'us-east-1'
-      end
-
-      def ow_client(
-        access = Skyed::Settings.access_key,
-        secret = Skyed::Settings.secret_key,
-        region = ENV['AWS_REGION'])
-        region ||= 'us-east-1'
-        Aws::OpsWorks::Client.new(
-          access_key_id: access,
-          secret_access_key: secret,
-          region: region)
-      end
-
       def vagrantfile
         File.join(Skyed::Settings.repo, 'Vagrantfile')
       end
@@ -220,44 +140,11 @@ module Skyed
         role_arn     = ENV['OW_SERVICE_ROLE'],
         profile_arn  = ENV['OW_INSTANCE_PROFILE'],
         aws_key_name = ENV['AWS_SSH_KEY_NAME'])
-        iam = aws_access_key(access, secret)
-        set_arns(iam, profile_arn, role_arn)
+        Skyed::AWS.set_credentials(access, secret)
+        Skyed::AWS::OpsWorks.set_arns(profile_arn, role_arn)
         Skyed::Settings.aws_key_name = aws_key_name
       end
 
-      def set_arns(iam, profile_arn, role_arn)
-        Skyed::Settings.role_arn     = role_arn || iam
-          .get_role(role_name: 'aws-opsworks-service-role')[:role][:arn]
-        key = :instance_profile
-        Skyed::Settings.profile_arn  = profile_arn || iam
-          .get_instance_profile(
-            instance_profile_name: 'aws-opsworks-ec2-role')[key][:arn]
-      end
-
-      def aws_access_key(access, secret)
-        access = ask(ACCESS_QUESTION) unless valid_credential?('AWS_ACCESS_KEY')
-        secret = ask(SECRET_QUESTION) unless valid_credential?('AWS_SECRET_KEY')
-        iam = iam_client(access, secret)
-        Skyed::Settings.access_key = access
-        Skyed::Settings.secret_key = secret
-        iam
-      end
-
-      def iam_client(
-        access = Skyed::Settings.access_key,
-        secret = Skyed::Settings.secret_key,
-        region = ENV['AWS_REGION'])
-        region ||= 'us-east-1'
-        Aws::IAM::Client.new(
-          access_key_id: access,
-          secret_access_key: secret,
-          region: region)
-      end
-
-      def valid_credential?(env_name)
-        ENV[env_name] != '' && !ENV[env_name].nil?
-      end
-
       def repo_path(repo)
         Pathname.new(repo.repo.path).dirname
       end

data/lib/skyed/run.rb

@@ -8,7 +8,7 @@ module Skyed
         else
           recipes = check_recipes_exist(args)
           check_vagrant
-          execute_recipes(Skyed::Init.ow_client, recipes)
+          execute_recipes(Skyed::AWS::OpsWorks.login, recipes)
         end
       end
 
@@ -80,7 +80,7 @@ module Skyed
 
       def login
         Skyed::Init.credentials if Skyed::Settings.empty?
-        Skyed::Init.ow_client
+        Skyed::AWS::OpsWorks.login
       end
 
       def check_run_options(options)

data/lib/skyed/utils.rb

@@ -0,0 +1,10 @@
+module Skyed
+  # This module encapsulates some generic utility functions.
+  module Utils
+    class << self
+      def read_key_file(key_file)
+        File.open(key_file, 'rb').read
+      end
+    end
+  end
+end

data/templates/ow-on-premise.yml.erb

@@ -9,7 +9,7 @@
     aws_opsworks_layer_id: ´{{ aws_opsworks_layer_id }}´
   tasks:
     - name: Install pip
-      apt: name=python-pip
+      apt: name=python-pip update_cache=yes
     - name: Install AWS CLI
       pip: name=awscli
     - name: Prepare directory for AWS credentials

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skyed
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ignasi Fosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -75,12 +75,14 @@ extra_rdoc_files: []
 files:
 - bin/skyed
 - lib/skyed.rb
+- lib/skyed/aws.rb
 - lib/skyed/commands.rb
 - lib/skyed/deploy.rb
 - lib/skyed/destroy.rb
 - lib/skyed/init.rb
 - lib/skyed/run.rb
 - lib/skyed/settings.rb
+- lib/skyed/utils.rb
 - templates/Vagrantfile.erb
 - templates/config.j2.erb
 - templates/credentials.j2.erb