hetzner-k3s 0.4.9 → 0.5.3

data/lib/hetzner/k3s/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Hetzner
   module K3s
-    VERSION = "0.4.9"
+    VERSION = '0.5.3'
   end
 end

data/lib/hetzner/utils.rb

@@ -1,4 +1,6 @@
 module Utils
+  CMD_FILE_PATH = '/tmp/cli.cmd'
+
   def which(cmd)
     exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
     ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
@@ -10,90 +12,92 @@ module Utils
     nil
   end
 
-  def run(command, kubeconfig_path:)
-    env = ENV.to_hash.merge({
-      "KUBECONFIG" => kubeconfig_path
-    })
+  def write_file(path, content, append: false)
+    File.open(path, append ? 'a' : 'w') { |file| file.write(content) }
+  end
 
-    cmd_path = "/tmp/cli.cmd"
+  def run(command, kubeconfig_path:)
+    env = ENV.to_hash.merge({ 'KUBECONFIG' => kubeconfig_path })
 
-    File.open(cmd_path, "w") do |f|
-      f.write("set -euo pipefail\n")
-      f.write(command)
-    end
+    write_file CMD_FILE_PATH, <<-CONTENT
+    set -euo pipefail
+    #{command}
+    CONTENT
 
-    FileUtils.chmod("+x", cmd_path)
+    FileUtils.chmod('+x', CMD_FILE_PATH)
 
     begin
       process = nil
 
       at_exit do
-        begin
-          process&.send_signal("SIGTERM")
-        rescue Errno::ESRCH, Interrupt
-        end
+        process&.send_signal('SIGTERM')
+      rescue Errno::ESRCH, Interrupt
       end
 
-      Subprocess.check_call(["bash", "-c", cmd_path], env: env) do |p|
+      Subprocess.check_call(['bash', '-c', CMD_FILE_PATH], env:) do |p|
         process = p
       end
-
     rescue Subprocess::NonZeroExit
-      puts "Command failed: non-zero exit code"
+      puts 'Command failed: non-zero exit code'
       exit 1
     rescue Interrupt
-      puts "Command interrupted"
+      puts 'Command interrupted'
       exit 1
     end
   end
 
   def wait_for_ssh(server)
-    Timeout::timeout(5) do
-      server_name = server["name"]
+    retries = 0
+
+    Timeout.timeout(5) do
+      server_name = server['name']
 
       puts "Waiting for server #{server_name} to be up..."
 
       loop do
-        result = ssh(server, "echo UP")
-        break if result == "UP"
+        result = ssh(server, 'echo UP')
+        break if result == 'UP'
       end
 
       puts "...server #{server_name} is now up."
     end
   rescue Errno::ENETUNREACH, Errno::EHOSTUNREACH, Timeout::Error, IOError
-    retry
+    retries += 1
+    retry if retries <= 15
   end
 
   def ssh(server, command, print_output: false)
-    public_ip = server.dig("public_net", "ipv4", "ip")
-    output = ""
+    retries = 0
+
+    public_ip = server.dig('public_net', 'ipv4', 'ip')
+    output = ''
 
     params = { verify_host_key: (verify_host_key ? :always : :never) }
 
-    if private_ssh_key_path
-      params[:keys] = [private_ssh_key_path]
-    end
+    params[:keys] = private_ssh_key_path && [private_ssh_key_path]
 
-    Net::SSH.start(public_ip, "root", params) do |session|
-      session.exec!(command) do |channel, stream, data|
+    Net::SSH.start(public_ip, 'root', params) do |session|
+      session.exec!(command) do |_channel, _stream, data|
         output << data
         puts data if print_output
       end
     end
     output.chop
   rescue Net::SSH::Disconnect => e
-    retry unless e.message =~ /Too many authentication failures/
+    retries += 1
+    retry unless retries > 15 || e.message =~ /Too many authentication failures/
   rescue Net::SSH::ConnectionTimeout, Errno::ECONNREFUSED, Errno::ENETUNREACH, Errno::EHOSTUNREACH
-    retry
+    retries += 1
+    retry if retries <= 15
   rescue Net::SSH::AuthenticationFailed
-    puts
-    puts "Cannot continue: SSH authentication failed. Please ensure that the private SSH key is correct."
+    puts '\nCannot continue: SSH authentication failed. Please ensure that the private SSH key is correct.'
     exit 1
   rescue Net::SSH::HostKeyMismatch
-    puts
-    puts "Cannot continue: Unable to SSH into server with IP #{public_ip} because the existing fingerprint in the known_hosts file does not match that of the actual host key."
-    puts "This is due to a security check but can also happen when creating a new server that gets assigned the same IP address as another server you've owned in the past."
-    puts "If are sure no security is being violated here and you're just creating new servers, you can eiher remove the relevant lines from your known_hosts (see IPs from the cloud console) or disable host key verification by setting the option 'verify_host_key' to false in the configuration file for the cluster."
+    puts <<-MESSAGE
+    Cannot continue: Unable to SSH into server with IP #{public_ip} because the existing fingerprint in the known_hosts file does not match that of the actual host key.\n
+    This is due to a security check but can also happen when creating a new server that gets assigned the same IP address as another server you've owned in the past.\n
+    If are sure no security is being violated here and you're just creating new servers, you can eiher remove the relevant lines from your known_hosts (see IPs from the cloud console) or disable host key verification by setting the option 'verify_host_key' to false in the configuration file for the cluster.
+    MESSAGE
     exit 1
   end
 end

data/lib/hetzner.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module Hetzner
 end

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: hetzner-k3s
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.3
 platform: ruby
 authors:
 - Vito Botta
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: bcrypt_pbkdf
+  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: ed25519
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ed25519
+  name: subprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bcrypt_pbkdf
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,13 +109,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: subprocess
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -119,6 +133,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
@@ -129,8 +144,8 @@ files:
 - README.md
 - Rakefile
 - bin/build.sh
-- bin/console
-- bin/setup
+- bin/console.sh
+- bin/setup.sh
 - cluster_config.yaml.example
 - entrypoint.sh
 - exe/hetzner-k3s
@@ -155,6 +170,7 @@ metadata:
   homepage_uri: https://github.com/vitobotta/hetzner-k3s
   source_code_uri: https://github.com/vitobotta/hetzner-k3s
   changelog_uri: https://github.com/vitobotta/hetzner-k3s
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -163,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="