mofa 0.5.12 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c1eb88f1c036d2fde056ffc49cedba0bd79e952abd9bd66373fa8df0729f5a1
-  data.tar.gz: b0482279a20d8a1988f4e82bb2132cb62f071e7d06265cb9bf75a1b994a1bcd4
+  metadata.gz: 22340c00ac56402d53cb1ed841920ace967951402a866f9ca880c33d25616c73
+  data.tar.gz: 228bdcb23b75e5da076e1f6f5ec80be8e63f2df02eeb828f564666ae566d0502
 SHA512:
-  metadata.gz: a8960aae289ce4d22fdbcc0b5f6804a61e3b34a21e674176791c8d1ab2d013701f6ac1359b6ed64a58231319a5820c49f2141e80fcea6063a38d72ca9a598a55
-  data.tar.gz: a1280c2d557f7c7a53ebd1cfc5ccb00820b82320c58ab326380ab73ec6ae6cb2d55adf24d87160d66b60fd444648ae6d68ce530b6bb06bfb516698cd905da29f
+  metadata.gz: f31f027919a1a26cc1bb5eaf973631cc37762d39592dc688948d2ea4f29b5d94909d320ea43a595eb15fa67f262178f6e9024b8e2c91a8745fd5f163d95ef51b
+  data.tar.gz: 92c20936e7dd2b917d6be30d548bf6c6efef8249a51e002788500088cdfeaf0ce4e179c1688d1731b001dc90eb34db1561e88179ca2957ef042f905edd163c07

data/lib/mofa/cli.rb

@@ -17,7 +17,6 @@ module Mofa
 
     desc 'provision <cookbook>', 'provisions Targethost(s) using a given cookbook.'
     method_option :ignore_ping, :type => :boolean, :aliases => '-P'
-    method_option :target, :type => :string, :aliases => '-t'
     method_option :concrete_target, :type => :string, :aliases => '-T'
     method_option :runlist, :type => :string, :aliases => '-o'
     method_option :attributes, :type => :string, :aliases => '-j'
@@ -27,17 +26,15 @@ module Mofa
     method_option :ssh_user, :type => :string, :aliases => '-u', :default => 'sccchef'
     method_option :ssh_keyfile, :type => :string, :aliases => '-i',  :default => '~/.ssh/id_rsa_sccchef'
     method_option :tmp_dir, :type => :string, :aliases => '-w', :default => '~/tmp/mofa'
-
+    method_option :binrepo_base_url, :type => :string, :aliases => '-r'
+    
     def provision(cookbook_name_or_path)
       set_verbosity
-
       cookbook_name_or_path ||= '.'
 
-      target_filter = options[:target]
-
       token = MofaCmd.generate_token
 
-      hostlist = Hostlist.create(target_filter, options[:service_hostlist_url], options[:concrete_target])
+      hostlist = Hostlist.create(options[:concrete_target])
       cookbook = Cookbook.create(cookbook_name_or_path, token, options[:override_mofa_secrets])
       runlist_map = RunlistMap.create(cookbook, hostlist, token, options[:runlist])
       attributes_map = AttributesMap.create(cookbook, hostlist, token, options[:runlist], options[:attributes])

data/lib/mofa/cookbook.rb

@@ -24,16 +24,16 @@ class Cookbook
     cookbook = nil
     begin
       case
-        when cookbook_name_or_path.match(/@/)
-          fail "Did not find released Cookbook #{cookbook_name_or_path}!" unless ReleasedCookbook.exists?(cookbook_name_or_path)
+      when cookbook_name_or_path.match(/@/)
+        raise "Did not find released Cookbook #{cookbook_name_or_path}!" unless ReleasedCookbook.exists?(cookbook_name_or_path)
 
-          cookbook = ReleasedCookbook.new(cookbook_name_or_path, override_mofa_secrets)
+        cookbook = ReleasedCookbook.new(cookbook_name_or_path, override_mofa_secrets)
 
-        else
-          cookbook = SourceCookbook.new(cookbook_name_or_path, override_mofa_secrets)
+      else
+        cookbook = SourceCookbook.new(cookbook_name_or_path, override_mofa_secrets)
       end
     rescue RuntimeError => e
-      raise "Cookbook not found/detected: " + e.message
+      raise 'Cookbook not found/detected: ' + e.message
     end
     cookbook.token = token
     cookbook.autodetect_type
@@ -43,32 +43,29 @@ class Cookbook
   end
 
   def autodetect_type
-    env_indicator = Mofa::Config.config['cookbook_type_indicator']['env']
-    wrapper_indicator = Mofa::Config.config['cookbook_type_indicator']['wrapper']
-    base_indicator = Mofa::Config.config['cookbook_type_indicator']['base']
+    env_indicator = '^env_.*'
+    base_indicator = '.*_base$'
 
-    say "Autodetecting Cookbook Architectural Type... "
+    say 'Autodetecting Cookbook Architectural Type...'
 
     case
-      when @name.match(env_indicator)
-        @type = 'env'
-      when @name.match(base_indicator)
-        @type = 'base'
-      when @name.match(wrapper_indicator)
-        @type = 'wrapper'
-      else
-        @type = 'application'
+    when @name.match(env_indicator)
+      @type = 'env'
+    when @name.match(base_indicator)
+      @type = 'base'
+    else
+      @type = 'application'
     end
     say "#{type.capitalize} Cookbook"
   end
 
-  def say(message = "", color = nil, force_new_line = (message.to_s !~ /( |\t)$/))
+  def say(message = '', color = nil, force_new_line = (message.to_s !~ /( |\t)$/))
     color ||= :green
     super
   end
 
   def ok(detail=nil)
-    text = detail ? "OK, #{detail}." : "OK."
+    text = detail ? "OK, #{detail}." : 'OK.'
     say text, :green
   end
 
@@ -86,6 +83,4 @@ class Cookbook
     exit_code = super(cmd, args.merge(:verbose => verbose))
     fail "Failed to run #{cmd.inspect}!" unless exit_code == true
   end
-
-
 end

data/lib/mofa/hostlist.rb

@@ -4,20 +4,10 @@ require 'json'
 
 class Hostlist
   attr_accessor :list
-  attr_accessor :filter
-  attr_accessor :service_host
-  attr_accessor :service_url
-  attr_accessor :api_key
   attr_accessor :concrete_target
 
-  def self.create(filter = nil, service_hostlist_url = nil, concrete_target = nil)
+  def self.create(concrete_target)
     hl = Hostlist.new
-    filter = Mofa::Config.config['service_hostlist_default_filter'] if concrete_target.nil? && filter.nil?
-    service_hostlist_url ||= Mofa::Config.config['service_hostlist_url']
-    hl.filter = filter
-    hl.service_host = Mofa::Config.config['service_hostlist_url'].gsub(/^http:\/\//, '').gsub(/\/.*$/, '').gsub(/:.*$/, '')
-    hl.service_url = service_hostlist_url
-    hl.api_key = Mofa::Config.config['service_hostlist_api_key']
     hl.concrete_target = concrete_target
     hl
   end
@@ -30,65 +20,16 @@ class Hostlist
     Hostlist::get_shortname(hostname).gsub(/\d+$/, '')
   end
 
-  def has_concrete_target
-    return (@concrete_target.nil?) ? false : true
-  end
-
   def retrieve
-    case
-      when has_concrete_target
-        @list = [@concrete_target]
-      when @service_url.match(/^http/)
-        fail "Hostlist Service not reachable! (cannot ping #{service_host})" unless up?
-        response = RestClient.get(@service_url, {:params => {:key => api_key}})
-        hosts_list_json = JSON.parse response.body
-        @list = hosts_list_json['data'].collect { |i| i['cname'] }
-      when @service_url.match(/^file:/)
-        json_file = @service_url.gsub(/^file:\/\//, '')
-        if File.exist?(json_file)
-          hosts_list_json = JSON.parse(File.read(json_file))
-          @list = hosts_list_json['data'].collect { |i| i['cname'] }
-        else
-          fail "Hostlist JSON-File not found: #{json_file}"
-        end
-
-      else
-        fail "Hostlist Service Url either has to be a http(s):// or a file:/// Url!"
-    end
-    apply_filter
-    sort_by_domainname
+    @list = [@concrete_target]
   end
 
-
   def up?
     p = Net::Ping::TCP.new(@service_host, 'http')
     p.ping?
   end
 
-  def apply_filter
-    unless @filter.nil?
-      if @filter[0] == '/' && @filter[-1] == '/' && @filter.length > 2
-        regex = @filter[1..-2]
-      else
-        # building matcher
-        regex = @filter.gsub(/\*/, '__ASTERISK__')
-        regex = Regexp.escape(regex).gsub(/__ASTERISK__/, '.*')
-        regex = '^' + regex + '$'
-      end
-      @list.select! { |hostname| hostname.match(regex) }
-    end
-  end
-
-  def sort_by_domainname
-    sortable = {}
-    @list.each do |hostname|
-      sortable.store(hostname.split(/\./).reverse.join('.'), hostname)
-    end
-    @list = sortable.keys.sort.collect { |s| sortable[s] }
-  end
-
   def filter_by_runlist_map(runlist_map)
     @list.select! { |hostname| runlist_map.mp.key?(hostname) }
   end
-
 end

data/lib/mofa/mofa_cmd.rb

@@ -17,42 +17,42 @@ class MofaCmd
 
   # @abstract
   def prepare
-    raise RuntimeError, "must be implemented"
+    raise RuntimeError, 'must be implemented'
   end
 
   # @abstract
   def execute(_ssh_port)
-    raise RuntimeError, "must be implemented"
+    raise RuntimeError, 'must be implemented'
   end
 
   # @abstract
   def cleanup
-    raise RuntimeError, "must be implemented"
+    raise RuntimeError, 'must be implemented'
   end
 
   def ssh_exec!(ssh, command)
-    stdout_data = ""
-    stderr_data = ""
+    stdout_data = ''
+    stderr_data = ''
     exit_code = nil
     exit_signal = nil
     ssh.open_channel do |channel|
-      channel.exec(command) do |ch, success|
+      channel.exec(command) do |_ch, success|
         unless success
           abort "FAILED: couldn't execute command (ssh.channel.exec)"
         end
-        channel.on_data do |ch, data|
-          stdout_data+=data
+        channel.on_data do |_ch, data|
+          stdout_data += data
         end
 
-        channel.on_extended_data do |ch, type, data|
-          stderr_data+=data
+        channel.on_extended_data do |_ch, _type, data|
+          stderr_data += data
         end
 
-        channel.on_request("exit-status") do |ch, data|
+        channel.on_request('exit-status') do |_ch, data|
           exit_code = data.read_long
         end
 
-        channel.on_request("exit-signal") do |ch, data|
+        channel.on_request('exit-signal') do |_ch, data|
           exit_signal = data.read_long
         end
       end

data/lib/mofa/provision_cmd.rb

@@ -207,7 +207,7 @@ class ProvisionCmd < MofaCmd
           end
           Net::SSH.start(hostname, ssh_user, keys: [ssh_keyfile], port: ssh_port, use_agent: false, verbose: :error) do |ssh|
             snapshot_or_release = cookbook.is_a?(SourceCookbook) ? 'snapshot' : 'release'
-            out = ssh_exec!(ssh, "sudo chown -R #{Mofa::Config.config['ssh_user']}.#{Mofa::Config.config['ssh_user']} #{solo_dir}")
+            out = ssh_exec!(ssh, "sudo chown -R #{ssh_user}.#{ssh_user} #{solo_dir}")
             puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
             out = ssh_exec!(ssh, '[ -d /var/lib/mofa ] || sudo mkdir /var/lib/mofa')
             puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0

data/lib/mofa/released_cookbook.rb

@@ -9,7 +9,7 @@ class ReleasedCookbook < Cookbook
 
   def self.exists?(cookbook_name_or_path)
     nv = get_name_and_version(cookbook_name_or_path)
-    url = "#{Mofa::Config.config['binrepo_base_url']}/#{nv['name']}/#{nv['version']}/#{nv['name']}_#{nv['version']}-full.tar.gz"
+    url = "#{Mofa::CLI::binrepo_base_url}/#{nv['name']}/#{nv['version']}/#{nv['name']}_#{nv['version']}-full.tar.gz"
     puts "Checking if cookbook exists: #{url}"
     RestClient.head(url)
   end
@@ -124,7 +124,7 @@ class ReleasedCookbook < Cookbook
 
   def set_cookbooks_url
     say 'Using remote URI as cookbooks_url: '
-    @cookbooks_url = "#{Mofa::Config.config['binrepo_base_url']}/#{@name}/#{@version}/#{@name}_#{@version}-full.tar.gz"
+    @cookbooks_url = "#{Mofa::CLI::binrepo_base_url}/#{@name}/#{@version}/#{@name}_#{@version}-full.tar.gz"
     say "#{@cookbooks_url}"
   end
 

data/lib/mofa/runlist_map.rb

@@ -33,7 +33,7 @@ class RunlistMap
       end
     else
       hostlist.list.each do |hostname|
-        @mp.store(hostname,  option_runlist)
+        @mp.store(hostname, option_runlist)
       end
     end
   end
@@ -51,7 +51,6 @@ class RunlistMap
         end
       end
     end
-
   end
 
   def set_default_runlist_for_every_host
@@ -62,5 +61,4 @@ class RunlistMap
       end
     end
   end
-
 end

data/lib/mofa/version.rb

@@ -1,3 +1,3 @@
 module Mofa
-  VERSION = '0.5.12'
+  VERSION = '0.5.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mofa
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - Alexander Birk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-18 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -229,8 +229,6 @@ files:
 - lib/mofa/upload_cmd.rb
 - lib/mofa/version.rb
 - mofa.gemspec
-- rspec/mofa/hostfile_spec.rb
-- rspec/mofa/test_hostlist.json
 homepage: https://github.com/pingworks/mofa
 licenses: []
 metadata: {}

data/rspec/mofa/hostfile_spec.rb

@@ -1,18 +0,0 @@
-require 'mofa/hostlist'
-require 'mofa/config'
-
-describe Hostlist do
-  before do
-    Mofa::Config.load
-
-  end
-  it "should initialize" do
-    hostlist = Hostlist.create("/.*/", "file://rspec/mofa/test_hostlist.json")
-    hostlist != nil
-  end
-  it "should retrieve" do
-    hostlist = Hostlist.create("/.*/", "file://rspec/mofa/test_hostlist.json")
-    puts     hostlist.retrieve.count
-  end
-
-end

data/rspec/mofa/test_hostlist.json

@@ -1,7 +0,0 @@
-{
-	"data": [
-		{
-			"cname": "some-machine.somedomain.somecompany.com"
-		}
-	]
-}