pero 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c70b7eacb6c850afd1cdd014f357204cf34face7354aeb5056cf3869172794e
-  data.tar.gz: 83d9dd8fedd249340337914d5635725b9f2cd189fac0d8bc189c7e9a3a74874f
+  metadata.gz: 987ee0dddd45d8f05e4a1ca60cfe2df83a31542e2793931ddfda01446f3bbe1b
+  data.tar.gz: 791d656dc30d9530316a10fa5b7dc08c69e7089d24a5b040f884435a44f4f038
 SHA512:
-  metadata.gz: bb72ebfec2140ef2bde35127614ed05240e73b41ebd7442d9cf8ab8bcc9b2bbed3c98198c6caef0932481066477246661332741b7a44d3fcfeb7667509709741
-  data.tar.gz: 4a9288d537cc01061b725552f9dd01ce71f48112cf9f49a5b180bba9cb5274521d95b7d673e3f9121d518158ae3596cba1e100e4a1f6c62d8acdcf2509fd1862
+  metadata.gz: 1745f07c1634fc170bd6b34c5f2332627a86d2352645045919cdd26e5cf57a3b6bb32e69606b2be4f7dbc6272153905f36095699062a89d047c2e1e54dacd330
+  data.tar.gz: e866274608d76736a53f74f0d9e2b0503c55e200548b1df204059743daca66c7cb208ff387cd9ffcd9bbe170fbd6cc7beb433822ffd55b4c4809104982b537a4

data/lib/pero/docker.rb

@@ -1,10 +1,11 @@
 require 'docker'
 require 'digest/md5'
-require "retryable"
+require 'retryable'
 require 'net/https'
 module Pero
   class Docker
     attr_reader :server_version, :image_name, :volumes
+
     def initialize(version, image_name, environment, volumes)
       @server_version = version
       @image_name = image_name
@@ -13,20 +14,25 @@ module Pero
     end
 
     def build
-      Pero.log.info "start build container"
+      Pero.log.info 'start build container'
       ::Docker.options[:read_timeout] = 300
       begin
         image = if image_name
                   ::Docker::Image.create('fromImage' => image_name)
                 else
-                  ::Docker::Image.build(docker_file)
+                  ::Docker::Image.build(
+                    docker_file,
+                    {
+                      'platform' => ENV['DOCKER_DEFAULT_PLATFORM'] || 'linux/amd64'
+                    }
+                  )
                 end
-      rescue => e
+      rescue StandardError => e
         Pero.log.debug docker_file
         Pero.log.error "failed build container #{e.inspect}"
         raise e
       end
-      Pero.log.info "success build container"
+      Pero.log.info 'success build container'
       image
     end
 
@@ -35,19 +41,19 @@ module Pero
     end
 
     def find
-      ::Docker::Container.all(:all => true).find do |c|
-        c.info["Names"].first == "/#{container_name}"
+      ::Docker::Container.all(all: true).find do |c|
+        c.info['Names'].first == "/#{container_name}"
       end
     end
 
     def alerady_run?
       c = find
-      c && c.info["State"] == "running" && c
+      c && c.info['State'] == 'running' && c
     end
 
     def run
-      ::Docker::Container.all(:all => true).each do |c|
-        c.delete(:force => true) if c.info["Names"].first == "/#{container_name}"
+      ::Docker::Container.all(all: true).each do |c|
+        c.delete(force: true) if c.info['Names'].first == "/#{container_name}"
       end
 
       vols = volumes || []
@@ -55,124 +61,122 @@ module Pero
       vols << "#{Dir.pwd}/keys:/etc/puppetlabs/puppet/eyaml/"
 
       container = ::Docker::Container.create({
-        'name' => container_name,
-        'Hostname' => 'puppet',
-        'Image' => build.id,
-        'ExposedPorts' => { '8140/tcp' => {} },
-        'HostConfig' => {
-          'Binds' => vols,
-          'PortBindings' => {
-            '8140/tcp' => [{ 'HostPort' => "0" }],
-          },
-        },
-        'Cmd' => ["bash", "-c", "rm -rf #{conf_dir}/ssl/* && #{create_ca} && #{run_cmd}"]
-      })
-
-      Pero.log.info "start puppet master container"
+                                               'name' => container_name,
+                                               'Hostname' => 'puppet',
+                                               'Image' => build.id,
+                                               'ExposedPorts' => { '8140/tcp' => {} },
+                                               'HostConfig' => {
+                                                 'Binds' => vols,
+                                                 'PortBindings' => {
+                                                   '8140/tcp' => [{ 'HostPort' => '0' }]
+                                                 }
+                                               },
+                                               'platform' => ENV['DOCKER_DEFAULT_PLATFORM'] || 'linux/amd64',
+                                               'Cmd' => ['bash', '-c', "rm -rf #{conf_dir}/ssl/* && #{create_ca} && #{run_cmd}"]
+                                             })
+
+      Pero.log.info 'start puppet master container'
       container.start
 
       container = find
       raise "can't start container" unless container
+
       begin
         Retryable.retryable(tries: 20, sleep: 5) do
-          begin
-            https = Net::HTTP.new('localhost', container.info["Ports"].first["PublicPort"])
-            https.use_ssl = true
-            https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-            Pero.log.debug "start server health check"
-            https.start {
-              response = https.get('/')
-              Pero.log.debug "puppet http response #{response}"
-            }
-          rescue => e
-            Pero.log.debug e.inspect
-            raise e
+          https = Net::HTTP.new('localhost', container.info['Ports'].first['PublicPort'])
+          https.use_ssl = true
+          https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          Pero.log.debug 'start server health check'
+          https.start do
+            response = https.get('/')
+            Pero.log.debug "puppet http response #{response}"
           end
+        rescue StandardError => e
+          Pero.log.debug e.inspect
+          raise e
         end
-      rescue
-        Pero.log.error "can't start container.please check [ docker logs #{container.info["id"]} ]"
+      rescue StandardError
+        Pero.log.error "can't start container.please check [ docker logs #{container.info['id']} ]"
         container = find
-        container.kill if container && container.info["State"] != "exited"
+        container.kill if container && container.info['State'] != 'exited'
         raise "can't start puppet server"
       end
       container
     end
 
     def puppet_config
-<<-EOS
-[master]
-vardir = /var/puppet
-certname = puppet
-dns_alt_names = puppet,localhost
-autosign = true
-environment_timeout = unlimited
-codedir = /etc/puppetlabs/code
-
-[main]
-server = puppet
-#{@environment && @environment != "" ? "environment = #{@environment}" : nil}
-EOS
-
-
+      <<~EOS
+        [master]
+        vardir = /var/puppet
+        certname = puppet
+        dns_alt_names = puppet,localhost
+        autosign = true
+        environment_timeout = unlimited
+        codedir = /etc/puppetlabs/code
+
+        [main]
+        server = puppet
+        #{@environment && @environment != '' ? "environment = #{@environment}" : nil}
+      EOS
     end
 
     def conf_dir
-      if Gem::Version.new("4.0.0") > Gem::Version.new(server_version)
-        "/etc/puppet"
-      elsif Gem::Version.new("5.0.0") > Gem::Version.new(server_version) && Gem::Version.new("4.0.0") <= Gem::Version.new(server_version)
-        "/etc/puppetlabs/puppet/"
-      elsif Gem::Version.new("6.0.0") > Gem::Version.new(server_version)&& Gem::Version.new("5.0.0") <= Gem::Version.new(server_version)
-        "/etc/puppetlabs/puppet/"
+      if Gem::Version.new('4.0.0') > Gem::Version.new(server_version)
+        '/etc/puppet'
+      elsif Gem::Version.new('5.0.0') > Gem::Version.new(server_version) && Gem::Version.new('4.0.0') <= Gem::Version.new(server_version)
+        '/etc/puppetlabs/puppet/'
+      elsif Gem::Version.new('6.0.0') > Gem::Version.new(server_version) && Gem::Version.new('5.0.0') <= Gem::Version.new(server_version)
+        '/etc/puppetlabs/puppet/'
       else
-        "/etc/puppetlabs/puppet/"
+        '/etc/puppetlabs/puppet/'
       end
     end
 
     def docker_file
-      release_package,package_name = if Gem::Version.new("4.0.0") > Gem::Version.new(server_version)
-        ["puppetlabs-release-el-#{el}.noarch.rpm", "puppet-server"]
-      elsif Gem::Version.new("5.0.0") > Gem::Version.new(server_version) && Gem::Version.new("4.0.0") <= Gem::Version.new(server_version)
-        ["puppetlabs-release-pc1-el-#{el}.noarch.rpm", "puppetserver"]
-      elsif Gem::Version.new("6.0.0") > Gem::Version.new(server_version)&& Gem::Version.new("5.0.0") <= Gem::Version.new(server_version)
-        ["puppet5-release-el-#{el}.noarch.rpm", "puppetserver"]
-      elsif Gem::Version.new("7.0.0") > Gem::Version.new(server_version)&& Gem::Version.new("6.0.0") <= Gem::Version.new(server_version)
-        ["puppet6-release-el-#{el}.noarch.rpm", "puppetserver"]
-      else
-        ["puppet7-release-el-#{el}.noarch.rpm", "puppetserver"]
-      end
+      release_package, package_name = if Gem::Version.new('4.0.0') > Gem::Version.new(server_version)
+                                        ["puppetlabs-release-el-#{el}.noarch.rpm", 'puppet-server']
+                                      elsif Gem::Version.new('5.0.0') > Gem::Version.new(server_version) && Gem::Version.new('4.0.0') <= Gem::Version.new(server_version)
+                                        ["puppetlabs-release-pc1-el-#{el}.noarch.rpm", 'puppetserver']
+                                      elsif Gem::Version.new('6.0.0') > Gem::Version.new(server_version) && Gem::Version.new('5.0.0') <= Gem::Version.new(server_version)
+                                        ["puppet5-release-el-#{el}.noarch.rpm", 'puppetserver']
+                                      elsif Gem::Version.new('7.0.0') > Gem::Version.new(server_version) && Gem::Version.new('6.0.0') <= Gem::Version.new(server_version)
+                                        ["puppet6-release-el-#{el}.noarch.rpm", 'puppetserver']
+                                      else
+                                        ["puppet7-release-el-#{el}.noarch.rpm", 'puppetserver']
+                                      end
 
       vault_repo = if el == 6
-        <<-EOS
-RUN sed -i "s|#baseurl=|baseurl=|g" /etc/yum.repos.d/CentOS-Base.repo \
-  && sed -i "s|mirrorlist=|#mirrorlist=|g" /etc/yum.repos.d/CentOS-Base.repo \
-  && sed -i "s|http://mirror\.centos\.org/|http://vault\.centos\.org/|g" /etc/yum.repos.d/CentOS-Base.repo
-        EOS
-      else
-        ''
-      end
-
-      legacy_signing = if Gem::Version.new("3.0.0") > Gem::Version.new(server_version)
-        "RUN echo 'LegacySigningMDs md5' >> /etc/pki/tls/legacy-settings"
-      else
-        ''
-      end
-
-      <<-EOS
-FROM #{from_image}
-#{vault_repo}
-#{legacy_signing}
-RUN curl -L -k -O https://yum.puppetlabs.com/#{release_package}  && \
-rpm -ivh #{release_package}
-RUN yum install -y #{package_name}-#{server_version}
-ENV PATH $PATH:/opt/puppetlabs/bin
-RUN echo -e "#{puppet_config.split(/\n/).join("\\n")}" > #{conf_dir}/puppet.conf
+                     <<~EOS
+                       RUN sed -i "s|#baseurl=|baseurl=|g" /etc/yum.repos.d/CentOS-Base.repo \
+                         && sed -i "s|mirrorlist=|#mirrorlist=|g" /etc/yum.repos.d/CentOS-Base.repo \
+                         && sed -i "s|http://mirror\.centos\.org/|http://vault\.centos\.org/|g" /etc/yum.repos.d/CentOS-Base.repo
+                     EOS
+                   else
+                     ''
+                   end
+
+      legacy_signing = if Gem::Version.new('3.0.0') > Gem::Version.new(server_version)
+                         "RUN echo 'LegacySigningMDs md5' >> /etc/pki/tls/legacy-settings"
+                       else
+                         ''
+                       end
+
+      <<~EOS
+        FROM #{from_image}
+        #{vault_repo}
+        #{legacy_signing}
+        RUN curl -L -k -O https://yum.puppetlabs.com/#{release_package}  && \
+        rpm -ivh #{release_package}
+        RUN yum install -y #{package_name}-#{server_version}
+        ENV PATH $PATH:/opt/puppetlabs/bin
+        RUN echo -e "#{puppet_config.split(/\n/).join('\\n')}" > #{conf_dir}/puppet.conf
       EOS
     end
 
     def create_ca
-      if Gem::Version.new("5.0.0") > Gem::Version.new(server_version)
+      if Gem::Version.new('5.0.0') > Gem::Version.new(server_version)
         'puppet cert generate `hostname` --dns_alt_names localhost,127.0.0.1'
-      elsif Gem::Version.new("6.0.0") > Gem::Version.new(server_version)
+      elsif Gem::Version.new('6.0.0') > Gem::Version.new(server_version)
         'puppet cert generate `hostname` --dns_alt_names localhost,127.0.0.1'
       else
         'puppetserver ca setup --ca-name `hostname` --subject-alt-names DNS:localhost'
@@ -180,14 +184,14 @@ RUN echo -e "#{puppet_config.split(/\n/).join("\\n")}" > #{conf_dir}/puppet.conf
     end
 
     def run_cmd
-      if Gem::Version.new("3.0.0") > Gem::Version.new(server_version)
+      if Gem::Version.new('3.0.0') > Gem::Version.new(server_version)
         # /var/puppet/run is created for the first time by running `puppet master`,
         # but `puppet master` will fail because the permissions are wrong.
         # So, let the `puppet master` fail once, fix the permission of /var/puppet/run, and execute `puppet master` again.
         'puppet master --no-daemonize --verbose || (chown puppet: /var/puppet/run && puppet master --no-daemonize --verbose)'
-      elsif Gem::Version.new("5.0.0") > Gem::Version.new(server_version)
+      elsif Gem::Version.new('5.0.0') > Gem::Version.new(server_version)
         'puppet master --no-daemonize --verbose'
-      elsif Gem::Version.new("6.0.0") > Gem::Version.new(server_version)
+      elsif Gem::Version.new('6.0.0') > Gem::Version.new(server_version)
         'puppetserver foreground'
       else
         'puppetserver foreground'
@@ -195,7 +199,7 @@ RUN echo -e "#{puppet_config.split(/\n/).join("\\n")}" > #{conf_dir}/puppet.conf
     end
 
     def el
-      if Gem::Version.new("3.5.1") > Gem::Version.new(server_version)
+      if Gem::Version.new('3.5.1') > Gem::Version.new(server_version)
         6
       else
         7

data/lib/pero/puppet.rb

@@ -9,9 +9,9 @@ module Specinfra
       return @sudo_password if defined?(@sudo_password)
 
       # TODO: Fix this dirty hack
-      return nil unless caller.any? {|call| call.include?('channel_data') }
+      return nil unless caller.any? { |call| call.include?('channel_data') }
 
-      print "sudo password: "
+      print 'sudo password: '
       @sudo_password = STDIN.noecho(&:gets).strip
       print "\n"
       @sudo_password
@@ -23,6 +23,7 @@ module Pero
   class Puppet
     extend Pero::SshExecutable
     attr_reader :specinfra
+
     def initialize(host, options, mutex)
       @options = options.dup
       @mutex = mutex
@@ -30,15 +31,13 @@ module Pero
       @options[:host] = host
       so = ssh_options
 
-      if !Net::SSH::VALID_OPTIONS.include?(:strict_host_key_checking)
-        so.delete(:strict_host_key_checking)
-      end
+      so.delete(:strict_host_key_checking) unless Net::SSH::VALID_OPTIONS.include?(:strict_host_key_checking)
 
       @specinfra = Specinfra::Backend::Ssh.new(
         request_pty: true,
         host: so[:host_name],
         ssh_options: so,
-        disable_sudo: false,
+        disable_sudo: false
       )
     end
 
@@ -48,15 +47,15 @@ module Pero
       opts[:host_name] = @options[:host]
 
       # from ssh-config
-      ssh_config_files = @options["ssh_config"] ? [@options["ssh_config"]] : Net::SSH::Config.default_files
-      opts.merge!(Net::SSH::Config.for(@options["host"], ssh_config_files))
-      opts[:user] = @options["user"] || opts[:user] || Etc.getlogin
-      opts[:password] = @options["password"] if @options["password"]
-      opts[:keys] = [@options["key"]] if @options["key"]
-      opts[:port] = @options["port"] if @options["port"]
-      opts[:timeout] = @options["timeout"] if @options["timeout"]
-
-      if @options["vagrant"]
+      ssh_config_files = @options['ssh_config'] ? [@options['ssh_config']] : Net::SSH::Config.default_files
+      opts.merge!(Net::SSH::Config.for(@options['host'], ssh_config_files))
+      opts[:user] = @options['user'] || opts[:user] || Etc.getlogin
+      opts[:password] = @options['password'] if @options['password']
+      opts[:keys] = [@options['key']] if @options['key']
+      opts[:port] = @options['port'] if @options['port']
+      opts[:timeout] = @options['timeout'] if @options['timeout']
+
+      if @options['vagrant']
         config = Tempfile.new('', Dir.tmpdir)
         hostname = opts[:host_name] || 'default'
         vagrant_cmd = "vagrant ssh-config #{hostname} > #{config.path}"
@@ -70,8 +69,8 @@ module Pero
         opts.merge!(Net::SSH::Config.for(hostname, [config.path]))
       end
 
-      if @options["ask_password"]
-        print "password: "
+      if @options['ask_password']
+        print 'password: '
         password = STDIN.noecho(&:gets).strip
         print "\n"
         opts.merge!(password: password)
@@ -82,47 +81,55 @@ module Pero
     def install
       osi = specinfra.os_info
       os = case osi[:family]
-      when "redhat"
-        Redhat.new(specinfra, osi)
-      else
-          raise "sorry unsupport os, please pull request!!!"
-      end
-      os.install(@options["agent-version"]) if @options["agent-version"]
+           when 'redhat'
+             Redhat.new(specinfra, osi)
+           else
+             raise 'sorry unsupport os, please pull request!!!'
+           end
+      os.install(@options['agent-version']) if @options['agent-version']
       Pero::History::Attribute.new(specinfra, @options).save
     end
 
     def stop_master
+      @mutex.lock
       run_container.kill if docker.alerady_run?
+    ensure
+      @mutex.unlock
     end
 
     def serve_master
-        container = run_container
-        begin
-          yield container
-        rescue => e
-          Pero.log.error e.inspect
-          raise e
-        end
+      container = run_container
+      begin
+        yield container
+      rescue StandardError => e
+        Pero.log.error e.inspect
+        raise e
+      end
     end
 
     def docker
-      Pero::Docker.new(@options["server-version"], @options["image-name"], @options["environment"], @options["volumes"])
+      Pero::Docker.new(@options['server-version'], @options['image-name'], @options['environment'], @options['volumes'])
     end
 
     def run_container
-      begin
-        @mutex.lock
-        docker.alerady_run? || docker.run
-      ensure
-        @mutex.unlock
-      end
+      @mutex.lock
+      docker.alerady_run? || docker.run
+    ensure
+      @mutex.unlock
     end
 
     def apply
       serve_master do |container|
-        port = container.info["Ports"].first["PublicPort"]
+        port = container.info['Ports'].first['PublicPort']
+        https = Net::HTTP.new('localhost', port)
+        https.use_ssl = true
+        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        https.start do
+          https.delete('/puppet-admin-api/v1/environment-cache')
+        end
+
         begin
-          tmpdir=container.info["id"][0..5]
+          tmpdir = container.info['id'][0..5]
           in_ssh_forwarding(port) do |host, ssh|
             Pero.log.info "#{host}:puppet cmd[#{puppet_cmd}]"
             cmd = "mkdir -p /tmp/puppet/#{tmpdir} && unshare -m -- /bin/bash -c 'export PATH=$PATH:/opt/puppetlabs/bin/ && \
@@ -131,14 +138,14 @@ module Pero
             Pero.log.debug "run cmd:#{cmd}"
             ssh_exec(ssh, host, cmd)
 
-            if @options["one-shot"]
+            if @options['one-shot']
               cmd = "/bin/rm -rf /tmp/puppet/#{tmpdir}"
               ssh_exec(ssh, host, cmd)
             end
 
-            ssh.loop {true} if ENV['PERO_DEBUG']
+            ssh.loop { true } if ENV['PERO_DEBUG']
           end
-        rescue => e
+        rescue StandardError => e
           Pero.log.error "puppet apply error:#{e.inspect}"
         end
       end
@@ -149,15 +156,15 @@ module Pero
     def ssh_exec(ssh, host, cmd)
       ssh.open_channel do |ch|
         ch.request_pty
-        ch.on_data do |ch,data|
+        ch.on_data do |_ch, data|
           Pero.log.info "#{host}:#{data.chomp}"
         end
 
-        ch.on_extended_data do |c,type,data|
+        ch.on_extended_data do |_c, _type, data|
           Pero.log.error "#{host}:#{data.chomp}"
         end
 
-        ch.exec specinfra.build_command(cmd) do |ch, success|
+        ch.exec specinfra.build_command(cmd) do |_ch, success|
           raise "could not execute #{cmd}" unless success
         end
       end
@@ -165,29 +172,27 @@ module Pero
     end
 
     def puppet_cmd
-        if Gem::Version.new("5.0.0") > Gem::Version.new(@options["agent-version"])
-            "puppet agent --no-daemonize --onetime #{parse_puppet_option(@options)} --ca_port 8140 --ca_server localhost --masterport 8140 --server localhost"
-        else
-            "/opt/puppetlabs/bin/puppet agent --no-daemonize --onetime #{parse_puppet_option(@options)} --ca_server localhost --masterport 8140 --server localhost"
-        end
+      if Gem::Version.new('5.0.0') > Gem::Version.new(@options['agent-version'])
+        "puppet agent --no-daemonize --onetime #{parse_puppet_option(@options)} --ca_port 8140 --ca_server localhost --masterport 8140 --server localhost"
+      else
+        "/opt/puppetlabs/bin/puppet agent --no-daemonize --onetime #{parse_puppet_option(@options)} --ca_server localhost --masterport 8140 --server localhost"
+      end
     end
 
     def parse_puppet_option(options)
-      ret = ""
-      %w(noop verbose test).each do |n|
+      ret = ''
+      %w[noop verbose test].each do |n|
         ret << " --#{n}" if options[n]
       end
-      ret << " --tags #{options["tags"].join(",")}" if options["tags"]
-      ret << " --environment #{options["environment"]}" if options["environment"]
+      ret << " --tags #{options['tags'].join(',')}" if options['tags']
+      ret << " --environment #{options['environment']}" if options['environment']
       ret
     end
 
     def in_ssh_forwarding(port)
       options = specinfra.get_config(:ssh_options)
 
-      if !Net::SSH::VALID_OPTIONS.include?(:strict_host_key_checking)
-        options.delete(:strict_host_key_checking)
-      end
+      options.delete(:strict_host_key_checking) unless Net::SSH::VALID_OPTIONS.include?(:strict_host_key_checking)
 
       Pero.log.info "start forwarding #{specinfra.get_config(:host)}:8140 => localhost:#{port}"
       Net::SSH.start(

data/lib/pero/version.rb

@@ -1,3 +1,3 @@
 module Pero
-  VERSION = "0.5.4"
+  VERSION = '0.5.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pero
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - pyama86
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: tool for puppet apply from our desktop.