chef-provisioning-fog 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d393fe60b94489dca31ede225f1d5729510eb8e5
-  data.tar.gz: 2c0ca50215ed95b55918657d64c67baecc6c2c1c
+  metadata.gz: db6ee7ec27d271fb3880b648dcaab0aa3dc6c3e3
+  data.tar.gz: 3562d4b915fae443ef15cbe7f48e9a1bf5d0af40
 SHA512:
-  metadata.gz: 24a68b07d7ae4492f9b31898f2850f4abf824d6deb3ffac909f21e4e38b163b1cb3d4cc40d90a73f367b35df53cf27dc5fa53f64366d371bd72767f1eb9843a1
-  data.tar.gz: 373dc190d606cb7e931bf662ed31ee1ca2df1a7ba09546dad836c8d559672303f241ae7f308b42920b2e284f8ce9d4cf66d1c70c8ef732e8c844c909b3e4f376
+  metadata.gz: 510f83a7ecc7ef0ab683e767fc0490039b2f812fe6827fbbf46cf85034d05663d974676ec6f8e4891413decb4409d12fc5d08649ba45c6dd8e659fe0c979cbea
+  data.tar.gz: 318681b378186a7219bae547ad29b96eaac2b2053a97f93a0a15fd38150388790eee279bfb91549c8542e4b455b024db5222346dd339cf096c3243ca9f373ed9

data/Gemfile

@@ -3,7 +3,7 @@ gemfile
 gemspec
 
 group :development do
-  gem "chef", git: "https://github.com/chef/chef" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.2.2") # until stable 12.14 is released (won't load new cheffish and such otherwise)
+  gem "chef"
   gem 'guard'
   gem 'guard-rspec'
   gem 'rb-readline'

data/README.md

@@ -210,6 +210,24 @@ with_driver "fog:XenServer:<XEN-SERVER-IP/NAME>", compute_options: {
 
 For a full example see [examples/xenserver/simple.rb](examples/xenserver/simple.rb).
 
+### Scaleway
+
+You should configure the driver with your credentials or :
+
+``` ruby
+with_driver "fog:Scaleway:Your-Organisation-UUID:region", compute_options: {
+  scalewat_token: 'your-api-token',
+}
+```
+
+or just use the fog configuration (~/.fog):
+
+``` ruby
+with_driver 'fog:Scaleway'
+```
+
+For full examples, see [examples/scaleway](examples/scaleway).
+
 ### Cleaning up
 
 ```ruby

data/chef-provisioning-fog.gemspec

@@ -17,7 +17,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'google-api-client', "~> 0.8.0"
   s.add_dependency 'fog-softlayer' , '~> 1.1.0'
   s.add_dependency 'fog-digitalocean'
+  s.add_dependency 'fog-scaleway'
   s.add_dependency 'retryable'
+  s.add_dependency 'winrm-elevated'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rake'

data/lib/chef/provider/scaleway_volume.rb

@@ -0,0 +1,53 @@
+require 'chef/provider/lwrp_base'
+require 'openssl'
+require 'chef/provisioning/chef_provider_action_handler'
+require 'chef/provisioning/chef_managed_entry_store'
+
+class Chef
+class Provider
+class ScalewayVolume < Chef::Provider::LWRPBase
+  provides :scaleway_volume
+
+  def action_handler
+    @action_handler ||= Chef::Provisioning::ChefProviderActionHandler.new(self)
+  end
+
+  def load_current_resource
+  end
+
+  def whyrun_supported?
+    true
+  end
+
+  def volume_spec
+    @volume_spec ||= chef_managed_entry_store.get_or_new(:volume, new_resource.name)
+  end
+
+  # Get the driver specified in the resource
+  def new_driver
+    @new_driver ||= run_context.chef_provisioning.driver_for(new_resource.driver)
+  end
+
+  def chef_managed_entry_store
+    @chef_managed_entry_store ||= Provisioning.chef_managed_entry_store(new_resource.chef_server)
+  end
+
+
+  action :create do
+    unless volume_spec.reference && new_driver.volume_for(volume_spec)
+      new_driver.create_volume(action_handler, volume_spec,
+                               new_resource.volume_options)
+    end
+    new_resource.id = volume_spec.reference['id']
+  end
+
+  action :destroy do
+    if volume_spec.reference && volume_spec.reference['id']
+      new_driver.destroy_volume(action_handler, volume_spec,
+                                new_resource.volume_options)
+      volume_spec.delete(action_handler)
+    end
+  end
+end
+end
+end

data/lib/chef/provisioning/fog_driver/driver.rb

@@ -277,6 +277,14 @@ module FogDriver
       end
     end
 
+    def create_volume(action_handler, volume_spec, volume_options)
+      raise "##create_volume not implemented in in #{self.class}"
+    end
+
+    def destroy_volume(action_handler, volume_spec, volume_options)
+      raise "##destroy_volume not implemented in in #{self.class}"
+    end
+
     protected
 
     def option_for(machine_options, key)
@@ -308,13 +316,13 @@ module FogDriver
           Chef::Log.warn "Machine #{machine_spec.name} (#{machine_spec.reference['server_id']} on #{driver_url}) no longer exists.  Recreating ..."
         end
 
-      machine_spec.reference ||= {}
-      machine_spec.reference.update(
-        'driver_url' => driver_url,
-        'driver_version' => FogDriver::VERSION,
-        'creator' => creator,
-        'allocated_at' => Time.now.to_i
-      )
+        machine_spec.reference ||= {}
+        machine_spec.reference.update(
+          'driver_url' => driver_url,
+          'driver_version' => FogDriver::VERSION,
+          'creator' => creator,
+          'allocated_at' => Time.now.to_i
+        )
 
         bootstrap_options = bootstrap_options_for(action_handler, machine_spec, machine_options)
         machine_spec.reference['key_name'] = bootstrap_options[:key_name] if bootstrap_options[:key_name]
@@ -368,6 +376,7 @@ module FogDriver
     def create_many_servers(num_servers, bootstrap_options, parallelizer)
       parallelizer.parallelize(1.upto(num_servers)) do |i|
         clean_bootstrap_options = Marshal.load(Marshal.dump(bootstrap_options)) # Prevent destructive operations on bootstrap_options.
+
         server = compute.servers.create(clean_bootstrap_options)
         yield server if block_given?
         server
@@ -483,7 +492,6 @@ module FogDriver
           end
           server.reload
         end
-
       end
     end
 
@@ -616,6 +624,10 @@ module FogDriver
       end
     end
 
+    def volume_for(volume_spec)
+      raise "Immplement me in #{self.class.name}"
+    end
+
     def convergence_strategy_for(machine_spec, machine_options)
       # Defaults
       if !machine_spec.reference

data/lib/chef/provisioning/fog_driver/providers/openstack.rb

@@ -48,7 +48,7 @@ module FogDriver
         result = Cheffish::MergedConfig.new(new_config, config, new_defaults)
 
         new_compute_options[:openstack_auth_url] = id if (id && id != '')
-        
+
         credential = Fog.credentials.find_all{ |k,v|
           k.to_s.start_with?('openstack') }
         credential.each { |k,v|

data/lib/chef/provisioning/fog_driver/providers/scaleway.rb

@@ -0,0 +1,248 @@
+# fog:OpenStack:https://identifyhost:portNumber/v2.0
+
+require 'fog/scaleway'
+require 'fog/scaleway/models/compute/server'
+
+#
+# We're monkeypatching here to avoid overriding too much of the base
+# class. This monkey patch will be removed if we can merge those changes
+# upstream
+#
+class Fog::Scaleway::Compute::Server
+  alias :start :poweron
+  alias :stop :poweroff
+
+  def disassociate_address(ip)
+    ip = ip.address if ip.respond_to? :address
+    if public_ip && public_ip.address == ip
+      public_ip.server = nil
+      public_ip.save
+    end
+    reload
+  end
+end
+
+class Chef
+module Provisioning
+module FogDriver
+  module Providers
+    class Scaleway < FogDriver::Driver
+      Driver.register_provider_class('Scaleway', FogDriver::Providers::Scaleway)
+
+      def creator
+        compute_options[:scaleway_organization]
+      end
+
+      def convergence_strategy_for(machine_spec, machine_options)
+        machine_options = Cheffish::MergedConfig.new(machine_options, {
+                                                       :convergence_options => {:ohai_hints => {'scaleway' => {}}}
+                                                     })
+        super(machine_spec, machine_options)
+      end
+
+      def bootstrap_options_for(action_handler, machine_spec, machine_options)
+        opts = super
+        opts[:tags] = opts[:tags].map { |key, value| [key, value].join('=') }
+
+        # Let's fetch the id of the volumes if the user didn't provide it
+        # Which probably means they were created in chef
+        if opts[:volumes]
+          managed_entry_store = machine_spec.managed_entry_store
+          volumes = Marshal.load(Marshal.dump(opts[:volumes]))
+
+          volumes.each do |index, volume|
+            unless volume[:id]
+              volume_spec = managed_entry_store.get(:volume, volume[:name])
+              unless volume_spec
+                raise "Volume #{volume[:name]} unknown, create it or provide its id"
+              end
+              volume[:id] = volume_spec.reference['id']
+            end
+          end
+          opts[:volumes] = volumes
+        end
+        opts
+      end
+
+      def destroy_machine(action_handler, machine_spec, machine_options)
+        server = server_for(machine_spec)
+        if server
+          action_handler.perform_action "destroy machine #{machine_spec.name} (#{machine_spec.reference['server_id']} at #{driver_url})" do
+
+            # Scaleway's API fail if we try to stop/terminate an instance with
+            # certains states
+            if server.state == 'running'
+              server.stop
+              server.wait_for { server.state != 'running' }
+            end
+            ['stopping', 'starting'].each do |state|
+              server.wait_for { server.state != state } if server.state == state
+            end
+
+            if server.state == 'stopped'
+              server.destroy
+            else
+              Chef::log.fatal "Server is in an unknown state (#{server.state})"
+            end
+            machine_spec.reference = nil
+          end
+        end
+        strategy = ConvergenceStrategy::NoConverge.new(machine_options[:convergence_options], config)
+        strategy.cleanup_convergence(action_handler, machine_spec)
+      end
+
+      def stop_machine(action_handler, machine_spec, machine_options)
+        server = server_for(machine_spec)
+        if server and server.state == 'running'
+          action_handler.perform_action "stop machine #{machine_spec.name} (#{server.id} at #{driver_url})" do
+            server.poweroff(true)
+            server.wait_for { server.state == 'stopped' }
+          end
+        end
+      end
+
+      def self.compute_options_for(provider, id, config)
+        new_compute_options = {}
+        new_compute_options[:provider] = provider
+        if (id && id != '')
+          org, region = id.split(':')
+          new_compute_options[:scaleway_organization] = org
+          new_compute_options[:scaleway_region] = region || 'par1'
+        end
+        new_config = { :driver_options => { :compute_options => new_compute_options }}
+
+        new_default_compute_options = {}
+        new_defaults = {
+          :driver_options => { :compute_options => new_default_compute_options },
+          :machine_options => { :bootstrap_options => {} }
+        }
+
+        result = Cheffish::MergedConfig.new(new_config, config, new_defaults)
+
+        credential = Fog.credentials
+        new_default_compute_options[:scaleway_organization] ||= credential[:scaleway_organization]
+        new_default_compute_options[:scaleway_token] ||= credential[:scaleway_token]
+
+        id = [result[:driver_options][:compute_options][:scaleway_organization],
+              result[:driver_options][:compute_options][:scaleway_region]].join(':')
+
+        [result, id]
+      end
+
+      def converge_floating_ips(action_handler, machine_spec, machine_options, server)
+        if server.dynamic_ip_required
+          Chef::Log.info "Dynamic IP allocation has been enabled, not converging IPs"
+        else
+          super
+        end
+      end
+
+      # Scaleway only has one global pool.
+      def attach_ip_from_pool(server, pool)
+        return server if server.public_ip
+
+        Chef::Log.info "Scaleway has only one IP pool, ignoring pool argument"
+        ip = server.service.ips.all.select { |ip| ip.address.nil? }.first
+        if ip
+          ip.server = server
+          ip.save
+          server.reload
+        else
+          # Allocate a new IP
+          ip = server.service.ips.create
+          ip.server = server
+          ip.save
+          server.reload
+        end
+      end
+
+      def attach_ip(server, floating_ip)
+        ip = server.service.ips.get(floating_ip)
+        if ip.nil?
+          raise RuntimeError, "Requested IP (#{floating_ip}) not found"
+        end
+        if ip.server and ip.server.identity != server.identity
+          raise RuntimeError, "Requested IP (#{floating_ip}) already attached"
+        end
+
+        if server.public_ip
+          old_ip = server.public_ip
+          Chef::Log.info "Server #{server.identity} already has IP #{old_ip.address}, removing it"
+          old_ip.server = nil
+          old_ip.save
+        end
+
+        ip.server = server
+        ip.save
+        server.reload
+      end
+
+      # Get the public IP if any
+      def find_floating_ips(server, action_handler)
+        public_ips = []
+        Retryable.retryable(RETRYABLE_OPTIONS) do |retries, _exception|
+          action_handler.report_progress "Querying for public IP attached to server #{server.id}, API attempt #{retries+1}/#{RETRYABLE_OPTIONS[:tries]} ..."
+          public_ips << server.public_ip.address if server.public_ip
+        end
+        public_ips
+      end
+
+
+      def create_volume(action_handler, volume_spec, volume_options)
+        # Prevent destructive operations on volume_options.
+        clean_volume_options = Marshal.load(Marshal.dump(volume_options))
+
+        volume_spec.reference ||= {}
+        volume_spec.reference.update(
+          'driver_url' => driver_url,
+          'driver_version' => FogDriver::VERSION,
+          'creator' => creator,
+          'allocated_at' => Time.now.to_i,
+        )
+
+        description = ["Creating volume #{volume_spec.name}"]
+        volume_options.each { |k, v| description << "  #{k}: #{v.inspect}"}
+
+        action_handler.report_progress description
+        if action_handler.should_perform_actions
+          clean_volume_options['name'] = volume_spec.name
+
+          volume = compute.volumes.create(clean_volume_options)
+
+          volume_spec.reference.update(
+            'id' => volume.id,
+            'volume_type' => volume.volume_type,
+            'size' => volume.size
+          )
+          volume_spec.save(action_handler)
+          action_handler.performed_action "volume #{volume_spec.name} created as #{volume.id} on #{driver_url}"
+        end
+      end
+
+      def destroy_volume(action_handler, volume_spec, volume_options)
+        volume = volume_for(volume_spec)
+
+        if volume && action_handler.should_perform_actions
+          begin
+            msg = "destroyed volume #{volume_spec.name} at #{driver_url}"
+            action_handler.perform_action msg do
+              volume.destroy
+              volume_spec.reference = nil
+              volume_spec.save(action_handler)
+            end
+          rescue Fog::Scaleway::Compute::InvalidRequestError => e
+            Chef::Log.error "Unable to destroy volume #{volume_spec.name} : #{e.message}"
+          end
+        end
+      end
+
+      def volume_for(volume_spec)
+        if volume_spec.reference
+          compute.volumes.get(volume_spec.reference['id'])
+        end
+      end
+    end
+  end
+end
+end
+end

data/lib/chef/provisioning/fog_driver/recipe_dsl.rb

@@ -1,6 +1,8 @@
 require 'chef/provisioning/fog_driver/driver'
 require 'chef/resource/fog_key_pair'
 require 'chef/provider/fog_key_pair'
+require 'chef/resource/scaleway_volume'
+require 'chef/provider/scaleway_volume'
 
 class Chef
   module DSL
@@ -27,6 +29,10 @@ class Chef
         with_fog_driver('Vcair', driver_options, &block)
       end
 
+      def with_fog_scaleway_driver(driver_options = nil, &block)
+        with_fog_driver('Scaleway', driver_options, &block)
+      end
+
     end
   end
 end

data/lib/chef/provisioning/fog_driver/version.rb

@@ -1,7 +1,7 @@
 class Chef
   module Provisioning
     module FogDriver
-      VERSION = '0.20.0'
+      VERSION = '0.21.0'
     end
   end
 end

data/lib/chef/resource/scaleway_volume.rb

@@ -0,0 +1,32 @@
+require 'chef/provisioning'
+
+class Chef::Resource::ScalewayVolume < Chef::Resource::LWRPBase
+  self.resource_name = 'scaleway_volume'
+
+  def initialize(*args)
+    super
+    @driver = run_context.chef_provisioning.current_driver
+    @chef_server = run_context.cheffish.current_chef_server
+  end
+
+  actions :create, :destroy, :nothing
+  default_action :create
+
+  attribute :id
+  attribute :chef_server
+  attribute :driver
+  attribute :volume_options
+
+  def add_volume_options(options)
+    if @volume_options
+      @volume_options = Cheffish::MergedConfig.new(options, @volume_options)
+    else
+      @volume_options = options
+    end
+  end
+
+  # We are not interested in Chef's cloning behavior here.
+  def load_prior_resource(*args)
+    Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
+  end
+end

data/spec/unit/providers/scaleway_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'chef/provisioning/fog_driver/providers/scaleway'
+
+describe Chef::Provisioning::FogDriver::Providers::Scaleway do
+  subject do
+    Chef::Provisioning::FogDriver::Driver.from_provider(
+      'Scaleway', driver_options: { compute_options: {
+                                      scaleway_organization: 'org',
+                                      scaleway_token: 'key'}
+                                   }
+    )
+  end
+
+  it "returns the correct driver" do
+    expect(subject).to be_an_instance_of Chef::Provisioning::FogDriver::Providers::Scaleway
+  end
+
+  it "has a Fog backend" do
+    pending unless Fog.mock?
+    expect(subject.compute).to be_an_instance_of Fog::Scaleway::Compute::Mock
+  end
+
+  describe '#creator' do
+    it 'returns the organization' do
+      expect(subject.creator).to eq 'org'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-fog
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - John Keiser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-provisioning
@@ -90,6 +90,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog-scaleway
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +118,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: winrm-elevated
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +193,7 @@ files:
 - Rakefile
 - chef-provisioning-fog.gemspec
 - lib/chef/provider/fog_key_pair.rb
+- lib/chef/provider/scaleway_volume.rb
 - lib/chef/provisioning/driver_init/fog.rb
 - lib/chef/provisioning/fog_driver/driver.rb
 - lib/chef/provisioning/fog_driver/providers/aws.rb
@@ -175,12 +204,14 @@ files:
 - lib/chef/provisioning/fog_driver/providers/joyent.rb
 - lib/chef/provisioning/fog_driver/providers/openstack.rb
 - lib/chef/provisioning/fog_driver/providers/rackspace.rb
+- lib/chef/provisioning/fog_driver/providers/scaleway.rb
 - lib/chef/provisioning/fog_driver/providers/softlayer.rb
 - lib/chef/provisioning/fog_driver/providers/vcair.rb
 - lib/chef/provisioning/fog_driver/providers/xenserver.rb
 - lib/chef/provisioning/fog_driver/recipe_dsl.rb
 - lib/chef/provisioning/fog_driver/version.rb
 - lib/chef/resource/fog_key_pair.rb
+- lib/chef/resource/scaleway_volume.rb
 - spec/spec_helper.rb
 - spec/support/aws/config-file.csv
 - spec/support/aws/ini-file.ini
@@ -189,6 +220,7 @@ files:
 - spec/unit/fog_driver_spec.rb
 - spec/unit/providers/aws/credentials_spec.rb
 - spec/unit/providers/rackspace_spec.rb
+- spec/unit/providers/scaleway_spec.rb
 - spec/unit/providers/softlayer.rb
 homepage: https://github.com/opscode/chef-provisioning-fog
 licenses: []