aws_as_code 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eade5597ca3f105f6391f9d610d8f221fb206e67
-  data.tar.gz: 0416d1eae2493a8bf05d8d3a35cbf900b598f0f4
+  metadata.gz: 845781da3a27dfdea57874670229deee74f64c31
+  data.tar.gz: e3ca61b0478a6e28b19d7ebab071fdee03dc14ba
 SHA512:
-  metadata.gz: 94799f73045ee7899ed3301c9f6308a5322d9baeb3382817fdb70bd939a4cb5a9d36cf4c7747c58170653a1d2583f0867af8508c07b6ce4c8f1cb59ffc1785af
-  data.tar.gz: bc3ea12b89769e178244729d96066e415527eeb966677eced702e61c7be314185a0880b662accac95d2ce9ee5996838d0acee70ec3639d0e6657b883fd5682e4
+  metadata.gz: 45590824f2c89688adc10c8edbac361eb7aa15a041eae67d404a565607f0246d4ecdf616114d3f520187cec8f822fc82b3725fc63260b25eebf8f0ef439a3a39
+  data.tar.gz: fd4970255bcc21d2ce6ec03875eb717e60e30142bd2d106b5f2f25985a0f08320dc7494e957592f2183fc977d2b7fe52605df67f9ab53e98800cb50402bd31ad

data/.rubocop.yml

@@ -8,6 +8,7 @@ AllCops:
   - "spec/**/*"
   - "features/**/*"
   - "db/schema.rb"
+  - "*.gemspec"
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes

data/bin/aws-as-code

@@ -0,0 +1 @@
+require_relative "../exe/aws-as-code"

data/exe/aws-as-code

@@ -14,11 +14,14 @@ DEFAULT_TEMPLATE = "environment".freeze
 
 # Main CLI application for aws-as-code gem
 class AwsAsCodeCli < Thor
+  class_option :config_dir, default: DEFAULT_RUBY_DIR
   class_option :ruby_dir, default: DEFAULT_RUBY_DIR
   class_option :json_dir, default: DEFAULT_JSON_DIR
   class_option :bucket, required: true
   class_option :template, default: DEFAULT_TEMPLATE
   class_option :stack, default: DEFAULT_STACK
+  class_option :stack_params, type: :hash, default: Hash[]
+  class_option :version, required: true
 
   desc "compile", "compile cfndsl to CF JSON"
   def compile

data/lib/aws_as_code.rb

@@ -2,8 +2,54 @@
 require "aws_as_code/version"
 require "aws_as_code/stack_state_semaphore"
 require "aws_as_code/concerns/aws_task_helpers"
+require "aws_as_code/dsl/cache_instances"
+require "aws_as_code/dsl/ec2_instances"
+require "aws_as_code/dsl/rds_instances"
 require "aws_as_code/task/base"
 require "aws_as_code/task/compile"
 require "aws_as_code/task/upload"
 require "aws_as_code/task/create"
 require "aws_as_code/task/update"
+
+module CfnDsl
+  class JSONable
+    def parameter_type(type)
+      case type
+      when "String" then String()
+      when "Number" then Number()
+      when "CommaDelimitedList" then CommaDelimitedList()
+      else raise ArgumentError, "Unknown parameter type #{type}"
+      end
+    end
+
+    def inputs(env = nil)
+      params(env).each do |name, data|
+        Parameter name do
+          parameter_type data["Type"]
+
+          Default data["Default"] unless data["Default"].nil?
+          Description data["Description"] unless data["Description"].nil?
+        end
+      end
+    end
+
+    def env_passthrough(env = nil)
+      Hash[
+        params(env).to_a.map do |pair|
+          k = pair.first
+          [k, Ref(k)]
+        end
+      ]
+    end
+
+    def env_ebs_options(env = nil)
+      params(env).map do |name, data|
+        {
+          Namespace: "aws:elasticbeanstalk:application:environment",
+          OptionName: data["_ext"]["env"],
+          Value: Ref(name)
+        }
+      end
+    end
+  end
+end

data/lib/aws_as_code/concerns/aws_task_helpers.rb

@@ -21,7 +21,8 @@ module AwsAsCode
 
       def template_object
         bucket = s3.bucket config.bucket
-        bucket.object "#{config.stack}/#{config.template}.json"
+        prefix = "#{config.stack}/#{config.version}"
+        bucket.object "#{prefix}/#{config.template}.json"
       end
     end
   end

data/lib/aws_as_code/dsl/cache_instances.rb

@@ -0,0 +1,14 @@
+CACHE_INSTANCE_CLASSES = %w(
+  cache.t2.micro
+  cache.t2.small
+  cache.t2.medium
+  cache.m3.medium
+  cache.m3.large
+  cache.m3.xlarge
+  cache.m3.2xlarge
+  cache.r3.large
+  cache.r3.xlarge
+  cache.r3.2xlarge
+  cache.r3.4xlarge
+  cache.r3.8xlarge
+).freeze

data/lib/aws_as_code/dsl/ec2_instances.rb

@@ -0,0 +1,41 @@
+EC2_INSTANCE_CLASSES = %w(
+  c3.2xlarge
+  c3.4xlarge
+  c3.8xlarge
+  c3.large
+  c3.xlarge
+  c4.2xlarge
+  c4.4xlarge
+  c4.8xlarge
+  c4.large
+  c4.xlarge
+  d2.2xlarge
+  d2.4xlarge
+  d2.xlarge
+  d3.8xlarge
+  g2.2xlarge
+  g2.8xlarge
+  i2.2xlarge
+  i2.4xlarge
+  i2.8xlarge
+  i2.xlarge
+  m3.2xlarge
+  m3.large
+  m3.medium
+  m3.xlarge
+  m4.10xlarge
+  m4.2xlarge
+  m4.4xlarge
+  m4.large
+  m4.xlarge
+  r3.2xlarge
+  r3.4xlarge
+  r3.8xlarge
+  r3.large
+  r3.xlarge
+  t2.large
+  t2.medium
+  t2.micro
+  t2.nano
+  t2.small
+).freeze

data/lib/aws_as_code/dsl/rds_instances.rb

@@ -0,0 +1,14 @@
+RDS_INSTANCE_CLASSES = %w(
+  db.m3.medium
+  db.m3.large
+  db.m3.xlarge
+  db.m3.2xlarge
+  db.r3.large
+  db.r3.xlarge
+  db.r3.2xlarge
+  db.r3.4xlarge
+  db.r3.8xlarge
+  db.t2.micro
+  db.t2.small
+  db.t2.medium
+).freeze

data/lib/aws_as_code/stack_state_semaphore.rb

@@ -15,7 +15,9 @@ module AwsAsCode
     end
 
     def wait_for_stack_availability(stack)
-      stack.wait_until(max_attempts: 360, delay: 10) do |s|
+      # Note that stack can have old state cached, hence explicit
+      # .reload here
+      stack.reload.wait_until(max_attempts: 360, delay: 10) do |s|
         if in_progress? s
           log_waiting s
           false

data/lib/aws_as_code/task/compile.rb

@@ -1,4 +1,6 @@
 require "cfndsl"
+require "yaml"
+require "fileutils"
 
 # frozen_string_literal: true
 module AwsAsCode
@@ -18,17 +20,73 @@ module AwsAsCode
 
       private
 
+      def load_params
+        param_filename = File.join config.config_dir, "parameters.yml"
+        return [] unless File.exist? param_filename
+        YAML.load_file(param_filename).to_a
+      end
+
+      def def_params
+        pairs = load_params
+
+        CfnDsl::JSONable.send :define_method, :params do |env = nil|
+          pairs.reject do |pair|
+            data = pair.last
+            services = data["_ext"]["services"]
+
+            !env.nil? &&
+              !services.nil? &&
+              !services.include?(env)
+          end.to_h
+        end
+      end
+
+      def def_template_url
+        c = config
+        CfnDsl::JSONable.send :define_method, :template_url do |name|
+          prefix = "#{c.stack}/#{c.version}"
+          "https://s3.amazonaws.com/#{c.bucket}/#{prefix}/#{name}.json"
+        end
+      end
+
+      def load_settings
+        filename = File.join config.config_dir, "settings.yml"
+        YAML.load_file(filename)
+      end
+
+      def def_settings
+        data = load_settings
+        c = config
+        CfnDsl::JSONable.send :define_method, :setting do |name|
+          data[name][c.stack] || data[name]["_default"]
+        end
+      end
+
       def compile_single_file(filename)
-        output_filename = File.basename(filename, ".rb") + ".json"
-        output_pathname = File.join config.json_dir, output_filename
+        def_params
+        def_settings
+        def_template_url
+
+        cfn = binding.eval(File.read(filename), filename)
+        save_output cfn, filename
+      end
+
+      def save_output(cfn, filename)
+        dest = File.join config.json_dir,
+                         output_pathname(filename)
 
-        cfn = CfnDsl.eval_file_with_extras(
-          filename,
-          [],
-          STDERR
-        )
+        dirname = File.dirname(dest)
+        FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+
+        File.open(dest, "w") { |f| f.write cfn.to_json }
+      end
 
-        File.open(output_pathname, "w") { |f| f.write cfn.to_json }
+      def output_pathname(filename)
+        Pathname
+          .new(filename)
+          .relative_path_from(Pathname.new(config.ruby_dir))
+          .sub_ext(".json")
+          .to_s
       end
 
       def input_files

data/lib/aws_as_code/task/create.rb

@@ -8,9 +8,21 @@ module AwsAsCode
         cloud_formation
           .create_stack stack_name: config.stack,
                         template_url: template_object.public_url,
-                        parameters: []
+                        parameters: parameters
         semaphore.wait_for_stack_availability stack
       end
+
+      private
+
+      def parameters
+        config.stack_params.to_a.map do |pair|
+          k, v = pair
+          {
+            parameter_key: k.to_s,
+            parameter_value: v
+          }
+        end
+      end
     end
   end
 end

data/lib/aws_as_code/task/update.rb

@@ -9,9 +9,49 @@ module AwsAsCode
           cloud_formation
             .update_stack stack_name: config.stack,
                           template_url: template_object.public_url,
-                          parameters: []
+                          parameters: parameters
         end
       end
+
+      private
+
+      def parameters
+        existing_parameters + overridden_parameters
+      end
+
+      def existing_parameters
+        keys = stack.parameters.map(&:parameter_key)
+        (keys - removed_keys - overridden_keys).map do |key|
+          {
+            parameter_key: key,
+            use_previous_value: true
+          }
+        end
+      end
+
+      def removed_keys
+        config.stack_params.to_a.map do |pair|
+          k, v = pair
+          v.empty? ? k.to_s : nil
+        end.compact
+      end
+
+      def overridden_keys
+        overridden_parameters.map { |p| p[:parameter_key] }
+      end
+
+      def overridden_parameters
+        config.stack_params.to_a.map do |pair|
+          k, v = pair
+
+          next nil if v.empty?
+
+          {
+            parameter_key: k.to_s,
+            parameter_value: v
+          }
+        end.compact
+      end
     end
   end
 end

data/lib/aws_as_code/task/upload.rb

@@ -30,7 +30,11 @@ module AwsAsCode
               .relative_path_from(config_path)
               .to_s
 
-        [config.stack, key].join("/")
+        [
+          config.stack,
+          config.version,
+          key
+        ].join("/")
       end
 
       def input_files

data/lib/aws_as_code/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module AwsAsCode
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_as_code
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Konstantin Burnaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-25 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfndsl
@@ -213,12 +213,16 @@ files:
 - README.md
 - Rakefile
 - aws-as-code.gemspec
+- bin/aws-as-code
 - bin/console
 - bin/setup
 - circle.yml
 - exe/aws-as-code
 - lib/aws_as_code.rb
 - lib/aws_as_code/concerns/aws_task_helpers.rb
+- lib/aws_as_code/dsl/cache_instances.rb
+- lib/aws_as_code/dsl/ec2_instances.rb
+- lib/aws_as_code/dsl/rds_instances.rb
 - lib/aws_as_code/stack_state_semaphore.rb
 - lib/aws_as_code/task/base.rb
 - lib/aws_as_code/task/compile.rb