ufo 4.6.0 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e191dff1d9d879e6c78eb6062dbdf8440efcc3a1178125af01aaf807e6632e2c
-  data.tar.gz: 9656eee37d6155be650e7292692db31fe54797c1cf6ea5d9b8f75917ffb0dc7f
+  metadata.gz: ed46bcbd9a6677e6a6d8ac6ec6bec143398fe5662aef5833d949c75d604d55c8
+  data.tar.gz: 631c1980a669e8fdebb44446246d22683ec0848d0a141f76ca8c1d538acb9710
 SHA512:
-  metadata.gz: 3769a6dedd2cb9100c4531a820dd9c1b848acb84a58186d546a7825c4d96765b2a1a8239d6883bfa7e346e2577ed4a0b4d95da29375a266bb13637dbcafd6428
-  data.tar.gz: b5a48692922794b70328f73153c80f09475c91468e1432f4103d56b80bc5e40f10ef92301e711ee1806e41a1be0987b21b5f1c979371a31ae9b72cc1dbf437e6
+  metadata.gz: c1e43ccef253916b2ba63e5202e37297d68d6021cf16c64c679ad7dceee98409c25d8fc2afa80fa115435871ebc36a91d8cf89e9faad7c9a091ca1f9064927ff
+  data.tar.gz: e8b6be518ea85b407cb73fba4d1240d38f646ae3c330e4cf6d948d3a496b4e0e98b5aca1112dc3043beb92cb356cf835cc58207fee2753e50bc6a89f685eff6b

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [4.6.1]
+- #93 Fix firelens functionality
+- #97 ufo logs --filter-pattern option
+- #98 fix env vars helper to allow surrounding quotes
+
 ## [4.6.0]
 - #95 Introduce: ufo logs command. Tail logs.
 - #96 docs and options

data/docs/_reference/ufo-logs.md

@@ -26,14 +26,15 @@ If you have a current service name set.
 ## Options
 
 ```
-[--follow], [--no-follow]    #  Whether to continuously poll for new logs. To exit from this mode, use Control-C.
-                             # Default: true
-[--since=SINCE]              # From what time to begin displaying logs.  By default, logs will be displayed starting from 1 minutes in the past. The value provided can be an ISO 8601 timestamp or a relative time.
-[--format=FORMAT]            # The format to display the logs. IE: detailed or short.  With detailed, the log stream name is also shown.
-                             # Default: simple
-[--verbose], [--no-verbose]  
-[--mute], [--no-mute]        
-[--noop], [--no-noop]        
-[--cluster=CLUSTER]          # Cluster.  Overrides .ufo/settings.yml.
+[--follow], [--no-follow]          #  Whether to continuously poll for new logs. To exit from this mode, use Control-C.
+                                   # Default: true
+[--since=SINCE]                    # From what time to begin displaying logs.  By default, logs will be displayed starting from 1 minutes in the past. The value provided can be an ISO 8601 timestamp or a relative time.
+[--format=FORMAT]                  # The format to display the logs. IE: detailed or short.  With detailed, the log stream name is also shown.
+                                   # Default: simple
+[--filter-pattern=FILTER_PATTERN]  # The filter pattern to use. If not provided, all the events are matched
+[--verbose], [--no-verbose]        
+[--mute], [--no-mute]              
+[--noop], [--no-noop]              
+[--cluster=CLUSTER]                # Cluster.  Overrides .ufo/settings.yml.
 ```
 

data/lib/ufo/cli.rb

@@ -192,6 +192,7 @@ module Ufo
     option :follow, default: true, type: :boolean, desc: " Whether to continuously poll for new logs. To exit from this mode, use Control-C."
     option :since, desc: "From what time to begin displaying logs.  By default, logs will be displayed starting from 1 minutes in the past. The value provided can be an ISO 8601 timestamp or a relative time."
     option :format, default: "simple", desc: "The format to display the logs. IE: detailed or short.  With detailed, the log stream name is also shown."
+    option :filter_pattern, desc: "The filter pattern to use. If not provided, all the events are matched"
     def logs(service=:current)
       Logs.new(service, options).run
     end

data/lib/ufo/dsl/helper.rb

@@ -30,7 +30,9 @@ module Ufo
       def env_vars(text)
         lines = filtered_lines(text)
         lines.map do |line|
-          key,*value = line.strip.split("=").map {|x| x.strip}
+          key,*value = line.strip.split("=").map do |x|
+            remove_surrounding_quotes(x.strip)
+          end
           value = value.join('=')
           {
             name: key,
@@ -39,6 +41,16 @@ module Ufo
         end
       end
 
+      def remove_surrounding_quotes(s)
+        if s =~ /^"/ && s =~ /"$/
+          s.sub(/^["]/, '').gsub(/["]$/,'') # remove surrounding double quotes
+        elsif s =~ /^'/ && s =~ /'$/
+          s.sub(/^[']/, '').gsub(/[']$/,'') # remove surrounding single quotes
+        else
+          s
+        end
+      end
+
       def filtered_lines(text)
         lines = text.split("\n")
         # remove comment at the end of the line

data/lib/ufo/logs.rb

@@ -41,14 +41,15 @@ module Ufo
     end
 
     def cloudwatch_tail(log={})
-      since = @options[:since] || "10m" # by default, search only 10 mins in the past
-      cw_tail = AwsLogs::Tail.new(
+      o = {
         log_group_name: log["awslogs-group"],
         log_stream_name_prefix: log["awslogs-stream-prefix"],
-        since: since,
+        since: @options[:since] || "10m", # by default, search only 10 mins in the past
         follow: @options[:follow],
         format: @options[:format],
-      )
+      }
+      o[:filter_pattern] = @options[:filter_pattern] if @options[:filter_pattern]
+      cw_tail = AwsLogs::Tail.new(o)
       cw_tail.run
     end
   end

data/lib/ufo/tasks/register.rb

@@ -70,15 +70,18 @@ module Ufo
 
       definitions = data[:container_definitions]
       definitions.each_with_index do |definition, i|
-        next unless definition[:log_configuration]
-        options = definition[:log_configuration][:options]
-        next unless options
+        next unless definition[:log_configuration] || definition[:firelens_configuration]
+        { log_configuration: 'logConfiguration',
+          firelens_configuration: 'firelensConfiguration' }.each_pair do |key, value|
 
-        # LogConfiguration options do not get transformed and keep their original
-        # structure:
-        #   https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/ECS/Types/ContainerDefinition.html
-        original_definition = original_data["containerDefinitions"][i]
-        definition[:log_configuration][:options] = original_definition["logConfiguration"]["options"]
+          next unless definition.dig(key, :options)
+
+          # LogConfiguration and firelensConfiguration options do not get transformed and
+          # keep their original structure:
+          #   https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/ECS/Types/ContainerDefinition.html
+          original_definition = original_data["containerDefinitions"][i]
+          definition[key][:options] = original_definition[value]["options"]
+        end
       end
 
       data

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "4.6.0"
+  VERSION = "4.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-logs