ufo 6.1.5 → 6.2.2

data/lib/ufo/task_definition/erb.rb

@@ -10,14 +10,14 @@ class Ufo::TaskDefinition
     alias_method :family, :name
 
     def run
-      logger.debug "Building Task Definition"
+      logger.info "Building Task Definition"
       clean
       load_context
       data = evaluate_code
       check_empty!(data)
       data = squeeze(data)
       write(data)
-      logger.info "Task Definition built: #{output_path}"
+      logger.info "    #{output_path}"
     end
 
     def check_empty!(data)

data/lib/ufo/task_definition/helpers/{core.rb → docker.rb}

@@ -4,13 +4,16 @@
 # * dockerfile_port - Exposed port in the Dockerfile.  Only supports one exposed port, the first one that is encountered.
 #
 module Ufo::TaskDefinition::Helpers
-  module Core
-    extend Memoist
-
+  module Docker
     def dockerfile_port
-      dockerfile_path = "#{Ufo.root}/Dockerfile"
-      if File.exist?(dockerfile_path)
-        parse_for_dockerfile_port(dockerfile_path)
+      if File.exist?("Dockerfile")
+        port = parse_for_dockerfile_port("Dockerfile")
+        return port if port
+      end
+
+      # Also consider EXPOSE in Dockerfile.base
+      if File.exist?("Dockerfile.base")
+        parse_for_dockerfile_port("Dockerfile.base")
       end
     end
 
@@ -19,24 +22,6 @@ module Ufo::TaskDefinition::Helpers
       Ufo::Docker::Builder.new({}).docker_image
     end
 
-    def env(text)
-      Vars.new(text: text).env
-    end
-    alias_method :env_vars, :env
-    alias_method :environment, :env
-
-    def env_file(path)
-      Vars.new(file: path).env
-    end
-
-    def secrets(text)
-      Vars.new(text: text).secrets
-    end
-
-    def secrets_file(path)
-      Vars.new(file: path).secrets
-    end
-
     def parse_for_dockerfile_port(dockerfile_path)
       lines = IO.read(dockerfile_path).split("\n")
       expose_line = lines.find { |l| l =~ /^EXPOSE / }

data/lib/ufo/task_definition/helpers/{aws_helper.rb → vars/aws_helper.rb}

@@ -1,4 +1,5 @@
-module Ufo::TaskDefinition::Helpers
+module Ufo::TaskDefinition::Helpers::Vars
+  # Named AwsHelper to avoid possible conflict with Aws elsewhere
   module AwsHelper
     extend Memoist
     extend ActiveSupport::Concern

data/lib/ufo/task_definition/helpers/vars/builder.rb

@@ -0,0 +1,124 @@
+require "aws_data"
+
+module Ufo::TaskDefinition::Helpers::Vars
+  class Builder
+    extend Memoist
+    include AwsHelper
+    include Ufo::Concerns::Names
+    include Ufo::Utils::Pretty
+    include Ufo::Config::CallableOption::Concern
+
+    def initialize(options={})
+      # use either file or text. text takes higher precedence
+      @file = options[:file]
+      @text = options[:text]
+    end
+
+    def content
+      @text || read(@file)
+    end
+
+    def read(path)
+      full_path = "#{Ufo.root}/#{path}"
+      unless File.exist?(full_path)
+        puts "The #{pretty_path(full_path)} env file could not be found.  Are you sure it exists?"
+        exit 1
+      end
+      IO.read(full_path)
+    end
+
+    def env
+      lines = filtered_lines(content)
+      lines.map do |line|
+        key,*value = line.strip.split("=").map do |x|
+          remove_surrounding_quotes(x.strip)
+        end
+        value = value.join('=')
+        {
+          name: key,
+          value: value,
+        }
+      end
+    end
+
+    def secrets
+      secrets = env
+      secrets.map do |item|
+        value = item.delete(:value)
+        arn = normalize_to_arn(item[:name], value)
+        value = expansion(arn)
+        value = value.sub('parameter//','parameter/') # auto fix accidental leading slash for user
+        item[:valueFrom] = value
+      end
+      secrets
+    end
+
+    def normalize_to_arn(name, value)
+      case value
+      when /^ssm:/i
+        value.sub(/^ssm:/i, "arn:aws:ssm:#{region}:#{account}:parameter/")
+      when /^secretsmanager:/i
+        value.sub(/^secretsmanager:/i, "arn:aws:secretsmanager:#{region}:#{account}:secret:")
+      when '' # blank string will mean use convention
+        conventional_pattern(name, value)
+      else
+        value # assume full arn has been passed
+      end
+    end
+
+    # arn:aws:ssm:us-west-2:111111111111:parameter/demo/dev/DB-NAME
+    # arn:aws:ssm:us-west-2:111111111111:parameter/demo/dev/DB-NAME
+    def expansion(arn)
+      # performance improvement only run names.expansion on the name portion
+      md = arn.match(/(.*:)(parameter\/|secret:)(.*)/)
+      prefix, type, name = md[1], md[2], md[3]
+      expanded_name = names.expansion(name, dasherize: false) # dasherize: false. dont turn SECRET_NAME => SECRET-NAME
+      "#{prefix}#{type}#{expanded_name}"
+    end
+
+    # Examples with config.secrets.provider = "ssm"
+    #
+    # .secrets
+    #
+    #      DB_NAME
+    #
+    # Results
+    #
+    #      DB_NAME=:APP/:ENV/:SECRET_NAME # expansion will use => demo/dev/DB_NAME
+    #
+    def conventional_pattern(name, value)
+      secrets = Ufo.config.secrets
+      provider = secrets.provider # ssm or secretsmanager
+      namespace = provider == "ssm" ? "parameter/" : "secret:"
+
+      config_name = "secrets.pattern.#{provider}"
+      pattern = callable_option(
+        config_name: config_name, # Ufo.config.names.stack => :APP-:ROLE-:ENV => demo-web-dev
+        passed_args: [self],
+      )
+      # replace :SECRET_NAME since names expand doesnt know how to nor do we want to add logic there
+      pattern = pattern.sub(':SECRET_NAME', name)
+      "arn:aws:#{provider}:#{region}:#{account}:#{namespace}#{pattern}"
+    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(content)
+      lines = content.split("\n")
+      # remove comment at the end of the line
+      lines.map! { |l| l.sub(/\s+#.*/,'').strip }
+      # filter out commented lines
+      lines = lines.reject { |l| l =~ /(^|\s)#/i }
+      # filter out empty lines
+      lines = lines.reject { |l| l.strip.empty? }
+    end
+  end
+end

data/lib/ufo/task_definition/helpers/vars.rb

@@ -1,124 +1,21 @@
-require "aws_data"
-
 module Ufo::TaskDefinition::Helpers
-  class Vars
-    extend Memoist
-    include AwsHelper
-    include Ufo::Concerns::Names
-    include Ufo::Utils::Pretty
-    include Ufo::Config::CallableOption::Concern
-
-    def initialize(options={})
-      # use either file or text. text takes higher precedence
-      @file = options[:file]
-      @text = options[:text]
-    end
-
-    def content
-      @text || read(@file)
-    end
-
-    def read(path)
-      full_path = "#{Ufo.root}/#{path}"
-      unless File.exist?(full_path)
-        puts "The #{pretty_path(full_path)} env file could not be found.  Are you sure it exists?"
-        exit 1
-      end
-      IO.read(full_path)
-    end
-
-    def env
-      lines = filtered_lines(content)
-      lines.map do |line|
-        key,*value = line.strip.split("=").map do |x|
-          remove_surrounding_quotes(x.strip)
-        end
-        value = value.join('=')
-        {
-          name: key,
-          value: value,
-        }
-      end
+  module Vars
+    def env(text)
+      Builder.new(text: text).env
     end
+    alias_method :env_vars, :env
+    alias_method :environment, :env
 
-    def secrets
-      secrets = env
-      secrets.map do |item|
-        value = item.delete(:value)
-        arn = normalize_to_arn(item[:name], value)
-        value = expansion(arn)
-        value = value.sub('parameter//','parameter/') # auto fix accidental leading slash for user
-        item[:valueFrom] = value
-      end
-      secrets
-    end
-
-    def normalize_to_arn(name, value)
-      case value
-      when /^ssm:/i
-        value.sub(/^ssm:/i, "arn:aws:ssm:#{region}:#{account}:parameter/")
-      when /^secretsmanager:/i
-        value.sub(/^secretsmanager:/i, "arn:aws:secretsmanager:#{region}:#{account}:secret:")
-      when '' # blank string will mean use convention
-        conventional_pattern(name, value)
-      else
-        value # assume full arn has been passed
-      end
-    end
-
-    # arn:aws:ssm:us-west-2:111111111111:parameter/demo/dev/DB-NAME
-    # arn:aws:ssm:us-west-2:111111111111:parameter/demo/dev/DB-NAME
-    def expansion(arn)
-      # performance improvement only run names.expansion on the name portion
-      md = arn.match(/(.*:)(parameter\/|secret:)(.*)/)
-      prefix, type, name = md[1], md[2], md[3]
-      expanded_name = names.expansion(name, dasherize: false) # dasherize: false. dont turn SECRET_NAME => SECRET-NAME
-      "#{prefix}#{type}#{expanded_name}"
-    end
-
-    # Examples with config.secrets.provider = "ssm"
-    #
-    # .secrets
-    #
-    #      DB_NAME
-    #
-    # Results
-    #
-    #      DB_NAME=:APP/:ENV/:SECRET_NAME # expansion will use => demo/dev/DB_NAME
-    #
-    def conventional_pattern(name, value)
-      secrets = Ufo.config.secrets
-      provider = secrets.provider # ssm or secretsmanager
-      namespace = provider == "ssm" ? "parameter/" : "secret:"
-
-      config_name = "secrets.pattern.#{provider}"
-      pattern = callable_option(
-        config_name: config_name, # Ufo.config.names.stack => :APP-:ROLE-:ENV => demo-web-dev
-        passed_args: [self],
-      )
-      # replace :SECRET_NAME since names expand doesnt know how to nor do we want to add logic there
-      pattern = pattern.sub(':SECRET_NAME', name)
-      "arn:aws:#{provider}:#{region}:#{account}:#{namespace}#{pattern}"
+    def env_file(path)
+      Builder.new(file: path).env
     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
+    def secrets(text)
+      Builder.new(text: text).secrets
     end
 
-    def filtered_lines(content)
-      lines = content.split("\n")
-      # remove comment at the end of the line
-      lines.map! { |l| l.sub(/\s+#.*/,'').strip }
-      # filter out commented lines
-      lines = lines.reject { |l| l =~ /(^|\s)#/i }
-      # filter out empty lines
-      lines = lines.reject { |l| l.strip.empty? }
+    def secrets_file(path)
+      Builder.new(file: path).secrets
     end
   end
 end

data/lib/ufo/upgrade/upgrade4.rb

@@ -24,7 +24,6 @@ class Ufo::Upgrade
       upsert_dockerignore
       upsert_gitignore
       update_params_yaml
-      update_task_definitions
       new_files
     end
 
@@ -34,14 +33,6 @@ class Ufo::Upgrade
     end
 
   private
-    def update_task_definitions
-      text = <<-EOL
-    # HINT: shows how Ufo.extra can to create different log groups
-    # awslogs_group: ["ecs/TASK_DEFINITION_NAME", Ufo.extra].compact.join('-'),
-EOL
-      insert_into_file ".ufo/task_definitions.rb", text, :before => /    awslogs_group:/
-    end
-
     def new_files
       configure_network_settings
       template(".ufo/settings/network/default.yml")

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "6.1.5"
+  VERSION = "6.2.2"
 end

data/ufo.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk-ecr"
   spec.add_dependency "aws-sdk-ecs"
   spec.add_dependency "aws-sdk-elasticloadbalancingv2"
+  spec.add_dependency "aws-sdk-s3"
   spec.add_dependency "aws-sdk-ssm"
   spec.add_dependency "aws-sdk-wafv2"
   spec.add_dependency "aws_data"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 6.1.5
+  version: 6.2.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-logs
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ssm
   requirement: !ruby/object:Gem::Requirement
@@ -445,6 +459,12 @@ files:
 - ".cody/acceptance/role.rb"
 - ".cody/shared/script/install.sh"
 - ".cody/shared/script/install/ufo.sh"
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/documentation.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/ISSUE_TEMPLATE/question.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
@@ -472,6 +492,7 @@ files:
 - lib/ufo.rb
 - lib/ufo/autoloader.rb
 - lib/ufo/aws_services.rb
+- lib/ufo/aws_services/concerns.rb
 - lib/ufo/booter.rb
 - lib/ufo/cfn/base.rb
 - lib/ufo/cfn/deploy.rb
@@ -581,6 +602,10 @@ files:
 - lib/ufo/docker/dockerfile.rb
 - lib/ufo/docker/pusher.rb
 - lib/ufo/docker/state.rb
+- lib/ufo/docker/state/base.rb
+- lib/ufo/docker/state/bucket.rb
+- lib/ufo/docker/state/file.rb
+- lib/ufo/docker/state/s3.rb
 - lib/ufo/ecr/auth.rb
 - lib/ufo/ecr/cleaner.rb
 - lib/ufo/ecs/service.rb
@@ -598,6 +623,9 @@ files:
 - lib/ufo/logger/formatter.rb
 - lib/ufo/names.rb
 - lib/ufo/param.rb
+- lib/ufo/s3/aws_setup.rb
+- lib/ufo/s3/bucket.rb
+- lib/ufo/s3/rollback.rb
 - lib/ufo/task_definition.rb
 - lib/ufo/task_definition/builder.rb
 - lib/ufo/task_definition/context.rb
@@ -607,14 +635,15 @@ files:
 - lib/ufo/task_definition/erb/yaml.rb
 - lib/ufo/task_definition/helpers.rb
 - lib/ufo/task_definition/helpers/acm.rb
-- lib/ufo/task_definition/helpers/aws_helper.rb
-- lib/ufo/task_definition/helpers/core.rb
+- lib/ufo/task_definition/helpers/docker.rb
 - lib/ufo/task_definition/helpers/ecr.rb
 - lib/ufo/task_definition/helpers/expansion.rb
 - lib/ufo/task_definition/helpers/ssm.rb
 - lib/ufo/task_definition/helpers/ssm/fetcher.rb
 - lib/ufo/task_definition/helpers/stack_output.rb
 - lib/ufo/task_definition/helpers/vars.rb
+- lib/ufo/task_definition/helpers/vars/aws_helper.rb
+- lib/ufo/task_definition/helpers/vars/builder.rb
 - lib/ufo/task_definition/helpers/vpc.rb
 - lib/ufo/task_definition/helpers/waf.rb
 - lib/ufo/upgrade/params.yml