kitchen-rackspace 0.21.0 → 0.21.1

data/lib/kitchen/driver/rackspace.rb

@@ -1,38 +1,17 @@
-# Encoding: UTF-8
-#
-# Author:: Jonathan Hartman (<j@p4nt5.com>)
-#
-# Copyright (C) 2013-2015, Jonathan Hartman
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'benchmark'
-require 'fog'
-require 'kitchen'
-require 'etc'
-require 'socket'
+require "benchmark" unless defined?(Benchmark)
+require "fog/rackspace"
+require "kitchen"
+require "etc" unless defined?(Etc)
+require "socket" unless defined?(Socket)
+require "json" unless defined?(JSON)
 
 module Kitchen
   module Driver
-    # Rackspace driver for Kitchen.
-    #
-    # @author Jonathan Hartman <j@p4nt5.com>
     class Rackspace < Kitchen::Driver::SSHBase
-      default_config :version, 'v2'
-      default_config :flavor_id, 'performance1-1'
-      default_config :username, 'root'
-      default_config :port, '22'
-      default_config :rackspace_region, 'dfw'
+      default_config :version, "v2"
+      default_config :flavor_id, "performance1-1"
+      default_config :username, "root"
+      default_config :port, "22"
       default_config :wait_for, 600
       default_config :no_ssh_tcp_check, false
       default_config :no_ssh_tcp_check_sleep, 120
@@ -43,22 +22,28 @@ module Kitchen
       default_config(:image_id, &:default_image)
       default_config(:server_name, &:default_name)
       default_config :networks, nil
+      default_config :user_data, nil
+      default_config :config_drive, true
 
       default_config :public_key_path do
         [
-          File.expand_path('~/.ssh/id_rsa.pub'),
-          File.expand_path('~/.ssh/id_dsa.pub'),
-          File.expand_path('~/.ssh/identity.pub'),
-          File.expand_path('~/.ssh/id_ecdsa.pub')
+          File.expand_path("~/.ssh/id_rsa.pub"),
+          File.expand_path("~/.ssh/id_dsa.pub"),
+          File.expand_path("~/.ssh/identity.pub"),
+          File.expand_path("~/.ssh/id_ecdsa.pub"),
         ].find { |path| File.exist?(path) }
       end
 
       default_config :rackspace_username do
-        ENV['RACKSPACE_USERNAME'] || ENV['OS_USERNAME']
+        ENV["RACKSPACE_USERNAME"] || ENV["OS_USERNAME"]
       end
 
       default_config :rackspace_api_key do
-        ENV['RACKSPACE_API_KEY'] || ENV['OS_PASSWORD']
+        ENV["RACKSPACE_API_KEY"] || ENV["OS_PASSWORD"]
+      end
+
+      default_config :rackspace_region do
+        ENV["RACKSPACE_REGION"] || ENV["OS_REGION_NAME"] || "dfw"
       end
 
       required_config :rackspace_username
@@ -76,7 +61,7 @@ module Kitchen
         state[:server_id] = server.id
         info("Rackspace instance <#{state[:server_id]}> created.")
         server.wait_for { ready? }
-        puts '(server ready)'
+        puts "(server ready)"
         rackconnect_check(server) if config[:rackconnect_wait]
         servicelevel_check(server) if config[:servicelevel_wait]
         state[:hostname] = hostname(server)
@@ -109,19 +94,19 @@ module Kitchen
       # Total:        63
       def default_name
         [
-          instance.name.gsub(/\W/, '')[0..14],
-          (Etc.getlogin || 'nologin').gsub(/\W/, '')[0..14],
-          Socket.gethostname.gsub(/\W/, '')[0..22],
-          Array.new(7) { rand(36).to_s(36) }.join
-        ].join('-')
+          instance.name.gsub(/\W/, "")[0..14],
+          (Etc.getlogin || "nologin").gsub(/\W/, "")[0..14],
+          Socket.gethostname.gsub(/\W/, "")[0..22],
+          Array.new(7) { rand(36).to_s(36) }.join,
+        ].join("-")
       end
 
       private
 
       def compute
-        server_def = { provider: 'Rackspace' }
-        opts = [:version, :rackspace_username, :rackspace_api_key,
-                :rackspace_region]
+        server_def = { provider: "Rackspace" }
+        opts = %i{version rackspace_username rackspace_api_key
+                  rackspace_region}
         opts.each do |opt|
           server_def[opt] = config[opt]
         end
@@ -129,8 +114,8 @@ module Kitchen
       end
 
       def create_server
-        server_def = { name: config[:server_name], networks: networks }
-        [:image_id, :flavor_id, :public_key_path, :no_passwd_lock].each do |opt|
+        server_def = { name: config[:server_name], networks: }
+        %i{image_id flavor_id public_key_path no_passwd_lock user_data config_drive}.each do |opt|
           server_def[opt] = config[opt]
         end
         # see @note on bootstrap def about rackconnect
@@ -141,8 +126,8 @@ module Kitchen
 
       def images
         @images ||= begin
-          json_file = File.expand_path('../../../../data/images.json', __FILE__)
-          JSON.load(IO.read(json_file))
+          json_file = File.expand_path("../../../data/images.json", __dir__)
+          JSON.parse(IO.read(json_file))
         end
       end
 
@@ -151,20 +136,20 @@ module Kitchen
         # it doesn't respect ssh_config values that might be required
         wait_for_sshd(state[:hostname]) unless config[:no_ssh_tcp_check]
         sleep(config[:no_ssh_tcp_check_sleep]) if config[:no_ssh_tcp_check]
-        puts '(ssh ready)'
+        puts "(ssh ready)"
       end
 
       def rackconnect_check(server)
         server.wait_for \
-          { metadata.all['rackconnect_automation_status'] == 'DEPLOYED' }
-        puts '(rackconnect automation complete)'
+          { metadata.all["rackconnect_automation_status"] == "DEPLOYED" }
+        puts "(rackconnect automation complete)"
         server.update # refresh accessIPv4 with new IP
       end
 
       def servicelevel_check(server)
         server.wait_for \
-          { metadata.all['rax_service_level_automation'] == 'Complete' }
-        puts '(service level automation complete)'
+          { metadata.all["rax_service_level_automation"] == "Complete" }
+        puts "(service level automation complete)"
       end
 
       def hostname(server)
@@ -176,10 +161,10 @@ module Kitchen
       end
 
       def networks
-        base_nets = %w(
+        base_nets = %w{
           00000000-0000-0000-0000-000000000000
           11111111-1111-1111-1111-111111111111
-        )
+        }
         config[:networks] ? base_nets + config[:networks] : nil
       end
     end

data/lib/kitchen/driver/rackspace_version.rb

@@ -1,27 +1,6 @@
-# Encoding: UTF-8
 # frozen_string_literal: true
-#
-# Author:: Jonathan Hartman (<j@p4nt5.com>)
-#
-# Copyright (C) 2013-2015, Jonathan Hartman
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 module Kitchen
-  # Version string for Rackspace Kitchen driver
-  #
-  # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    RACKSPACE_VERSION = '0.21.0'.freeze
+    RACKSPACE_VERSION = "0.21.1"
   end
 end

data/release-please-config.json

@@ -0,0 +1,12 @@
+{
+  "packages": {
+    ".": {
+      "package-name": "kitchen-rackspace",
+      "changelog-path": "CHANGELOG.md",
+      "release-type": "ruby",
+      "include-component-in-tag": false,
+      "version-file": "lib/kitchen/driver/rackspace_version.rb"
+    }
+  },
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
+}

data/renovate.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended",
+    ":disableDependencyDashboard",
+    "schedule:automergeEarlyMondays"
+  ]
+}