enviroblyd 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05071a7be6ad5145537f06b8466841984969e4c89759ea929ee0f1a28a6457cf
-  data.tar.gz: 79c5c57647395378dddd409ae90075e888e7e1999c997efd1c1e736b6a871fbb
+  metadata.gz: 20310001470bfb7d27a249ce226a8754b5c73594227c8dd9de29375cdfb525d7
+  data.tar.gz: df8c884d9ccf0895116c19bfe2ab6c9ee0571397e3e2900b64a311e130301897
 SHA512:
-  metadata.gz: 54cdd680ffb67c14da0795fee35ef925e44795fc91876917377b8c7be8e6719b4ecb6c8cb826ad3d941d6856680a7aff6700f7a0de284ec0847e026bc60e1acf
-  data.tar.gz: a71d5071c3bb1001f6f35ef5603a617b88aec4d1a54c338945afd1df43e6a764ce441b2324cc3a932f2b97df5ee5947221136ad86694bd7bae78922b10a5bd9c
+  metadata.gz: 78e2c025fd71934402535993f38e1e8e31c98fb2190d6e8a01e8a9ec42f4c8063012f1889228e7802ecb2b9abe190a20155d63f11c1ae74aad2e335d26d5d76f
+  data.tar.gz: 109616a3d9bec031e964126b5142b65997ea4046da301ae97fb9c1f4a21029269a3888c9e6da8f553e02a0548caa2f1214ca7adf8eab026b6e60efbcfecc5a2f

data/lib/enviroblyd/command.rb

@@ -6,8 +6,13 @@ class Enviroblyd::Command
   DEFAULT_TIMEOUT_SECONDS = 5 * 60
   DEFAULT_RUNTIME = "/bin/bash"
 
+  def self.run(params)
+    Thread.new do
+      new(params).run
+    end
+  end
+
   def initialize(params)
-    @web = Enviroblyd::Web.new
     @url = params.fetch "url"
     @script = params.fetch "script"
     @runtime = params.fetch "runtime", DEFAULT_RUNTIME
@@ -17,7 +22,6 @@ class Enviroblyd::Command
 
   def run
     puts "Command #{@url} starting"
-
     Open3.popen3("timeout #{@timeout} #{@runtime}") do |stdin, stdout, stderr, thread|
       stdin.puts @script
       stdin.close
@@ -25,11 +29,10 @@ class Enviroblyd::Command
       @stderr = stderr.read
       @exit_code = thread.value.exitstatus
     end
-
     puts "Command #{@url} exited with #{@exit_code}"
     $stdout.flush
 
-    @web.http(@url, type: Net::HTTP::Put, params: to_complete_params)
+    Enviroblyd::Web.http(@url, type: Net::HTTP::Put, params: to_complete_params)
   end
 
   private

data/lib/enviroblyd/daemon.rb

@@ -8,42 +8,36 @@ class Enviroblyd::Daemon
   LISTEN_PORT = ENV.fetch("ENVIROBLYD_PORT", 63106).to_i
 
   def self.start
-    web = Enviroblyd::Web.new
-    web.register
-
-    daemon = new
-    daemon.listen
+    imds = Enviroblyd::IMDS.new
+    host = imds.private_ipv4
+    new.listen(host) do
+      Enviroblyd::Web.register
+    end
   end
 
-  def listen
-    server = TCPServer.new LISTEN_PORT
-    puts "Listening on port #{LISTEN_PORT}"
+  def listen(host)
+    server = TCPServer.new host, LISTEN_PORT
+    puts "Listening on #{host}:#{LISTEN_PORT}"
+
+    yield
 
     loop do
       Thread.start(server.accept) do |client|
-        message = client.recv(MAX_MESSAGE_SIZE)
-
         params =
           begin
-            JSON.parse message
+            JSON.parse client.recv(MAX_MESSAGE_SIZE)
           rescue
-            nil
+            :invalid_json
           end
 
-        if params.nil?
+        if params == :invalid_json
           client.puts "Error parsing JSON"
         else
-          puts "Received valid JSON:"
-          puts params
           client.puts "OK"
         end
 
-        # TODO: Handle Broken pipe (Errno::EPIPE) (client closing connection before we write back)
         client.close
-
-        Thread.new do
-          Enviroblyd::Command.new(params).run
-        end
+        Enviroblyd::Command.run(params)
       end
     end
   end

data/lib/enviroblyd/imds.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class Enviroblyd::IMDS
+  TOKEN_TTL_SECONDS = 30
+  IMDS_HOST = ENV.fetch("ENVIROBLYD_IMDS_HOST", "169.254.169.254")
+
+  def initialize
+    @token = Enviroblyd::Web.http("http://#{IMDS_HOST}/latest/api/token",
+      type: Net::HTTP::Put, headers: { "X-aws-ec2-metadata-token-ttl-seconds" => TOKEN_TTL_SECONDS.to_s }).
+      body.strip
+  end
+
+  def get(key)
+    Enviroblyd::Web.http("http://#{IMDS_HOST}/latest/meta-data/#{key}",
+      headers: { "X-aws-ec2-metadata-token" => @token }).
+      body.strip
+  end
+
+  def private_ipv4
+    get "private_ipv4"
+  end
+end

data/lib/enviroblyd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Enviroblyd
-  VERSION = "0.4.1"
+  VERSION = "0.4.3"
 end

data/lib/enviroblyd/web.rb

@@ -10,67 +10,63 @@ require "json"
 class Enviroblyd::Web
   USER_AGENT = "enviroblyd #{Enviroblyd::VERSION}"
   CONTENT_TYPE = "application/json"
-  # TOKEN_TTL_SECONDS = 30
-  # IMDS_HOST = ENV.fetch("ENVIROBLYD_IMDS_HOST", "169.254.169.254")
   API_HOST = ENV.fetch("ENVIROBLYD_API_HOST", "envirobly.com")
   WORKING_DIR = Pathname.new ENV.fetch("ENVIROBLYD_WORKING_DIR", "/var/envirobly/daemon")
   INITIALIZED_FILE = WORKING_DIR.join "initialized"
 
-  def register
-    if File.exist?(INITIALIZED_FILE)
-      puts "Skipping initialization because #{INITIALIZED_FILE} exists."
-    else
-      init_url = ENV.fetch "ENVIROBLYD_INIT_URL"
-      puts "Init URL: #{init_url}"
-      response = http(init_url, type: Net::HTTP::Put, retry_interval: 3, retries: 10, backoff: :exponential)
-      puts "Init response code: #{response.code}"
+  class << self
+    def register
+      if File.exist?(INITIALIZED_FILE)
+        puts "Skipping initialization because #{INITIALIZED_FILE} exists."
+      else
+        init_url = ENV.fetch "ENVIROBLYD_INIT_URL"
+        puts "Init URL: #{init_url}"
+        response = http(init_url, type: Net::HTTP::Put)
+        puts "Init response code: #{response.code}"
 
-      if response.code.to_i == 200
-        FileUtils.mkdir_p WORKING_DIR
-        File.write INITIALIZED_FILE, init_url
+        if response.code.to_i == 200
+          FileUtils.mkdir_p WORKING_DIR
+          File.write INITIALIZED_FILE, init_url
+        end
       end
     end
-  end
 
-  def http(url, type: Net::HTTP::Get, headers: {}, retry_interval: 2, retries: 30, backoff: false, tries: 1, params: nil)
-    if retries <= tries
-      $stderr.puts "Retried #{tries} times. Aborting."
-      exit 1
-    end
+    def http(url, type: Net::HTTP::Get, params: nil, headers: {}, retry_interval: 3, retries: 10, backoff: :exponential, tries: 1)
+      if retries <= tries
+        $stderr.puts "Retried #{tries} times. Aborting."
+        exit 1
+      end
 
-    uri = URI(url)
-    http = Net::HTTP.new uri.host, uri.port
-    http.use_ssl = true if uri.scheme == "https"
-    http.open_timeout = 5
-    http.read_timeout = 5
+      uri = URI(url)
+      http = Net::HTTP.new uri.host, uri.port
+      http.use_ssl = true if uri.scheme == "https"
+      http.open_timeout = 10
+      http.read_timeout = 10
 
-    request = type.new(uri, default_headers.merge(headers))
-    request.content_type = CONTENT_TYPE
+      request = type.new(uri, default_headers.merge(headers))
+      request.content_type = CONTENT_TYPE
+      request.body = JSON.dump(params) unless params.nil?
 
-    unless params.nil?
-      request.body = JSON.dump params
-    end
+      response =
+        begin
+          http.request(request)
+        rescue
+          :retry
+        end
 
-    response =
-      begin
-        http.request(request)
-      rescue
-        :retry
+      if response == :retry || (500..599).include?(response.code.to_i)
+        sleep_time = (backoff == :exponential) ? (retry_interval * tries) : retry_interval
+        $stderr.puts "Retry #{uri} in #{sleep_time}s"
+        sleep sleep_time
+        http(url, type:, params:, retry_interval:, retries:, backoff:, tries: (tries + 1))
+      else
+        response
       end
-
-    # https://developers.cloudflare.com/support/troubleshooting/cloudflare-errors/troubleshooting-cloudflare-1xxx-errors/
-    if response == :retry || (500..599).include?(response.code.to_i)
-      sleep_time = (backoff == :exponential) ? (retry_interval * tries) : retry_interval
-      $stderr.puts "Retry #{uri} in #{sleep_time}s"
-      sleep sleep_time
-      http(url, type:, retry_interval:, retries:, backoff:, tries: (tries + 1))
-    else
-      response
     end
-  end
 
-  private
-    def default_headers
-      { "User-Agent" => USER_AGENT }
-    end
+    private
+      def default_headers
+        { "User-Agent" => USER_AGENT }
+      end
+  end
 end

data/lib/enviroblyd.rb

@@ -8,5 +8,8 @@ end
 require "zeitwerk"
 
 loader = Zeitwerk::Loader.for_gem
+loader.inflector.inflect(
+  "imds" => "IMDS"
+)
 loader.setup
 loader.eager_load

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enviroblyd
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Robert Starsi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-04 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -68,6 +68,7 @@ files:
 - lib/enviroblyd/cli/main.rb
 - lib/enviroblyd/command.rb
 - lib/enviroblyd/daemon.rb
+- lib/enviroblyd/imds.rb
 - lib/enviroblyd/version.rb
 - lib/enviroblyd/web.rb
 homepage: https://github.com/envirobly/enviroblyd