vagrant-sakura 0.0.9 → 0.1.0

data/lib/vagrant-sakura/action/run_instance.rb

@@ -20,10 +20,15 @@ module VagrantPlugins
           server_name ||= env[:machine].name
           server_plan = env[:machine].provider_config.server_plan
           disk_plan = env[:machine].provider_config.disk_plan
+          disk_source_mode = env[:machine].provider_config.disk_source_mode
+          os_type = env[:machine].provider_config.os_type
           disk_source_archive = env[:machine].provider_config.disk_source_archive
           sshkey_id = env[:machine].provider_config.sshkey_id
           public_key_path = env[:machine].provider_config.public_key_path
           use_insecure_key = env[:machine].provider_config.use_insecure_key
+          enable_pw_auth = env[:machine].provider_config.enable_pw_auth
+          packet_filter = env[:machine].provider_config.packet_filter.to_s
+          startup_scripts = env[:machine].provider_config.startup_scripts
           tags = env[:machine].provider_config.tags
           description = env[:machine].provider_config.description
 
@@ -31,7 +36,10 @@ module VagrantPlugins
           env[:ui].info(" -- Server Name: #{server_name}")
           env[:ui].info(" -- Server Plan: #{server_plan}")
           env[:ui].info(" -- Disk Plan: #{disk_plan}")
+          env[:ui].info(" -- Disk Source OS Type: #{os_type}") if os_type
           env[:ui].info(" -- Disk Source Archive: #{disk_source_archive}")
+          env[:ui].info(" -- Packet Filter: #{packet_filter}") unless packet_filter.empty?
+          env[:ui].info(" -- Startup Scripts: #{startup_scripts.map {|item| item["ID"]}}") unless startup_scripts.empty?
           env[:ui].info(" -- Tags: #{tags}") unless tags.empty?
           env[:ui].info(" -- Description: \"#{description}\"") unless description.empty?
 
@@ -39,7 +47,6 @@ module VagrantPlugins
 
           if env[:machine].provider_config.disk_id
             diskid = env[:machine].provider_config.disk_id
-
           else
             data = {
               "Disk" => {
@@ -92,8 +99,14 @@ module VagrantPlugins
             raise 'no Server ID returned'
           end
           env[:machine].id = serverid = response["Server"]["ID"]
+          interface_id = response["Server"]["Interfaces"][0]["ID"]
           # Server Created
 
+          unless packet_filter.empty?
+            response = api.put("/interface/#{interface_id}/to/packetfilter/#{packet_filter}")
+            # Packet Filter connected to Server
+          end
+
           begin
             response = api.put("/disk/#{diskid}/to/server/#{serverid}")
             # Disk mounted to Server
@@ -103,7 +116,9 @@ module VagrantPlugins
           end
 
           data = {
-            "UserSubnet" => {}
+            "UserSubnet" => {},
+            "Notes" => startup_scripts,
+            "DisablePWAuth" => !enable_pw_auth
           }
           if sshkey_id
             data["SSHKey"] = { "ID" => sshkey_id }
@@ -115,6 +130,7 @@ module VagrantPlugins
           else
             raise 'failsafe'
           end
+
           response = api.put("/disk/#{diskid}/config", data)
           # Config
 

data/lib/vagrant-sakura/action.rb

@@ -35,6 +35,27 @@ module VagrantPlugins
         end
       end
 
+      def self.action_reinstall
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectSakura
+          b.use CompleteArchiveId
+          b.use Call, ReadState do |env, b2|
+            case env[:machine_state_id]
+            when :up
+              b2.use Halt
+              b2.use Reinstall
+              b2.use Provision
+            when :down, :cleaning
+              b2.use Reinstall
+              b2.use Provision
+            when :not_created
+              b2.use MessageNotCreated
+          end
+          end
+        end
+      end
+
       def self.action_list_id
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
@@ -134,6 +155,7 @@ module VagrantPlugins
           b.use HandleBox
           b.use ConfigValidate
           b.use ConnectSakura
+          b.use CompleteArchiveId
           b.use Call, ReadState do |env, b2|
             case env[:machine_state_id]
             when :up
@@ -150,6 +172,7 @@ module VagrantPlugins
       end
 
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
+      autoload :CompleteArchiveId, action_root.join("complete_archive_id")
       autoload :ConnectSakura, action_root.join("connect_sakura")
       autoload :DeleteServer, action_root.join("delete_server")
       autoload :IsCreated, action_root.join("is_created")
@@ -162,6 +185,7 @@ module VagrantPlugins
       autoload :PowerOn, action_root.join("power_on")
       autoload :ReadSSHInfo, action_root.join("read_ssh_info")
       autoload :ReadState, action_root.join("read_state")
+      autoload :Reinstall, action_root.join("reinstall")
       autoload :Reset, action_root.join("reset")
       autoload :RunInstance, action_root.join("run_instance")
       autoload :SyncFolders, action_root.join("sync_folders")

data/lib/vagrant-sakura/{command.rb → command_list_id.rb}

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module Sakura
-    class Command < Vagrant.plugin(2, :command)
+    class CommandListId < Vagrant.plugin(2, :command)
       def self.synopsis
         "query Sakura for available archives and server plans"
       end

data/lib/vagrant-sakura/command_reinstall.rb

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module Sakura
+    class CommandReinstall < Vagrant.plugin(2, :command)
+      def self.synopsis
+        "Reinstall Sakura cloud disk"
+      end
+
+      def execute
+        with_target_vms(nil, { :provider => "sakura" }) do |vm|
+          vm.action(:reinstall)
+        end
+        0
+      end
+    end
+  end
+end

data/lib/vagrant-sakura/config.rb

@@ -1,8 +1,11 @@
 require "vagrant"
+require "json"
+require "vagrant-sakura/os_type"
 
 module VagrantPlugins
   module Sakura
     class Config < Vagrant.plugin("2", :config)
+
       # The ACCESS TOKEN to access Sakura Cloud API.
       #
       # @return [String]
@@ -28,6 +31,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :disk_source_archive
 
+      # The source archive os-type.
+      #
+      # @return [String]
+      attr_accessor :os_type
+
       # The pathname of the SSH public key to register on the server.
       #
       # @return [String]
@@ -53,9 +61,29 @@ module VagrantPlugins
       # @return [Boolean]
       attr_accessor :use_insecure_key
 
+      # Enable password auth to connecting via ssh.
+      #
+      # @return [Boolean]
+      attr_accessor :enable_pw_auth
+
+      # The packet filter ID of the server's first NIC.
+      #
+      # @return [String]
+      attr_accessor :packet_filter
+
+      # The startup script IDs of the server.
+      #
+      # @return [Array<String>]
+      attr_accessor :startup_scripts
+
       # The ID of the zone.
       attr_accessor :zone_id
 
+      # The path of the usacloud config.
+      #
+      # @return [String]
+      attr_accessor :config_path
+
       # The tags of the server and disk.
       #
       # @return [Array<String>]
@@ -72,24 +100,49 @@ module VagrantPlugins
         @disk_id             = UNSET_VALUE
         @disk_plan           = UNSET_VALUE
         @disk_source_archive = UNSET_VALUE
+        @os_type             = UNSET_VALUE
         @public_key_path     = UNSET_VALUE
         @server_name         = UNSET_VALUE
         @server_plan         = UNSET_VALUE
         @sshkey_id           = UNSET_VALUE
         @use_insecure_key    = UNSET_VALUE
+        @enable_pw_auth      = UNSET_VALUE
+        @packet_filter       = UNSET_VALUE
+        @startup_scripts     = UNSET_VALUE
         @zone_id             = UNSET_VALUE
+        @config_path         = UNSET_VALUE
         @tags                = UNSET_VALUE
         @description         = UNSET_VALUE
       end
 
+      # @return one of [:disk, :archive, :os_type]
+      def disk_source_mode
+        return :disk unless @disk_id.to_s.empty?
+        return :archive unless @disk_source_archive.to_s.empty?
+        :os_type
+      end
+
       def finalize!
+
+        usacloud_config = get_usacloud_config(@config_path)
+
         if @access_token == UNSET_VALUE
-          @access_token = ENV['SAKURA_ACCESS_TOKEN']
+          if usacloud_config.nil?
+            @access_token = nil
+          else
+            @access_token = usacloud_config["AccessToken"]
+          end
+          @access_token = ENV['SAKURA_ACCESS_TOKEN'] if @access_token.nil?
           @access_token = ENV['SAKURACLOUD_ACCESS_TOKEN'] if @access_token.nil?
         end
 
         if @access_token_secret == UNSET_VALUE
-          @access_token_secret = ENV['SAKURA_ACCESS_TOKEN_SECRET']
+          if usacloud_config.nil?
+            @access_token_secret = nil
+          else
+            @access_token_secret = usacloud_config["AccessTokenSecret"]
+          end
+          @access_token_secret = ENV['SAKURA_ACCESS_TOKEN_SECRET'] if @access_token_secret.nil?
           @access_token_secret = ENV['SAKURACLOUD_ACCESS_TOKEN_SECRET'] if @access_token_secret.nil?
         end
 
@@ -101,8 +154,10 @@ module VagrantPlugins
           @disk_plan = 4  # SSD
         end
 
-        if @disk_source_archive == UNSET_VALUE
-          @disk_source_archive = 113000423772 # Ubuntu Server 16.04.4 LTS 64bit on is1b
+        @disk_source_archive = nil if @disk_source_archive == UNSET_VALUE
+        @os_type = nil if @os_type == UNSET_VALUE
+        if @disk_source_archive.to_s.empty? && @os_type.to_s.empty?
+          @os_type = "ubuntu"
         end
 
         @public_key_path = nil if @public_key_path == UNSET_VALUE
@@ -118,9 +173,21 @@ module VagrantPlugins
         @sshkey_id = nil if @sshkey_id == UNSET_VALUE
 
         @use_insecure_key = false if @use_insecure_key == UNSET_VALUE
+        @enable_pw_auth = false if @enable_pw_auth == UNSET_VALUE
+
+        @packet_filter = "" if @packet_filter == UNSET_VALUE
+
+        @startup_scripts = [] if @startup_scripts == UNSET_VALUE
+        @startup_scripts = [@startup_scripts] unless @startup_scripts.is_a?(Array)
+        @startup_scripts.map! { |id| {"ID" => id.to_s} }
 
         if @zone_id == UNSET_VALUE
-          @zone_id = ENV['SAKURACLOUD_ZONE']
+          if usacloud_config.nil?
+            @zone_id = nil
+          else
+            @zone_id = usacloud_config["Zone"]
+          end
+          @zone_id = ENV['SAKURACLOUD_ZONE'] if @zone_id.nil?
           @zone_id = "is1b" if @zone_id.nil?
         end
 
@@ -146,8 +213,57 @@ module VagrantPlugins
           errors << I18n.t("vagrant_sakura.config.need_ssh_key_config")
         end
 
+        if not VagrantPlugins::Sakura::OSType::os_types.include? @os_type
+          errors << I18n.t("vagrant_sakura.config.need_valid_os_type")
+        end
+
         { "Sakura Provider" => errors }
       end
+
+      def choose_usacloud_profile_dir
+        profile_path = ENV.fetch("USACLOUD_PROFILE_DIR", "")
+        if profile_path.empty?
+          File.expand_path("~/.usacloud")
+        else
+          File.join(File.expand_path(profile_path), ".usacloud")
+        end
+      end
+
+      def get_usacloud_profile_name
+        profile_dir = choose_usacloud_profile_dir
+        current_file = File.join(profile_dir, "current")
+
+        return "default" unless FileTest.exist? current_file
+        File.open(current_file) do |file|
+          file.read.split("\n").each do |line|
+            return line
+          end
+        end
+        "default"
+      end
+
+      def get_usacloud_config(config_path = nil)
+        if config_path.nil? || config_path == UNSET_VALUE
+          profile_dir = choose_usacloud_profile_dir
+          profile_name = get_usacloud_profile_name
+
+          return nil if profile_name.empty?
+          config_path = File.join(profile_dir, profile_name, "config.json")
+        end
+
+        if FileTest.exist?(config_path)
+          File.open(config_path) do |file|
+            begin
+              json = JSON.load(file)
+              return json
+            rescue JSON::ParserError
+              return nil
+            end
+          end
+        end
+
+        nil
+      end
     end
   end
 end

data/lib/vagrant-sakura/driver/api.rb

@@ -30,8 +30,9 @@ module VagrantPlugins
         end
 
         def get(resource, data = nil)
-          request = Net::HTTP::Get.new(@prefix + resource)
-          request.body = data.to_json if data
+          uri = URI.parse(@prefix + resource)
+          uri.query = data.to_json if data
+          request = Net::HTTP::Get.new uri.to_s
           do_request request
         end
 

data/lib/vagrant-sakura/os_type.rb

@@ -0,0 +1,34 @@
+module VagrantPlugins
+  module Sakura
+    module OSType
+      OS_TYPE_QUERIES = {
+          "centos" => {
+              "Tags.Name" => [%w(current-stable distro-centos)]
+          },
+          "centos6" => {
+              "Tags.Name" => [%w(distro-centos distro-ver-6.10)]
+          },
+          "ubuntu" => {
+              "Tags.Name" => [%w(current-stable distro-ubuntu)]
+          },
+          "debian" => {
+              "Tags.Name" => [%w(current-stable distro-debian)]
+          },
+          "coreos" => {
+              "Tags.Name" => [%w(current-stable distro-coreos)]
+          },
+          "rancheros" => {
+              "Tags.Name" => [%w(current-stable distro-rancheros)]
+          },
+          "freebsd" => {
+              "Tags.Name" => [%w(current-stable distro-freebsd)]
+          },
+      }
+
+      def self.os_types
+        OS_TYPE_QUERIES.keys
+      end
+    end
+  end
+end
+

data/lib/vagrant-sakura/plugin.rb

@@ -23,9 +23,14 @@ module VagrantPlugins
         Provider
       end
 
+      command(:'sakura-reinstall') do
+        require_relative "command_reinstall"
+        CommandReinstall
+      end
+
       command(:'sakura-list-id') do
-        require_relative "command"
-        Command
+        require_relative "command_list_id"
+        CommandListId
       end
 
       def self.setup_i18n

data/lib/vagrant-sakura/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Sakura
-    VERSION = "0.0.9"
+    VERSION = "0.1.0"
   end
 end

data/locales/en.yml

@@ -8,6 +8,8 @@ en:
       Warning! You are using insecure default key to login to the server on
       Sakura-no-cloud.  The key is publicly available (bundled in Vagrant
       distribution) so malicious people can login to your server.
+    reinstalling_disk: |-
+      Re-installing a disk with the following settings...
     down: |-
       The server is down.
     not_created: |-
@@ -48,3 +50,5 @@ en:
         An access token secret is required via "access_token_secret"
       need_ssh_key_config: |-
         You must set one of "sshkey_id", "pubic_key_path", or "use_insecure_key".
+      need_valid_os_type: |-
+        You must set valid os_type value.

data/test/test_config.rb

@@ -4,14 +4,7 @@ require "vagrant-sakura/config"
 module VagrantPlugins
   module Sakura
     class TestConfig < Test::Unit::TestCase
-
-      def setup
-        %w("SAKURACLOUD_ACCESS_TOKEN" "SAKURACLOUD_ACCESS_TOKEN_SECRET" "SAKURACLOUD_ZONE").map do |k|
-          ENV.delete(k)
-        end
-      end
-
-      def test_apikeys
+      def test_load_config
         cases = {
             "config only" => {
                 "config" => {
@@ -65,6 +58,30 @@ module VagrantPlugins
                     "zone" => "tk1a"
                 }
             },
+            "profile only" => {
+                "config" => {},
+                "env" => {},
+                "profile" => '{"AccessToken": "foo", "AccessTokenSecret": "bar", "Zone": "tk1a"}',
+                "expects" => {
+                    "token" => "foo",
+                    "secret" => "bar",
+                    "zone" => "tk1a"
+                }
+            },
+            "conf and profile order" => {
+                "config" => {
+                    "access_token" => "foo",
+                    "access_token_secret" => "bar",
+                    "zone_id" => "tk1a"
+                },
+                "env" => {},
+                "profile" => '{"AccessToken": "not_use", "AccessTokenSecret": "not_use", "Zone": "not_use"}',
+                "expects" => {
+                    "token" => "foo",
+                    "secret" => "bar",
+                    "zone" => "tk1a"
+                }
+            },
             "conf and env order" => {
                 "config" => {
                     "access_token" => "foo",
@@ -83,22 +100,171 @@ module VagrantPlugins
                     "secret" => "bar",
                     "zone" => "tk1a"
                 }
+            },
+            "profile and env order" => {
+                "config" => {},
+                "env" => {
+                    "SAKURA_ACCESS_TOKEN" => "not_use",
+                    "SAKURA_ACCESS_TOKEN_SECRET" => "not_use",
+                    "SAKURACLOUD_ACCESS_TOKEN" => "not_use",
+                    "SAKURACLOUD_ACCESS_TOKEN_SECRET" => "not_use",
+                    "SAKURACLOUD_ZONE" => "not_use",
+                },
+                "profile" => '{"AccessToken": "foo", "AccessTokenSecret": "bar", "Zone": "tk1a"}',
+                "expects" => {
+                    "token" => "foo",
+                    "secret" => "bar",
+                    "zone" => "tk1a"
+                }
             }
         }
 
-        cases.map {|name, c|
-          puts "Case: #{name}"
+
+        cases.map do |name, c|
+          Dir.mktmpdir do |dir|
+            env = { "USACLOUD_PROFILE_DIR" => dir }
+            ENV.update env
+
+            %w(SAKURA_ACCESS_TOKEN SAKURACLOUD_ACCESS_TOKEN SAKURA_ACCESS_TOKEN_SECRET SAKURACLOUD_ACCESS_TOKEN_SECRET SAKURACLOUD_ZONE).map do |k|
+              ENV.delete(k)
+            end
+
+            if !c["profile"].nil?
+              current_file = File.join(dir, ".usacloud", "current")
+              FileUtils.mkdir_p(File.dirname(current_file))
+              File.open(current_file, "w") do |file|
+                file.puts "default"
+              end
+
+              profile_file = File.join(dir, ".usacloud", "default", "config.json")
+              FileUtils.mkdir_p(File.dirname(profile_file))
+              File.open(profile_file, "w") do |file|
+                file.puts c["profile"]
+              end
+            end
+
+            conf = Config.new
+            conf.set_options c["config"]
+
+            ENV.update c["env"]
+
+            conf.finalize!
+
+            assert_equal c["expects"]["token"], conf.access_token
+            assert_equal c["expects"]["secret"], conf.access_token_secret
+            assert_equal c["expects"]["zone"], conf.zone_id
+          end
+        end
+
+      end
+
+      def test_startup_scripts_handling
+        cases = {
+            "startup_scripts is empty" => {
+                "config" => {},
+                "expects" => {
+                    "startup_scripts" => []
+                }
+            },
+
+            "startup_scripts is a number" => {
+                "config" => {
+                    "startup_scripts" => 999999999999
+                },
+                "expects" => {
+                    "startup_scripts" => [{"ID" => "999999999999"}]
+                }
+            },
+
+            "startup_scripts is array" => {
+                "config" => {
+                    "startup_scripts" => [999999999999,888888888888]
+                },
+                "expects" => {
+                    "startup_scripts" => [{"ID" => "999999999999"}, {"ID" => "888888888888"}]
+                }
+            },
+        }
+
+        cases.map do |name, c|
           conf = Config.new
           conf.set_options c["config"]
+          conf.finalize!
+
+          assert_equal c["expects"]["startup_scripts"], conf.startup_scripts
+        end
+
+      end
+
+      def test_disk_source_mode
+        cases = {
+            "mode is :disk" => {
+                "config" => {
+                    "disk_id" => 999999999999
+                },
+                "expect" => :disk
+            },
+
+            "mode is :archive" => {
+                "config" => {
+                    "disk_source_archive" => 999999999999
+                },
+                "expect" => :archive
+            },
+
+            "mode is :os_type" => {
+                "config" => {
+                    "os_type" => "centos"
+                },
+                "expect" => :os_type
+            },
 
-          ENV.update c["env"]
+            "mode is :os_type with defaults" => {
+                "config" => {},
+                "expect" => :os_type
+            },
+        }
 
+        cases.map do |name, c|
+          conf = Config.new
+          conf.set_options c["config"]
           conf.finalize!
-          assert_equal c["expects"]["token"], conf.access_token
-          assert_equal c["expects"]["secret"], conf.access_token_secret
-          assert_equal c["expects"]["zone"], conf.zone_id
+
+          assert_equal c["expect"], conf.disk_source_mode
+        end
+      end
+
+      def test_os_type
+        cases = {
+            "os_type is valid" => {
+                "config" => {
+                    "use_insecure_key" => true,
+                    "os_type" => "ubuntu"
+                },
+                "expect" => true
+            },
+
+            "os_type is invalid" => {
+                "config" => {
+                    "use_insecure_key" => true,
+                    "os_type" => "invalid",
+                },
+                "expect" => false
+            },
         }
+
+        cases.map do |name, c|
+          conf = Config.new
+          conf.set_options c["config"]
+          conf.finalize!
+
+          res = conf.validate(nil)
+
+          assert_equal c["expect"], res["Sakura Provider"].empty?
+        end
       end
+
+
     end
   end
 end