ufo 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 653b01be727b4764ac9c022606359059e6102fe30b202461ffb1ee1665c3d4b6
-  data.tar.gz: 97a8fd6af8b07ea9c213e339dd70c23f98a74186c7ba6cd906ea38e7aba39f10
+  metadata.gz: d69cb0cf10e5170348b79e5ca64a6a593196c7e820a50d2c76e3ba667a4093cb
+  data.tar.gz: 60f41ec8d10fdf1a17265c6a6f3ad7a95777943c6246e7ee04be038241bdd2bb
 SHA512:
-  metadata.gz: d040994ee8a6b73c151d91a90847dc91ef8c3233b4b9ff65aaf731f9c585ee8093dfb0c2448ce0eddd1b5e823bbafeab5e69495319c3959ac4281b804b404ecf
-  data.tar.gz: 2e64ef5b51b100708154b160a089e118e5e06346dbf68a5a69bdc1c0894ce1762d58f4ceb073c0ec6d1c38947662edb9901cbce16ef15df1255faca06e7c7eeb
+  metadata.gz: '08b075b165b296f5efd8c45493bd5d0f71db161272a9fd7f41dfd91f9ed18d92287179029ac961f7b892c8c92e86f0a856b85fbe87d595c011cc04de89cd92e3'
+  data.tar.gz: ed0559461a50e6701d93b37bc5484c7366ddf7f9ad56f613b728b43ee1c06a3f9863bab267793f6d6977a2ce9a4ce5aac689a606021390ad69e1bb2ca3ea8cf4

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.
 
+## [5.0.2]
+- #111 Add support of credsStore
+- #112 Add support for bridge network mode
+- #113 Allow custom container name when you try to attach an existing ELB to a service
+
 ## [5.0.1]
 - #109 fix fargate
 - #110 adjust and document `managed_security_groups` setting

data/lib/ufo/ecr/auth.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 =begin
 Normally, you must authorized to AWS ECR to push to their registry with:
 
@@ -27,19 +29,15 @@ module Ufo
       return unless ecr_image?
 
       auth_token = fetch_auth_token
-      if File.exist?(docker_config)
-        data = JSON.load(IO.read(docker_config))
-        data["auths"][@repo_domain] = {auth: auth_token}
-      else
-        data = {"auths" => {@repo_domain => {auth: auth_token}}}
+      username, password = Base64.decode64(auth_token).split(':')
+
+      command = "docker login -u #{username} --password-stdin #{@repo_domain}"
+      puts "=> #{command}".color(:green)
+      *, status = Open3.capture3(command, stdin_data: password)
+      unless status.success?
+        puts "ERROR: The docker failed to login.".color(:red)
+        exit 1
       end
-
-      # Handle legacy docker clients that still have old format with https://
-      legacy_entry = "https://#{@repo_domain}"
-      data["auths"][legacy_entry] = {auth: auth_token}
-
-      ensure_dotdocker_exists
-      IO.write(docker_config, JSON.pretty_generate(data))
     end
 
     def ecr_image?
@@ -50,14 +48,5 @@ module Ufo
       ecr.get_authorization_token.authorization_data.first.authorization_token
     end
 
-    def docker_config
-      "#{ENV['HOME']}/.docker/config.json"
-    end
-
-    def ensure_dotdocker_exists
-      dirname = File.dirname(docker_config)
-      FileUtils.mkdir_p(dirname) unless File.exist?(dirname)
-    end
-
   end
 end

data/lib/ufo/stack/builder/resources/ecs.rb

@@ -21,18 +21,12 @@ class Ufo::Stack::Builder::Resources
             {Ref: "EcsDesiredCount"}
           ]
         },
-        NetworkConfiguration: {
-          AwsvpcConfiguration: {
-            Subnets: {Ref: "EcsSubnets"},
-            SecurityGroups: security_groups(:ecs)
-          }
-        },
         LoadBalancers: {
           "Fn::If": [
             "CreateTargetGroupIsTrue",
             [
               {
-                ContainerName: "web",
+                ContainerName: @container[:name],
                 ContainerPort: @container[:port],
                 TargetGroupArn: {Ref: "TargetGroup"}
               }
@@ -43,7 +37,7 @@ class Ufo::Stack::Builder::Resources
                 [],
                 [
                   {
-                    ContainerName: "web",
+                    ContainerName: @container[:name],
                     ContainerPort: @container[:port],
                     TargetGroupArn: {Ref: "ElbTargetGroup"}
                   }
@@ -56,9 +50,19 @@ class Ufo::Stack::Builder::Resources
       }
 
       props[:TaskDefinition] = @rollback_definition_arn ? @rollback_definition_arn : {Ref: "TaskDefinition"}
-      if @container[:fargate]
-        props[:LaunchType] = "FARGATE"
-        props[:NetworkConfiguration][:AwsvpcConfiguration][:AssignPublicIp] = "ENABLED" # Works with fargate but doesnt seem to work with non-fargate
+
+      if @container[:network_mode].to_s == 'awsvpc'
+        props[:NetworkConfiguration] = {
+          AwsvpcConfiguration: {
+            Subnets: {Ref: "EcsSubnets"},
+            SecurityGroups: security_groups(:ecs)
+          }
+        }
+
+        if @container[:fargate]
+          props[:LaunchType] = "FARGATE"
+          props[:NetworkConfiguration][:AwsvpcConfiguration][:AssignPublicIp] = "ENABLED" # Works with fargate but doesnt seem to work with non-fargate
+        end
       end
 
       props

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "5.0.1"
+  VERSION = "5.0.2"
 end

data/spec/lib/ecr_auth_spec.rb

@@ -1,36 +1,48 @@
 describe Ufo::Ecr::Auth do
   let(:repo_domain) { "123456789.dkr.ecr.us-east-1.amazonaws.com" }
+  let(:username) { "user" }
+  let(:password) { "opensesame" }
   let(:auth) { Ufo::Ecr::Auth.new(repo_domain) }
   before(:each) do
-    allow(auth).to receive(:fetch_auth_token).and_return("opensesame")
+    allow(auth).to receive(:fetch_auth_token).and_return(Base64.encode64("#{username}:#{password}"))
   end
 
   context("update") do
-    before(:each) do
-      clean_home
-    end
+    context("with ecr repo") do
+      context("when login successful") do
+        it "should create the auth token" do
+          command = "docker login -u #{username} --password-stdin #{repo_domain}"
+          command_result = double(success?: true)
+          expect(Open3).to receive(:capture3)
+            .with(command, stdin_data: password)
+            .and_return(['', '', command_result])
 
-    context("missing ~/.docker/config.json") do
-      it "should create the auth token" do
-        auth.update
-        data = JSON.load(IO.read("spec/fixtures/home/.docker/config.json"))
-        auth_token = data["auths"][repo_domain]["auth"]
-        expect(auth_token).to eq("opensesame")
+          auth.update
+        end
+      end
+
+      context("when login failed") do
+        it "should exit with code 1" do
+          command = "docker login -u #{username} --password-stdin #{repo_domain}"
+          command_result = double(success?: false)
+          expect(Open3).to receive(:capture3)
+            .with(command, stdin_data: password)
+            .and_return(['', '', command_result])
+          expect(auth).to receive(:exit).with(1)
+
+          auth.update
+        end
       end
     end
 
-    context("existing ~/.docker/config.json") do
-      it "should update the auth token" do
+    context("with not ecr repo") do
+      let(:repo_domain) { "example/test" }
+
+      it "should not update credentials" do
+        expect(Open3).not_to receive(:capture3)
+
         auth.update
-        data = JSON.load(IO.read("spec/fixtures/home/.docker/config.json"))
-        auth_token = data["auths"][repo_domain]["auth"]
-        expect(auth_token).to eq("opensesame")
       end
     end
   end
-
-  def clean_home
-    FileUtils.rm_rf("spec/fixtures/home")
-    FileUtils.cp_r("spec/fixtures/home_existing", "spec/fixtures/home")
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2020-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-logs