ECSD 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85921421f89d6887512a3a5d71d84872afd6d0edd5cb5a06c60587bc419ac14e
-  data.tar.gz: 76d1c4978c067f94d239d6991c126e7c2383ed26dba00cd246357d7e1c48fb9e
+  metadata.gz: 0f19066645944c5f7ecff8ea1f68a7155a2aab15d9f8a818bd72823aeed8f4de
+  data.tar.gz: 3a1d043775d82bd332530f3f390a65d4e96d77249bca1865a3840693e5ad8261
 SHA512:
-  metadata.gz: 27abc6484c4c5d1a921338c9e942dabd735cd7294e7ca653a979b8ef1d9645194932c06a601af66e60a7204dd86c56f22aceeac10cf0e5331fafa5bcc065b3b7
-  data.tar.gz: af3fc571207e37fe660b4abfb558857892fcb2ef8cd0234d31ace182b0269b845202597a3be351afd7dbad4406cd22d90028435d74598e5c69f45056716a9570
+  metadata.gz: 504a3ce9d65b4a6a84d5f7ae83ea67cc9160df44bdcb4ae6521846cd88b8efbd2fb1bf5be40f589d95cc31b8012dae22eed512b951fb5114bc0b83fc0825b1bd
+  data.tar.gz: 4a63c8319d9a9f6997d35158843e8160819205b6a8a06039ac9ca3da841911ca541562b16e24791c159f296d7759b1a64a51e5377db95a5c59386d41f8d5c87c

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.1.1
+
+- fix task_revision value type
+
+# 1.1.0
+
+- add json export file format support
+
 # 1.0.1
 
 - fix mapped response instead of 'each'

data/README.md

@@ -12,7 +12,7 @@ First create AWS IAM user with roles for describe and list.
 
 Then add gem to your service:
 ```ruby
-gem 'ECSD', '~> 1.0'
+gem 'ECSD', '~> 1.1.0'
 ```
 Or install directly:
 ```

data/lib/ecsd/config.rb

@@ -24,6 +24,10 @@ module ECSD
       # @param payload [Hash] { export_path: 'path/to/folder', timeout: 0 }
       def options=(payload)
         payload[:export_path] ||= ECSD::DEFAULT_EXPORT_PATH
+        payload[:export_format] ||= ECSD::Constants::DEFAULT_EXPORT_FORMAT
+        unless [Constants::FORMATS[:json], Constants::FORMATS[:yml]].include?(payload[:export_format])
+          raise UnknownExportFormatError, "Invalid export format: #{payload[:export_format]}"
+        end
         payload[:timeout] ||= 0
         super(payload)
       end

data/lib/ecsd/constants.rb

@@ -2,6 +2,8 @@ module ECSD
   module Constants
     DEFAULT_METRICS_PATH = '/metrics'.freeze
     DEFAULT_EXPORT_PATH = (File.expand_path('../..', __dir__) << '/export').freeze
+    FORMATS = { json: 'json', yml: 'yml' }.freeze
+    DEFAULT_EXPORT_FORMAT = FORMATS[:yml]
     LAUNCH_TYPE = 'EC2'.freeze
     CONNECTIVITY = {
       connected: 'CONNECTED'

data/lib/ecsd/errors.rb

@@ -1,6 +1,8 @@
 module ECSD
   class BaseError < RuntimeError; end
 
+  class UnknownExportFormatError < BaseError; end
+
   class Config
     class ValidationError < BaseError; end
   end

data/lib/ecsd/helpers/common.rb

@@ -2,8 +2,15 @@ module ECSD
   module Helpers
     module Common
       def write_to_file(cluster, data, path = ECSD.config.options[:export_path] || DEFAULT_EXPORT_PATH)
-        File.open("#{path}/#{cluster.downcase}.yml", 'w') do |f|
-          f.write(data.join)
+        format = ECSD.config.options[:export_format]
+        content = case format
+                  when ECSD::Constants::FORMATS[:yml]
+                    YAML.dump(data)
+                  when ECSD::Constants::FORMATS[:json]
+                    data.to_json
+                  end
+        File.open("#{path}/#{cluster.downcase}.#{format}", 'w') do |f|
+          f.write(content)
         end
       end
 

data/lib/ecsd/template.rb

@@ -10,17 +10,17 @@ module ECSD
                         container_name:,
                         instance_id:,
                         metrics_path: DEFAULT_METRICS_PATH|
-    <<~TEXT
-      - targets:
-        - #{ip_addr}:#{dyn_port}
-        labels:
-          task_id: #{task_id}
-          task_definition_name: #{task_definition_name}
-          task_revision: #{task_revision}
-          cluster_name: #{cluster_name}
-          container_name: #{container_name}
-          instance_id: #{instance_id}
-          __metrics_path__: #{metrics_path}
-    TEXT
+    {
+      "targets" => ["#{ip_addr}:#{dyn_port}"],
+      "labels" => {
+        "task_id" => task_id,
+        "task_definition_name" => task_definition_name,
+        "task_revision" => task_revision,
+        "cluster_name" => cluster_name,
+        "container_name" => container_name,
+        "instance_id" => instance_id,
+        "__metrics_path__" => metrics_path
+      }
+    }
   end
 end

data/lib/ecsd/version.rb

@@ -1,3 +1,3 @@
 module ECSD
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.1'.freeze
 end

data/lib/ecsd.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'json'
+require 'yaml'
 
 require 'aws-sdk-ecs'
 require 'aws-sdk-ec2'

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ECSD
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Anton Shevtsov
+- Anton Kotenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2025-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ec2