cyoi 0.2.0 → 0.3.0

data/ChangeLog.md

@@ -2,6 +2,10 @@
 
 Cyoi (choose-your-own-infrastructure) is a library to ask an end-user to choose an infrastructure (AWS, OpenStack, etc), region, and login credentials.
 
+## v0.3
+
+* added `cyoi keypair` & `cyoi key_pair`
+
 ## v0.2
 
 * executable `cyoi` became `cyoi provider`

data/Guardfile

@@ -1,6 +1,7 @@
-guard 'rspec' do
-  watch(%r{^spec})
+guard "rspec", spec_paths: ["spec/unit"] do
+  watch(%r{^spec/unit})
   # watch(%r{^lib/cyoi})    { |m| "spec" }
-  watch(%r{^lib/cyoi/cli/(?:|provider_)address})    { |m| "spec/integration/cli/address" }
+  # watch(%r{^lib/cyoi/cli/(?:|provider_)address})    { |m| "spec/integration/cli/address" }
+  watch(%r{^lib/cyoi/cli/(?:|provider_)key_pair})    { |m| "spec/unit/cli" }
 end
 

data/bin/cyoi

@@ -14,8 +14,11 @@ when :provider
 when :address
   require "cyoi/cli/address"
   Cyoi::Cli::Address.new(argv)
+when :keypair, :key_pair
+  require "cyoi/cli/key_pair"
+  Cyoi::Cli::KeyPair.new(argv)
 else
-  $stderr.puts "USAGE: cyoi [provider|address]"
+  $stderr.puts "USAGE: cyoi [provider|address|key_pair]"
   exit 1
 end
 

data/lib/cyoi/cli/helpers/settings.rb

@@ -44,6 +44,11 @@ module Cyoi::Cli::Helpers::Settings
     puts "Using settings file #{settings_path}"
   end
 
+  def reload_settings!
+    @settings = nil
+    settings
+  end
+
   def migrate_old_settings
   end
 end

data/lib/cyoi/cli/key_pair.rb

@@ -0,0 +1,64 @@
+require "cyoi/cli"
+require "cyoi/cli/auto_detection"
+require "cyoi/cli/helpers"
+class Cyoi::Cli::KeyPair
+  include Cyoi::Cli::Helpers
+
+  attr_reader :key_pair_name
+
+  def initialize(argv, stdin=STDIN, stdout=STDOUT, stderr=STDERR, kernel=Kernel)
+    @argv, @stdin, @stdout, @stderr, @kernel = argv, stdin, stdout, stderr, kernel
+    unless @key_pair_name = @argv.shift
+      raise "Please provide key pair name as first argument"
+    end
+    @settings_dir = @argv.shift || "/tmp/provider_settings"
+    @settings_dir = File.expand_path(@settings_dir)
+  end
+
+  # TODO run Cyoi::Cli::Provider first if settings.provider.name missing
+  def execute!
+    unless settings.exists?("provider.name")
+      $stderr.puts("Please run 'cyoi provider' first")
+      exit 1
+    end
+    unless valid?
+      settings["key_pair"] = key_pair_cli.perform_and_return_attributes
+    end
+    save_settings!
+    key_pair_cli.display_confirmation
+  end
+
+  # Continue the interactive session with the user
+  # specific to the key_pair/infrastructure they have
+  # chosen.
+  #
+  # The returned object is a class from cyoi/cli/key_pairs/provier_cli_NAME.rb
+  # The class loads itself into `@key_pair_clis` via `register_key_pair_cli`
+  #
+  # Returns nil if settings.key_pair.name not set
+  def key_pair_cli
+    @key_pair_cli ||= begin
+      provider_name = settings.exists?("provider.name")
+      return nil unless provider_name
+      require "cyoi/cli/provider_key_pair/key_pair_#{settings.provider.name}"
+      klass = self.class.key_pair_cli(settings.provider.name)
+      settings["key_pair"] ||= {}
+      settings.key_pair["name"] = key_pair_name
+      klass.new(provider_client, settings.key_pair, hl)
+    end
+  end
+
+  def self.register_key_pair_cli(name, klass)
+    @key_pair_clis ||= {}
+    @key_pair_clis[name] = klass
+  end
+
+  def self.key_pair_cli(name)
+    @key_pair_clis[name]
+  end
+
+  protected
+  def valid?
+    key_pair_cli && key_pair_cli.valid?
+  end
+end

data/lib/cyoi/cli/provider_key_pair/key_pair_aws.rb

@@ -0,0 +1,58 @@
+class Cyoi::Cli::KeyPair; end
+class Cyoi::Cli::KeyPair::KeyPairCliAws
+  attr_reader :provider_client
+  attr_reader :attributes
+  attr_reader :hl
+
+  def initialize(provider_client, attributes, highline)
+    @provider_client = provider_client
+    @hl = highline
+    @attributes = attributes.is_a?(Hash) ? Settingslogic.new(attributes) : attributes
+    raise "@attributes must be Settingslogic (or Hash)" unless @attributes.is_a?(Settingslogic)
+    raise "@attributes.name must be set" unless @attributes["name"]
+  end
+
+  def perform_and_return_attributes
+    unless valid?
+      destroy_existing_key_pair
+      provision_key_pair
+    end
+    export_attributes
+  end
+
+  # helper to export the complete nested attributes.
+  def export_attributes
+    attributes.to_nested_hash
+  end
+
+  def valid?
+    attributes["name"] && attributes["fingerprint"] && attributes["private_key"] &&
+      provider_client.valid_key_pair_fingerprint?(key_pair_name, attributes.fingerprint)
+  end
+
+  def display_confirmation
+    puts "\n"
+    puts "Confirming: Using key pair #{key_pair_name}"
+  end
+
+  def key_pair_name
+    attributes.name
+  end
+
+  protected
+  def destroy_existing_key_pair
+    provider_client.delete_key_pair_if_exists(key_pair_name)
+  end
+
+  # provisions key pair from AWS and returns fog object KeyPair
+  def provision_key_pair
+    print "Acquiring a key pair #{key_pair_name}... "
+    if key_pair = provider_client.create_key_pair(key_pair_name)
+      attributes["fingerprint"] = key_pair.fingerprint
+      attributes["private_key"] = key_pair.private_key
+      puts "done"
+    end
+  end
+end
+
+Cyoi::Cli::KeyPair.register_key_pair_cli("aws", Cyoi::Cli::KeyPair::KeyPairCliAws)

data/lib/cyoi/providers/clients/fog_provider_client.rb

@@ -21,6 +21,14 @@ class Cyoi::Providers::Clients::FogProviderClient
     fog_compute.key_pairs.create(:name => key_pair_name)
   end
 
+  def valid_key_pair_fingerprint?(key_pair_name, fingerprint)
+    if fog_key_pair = fog_compute.key_pairs.get(key_pair_name)
+      fog_key_pair.fingerprint == fingerprint
+    else
+      false
+    end
+  end
+
   # set_resource_name(fog_server, "inception")
   # set_resource_name(volume, "inception-root")
   # set_resource_name(volume, "inception-store")

data/lib/cyoi/version.rb

@@ -1,3 +1,3 @@
 module Cyoi
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/integration/cli/key_pair/key_pair_aws_spec.rb

@@ -0,0 +1,30 @@
+describe "cyoi key_pair aws" do
+  include Cyoi::Cli::Helpers::Settings
+  include SettingsHelper
+  include Aruba::Api
+  before { @settings_dir = File.expand_path("~/.cyoi_client_lib") }
+
+  it "fails nicely if provider.name missing" do
+    run_interactive(unescape("cyoi key_pair #{settings_dir}"))
+    assert_failing_with("Please run 'cyoi provider' first")
+  end
+
+  describe "name & provider setup and" do
+    before do
+      setting "provider.name", "aws"
+      setting "provider.credentials.aws_access_key_id", "aws_access_key_id"
+      setting "provider.credentials.aws_secret_access_key", "aws_secret_access_key"
+      setting "provider.region", "us-west-2"
+      setting "name", "test-bosh"
+    end
+
+    it "create new key pair (didn't already exist in AWS)" do
+      assert_passing_with(<<-OUT)
+Provisioning new key pair microbosh-test-bosh... done
+
+Confirm: Using key pair microbosh-test-bosh
+      OUT
+    end
+  end
+
+end

data/spec/unit/cli/key_pair_spec.rb

@@ -0,0 +1,79 @@
+require "fog"
+require "cyoi/cli/key_pair"
+
+describe "cyoi key_pair aws" do
+  include Cyoi::Cli::Helpers::Settings
+  include SettingsHelper
+  include StdoutCapture
+  include Aruba::Api
+  before { @settings_dir = File.expand_path("~/.cyoi_client_lib") }
+  before { Fog.mock!; Fog::Mock.reset }
+  before do
+    setting "provider.name", "aws"
+    setting "provider.credentials.aws_access_key_id", "aws_access_key_id"
+    setting "provider.credentials.aws_secret_access_key", "aws_secret_access_key"
+    setting "provider.region", "us-west-2"
+  end
+
+  subject { Cyoi::Cli::KeyPair.new(["test-bosh", settings_dir]) }
+
+  let(:fog_compute) { subject.key_pair_cli.provider_client.fog_compute }
+
+  it "creates new key pair if not already valid in settings" do
+    capture_stdout { subject.execute! }
+    reload_settings!
+    settings.key_pair.name.should == "test-bosh"
+    settings.key_pair.fingerprint.should_not be_nil
+    settings.key_pair.private_key.should_not be_nil
+  end
+
+  it "creates new key pair, first destroying existing key pair of same name" do
+    old_key = fog_compute.key_pairs.create(name: "test-bosh")
+    capture_stdout { subject.execute! }
+    reload_settings!
+    settings.key_pair.name.should == "test-bosh"
+    settings.key_pair.fingerprint.should_not be_nil
+    settings.key_pair.private_key.should_not be_nil
+
+    new_key = fog_compute.key_pairs.get("test-bosh")
+    settings.key_pair.fingerprint.should == new_key.fingerprint
+    settings.key_pair.fingerprint.should_not == old_key.fingerprint
+  end
+
+  it "does nothing if key pair already in settings and matches fingerprint with AWS" do
+    capture_stdout { subject.execute! }
+    reload_settings!
+    fingerprint = settings.key_pair.fingerprint
+
+    capture_stdout { subject.execute! }
+    reload_settings!
+    settings.key_pair.fingerprint.should == fingerprint
+  end
+
+  it "recreates key pair if fingerprint mismatch" do
+    old_key = fog_compute.key_pairs.create(name: "test-bosh")
+    capture_stdout { subject.execute! }
+    reload_settings!
+
+    setting "key_pair.fingerprint", "xxxx"
+    capture_stdout { subject.execute! }
+    reload_settings!
+
+    new_key = fog_compute.key_pairs.get("test-bosh")
+    settings.key_pair.fingerprint.should_not == "xxxx"
+    settings.key_pair.fingerprint.should_not == old_key.fingerprint
+    settings.key_pair.fingerprint.should == new_key.fingerprint
+  end
+
+  it "recreates key pair if there is no record of key pair with AWS" do
+    setting "key_pair.name", "test-bosh"
+    setting "key_pair.fingerprint", "xxxx"
+    capture_stdout { subject.execute! }
+    reload_settings!
+
+    new_key = fog_compute.key_pairs.get("test-bosh")
+    settings.key_pair.fingerprint.should_not == "xxxx"
+    settings.key_pair.fingerprint.should == new_key.fingerprint
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyoi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -152,8 +152,10 @@ files:
 - lib/cyoi/cli/helpers/interactions.rb
 - lib/cyoi/cli/helpers/provider.rb
 - lib/cyoi/cli/helpers/settings.rb
+- lib/cyoi/cli/key_pair.rb
 - lib/cyoi/cli/provider.rb
 - lib/cyoi/cli/provider_addresses/address_cli_aws.rb
+- lib/cyoi/cli/provider_key_pair/key_pair_aws.rb
 - lib/cyoi/cli/providers/provider_cli.rb
 - lib/cyoi/cli/providers/provider_cli_aws.rb
 - lib/cyoi/cli/providers/provider_cli_openstack.rb
@@ -167,12 +169,14 @@ files:
 - lib/cyoi/version.rb
 - spec/.DS_Store
 - spec/integration/cli/address/address_aws_spec.rb
+- spec/integration/cli/key_pair/key_pair_aws_spec.rb
 - spec/integration/cli/provider/provider_aws_spec.rb
 - spec/integration/cli/provider/provider_openstack_spec.rb
 - spec/spec_helper.rb
 - spec/support/settings_helper.rb
 - spec/support/stdout_capture.rb
 - spec/unit/.gitkeep
+- spec/unit/cli/key_pair_spec.rb
 homepage: https://github.com/drnic/cyoi
 licenses:
 - MIT
@@ -188,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3618245978349613620
+      hash: 3080735547903421665
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3618245978349613620
+      hash: 3080735547903421665
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -212,9 +216,11 @@ summary: A library to ask an end-user to choose an infrastructure (AWS, OpenStac
 test_files:
 - spec/.DS_Store
 - spec/integration/cli/address/address_aws_spec.rb
+- spec/integration/cli/key_pair/key_pair_aws_spec.rb
 - spec/integration/cli/provider/provider_aws_spec.rb
 - spec/integration/cli/provider/provider_openstack_spec.rb
 - spec/spec_helper.rb
 - spec/support/settings_helper.rb
 - spec/support/stdout_capture.rb
 - spec/unit/.gitkeep
+- spec/unit/cli/key_pair_spec.rb