busbar-cli 1.9.3 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdc228f546309ef55d73857144c42342aab59774
-  data.tar.gz: be9080480a0f1ce0632a0730ede8170cd7e48091
+  metadata.gz: 7991702d66db4cdc6aa280b8ccaa5f840fe3a78d
+  data.tar.gz: a8cd115657504495412dc2058dc5c68524e999e4
 SHA512:
-  metadata.gz: b36299c95d25c838dfed38ccecac1617473f87269cbc4ce3f96b634d4557ccd95ecfb4f6391c16e3a2a5e84c17bacb4a0d46270501cb0b73d771235b8aabad11
-  data.tar.gz: 75729de146953bde8b911242738446ba0412b795478ac2feb8802b7bda679ba313d7551aa2a2a7d676bda8b9a0121e86c3d0a9d3d6874967d5025ea87d247cb1
+  metadata.gz: d456631e1130fd40a8a5826bc0542724cf15788498ac06bc259efb1571131dffb326cbfe96824eb9859ad7837cba4c690e9402c44b70f6d155986807d122416a
+  data.tar.gz: 808ec6689929bd252cf78f0a4be4b6648337a81b9f61d92e5923e5c6e9075b14ca013d9b7dfc95f7bf97a3afbe07ae34a5dbb593fa9924e7acda18aa55d7b5a5

data/lib/busbar_cli/commands/logs.rb

@@ -3,43 +3,32 @@ module Commands
     extend ActiveSupport::Concern
 
     included do
-      desc 'logs APPLICATION_CONTAINER ENV [COMPONENT_TYPE]',
-        'Fetch the logs from a application container. You can find the container for your application through the "busbar containers" command.'
+      desc 'logs APP ENV [COMPONENT]',
+        'Stream the application logs.'
       method_option :since,
                     default: '0',
                     type: :string,
-                    desc: 'Only return logs newer than a relative duration like 5s, 2m, or 3h. ' \
-                          'Defaults to all logs.'
+                    desc: 'Look-back duration in seconds, minutes, or hours (5s, 2m, 3h).'
       method_option :size,
-                    default: '100',
+                    default: '30',
                     type: :string,
-                    desc: 'Last <size> lines of the logs to be returned' \
-                          'Defaults to 100.'
+                    desc: 'Number of lines.'
       method_option :profile,
-                    desc: 'Profile used to run the command'
+                    desc: 'Profile used to run the command.'
       def logs(
-        resource_id,
-        environment_name = Services::AppConfig.get_or_exit('environment'),
-        component = nil
+        app_id,
+        environment_name,
+        component_id = nil
       )
         Services::Kube.configure_temporary_profile(options['profile'])
 
-        if !component.nil? && AppsRepository.find(app_id: resource_id)
-          Services::ComponentLogs.call(
-            component: Component.new(
-              app_id: resource_id,
-              environment_name: environment_name,
-              type: component
-            ),
-            size: options['size'].to_i
-          )
-        else
-          Services::Logs.call(
-            container_id: resource_id,
-            environment_name: environment_name,
-            since: options['since']
-          )
-        end
+        Services::Logs.call(
+          app_id: app_id,
+          environment_name: environment_name,
+          component_id: component_id,
+          since: options['since'],
+          size: options['size'].to_i
+        )
       end
     end
   end

data/lib/busbar_cli/config/version.rb

@@ -1,6 +1,6 @@
 # Version Variables
 VERSION                     = '1.9'.freeze
-BUSBAR_PATCH_VERSION        = '3'.freeze
+BUSBAR_PATCH_VERSION        = '4'.freeze
 KUBECTL_PATCH_VERSION       = '6'.freeze
 BUSBAR_VERSION              = "#{VERSION}.#{BUSBAR_PATCH_VERSION}".freeze
 KUBECTL_VERSION             = "#{VERSION}.#{KUBECTL_PATCH_VERSION}".freeze

data/lib/busbar_cli/repositories/environments_repository.rb

@@ -27,6 +27,13 @@ class EnvironmentsRepository
       Environment.new(environment_data)
     end
 
+    def get(environment_name, app_id)
+      @environment_name = environment_name
+      @app_id = app_id
+
+      Request.get(environment_route).body
+    end
+
     def create(params)
       @app_id = params[:app_id]
 

data/lib/busbar_cli/services.rb

@@ -6,7 +6,6 @@ require 'busbar_cli/services/app_config/displayer'
 require 'busbar_cli/services/app_config/reseter'
 require 'busbar_cli/services/app_config/unseter'
 require 'busbar_cli/services/console'
-require 'busbar_cli/services/component_logs'
 require 'busbar_cli/services/database_creator'
 require 'busbar_cli/services/database_destroyer'
 require 'busbar_cli/services/deploy'

data/lib/busbar_cli/services/logs.rb

@@ -1,14 +1,71 @@
 module Services
   class Logs
-    def self.call(container_id:, environment_name:, since:)
+    def self.call(app_id:, environment_name:, component_id:, since:, size:)
       Services::Kube.setup
+      require 'open3'
 
-      container_name = container_id.split('-')[0..-3].join('-')
+      @environment_name = environment_name
+      @app_id = app_id
+      @component_id = component_id
 
-      Kernel.exec(
-        "#{KUBECTL} --context=#{Services::Kube.current_profile} " \
-        "logs -f --since=#{since} #{container_id} #{container_name} -n #{environment_name}"
+      # Retrieve Component Data
+      if @component_id.nil? then
+        # retrieve app components from server
+        environment_data = JSON.parse(EnvironmentsRepository.get(environment_name, app_id))
+        components_data = environment_data['data']['components']
+
+        if components_data.length == 1 then
+          @component_id = components_data[0]['type']
+        else
+          puts "More than one component found for #{@app_id} #{@environment_name}."
+          puts "Available components:"
+          components_data.each do |component|
+            puts "  #{component['type']}"
+          end
+          puts "Please choose one from the list above and try again."
+          return
+        end
+      end
+
+      # Retrieve a Pod Name
+      stdout, stderr, status = Open3.capture3(
+        "#{KUBECTL} --context=#{Services::Kube.current_profile} --namespace #{environment_name} " \
+        "get pod -l busbar.io/app=#{app_id},busbar.io/component=#{@component_id} | grep -v '^NAME' | head -n 1 | awk '{print $1}'"
+      )
+
+      if status.to_s.end_with?('0') and stdout.length > 0 then
+        pod_name = stdout.to_s.chomp
+      else
+        puts "Application not found."
+        return
+      end
+
+      # Retrieve pod data and set a container name
+      stdout, stderr, status = Open3.capture3(
+        "#{KUBECTL} --context=#{Services::Kube.current_profile} --namespace #{environment_name} " \
+        "get pod #{pod_name} --output json"
       )
+
+      if status.to_s.end_with?('0') then
+        pod_data_json = JSON.parse(stdout)
+
+        if pod_data_json['spec']['containers'].length == 1 then
+          @container_name = pod_data_json['spec']['containers'][0]['name']
+        else
+          pod_data_json['spec']['containers'].each do |record|
+            @container_name = record['name'] unless record['name'].end_with?('nginx')
+          end
+        end
+
+        # Fetch components => pod => container log
+        Kernel.exec(
+          "#{KUBECTL} --context=#{Services::Kube.current_profile} --namespace #{environment_name} " \
+          "logs --follow=true --since=#{since} --tail=#{size} #{pod_name} --container #{@container_name}"
+        )
+      else
+        puts "Error while retrieving pod data:"
+        puts "  #{stderr}"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: busbar-cli
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.4
 platform: ruby
 authors:
 - Igor Marques
@@ -208,7 +208,6 @@ files:
 - lib/busbar_cli/services/app_destroyer.rb
 - lib/busbar_cli/services/apps.rb
 - lib/busbar_cli/services/busbar_config.rb
-- lib/busbar_cli/services/component_logs.rb
 - lib/busbar_cli/services/console.rb
 - lib/busbar_cli/services/database_creator.rb
 - lib/busbar_cli/services/database_destroyer.rb

data/lib/busbar_cli/services/component_logs.rb

@@ -1,9 +0,0 @@
-module Services
-  class ComponentLogs
-    def self.call(component:, size:)
-      Printer.print_resource(
-        ComponentsRepository.log_for(component: component, size: size)
-      )
-    end
-  end
-end