ufo 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52f0ef8e22102e9fc1ae63ae8074d39678bc575a457a94d04ffd0ec07e6c6938
-  data.tar.gz: aa281a52edbafa042a7005e8b7dd8ae687126c201197f7dbee220c30b239af88
+  metadata.gz: 577e905ee782f5880d9d9e5bc69ee622e65b7ded641ea3bbcc48e022bd409a07
+  data.tar.gz: b47e630a786fa437df2662879fc2697605a01b1523346ca5718da276db1c20c8
 SHA512:
-  metadata.gz: '09506b8a70f79e4cb98292d5783ea875220eb02efb15098148b81a080a67820acf65926d1fe96ae50c9c1f41637a10fa4d4c20bb563af5948624f3a9f52378d2'
-  data.tar.gz: 370f8cf93cfa5010d90ef92bb5fd2a2b43828ee31e4bd211ccf14221ba34b90cc51f46eaf2f58b31b28a7f7df37793b8d9e1fdf94429331bc31dd61e3e3138f2
+  metadata.gz: c10fb1658f61cb08b868dc2d7adc473fd618e0e9a8556567908ae7e4745651c33bc25d4ac92046ddf6113ef05a633a10dfdbe88751fab4e45405ef043c8fda76
+  data.tar.gz: e322a656ae5e18b423af595a80b111b706c804975f8f0a8adb1ad9e8be4fae9b1972ad994500d8a97e4f0ab24dad712605fe0e286a0992bd9842e2db56cb2239

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.
 
+## [3.4.2]
+- Merge pull request #33 from tongueroo/rubyize_format
+- improve rubyize_format so that original log configuration options are kept
+
 ## [3.4.1]
 - Merge pull request #32 from tongueroo/fix-log-configuration
 - fix log configuration dasherization

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ufo (3.4.1)
+    ufo (3.4.2)
       aws-sdk-cloudwatchlogs
       aws-sdk-ec2
       aws-sdk-ecr

data/lib/ufo/tasks/register.rb

@@ -22,10 +22,10 @@ module Ufo
 
     # aws ecs register-task-definition --cli-input-json file://.ufo/output/hi-web-prod.json
     def register
-      data = JSON.parse(IO.read(@template_definition_path), symbolize_names: true)
-      data = data.to_snake_keys
-      data = dasherize_log_configuation_option(data)
-    message = "#{data[:family]} task definition registered."
+      data = JSON.parse(IO.read(@template_definition_path))
+      puts "@template_definition_path #{@template_definition_path.inspect}"
+      data = rubyize_format(data)
+      message = "#{data[:family]} task definition registered."
       if @options[:noop]
         message = "NOOP: #{message}"
       else
@@ -53,19 +53,28 @@ module Ufo
       end
     end
 
-    # LogConfiguration requires a string with dashes as the keys
-    # https://docs.aws.amazon.com/sdkforruby/api/Aws/ECS/Client.html
-    def dasherize_log_configuation_option(data)
+    # The ruby aws-sdk expects symbols for keys and AWS docs for the task
+    # definition uses json camelCase for the keys.  This method transforms
+    # the keys to the expected ruby aws-sdk format.
+    #
+    # One quirk is that the logConfiguration options casing should not be
+    # transformed.
+    def rubyize_format(original_data)
+      data = original_data.to_snake_keys.deep_symbolize_keys
+
       definitions = data[:container_definitions]
-      definitions.each do |definition|
+      definitions.each_with_index do |definition, i|
         next unless definition[:log_configuration]
         options = definition[:log_configuration][:options]
         next unless options
 
-        options["awslogs-group"] = options.delete(:awslogs_group)
-        options["awslogs-region"] = options.delete(:awslogs_region)
-        options["awslogs-stream-prefix"] = options.delete(:awslogs_stream_prefix)
+        # 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"]
       end
+
       data
     end
   end

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "3.4.1"
+  VERSION = "3.4.2"
 end

data/spec/lib/cli_spec.rb

@@ -18,6 +18,14 @@ describe Ufo::CLI do
     end
 
     context "tasks" do
+      before(:each) do
+        FileUtils.mkdir_p("#{Ufo.root}/.ufo/data/")
+        FileUtils.touch("#{Ufo.root}/.ufo/data/docker_image_name_ufo.txt")
+      end
+      after(:each) do
+        FileUtils.rm_f("#{Ufo.root}/.ufo/data/docker_image_name_ufo.txt")
+      end
+
       it "build builds task definition" do
         out = execute("exe/ufo tasks build #{@args}")
         expect(out).to include("Task Definitions built")

data/spec/lib/register_spec.rb

@@ -8,16 +8,16 @@ describe Ufo::Tasks::Register do
   context "syslog" do
     let(:data) do
       {
-        "container_definitions": [{
-          "logConfiguration": {
-            "logDriver": "syslog"
+        "containerDefinitions" => [{
+          "logConfiguration" => {
+            "logDriver" => "syslog"
           }
         }]
-      }.to_snake_keys.deep_symbolize_keys
+      }
     end
 
-    it "dasherizes log configuration option" do
-      result = register.dasherize_log_configuation_option(data)
+    it "#rubyize_format" do
+      result = register.rubyize_format(data)
       driver = result[:container_definitions][0][:log_configuration][:log_driver]
       expect(driver).to eq "syslog"
     end
@@ -26,21 +26,21 @@ describe Ufo::Tasks::Register do
   context "awslogs" do
     let(:data) do
       {
-        "container_definitions": [{
-          "logConfiguration": {
-            "logDriver": "awslogs",
-            "options": {
-              "awslogs-group": "mygroup",
-              "awslogs-region": "us-east-1",
-              "awslogs-stream-prefix": "mystream"
+        "containerDefinitions" => [{
+          "logConfiguration" => {
+            "logDriver" => "awslogs",
+            "options" => {
+              "awslogs-group" => "mygroup",
+              "awslogs-region" => "us-east-1",
+              "awslogs-stream-prefix" => "mystream"
             }
           }
         }]
-      }.to_snake_keys.deep_symbolize_keys
+      }
     end
 
-    it "dasherizes log configuration option" do
-      result = register.dasherize_log_configuation_option(data)
+    it "rubyize_format" do
+      result = register.rubyize_format(data)
       log_configuration = result[:container_definitions][0][:log_configuration]
       expect(log_configuration[:log_driver]).to eq "awslogs"
       expect(log_configuration[:options].keys).to include("awslogs-group")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Tung Nguyen