harbr 0.2.10 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '080e73e776d948d2528073f3b01e8295f364f090c160a034fd67fcae5adc867f'
-  data.tar.gz: eb4c1f32b65805784e0be36804143f994ea05eec5aaefec48a8b6e4938344ed5
+  metadata.gz: 2d22be1691e9a058891f9eea7f3c3f6948ebe2012a2c99e275413d55d9700040
+  data.tar.gz: eca940628488eb5002a912bc8dbd299e7fbb4356fa07d3461313c21392bdad0c
 SHA512:
-  metadata.gz: bc1db32542486d8965184c780cdf7086722d571587be7a0441abecd96f4ac00c26b42d8adb0a765c8d3f6a083c7049481763fd1bdf0637b2df80081993b9c450
-  data.tar.gz: 859fe567afe19637a7ff5cc1a49324ba94db966a6afcdcd6424219f1c0f52a6875c209c5613a5b24c7dfcf2aa1497f73fa5973f6fd0ab5138284bfec508b86be
+  metadata.gz: f75aa4c6034468b2e76707d95ff8f1442f3dc9a1cf042160dedc07dab79dc03bd979025cf6641e65a50375bb4d66ea03aaf8cb092adb16783debd76f4767bcbf
+  data.tar.gz: 4d6a1c95f6656329d6cc88a2b9f4f667f4cc8f7d3f7ca0ac4d75269257681f0e302cc30c47c1e34d7158fe213730b65fe659d9f415e55c18edc7e7beb944083c

data/exe/harbr

@@ -1,8 +1,213 @@
 #!/usr/bin/env ruby
 require_relative "../lib/harbr"
 
+class Host < Thor
+  attr_reader :containers
+  attr_reader :hosts
+
+  def initialize(a, b, c)
+    @containers = Harbr::Container::Repository.new
+    @hosts = Harbr::Host::Repository.new
+    super(a, b, c)
+  end
+
+  no_commands do
+    def display_table(hosts)
+      return puts "No hosts available." if hosts.empty?
+
+      # Define headers based on Container attributes
+      headers = ["Uid", "Container","Ip","Port", "Host"]
+
+      rows = hosts.map do |host|
+        container = containers.get(host.container_uid)
+        [host.uid, container.name,container.ip,host.port,host.header]
+      end
+
+      table = ::Terminal::Table.new(headings: headers, rows: rows)
+      puts ""
+      puts "Harbr Container Hosts"
+      puts ""
+      puts table
+      puts ""
+    end
+  end
+
+  desc "add CONTAINER PORT HOST", "Add a new host"
+  def add(container,port, header)
+    container = containers.find_by_name(container)
+    host = Harbr::Host.new
+    host.container_uid = container.uid
+    host.port = port
+    host.header = header
+    hosts.create(host)
+  end
+
+  desc "delete ID", "Delete a host"
+  def delete(id)
+    host = hosts.get(id)
+    host ||= hosts.find_by_header(id)
+
+    hosts.delete(host) if host
+  end
+
+  desc "update ID HOST_HEADER", "Update a host"
+  def update(id, host_header, port)
+    host = hosts.get(id)
+    host.header = host_header
+    host.port = port
+    hosts.update(host)
+  end
+
+  desc "list", "List all hosts"
+  def list
+    display_table(hosts.all)
+  end
+
+  desc "show", "show host for container"
+  def show(name)
+    container = containers.find_by_name(name)
+    display_table(hosts.get_by_container(container))
+  end
+  
+end
+
+class Container < Thor
+  no_commands do
+    def display_table(containers)
+      return puts "No containers available." if containers.empty?
+
+      # Define headers based on Container attributes
+      headers = ["Uid","Name", "IP", "Host Headers and Port"]
+      rows = containers.map do |container|
+        raise "oops" if container.is_a?(Harbr::Host)
+
+        container&.hosts = hosts&.get_by_container(container)
+
+        [container.uid,container.name, container.ip, container&.hosts&.map(&:to_s)&.join("\n")]
+      end
+
+      table = ::Terminal::Table.new(headings: headers, rows: rows)
+      puts ""
+      puts "Harbr Containers"
+      puts ""
+      puts table
+      puts ""
+    end
+  end
+
+  attr_reader :containers
+  attr_reader :hosts
+
+  def initialize(a, b, c)
+    @containers = Harbr::Container::Repository.new
+    @hosts = Harbr::Host::Repository.new
+    super(a, b, c)
+  end
+  desc "add NAME, IP", "Add a new container"
+  def add(name,ip)
+    container = Harbr::Container.new
+    container.name = name
+    container.ip = ip
+    containers.create(container)
+  end
+
+  desc "delete NAME", "Delete a container"
+  def delete(name)
+    container = @containers.get(name)
+    container = @containers.find_by_name(name) if container.nil?
+    if container
+      hosts.get_by_container(container).each do |host|
+        hosts.delete(host)
+      end
+      containers.delete(container) 
+    end 
+  end
+
+  desc "update NAME ID", "Update ip address of a container"
+  def update(name, ip, port)
+    container = @containers.find_by_name(name)
+    container.ip = ip
+    §§container.port = port
+    @containers.update(container) if container
+  end
+
+  desc "list", "List all names"
+  def list
+    display_table(@containers.all)
+  end
+  
+  desc "show", "show container"
+  def show(name)
+    container = @containers.find_by_name(name)
+    display_table([container])
+  end
+  
+end
+
 class HarbrCLI < Thor
+  include Thor::Actions
+  include Harbr::SSH
+
+  attr_reader :containers
+  attr_reader :hosts
+
+  def initialize(a, b, c)
+    @containers = Harbr::Container::Repository.new
+    @hosts = Harbr::Host::Repository.new
+    super(a, b, c)
+  end
+
   no_commands do
+    def render_hosts(container)
+      container&.hosts&.map { |host| "Host(`#{host.header}`)" }&.join(" || ")
+    end
+
+    def commit_to_file(container)
+
+      container.hosts.each do |host|
+        filename,contents = generate_traefik_config_with_filename(host.header, container.ip, host.port)
+        
+        on_ssh do |ssh|
+          ssh << ("echo '#{contents}' > /etc/traefik/providers/#{filename}")
+        end
+
+      end
+      
+
+      
+    end
+    
+    def generate_traefik_config_with_filename(domain, host, port)
+      server_url = "http://#{host}:#{port}"
+      service_name = "#{domain.gsub('.', '_')}_#{port}"
+      filename = "#{domain.gsub('.', '-')}.toml"
+    
+      erb_template = <<-ERB
+    # Traefik Configuration for <%= domain %>
+    # Service for <%= domain %>
+    # produced by Harbr version #{Harbr::VERSION}
+    
+    # Router for <%= domain %>
+    [http.routers.<%= domain.gsub('.', '-') %>]
+      rule = "Host(`<%= domain %>`)"
+      service = "<%= service_name %>"
+      entryPoints = ["http", "https"]
+      [http.routers.<%= domain.gsub('.', '-') %>.tls]
+        certResolver = "letsencrypt"
+    
+    # Service for <%= domain %>
+    [http.services.<%= service_name %>.loadBalancer]
+    [[http.services.<%= service_name %>.loadBalancer.servers]]
+      url = "<%= server_url %>"
+      ERB
+    
+      config_content = ERB.new(erb_template, trim_mode: '-').result(binding)
+      return filename, config_content
+    end
+    
+    
+    
+
     def display_containers_table(containers)
       return puts "No containers available." if containers.empty?
 
@@ -21,13 +226,6 @@ class HarbrCLI < Thor
       puts ""
     end
 
-    def check_and_create_directory(path)
-      unless Dir.exist?(path)
-        puts "Creating directory: #{path}"
-        FileUtils.mkdir_p(path)
-      end
-    end
-
     def command_exists?(command)
       system("command -v #{command} > /dev/null 2>&1")
     end
@@ -47,83 +245,6 @@ class HarbrCLI < Thor
       puts "Installing #{package} using apt..."
       system("sudo apt install #{package}") or raise "Failed to install #{package}"
     end
-
-    def create_traefik_config(containers)
-      config = {
-        "http" => {
-          "routers" => {},
-          "services" => {}
-        }
-      }
-
-      containers.each do |container|
-        container.ip = "127.0.0.1"
-        name = container.name.tr(".", "-")
-
-        router_key = "#{name}-router-secure"
-        config["http"]["routers"][router_key] = {
-          "rule" => "Host(`#{container.host_header}`)",
-          "service" => "#{name}-service",
-          "entryPoints" => ["https"],
-          "tls" => {
-            "certResolver" => "myresolver"
-          }
-        }
-
-        config["http"]["services"]["#{name}-service"] = {
-          "loadBalancer" => {
-            "servers" => [{"url" => "http://#{container.ip}:#{container.port}"}]
-          }
-        }
-      end
-
-      File.write("/etc/traefik/providers/harbr.toml", TomlRB.dump(config))
-      puts "Traefik configuration written to /etc/traefik/providers/harbr.toml"
-    end
-  end
-
-  desc "destroy", "Destroy a container and remove all traces"
-  def destroy(name)
-    puts "Destroying container: #{name}"
-
-    container_repo = Harbr::Container::Repository.new
-
-    ["live.#{name}", "next.#{name}", name].each do |container_name|
-      container_repo.get_by_name(container_name).each do |container|
-        `port release #{container.port}`
-        puts "released port #{container.port} successfully."
-        container_repo.delete(container)
-      end
-
-      `rm -rf /etc/service/#{container_name}`
-      `rm -rf /etc/sv/harbr/#{container_name}`
-
-      puts "Container #{container_name} destroyed successfully."
-    end
-
-    `rm -rf /var/harbr/containers/#{name}`
-    `rm -rf /var/log/harbr/#{name}`
-
-    create_traefik_config(container_repo.all)
-  end
-
-  desc "logs", "Show logs"
-  def logs
-    exec "tail -f /var/log/harbr/current"
-  end
-
-  desc "peek CONTAINER", "Peek in a given container"
-  method_option :live, type: :boolean, aliases: "-l", desc: "Process in live mode"
-  method_option :next, type: :boolean, default: true, aliases: "-n", desc: "Process in next mode"
-  def peek(container)
-    container_repo = Harbr::Container::Repository.new
-    container = container_repo.find_by_name(container)
-    if container
-      exec "tail -f /var/log/harbr/#{container.name}/live/current" if options[:live]
-      exec "tail -f /var/log/harbr/#{container.name}/next/current" if options[:next]
-    else
-      puts "Container not recognized"
-    end
   end
 
   desc "setup", "Set up Harbr environment"
@@ -135,87 +256,41 @@ class HarbrCLI < Thor
     install_with_snap("ruby") unless command_exists?("ruby")
     install_with_snap("traefik") unless command_exists?("traefik")
     install_with_apt("runit") unless command_exists?("runit")
+    install_with_apt("lxd") unless command_exists?("lxd")
     install_with_apt("lxc") unless command_exists?("lxc")
 
-    Harbr::Lxd::Setup.new.perform("panamax")
-        
     puts "Setup completed successfully."
   end
 
-  desc "containers", "show all containers"
-  def containers
-    container_repo = Harbr::Container::Repository.new
-    display_containers_table(container_repo.all)
-  end
-
-  desc "deploy", "deploy a container to production"
-  method_option :live, type: :boolean, default: false, aliases: "-l", desc: "deploy to live environment"
-  method_option :next, type: :boolean, default: false, aliases: "-n", desc: "deploy to next environment"
-  def deploy(name, version = nil)
-    if options[:live]
-      /versions\/(?<version>\d*)/ =~ `ls -l /var/harbr/containers/#{name}/next`
-      version = $1
-      raise "Ooops! next version not found!" if version.nil?
-
-      Harbr::Job.perform_async(name, version, "live")
-
-      /versions\/(?<version>\d*)/ =~ `ls -l /var/harbr/containers/#{name}/live`
-      `ln -sf /var/harbr/containers/#{name}/version/#{$1} /var/harbr/containers/#{name}/rollback`
-
-      puts "deploy version #{version} of #{name} to live environment"
+  desc "commit", "commit changes traeffic"
+  def commit
+    
+    on_ssh do |ssh|
+      ssh << "rm -rf /etc/traefik/providers/*;"
     end
-
-    if options[:next]
-      `ln -sf /var/harbr/containers/#{name}/version/#{version} /var/harbr/containers/#{name}/next`
-      Harbr::Job.perform_async(name, version, "next")
-      puts "deploy version #{version} of #{name} to next environment"
+    containers.all.each do |container|
+      container.hosts = hosts.get_by_container(container)
+      commit_to_file(container)
     end
+    
   end
 
-  desc "containerise", "deploy a container to a lxd comtainer"
-  method_option :live, type: :boolean, default: false, aliases: "-l", desc: "deploy to live environment"
-  method_option :next, type: :boolean, default: false, aliases: "-n", desc: "deploy to next environment"
-  def containerise(name, version = nil)
-    if options[:live]
-      /versions\/(?<version>\d*)/ =~ `ls -l /var/harbr/containers/#{name}/next`
-      version = $1
-      raise "Ooops! next version not found!" if version.nil?
-
-      Harbr::Lxd::Job.perform_async(name,version, "live",9292)
-
-      /versions\/(?<version>\d*)/ =~ `ls -l /var/harbr/containers/#{name}/live`
-      `ln -sf /var/harbr/containers/#{name}/version/#{$1} /var/harbr/containers/#{name}/rollback`
-
-      puts "deploy version #{version} of #{name} to live environment"
-    end
-
-    if options[:next]
-      `ln -sf /var/harbr/containers/#{name}/version/#{version} /var/harbr/containers/#{name}/next`
-      Harbr::Lxd::Job.perform_async(name,version,"next",9292)
-      puts "deploy version #{version} of #{name} to next environment"
-    end
-  end
-
-
-  desc "rollback", "rollback last deploy"
-  def rollback(name)
-    Dir.chdir("/var/harbr/containers/#{name}") do
-      if File.exist?("rollback")
-        Dir.chdir("/var/harbr/containers/#{name}/") do
-          /(?:. * -> (?:.*))/ =~ `ls -l /var/harbr/containers/#{name}/rollback`
-          `rm -r live`
-          `ln -sf #{$2} live`
-          `sv restart live.#{name}`
-        end
-        puts "rollback successful"
-      end
-    end
+  desc "rollback", "rollback changes to traeffic"
+  def rollback
   end
 
   desc "update", "update to the latest version of harbr"
   def update
     system "gem update harbr"
   end
+
+  # Registering the Host subcommand
+  desc "host", "Manage hosts"
+  subcommand "host", Host
+
+  # Registering the Host subcommand
+  desc "container", "Manage containers"
+  subcommand "container", Container
 end
 
 HarbrCLI.start(ARGV)

data/lib/examples/container.toml

@@ -0,0 +1,13 @@
+# Dynamic configuration
+[http.routers]
+  [http.routers.sild]
+  rule = "Host(`sild.harbr.zero2one.ee`) || Host(`next.sild.harbr.zero2one.ee`)"
+  service = "sild"
+  entryPoints = ["http", "https"]
+  [http.routers.sild.tls]
+    certResolver = "myresolver"
+
+[http.services]
+  [http.services.sild.loadBalancer]
+    [[http.services.sild.loadBalancer.servers]]
+    url = "http://10.189.96.89"

data/lib/harbr/container.rb

@@ -1,19 +1,23 @@
 module Harbr
   class Container
     include Dddr::Entity
-    attr_accessor :name, :host_header, :ip, :port
 
-    queries do
-      def find_by_header(host_header)
-        all.find { |container| container.host_header.downcase == host_header.downcase }
-      end
+    def initialize
+      @hosts = []
+      @ports = []
+    end
 
-      def find_by_name(name)
-        all.find { |container| container.name.downcase == name.downcase }
-      end
+    attr_accessor :name, :ip
+    
+    attr_writer :hosts
+    attr_reader :hosts
+
+    attr_writer :ports
+    attr_reader :ports
 
-      def get_by_name(name)
-        all.select { |container| container.name.downcase.include? name.downcase }
+    queries do
+      def find_by_name(name)
+        all.find { |container| container.name.to_s.downcase == name.to_s.downcase }
       end
     end
   end

data/lib/harbr/host.rb

@@ -0,0 +1,21 @@
+module Harbr
+  class Host
+    include Dddr::Entity
+    attr_accessor :header,:container_uid,:port
+
+    def to_s
+      "#{port} -> #{header}"
+    end
+    
+    queries do
+      def find_by_header(header)
+        all.find { |host| host.header == header }
+      end
+
+      def get_by_container(container)
+        all.select { |host| host.container_uid == container.uid}
+      end
+      
+    end
+  end
+end

data/lib/harbr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Harbr
-  VERSION = "0.2.10"
+  VERSION = "2.8.1"
 end

data/lib/harbr.rb

@@ -7,22 +7,37 @@ require "fileutils"
 require "ostruct"
 require "sucker_punch"
 require "resend"
+require "net/ssh"
 
 require_relative "harbr/version"
 require_relative "harbr/container"
-require_relative "harbr/job"
-require_relative "harbr/lxd/job"
-require_relative "harbr/lxd/setup"
-
+require_relative "harbr/host"
 
 
 # Harbr module for managing containers, jobs, ports, and 2s
 module Harbr
-  DEFAULT_DIRECTORY = "/var/harbr/containers"
+  DEFAULT_DIRECTORY = "~/.config/harbr"
   DEFAULT_DIRECTORY_DATA_DIR = "#{DEFAULT_DIRECTORY}/.data"
 
   Dddr.configure do |config|
-    config.data_dir = DEFAULT_DIRECTORY_DATA_DIR
+    config.container = "harbr"
+  end
+
+  module SSH
+    def on_ssh
+      command = ""
+      command = yield command
+      hostname = "smtp.laki.zero2one.ee"
+      username = "root"
+      key_path = "/Users/db/.ssh/id_rsa"  # Replace with the path to your private SSH key
+      Net::SSH.start(hostname, username, keys: [key_path]) do |ssh|
+        ssh.exec!(command)
+      end
+    rescue => e
+      puts "Error: #{e.class}"
+      puts "backtrace: #{e.backtrace.join('\n')}"
+      puts "Error sending notification: #{e.message}"
+    end
   end
 
   class Error < StandardError; end

data/vendor/bundle/ruby/3.2.0/gems/dddr-1.0.8/.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper

data/vendor/bundle/ruby/3.2.0/gems/dddr-1.0.8/.standard.yml

@@ -0,0 +1,3 @@
+# For available configuration options, see:
+#   https://github.com/testdouble/standard
+ruby_version: 2.6

data/vendor/bundle/ruby/3.2.0/gems/dddr-1.0.8/CHANGELOG.md

@@ -0,0 +1,5 @@
+## [Unreleased]
+
+## [0.1.0] - 2023-10-29
+
+- Initial release

data/vendor/bundle/ruby/3.2.0/gems/dddr-1.0.8/CODE_OF_CONDUCT.md

@@ -0,0 +1,84 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at delaney@vidtreone.com. All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
+available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.