Merge pull request #102 from stevius10/develop

dev/1.1-2

Author: stevius10

config/libraries/env.rb

@@ -53,26 +53,48 @@ def self.request(ctx, key, body: nil, repo: nil, owner: nil, expect: false)
     return response
   end
 
-  def self.dump(ctx, *keys, repo: nil, owner: nil)
+  def self.dump(ctx, *args, repo: nil, owner: nil)
     Logs.try!("dump variables", [:repo, repo, :owner, owner], raise: true) do
-      node = Ctx.node(ctx); f = ->(keys) do; case keys
-      in [key, value] if !key.is_a?(Array)
-        val = value.respond_to?(:call) ? value.call(node) : (value.is_a?(Array) ? node.dig(*value) : value)
-        Env.set_variable(node, key, val, repo: repo, owner: owner) unless val.blank?
-      in Array => a
-        a.each { |x| f.(x) }
-      else
-        val = node[keys]; return if val.blank?
-        if val.is_a?(Hash)
-         val.each { |subkey, subvalue| Env.set_variable(node, "#{keys}_#{subkey}", subvalue, repo: repo, owner: owner) unless subvalue.blank? }
-        elsif val.is_a?(Array)
-         val.each_with_index { |x, i| Env.set_variable(node, "#{keys}_#{i}", x, repo: repo, owner: owner) unless x.blank? }
+      node = Ctx.node(ctx)
+      get = ->(key) { k = key.is_a?(String) ? key : key.to_s; node[key] || node[k] || node[k.to_sym] }
+      set = ->(key, value) { Env.set_variable(node, key, value, repo: repo, owner: owner) unless value.blank? }
+      resolve = ->(key, value) do
+        v = value
+        v = v.call(node) if v.respond_to?(:call)
+        v = node.dig(*v) if v.is_a?(Array)
+        set.(key, v)
+      end
+      single = args.length == 1 && args.first.is_a?(Array)
+      work = single ? args.first : args
+      rec = nil
+      rec = ->(arg) do
+        case arg
+        when Hash
+          arg.each { |key, value| resolve.(key, value) }
+        when Array
+          if !single && arg.length == 2 && !arg.first.is_a?(Array)
+            key, value = arg
+            resolve.(key, value)
+          else
+            arg.each { |x| rec.(x) }
+          end
         else
-         Env.set_variable(node, keys, val, repo: repo, owner: owner)
+          value = get.(arg)
+          if value.present?
+            case value
+            when Hash
+              value.each { |subkey, subvalue| set.("#{arg}_#{subkey}", subvalue) unless subvalue.blank? }
+            when Array
+              value.each_with_index { |subvalue, i| set.("#{arg}_#{i}", subvalue) unless subvalue.blank? }
+            else
+              set.(arg, value)
+            end
+          end
         end
-      end end
-      keys.each { |key| f.(key) }
+      end
+      work.each { |x| rec.(x) }
       true
-    end end
-  
-end
+    end
+  end
+
+  end

config/recipes/config.rb

@@ -1,4 +1,86 @@
+login    = node.run_state['login']
+password = node.run_state['password']
+email    = node.run_state['email']
+
 Utils.wait("127.0.0.1:#{node['git']['port']['http']}", timeout: 15, sleep_interval: 1)
 
-include_recipe 'config::config_user'
-include_recipe 'config::config_org'
+# User configuration
+
+execute 'config_set_user' do
+  user node['app']['user']
+  command <<-EOH
+    login="#{login}"
+    base="#{node['git']['dir']['app']}/gitea admin user --config #{node['git']['dir']['app']}/app.ini"
+    user="--username #{login} --password #{password}"
+    create="--email #{email} --admin --must-change-password=false"
+    if $base list | awk '{print $2}' | grep -q "^#{login}$"; then
+      $base delete $user 
+    fi
+    $base create $create $user
+  EOH
+  not_if { Utils.request("#{node['git']['api']['endpoint']}/user", user: login, pass: password, expect: true) }
+end
+
+ruby_block 'config_set_key' do
+  block do
+    key = ::File.read("#{node['key']}.pub").strip
+    uri = "#{node['git']['api']['endpoint']}/user/keys"
+
+    Utils.request(uri, user: login, pass: password).json.each do |k|
+      Utils.request("#{uri}/#{k['id']}", user: login, pass: password,
+        method: Net::HTTP::Delete) if k['key'] && k['key'].strip == key
+    end
+
+    response = Utils.request(uri, body: { title: login, key: key }.json, user: login, pass: password, method: Net::HTTP::Post, headers: Constants::HEADER_JSON)
+    Logs.request!(uri, response, [201, 422], msg: "set key")
+  end
+  only_if { ::File.exist?("#{node['key']}.pub") }
+  not_if do
+    next false unless ::File.exist?("#{node['key']}.pub")
+    begin
+      response = Utils.request("#{node['git']['api']['endpoint']}/user/keys", user: login, pass: password)
+      response.json.any? { |k| k['key'] && k['key'].strip == ::File.read("#{node['key']}.pub").strip }
+    end
+  end
+end
+
+# Git configuration
+
+execute 'config_git_safe_directory' do
+  command <<-SH
+    git config --global --add safe.directory "*" && \
+    git config --system --add safe.directory "*"
+  SH
+end
+
+execute 'config_git_user' do
+  command <<-SH
+    git config --global user.name "#{login}"
+    git config --global user.email "#{email}"
+    git config --global core.excludesfile #{ENV['PWD']}/.gitignore
+  SH
+  user node['app']['user']
+end
+
+# Organization
+
+[node['git']['org']['main'], node['git']['org']['stage'], node['git']['org']['tasks']].each do |org|
+
+  ruby_block "dump_variables_#{org}" do
+    action :nothing
+    block do
+      Env.dump(self, [ 'proxmox', 'host', 'login', 'password', 'email', [:endpoint, node.dig('git','api','endpoint')] ], owner: org)
+    end
+  end
+
+  ruby_block "create_org_#{org}" do
+    block do
+      name, password = Env.creds(self)
+      uri = "#{node.dig('git','api','endpoint')}/orgs"
+      r = Utils.request(uri, method: Net::HTTP::Post, headers: Constants::HEADER_JSON, body: { username: org }.to_json, user: name, pass: password)
+      Logs.request!(uri, r, [201, 409, 422], msg: "create organization '#{org}'")
+    end
+    notifies :run, "ruby_block[dump_variables_#{org}]", :immediate
+  end
+
+end

config/recipes/config_org.rb

@@ -2,7 +2,6 @@
 
 include_recipe 'config::git'
 include_recipe 'config::runner'
-
 include_recipe 'config::config'
 
 include_recipe 'config::repo'

config/recipes/config_user.rb

@@ -1,17 +1,24 @@
-name_repo = @name_repo; repository = @repository; path_destination = @path_destination
+name_repo = @name_repo; repository = @repository; monorepo = @monorepo; path_destination = @path_destination
 
 ruby_block "repo_#{name_repo}_request" do
   only_if { Logs.info?("[#{repository} (#{name_repo})] create repository") }
   block do
     uri="#{node['git']['api']['endpoint']}/admin/users/#{node['git']['org']['main']}/repos"
     response = Utils.request(uri, method: Net::HTTP::Post, headers: Constants::HEADER_JSON,
-                             user: Env.get(self, 'login'), pass: Env.get(self, 'password'),
-                             body: { name: name_repo, private: false, auto_init: false, default_branch: 'main' }.json )
+      user: Env.get(self, 'login'), pass: Env.get(self, 'password'),
+      body: { name: name_repo, private: false, auto_init: false, default_branch: 'main' }.json )
     Logs.request!(uri, response, [201], msg: "Create repository '#{name_repo}'")
     response.json
   end
 end
 
+ruby_block "dump_variables_#{cookbook_name}" do
+  block do
+    Env.dump(self, ['ip', 'git', 'runner'], repo: cookbook_name)
+  end
+  only_if { monorepo }
+end
+
 execute "repo_#{name_repo}_git_init" do
   command <<-EOH
     mkdir -p #{path_destination} && cd #{path_destination} && git init -b main

config/recipes/default.rb

@@ -21,11 +21,8 @@
     fi
   fi
   EOH
-  notifies :run, "ruby_block[dump_variables_#{cookbook_name}]", :delayed if monorepo
 end
 
-name_repo = @name_repo; repository = @repository; path_destination = @path_destination;
-
 execute "repo_#{name_repo}_exists_snapshot_push" do
   command <<-EOH
     cp -r #{path_destination}/.git #{path_working}

config/recipes/repo/init.rb

@@ -3,4 +3,14 @@
 Dir[File.join(__dir__, 'libraries', '**', '*.rb')].sort.each { |f| require f }
 ctx = { "endpoint"=>ENV["ENDPOINT"], "host"=>ENV["HOST"], "login"=>ENV["LOGIN"], "password"=>ENV["PASSWORD"],  }
 
-puts(Utils.proxmox(ctx, 'nodes/pve/lxc')) # TODO: shared library test
+list = Utils.proxmox(ctx, 'nodes/pve/lxc')
+list.each do |ct|
+  id = ct['vmid']
+  cfg = Utils.proxmox(ctx, "nodes/pve/lxc/#{id}/config")
+  cur = Utils.proxmox(ctx, "nodes/pve/lxc/#{id}/status/current")
+  hn = cfg['hostname'] || id.to_s
+  st = cur['status']
+  ip = cfg['net0'] && cfg['net0'][/ip=(\d+\.\d+\.\d+\.\d+)/, 1]
+  Env.set(ctx, "#{hn}_status", st, repo: 'health', owner: 'tasks')
+  Env.set(ctx, "#{hn}_ip", ip, repo: 'health', owner: 'tasks') if ip
+end