takeltau 0.44.2 → 0.44.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91c0fd02dbdf001b8c5fa156dda3652f49e03478e9f8f1815242c309acaf29a4
-  data.tar.gz: 9e729bcd61aff9974a34e7a6f203ac628e99c359ef0eb1756329cd88bbadba17
+  metadata.gz: 0265577b0c7fe802841470d93b7df218162928a825b3c360e0c7fa5c16d10810
+  data.tar.gz: 39143047fc8490a50a8bef1c967ddf7ee61396e5f8a1f198f7aac0ab803c9ffe
 SHA512:
-  metadata.gz: f258eec6024594a928f0da69b07836b1c0382b40b1c057976aacda403cfa77fa7d25b96bbe6597a92f41b3441902380d7a06f597598946c6673db5ee863fe341
-  data.tar.gz: f9db8ceaeaa94f105b07ecd766ac6b03022bbe04164d358b137e8b7816ff8b5591c3bdcaab14be4e5f98ea0bbb5bb2c84dd711db4177abf30c0b0146f6649d9b
+  metadata.gz: d28bb37c89010cbba5c0a0061b6d349bfe3e1c1235c5fc1e3ecab38db85518583c86059f0d457362ef1f0c4fb25fdb6d24593b98579e15df914876f4e04a9b89
+  data.tar.gz: 06c7e2e98e681c7a28cc03ddbfef9cff9c21481db11446c8067ef5e9962c56ee1c55506d436a728dd1949323c51aeb1127ec7cdf32c7c4d561826739d6daa0df

data/lib/takeltau/default.yml

@@ -61,10 +61,10 @@ cmd_ship_container_docker: '%{ship_docker} exec --interactive %{tty} %{ship_host
 cmd_ship_container_login: 'bash'
 cmd_ship_docker: 'docker'
 cmd_ship_docker_check: 'docker --version'
+cmd_ship_project_follow_logs: 'pod --workdir /home/podman/takelship/compose/projects/%{project} podman-compose logs --follow'
 cmd_ship_project_start_docker_run_nonprivileged: '%{ship_docker} run --rm --interactive %{image} %{command}'
 cmd_ship_project_start_docker_run_privileged: '%{ship_docker} run --privileged --rm --detach --name %{ship_hostname} --hostname %{ship_hostname} %{ship_env} %{ports} --volume ./%{ship_data_dir}:/home/podman/takelship %{image} %{command}'
 cmd_ship_project_start_docker_stop: '%{ship_docker} stop %{ship_hostname}'
-cmd_ship_project_follow_logs: 'pod --workdir /home/podman/takelship/compose/projects/%{project} podman-compose logs --follow'
 docker_container_check_matrjoschka: 'true'
 docker_debug: 'ansible/roles/takel_takelage/files/takelscripts'
 docker_entrypoint_extra: ''
@@ -96,7 +96,6 @@ ship_env: '--env TAKELSHIP_UPDATE=true'
 ship_hostname: '%{ship_name}_%{unique}'
 ship_name: 'takelship'
 ship_podman_localhost: '127.0.0.1'
-ship_ports: ''
 ship_port_expose_podman_socket: 'false'
 ship_repo: 'takelship'
 ship_tag: 'latest'

data/lib/takeltau/lib/system.rb

@@ -49,6 +49,13 @@ module SystemModule
     @content
   end
 
+  # Write content to file
+  def write_file(file, content)
+    log.debug "Writing content to file \"#{file}\":"
+    log.debug "\"#{content}\""
+    File.write(file, content)
+  end
+
   # Remove directory tree.
   def rm_fr(directory)
     unless File.directory? directory

data/lib/takeltau/ship/cli.rb

@@ -25,6 +25,9 @@ module Takeltau
     desc 'info [COMMAND]', 'Get info about takelship containers'
     subcommand 'info', ShipInfo
 
+    desc 'ports [COMMAND]', 'Manage takelship portss'
+    subcommand 'ports', ShipPorts
+
     desc 'project [COMMAND]', 'Manage takelship projects'
     subcommand 'project', ShipProject
 

data/lib/takeltau/ship/container/lib.rb

@@ -20,14 +20,18 @@ module ShipContainerLib
   # rubocop:disable Metrics/MethodLength
   def _ship_container_lib_docker_privileged(ports, command)
     ship_data_dir = config.active['ship_data_dir']
-    ship_env = config.active['ship_env']
+    ship_env = [config.active['ship_env']]
+    ports.each do |key, port|
+      envvar = "TAKELSHIP_CONFIG_#{key}".upcase
+      envstr = "--env #{envvar}=#{port['localhost']}"
+      ship_env << envstr
+    end
     ports = _ship_container_lib_publish(ports)
-    ports = config.active['ports'] unless config.active['ship_ports'].empty?
     cmd_docker_run_command = format(
       config.active['cmd_ship_project_start_docker_run_privileged'],
       ship_docker: config.active['cmd_ship_docker'],
       ship_hostname: _ship_container_lib_ship_hostname,
-      ship_env: ship_env,
+      ship_env: ship_env.join(' '),
       ports: ports,
       ship_data_dir: ship_data_dir,
       image: _ship_container_lib_image,
@@ -77,7 +81,11 @@ module ShipContainerLib
   def _ship_container_lib_publish(ports)
     publish = []
     ports.each do |port|
-      publish << "--publish \"127.0.0.1:#{port}:#{port}\""
+      shipport = port[1]['takelship'].to_s
+      localport = port[1]['localhost'].to_s
+      next unless localport.to_i.between? 1, 65_535
+
+      publish << "--publish \"127.0.0.1:#{localport}:#{shipport}\""
     end
     publish.join(' ')
   end

data/lib/takeltau/ship/container/stop.rb

@@ -5,6 +5,7 @@ module ShipContainerStop
   # Stop a takelship container
   def ship_container_stop
     _ship_container_stop_docker_stop
+    "Stopped takelship \"#{_ship_container_lib_ship_hostname}\""
   end
 
   private

data/lib/takeltau/ship/info/lib.rb

@@ -9,6 +9,7 @@ module ShipInfoLib
     log.debug 'Gathering takelship info'
     takelshipinfo = _ship_info_lib_get_info_from_file
     takelshipinfo = _ship_info_lib_get_info_from_docker if takelshipinfo.empty?
+
     return false if takelshipinfo.nil?
 
     takelshipinfo
@@ -44,6 +45,8 @@ module ShipInfoLib
   def _ship_info_lib_valid_project?(takelship, project)
     valid_project = false
     takelship_projects = takelship['projects']
+    return false if takelship_projects.nil? || takelship_projects.empty?
+
     takelship_projects.each do |takelship_project|
       valid_project = true if project == takelship_project['name']
     end

data/lib/takeltau/ship/ports/cli.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Takeltau
+  # tau ship info
+  class ShipPorts < SubCommandBase
+    include LoggingModule
+    include SystemModule
+    include ConfigModule
+    include DockerCheckDaemon
+    include ShipContainerLib
+    include ShipInfoLib
+    include ShipPortsLib
+    include ShipPortsList
+
+    desc 'list [PROJECT]', 'Print takelship ports of a [PROJECT]'
+    long_desc <<-LONGDESC.gsub("\n", "\x5")
+    Print the ports that a takelship project exposes.
+    LONGDESC
+    # ship list: {Takeltau::ShipPorts#list}
+    def list(project = 'default')
+      say (ship_ports_list project).to_yaml
+    end
+  end
+end

data/lib/takeltau/ship/ports/lib.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+# tau ship ports lib
+module ShipPortsLib
+  private
+
+  # get the ports of a takelship
+  # rubocop:disable Metrics/MethodLength
+  def _ship_ports_lib_get_ports(takelship, takelproject)
+    ports = _ship_ports_lib_get_ports_docker(takelship)
+    takelship['projects'].each do |project|
+      next unless project['name'] == takelproject
+
+      project['services'].each do |service|
+        next unless service.key? 'ports'
+
+        service['ports'].each do |port|
+          key = _ship_ports_lib_generate_key port, service
+          ports[key] = _ship_ports_lib_get_port key, port, service
+        end
+      end
+    end
+    ports
+  end
+  # rubocop:enable Metrics/MethodLength
+
+  # write ports to project takelage.yml
+  def _ship_ports_lib_write_ports(ports, project)
+    config_project = _ship_ports_lib_get_project_config ports, project
+    project_dir = config.active['project_root_dir']
+    config_file = "#{project_dir}/takelage.yml"
+    write_file config_file, config_project.to_yaml
+  end
+
+  # get current project config
+  # the values are added/updated unconditionally
+  # the merge with the existing values has been done here:
+  # ConfigModule::TakeltauConfig::_config_merge_active
+  # and here: _ship_ports_lib_get_localhost_port
+  def _ship_ports_lib_get_project_config(ports, project)
+    config_project = config.project
+    ports.each do |key, port|
+      config_project[key] = port['localhost']
+    end
+    config_project['ship_default_project'] = project
+    config_project.sort.to_h
+  end
+
+  # map the podman socket port (aka "DOCKER_HOST")
+  # returns a hash unlike the get_port method
+  # rubocop:disable Metrics/MethodLength
+  def _ship_ports_lib_get_ports_docker(takelship)
+    takel_docker = takelship['docker_host']
+    docker_key = "ship_ports_dind_docker_#{takel_docker}"
+    local_docker = _ship_ports_lib_get_localhost_port docker_key, takel_docker
+    {
+      docker_key => {
+        'service' => 'dind',
+        'protocol' => 'docker',
+        'takelship' => takel_docker.to_i,
+        'localhost' => local_docker
+      }
+    }
+  end
+  # rubocop:enable Metrics/MethodLength
+
+  # map a takelship port
+  def _ship_ports_lib_get_port(key, port, service)
+    localhost = _ship_ports_lib_get_localhost_port key, port['port']
+    {
+      'service' => service['name'],
+      'protocol' => port['protocol'],
+      'takelship' => port['port'],
+      'localhost' => localhost
+    }
+  end
+
+  # get new port on localhost for takelport
+  def _ship_ports_lib_get_localhost_port(key, port)
+    env_var = "TAKELAGE_TAU_CONFIG_#{key}".upcase
+    return ENV[env_var].to_i if ENV.key? env_var
+
+    return config.active[key] if config.active.key? key
+
+    _ship_ports_lib_get_free_port port
+  end
+
+  # derive a random free port from a port
+  def _ship_ports_lib_get_free_port(port)
+    localport = 0
+    loop do
+      offset = _ship_ports_lib_get_offset
+      localport = port.to_i + offset
+      break unless _ship_ports_lib_port_open? localport
+    end
+    localport
+  end
+
+  # generate dynamic takelconfig key
+  def _ship_ports_lib_generate_key(port, service)
+    key = "ship_ports_#{service['name']}_#{port['protocol']}_#{port['port']}"
+    key.gsub('-', '_')
+  end
+
+  # generate random offset
+  def _ship_ports_lib_get_offset
+    # this results in ports
+    # from 30000 + 15000 = 45000
+    # to 40000 + 25000 = 65000
+    # max port number: 65535
+    rand(15_000..25_000)
+  end
+
+  # check if a port on the host is open
+  def _ship_ports_lib_port_open?(port)
+    log.debug "Checking if port #{port} is open"
+    begin
+      Socket.tcp('127.0.0.1', port, connect_timeout: 5)
+      true
+    rescue Errno::ECONNREFUSED
+      false
+    end
+  end
+end

data/lib/takeltau/ship/ports/list.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# tau ship ports list
+module ShipPortsList
+  # List takelship portss.
+  def ship_ports_list(project)
+    log.debug 'List takelship ports'
+
+    takelship = _ship_info_lib_get_takelshipinfo
+    project = _ship_info_lib_get_project(project, takelship)
+
+    return false unless _ship_info_lib_valid_project? takelship, project
+
+    _ship_ports_lib_get_ports takelship, project
+  end
+end

data/lib/takeltau/ship/project/cli.rb

@@ -12,6 +12,7 @@ module Takeltau
     include ShipContainerLib
     include ShipContainerStop
     include ShipInfoLib
+    include ShipPortsLib
     include ShipProjectList
     include ShipProjectLogs
     include ShipProjectStart
@@ -46,7 +47,8 @@ module Takeltau
     Start a takelship and run project [PROJECT] in it.
     LONGDESC
     def start(project = 'default')
-      ship_project_start project
+      project_start = ship_project_start project
+      say project_start if project_start
     end
 
     #

data/lib/takeltau/ship/project/start.rb

@@ -4,44 +4,75 @@
 module ShipProjectStart
   # Start a takelship
   def ship_project_start(project)
-    return false if _docker_container_lib_check_matrjoschka
-
-    return false if ship_container_check_existing
+    return false unless _ship_project_start_prerequisites_fulfilled?
 
     takelship = _ship_info_lib_get_takelshipinfo
-    project = _ship_info_lib_get_project(project, takelship)
+    project = _ship_info_lib_get_project project, takelship
+
+    return false unless _ship_project_start_valid_project? takelship, project
+
+    ports = _ship_ports_lib_get_ports(takelship, project)
 
-    return false unless _ship_info_lib_valid_project? takelship, project
+    log.debug 'Writing port configuration to takelage.yml'
+    _ship_ports_lib_write_ports(ports, project)
 
     log.debug "Starting takelship project \"#{project}\""
-    ports = _ship_project_start_ports takelship, project
-    say _ship_container_lib_docker_privileged ports, project
+    _ship_container_lib_docker_privileged ports, project
+
+    _ship_project_start_print_ports project, ports
   end
 
   private
 
-  # Get takelship ports
-  # rubocop:disable Metrics/MethodLength
-  # rubocop:disable Metrics/AbcSize
-  def _ship_project_start_ports(takelship, project)
-    ports = []
-    takelship['projects'].each do |takelship_project|
-      next unless project == takelship_project['name']
-
-      takelship_project['services'].each do |service|
-        next unless service.key?('ports')
-
-        service['ports'].each do |port|
-          ports << port['port']
-        end
-      end
+  # check prerequisistes
+  def _ship_project_start_prerequisites_fulfilled?
+    if _docker_container_lib_check_matrjoschka
+      say 'Cannot start a takelship from within a takelage container!'
+      return false
+    end
+
+    if ship_container_check_existing
+      say "Container \"#{_ship_container_lib_ship_hostname}\" is already started!"
+      return false
+    end
+
+    true
+  end
+
+  # check if the project is a valid takelship project
+  def _ship_project_start_valid_project?(takelship, project)
+    return true if _ship_info_lib_valid_project? takelship, project
+
+    say 'No valid project found!'
+    false
+  end
+
+  # print ports after starting a takelship
+  def _ship_project_start_print_ports(project, ports)
+    output = []
+    output << "Started takelship project \"#{project}\"\n"
+    max_length = _ship_project_start_get_maxlength ports
+
+    ports.each_value do |port|
+      next unless port['localhost'].to_i.between? 1, 65_535
+
+      left = "localhost:#{port['localhost']}"
+      right = "(#{port['service']} #{port['protocol']})"
+      output << "#{left.ljust(max_length)} #{right}"
     end
-    if config.active['ship_port_expose_podman_socket'] == 'true'
-      log.debug "Add DOCKER_HOST port #{config.active['ship_docker_host']}"
-      ports << config.active['ship_docker_host']
+    output.join("\n")
+  end
+
+  # get max length of left column
+  def _ship_project_start_get_maxlength(ports)
+    max_length = 0
+    ports.each_value do |port|
+      localport = port['localhost']
+      next unless localport.to_i.between? 1, 65_535
+
+      left_string = "localhost:#{localport}"
+      max_length = left_string.length if max_length < left_string.length
     end
-    ports
+    max_length
   end
 end
-# rubocop:enable Metrics/AbcSize
-# rubocop:enable Metrics/MethodLength

data/lib/takeltau/version

@@ -1 +1 @@
-0.44.2
+0.44.8

data/lib/takeltau.rb

@@ -98,6 +98,9 @@ require_relative 'takeltau/ship/container/stop'
 require_relative 'takeltau/ship/container/update'
 require_relative 'takeltau/ship/container/cli'
 require_relative 'takeltau/ship/info/cli'
+require_relative 'takeltau/ship/ports/lib'
+require_relative 'takeltau/ship/ports/list'
+require_relative 'takeltau/ship/ports/cli'
 require_relative 'takeltau/ship/project/list'
 require_relative 'takeltau/ship/project/logs'
 require_relative 'takeltau/ship/project/start'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeltau
 version: !ruby/object:Gem::Version
-  version: 0.44.2
+  version: 0.44.8
 platform: ruby
 authors:
 - Takelwerk
@@ -300,6 +300,9 @@ files:
 - lib/takeltau/ship/container/update.rb
 - lib/takeltau/ship/info/cli.rb
 - lib/takeltau/ship/info/lib.rb
+- lib/takeltau/ship/ports/cli.rb
+- lib/takeltau/ship/ports/lib.rb
+- lib/takeltau/ship/ports/list.rb
 - lib/takeltau/ship/project/cli.rb
 - lib/takeltau/ship/project/list.rb
 - lib/takeltau/ship/project/logs.rb