cody 0.9.5 → 1.0.1

data/lib/cody/schedule.rb

@@ -1,13 +1,12 @@
 module Cody
-  class Schedule
+  class Schedule < Dsl::Base
     include Cody::Dsl::Schedule
     include Evaluate
     include Variables
 
     def initialize(options={})
-      @options = options
+      super
       @schedule_path = options[:schedule_path] || get_schedule_path
-      @properties = default_properties
       @iam_policy = {}
     end
 
@@ -18,27 +17,27 @@ module Cody
       load_variables
       evaluate(@schedule_path)
 
-      @properties[:schedule_expression] = @schedule_expression if @schedule_expression
+      @properties[:ScheduleExpression] = @schedule_expression if @schedule_expression
       set_rule_event! if @rule_event_props
       return if old_properties == @properties # empty schedule.rb file
 
       resource = {
-        events_rule: {
-          type: "AWS::Events::Rule",
-          properties: @properties
+        EventsRule: {
+          Type: "AWS::Events::Rule",
+          Properties: @properties
         },
-        events_rule_role: events_rule_role,
+        EventsRuleRole: events_rule_role,
       }
-      CfnCamelizer.transform(resource)
+      auto_camelize(resource)
     end
 
     def set_rule_event!
       props = @rule_event_props
-      if props.key?(:detail)
-        description = props.key?(:description) ? props.delete(:description) : rule_description
-        rule_props = { event_pattern: props, description: description }
-      else # if props.key?(:event_pattern)
-        props[:description] ||= rule_description
+      if props.key?(:Detail)
+        description = props.key?(:Description) ? props.delete(:Description) : rule_description
+        rule_props = { EventPattern: props, description: description }
+      else # if props.key?(:EventPattern)
+        props[:Description] ||= rule_description
         rule_props = props
       end
 
@@ -49,15 +48,15 @@ module Cody
       description = "Cody #{@options[:full_project_name]}"
       name = description.gsub(" ", "-").downcase
       {
-        description: "#{description} CodeBuild project",
-        # event_pattern: ,
-        name: name,
-        # schedule_expression: ,
-        state: "ENABLED",
-        targets: [{
-          arn: { "Fn::GetAtt": "CodeBuild.Arn" },
-          role_arn: { "Fn::GetAtt": "EventsRuleRole.Arn" }, # required for specific CodeBuild target.
-          id: "CodeBuildTarget",
+        Description: "#{description} CodeBuild project",
+        # EventPattern: ,
+        Name: name,
+        # ScheduleExpression: ,
+        State: "ENABLED",
+        Targets: [{
+          Arn: { "Fn::GetAtt": "CodeBuild.Arn" },
+          RoleArn: { "Fn::GetAtt": "EventsRuleRole.Arn" }, # required for specific CodeBuild target.
+          Id: "CodeBuildTarget",
         }]
       }
     end
@@ -69,25 +68,25 @@ module Cody
 
     def events_rule_role
       {
-        type: "AWS::IAM::Role",
-        properties: {
-          assume_role_policy_document: {
-            statement: [{
-              action: [ "sts:AssumeRole" ],
-              effect: "Allow",
-              principal: { service: [ "events.amazonaws.com" ] }
+        Type: "AWS::IAM::Role",
+        Properties: {
+          AssumeRolePolicyDocument: {
+            Statement: [{
+              Action: [ "sts:AssumeRole" ],
+              Effect: "Allow",
+              Principal: { Service: [ "events.amazonaws.com" ] }
             }],
-            version: "2012-10-17"
+            Version: "2012-10-17"
           },
-          path: "/",
-          policies: [{
-            policy_name: "CodeBuildAccess",
-            policy_document: {
-              version: "2012-10-17",
-              statement: [{
-                action: "codebuild:StartBuild",
-                effect: "Allow",
-                resource: "arn:aws:codebuild:#{aws_data.region}:#{aws_data.account}:project/#{@options[:full_project_name]}"
+          Path: "/",
+          Policies: [{
+            PolicyName: "CodeBuildAccess",
+            PolicyDocument: {
+              Version: "2012-10-17",
+              Statement: [{
+                Action: "codebuild:StartBuild",
+                Effect: "Allow",
+                Resource: "arn:aws:codebuild:#{aws_data.region}:#{aws_data.account}:project/#{@options[:full_project_name]}"
               }]
             }
           }]

data/lib/cody/stack.rb

@@ -2,92 +2,37 @@ require "aws-sdk-cloudformation"
 
 module Cody
   class Stack
-    include AwsServices
+    include Cody::AwsServices
 
     def initialize(options)
       @options = options
       @project_name = @options[:project_name] || inferred_project_name
-      @stack_name = options[:stack_name] || inferred_stack_name(@project_name)
-
-      @full_project_name = project_name_convention(@project_name)
-      @template = {
-        "Description" => "CodeBuild Project: #{@full_project_name}",
-        "Resources" => {}
-      }
+      @stack_name = normalize_stack_name(options[:stack_name] || inferred_stack_name(@project_name))
     end
 
     def run
-      options = @options.merge(
-        project_name: @project_name,
-        full_project_name: @full_project_name,
-      )
-      project_builder = Project.new(options)
-      unless project_builder.exist?
-        puts "ERROR: Cody project does not exist: #{project_builder.project_path}".color(:red)
-        exit 1
-        return
-      end
-      project = project_builder.run
-      @template["Resources"].merge!(project)
-
-      if project["CodeBuild"]["Properties"]["ServiceRole"] == {"Ref"=>"IamRole"}
-        role = Role.new(options).run
-        @template["Resources"].merge!(role)
-      end
-
-      schedule = Schedule.new(options).run
-      @template["Resources"].merge!(schedule) if schedule
-
-      template_path = "/tmp/codebuild.yml"
-      FileUtils.mkdir_p(File.dirname(template_path))
-      IO.write(template_path, YAML.dump(@template))
-      puts "Generated CloudFormation template at #{template_path.color(:green)}"
-      return if @options[:noop]
-      puts "Deploying stack #{@stack_name.color(:green)} with CodeBuild project #{@full_project_name.color(:green)}"
-
-      begin
-        perform
-        url_info
-        return unless @options[:wait]
-        status.wait
-        exit 2 unless status.success?
-      rescue Aws::CloudFormation::Errors::ValidationError => e
-        if e.message.include?("No updates") # No updates are to be performed.
-          puts "WARN: #{e.message}".color(:yellow)
-        else
-          puts "ERROR ValidationError: #{e.message}".color(:red)
-          exit 1
-        end
+      handle_rollback_completed!
+      if stack_exists?(@stack_name)
+        Update.new(@options).run
+      else
+        Create.new(@options).run
       end
     end
 
   private
-    def url_info
-      stack = cfn.describe_stacks(stack_name: @stack_name).stacks.first
-      region = `aws configure get region`.strip rescue "us-east-1"
-      url = "https://console.aws.amazon.com/cloudformation/home?region=#{region}#/stacks"
-      puts "Stack name #{@stack_name.color(:yellow)} status #{stack["stack_status"].color(:yellow)}"
-      puts "Here's the CloudFormation url to check for more details #{url}"
-    end
-
-    def status
-      @status ||= Cfn::Status.new(@stack_name)
+    def handle_rollback_completed!
+      @stack = find_stack(@stack_name)
+      if @stack && rollback_complete?(@stack)
+        puts "Existing stack in ROLLBACK_COMPLETE state. Deleting stack before continuing."
+        cfn.delete_stack(stack_name: @stack_name)
+        status.wait
+        status.reset
+        @stack = nil # at this point stack has been deleted
+      end
     end
 
     def rollback_complete?(stack)
       stack.stack_status == 'ROLLBACK_COMPLETE'
     end
-
-    def find_stack(stack_name)
-      resp = cfn.describe_stacks(stack_name: stack_name)
-      resp.stacks.first
-    rescue Aws::CloudFormation::Errors::ValidationError => e
-      # example: Stack with id demo-web does not exist
-      if e.message =~ /Stack with/ && e.message =~ /does not exist/
-        nil
-      else
-        raise
-      end
-    end
   end
 end

data/lib/cody/stack/base.rb

@@ -0,0 +1,104 @@
+class Cody::Stack
+  class Base
+    include Cody::AwsServices
+
+    def initialize(options)
+      @options = options
+      @project_name = @options[:project_name] || inferred_project_name
+      @stack_name = normalize_stack_name(options[:stack_name] || inferred_stack_name(@project_name))
+
+      @full_project_name = project_name_convention(@project_name)
+      @template = {
+        "Description" => "CodeBuild Project: #{@full_project_name}",
+        "Resources" => {}
+      }
+    end
+
+    def run
+      options = @options.merge(
+        project_name: @project_name,
+        full_project_name: @full_project_name,
+      )
+      project_builder = Cody::Project.new(options)
+      unless project_builder.exist?
+        puts "ERROR: Cody project does not exist: #{project_builder.project_path}".color(:red)
+        exit 1
+        return
+      end
+      project = project_builder.run
+      @template["Resources"].merge!(project)
+
+      if project["CodeBuild"]["Properties"]["ServiceRole"] == {"Ref"=>"IamRole"}
+        role = Cody::Role.new(options).run
+        @template["Resources"].merge!(role)
+      end
+
+      schedule = Cody::Schedule.new(options).run
+      @template["Resources"].merge!(schedule) if schedule
+
+      template_path = "/tmp/codebuild.yml"
+      FileUtils.mkdir_p(File.dirname(template_path))
+      IO.write(template_path, YAML.dump(@template))
+      puts "Generated CloudFormation template at #{template_path.color(:green)}"
+      return if @options[:noop]
+      puts "Deploying stack #{@stack_name.color(:green)} with CodeBuild project #{@full_project_name.color(:green)}"
+
+      begin
+        perform
+        url_info
+        return unless @options[:wait]
+        status.wait
+        exit 2 unless status.success?
+      rescue Aws::CloudFormation::Errors::ValidationError => e
+        if e.message.include?("No updates") # No updates are to be performed.
+          puts "WARN: #{e.message}".color(:yellow)
+        else
+          puts "ERROR ValidationError: #{e.message}".color(:red)
+          exit 1
+        end
+      end
+    end
+
+  private
+    def url_info
+      stack = cfn.describe_stacks(stack_name: @stack_name).stacks.first
+      region = `aws configure get region`.strip rescue "us-east-1"
+      url = "https://console.aws.amazon.com/cloudformation/home?region=#{region}#/stacks"
+      puts "Stack name #{@stack_name.color(:yellow)} status #{stack["stack_status"].color(:yellow)}"
+      puts "Here's the CloudFormation url to check for more details #{url}"
+    end
+
+    def status
+      @status ||= CfnStatus.new(@stack_name)
+    end
+
+    def rollback_complete?(stack)
+      stack.stack_status == 'ROLLBACK_COMPLETE'
+    end
+
+
+    def handle_rollback_completed!
+      @stack = find_stack(@stack_name)
+      if @stack && rollback_complete?(@stack)
+        puts "Existing stack in ROLLBACK_COMPLETE state. Deleting stack before continuing."
+        cfn.delete_stack(stack_name: @stack_name)
+        status.wait
+        status.reset
+        @stack = nil # at this point stack has been deleted
+      end
+    end
+
+    def find_stack(stack_name)
+      return if ENV['TEST']
+      resp = cfn.describe_stacks(stack_name: stack_name)
+      resp.stacks.first
+    rescue Aws::CloudFormation::Errors::ValidationError => e
+      # example: Stack with id demo-web does not exist
+      if e.message =~ /Stack with/ && e.message =~ /does not exist/
+        nil
+      else
+        raise
+      end
+    end
+  end
+end

data/lib/cody/{create.rb → stack/create.rb}

@@ -1,5 +1,5 @@
-module Cody
-  class Create < Stack
+class Cody::Stack
+  class Create < Base
     def perform
       cfn.create_stack(
         stack_name: @stack_name,

data/lib/cody/{update.rb → stack/update.rb}

@@ -1,5 +1,5 @@
-module Cody
-  class Update < Stack
+class Cody::Stack
+  class Update < Base
     def perform
       cfn.update_stack(
         stack_name: @stack_name,

data/lib/cody/tailer.rb

@@ -2,7 +2,7 @@ require "aws-logs"
 
 module Cody
   class Tailer
-    include AwsServices
+    include Cody::AwsServices
 
     def initialize(options, build_id)
       @options, @build_id = options, build_id

data/lib/cody/version.rb

@@ -1,3 +1,3 @@
 module Cody
-  VERSION = "0.9.5"
+  VERSION = "1.0.1"
 end

data/lib/template/project/buildspec.yml

@@ -5,7 +5,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
-      ruby: 2.6
+      ruby: latest
   build:
     commands:
       - uptime

data/lib/template/project/project.rb.tt

@@ -1,5 +1,10 @@
 # For methods, refer to the properties of the CloudFormation CodeBuild::Project https://amzn.to/2UTeNlr
 # For convenience methods, refer to the source https://github.com/tongueroo/cody/blob/master/lib/cody/dsl/project.rb
+# Docs:
+#
+# * https://cody.run/docs/dsl/project/
+# * https://cody.run/docs/docs/dsl/helpers/
+#
 
 # name("example-project-name") # recommend leaving unset and codebuild will use a conventional name
 github_url("<%= project_github_url %>")
@@ -8,22 +13,3 @@ environment_variables(
   JETS_ENV: "test",
   # API_KEY: "ssm:/codebuild/demo/api_key" # Example of ssm parameter
 )
-
-# Some useful helpers:
-# puts "project_name #{project_name}" # IE: demo-web
-# puts "full_project_name #{full_project_name}" # demo-web-development
-
-# Uncomment to enable github webhook, the GitHub oauth token needs admin:repo_hook permissions
-# Refer to https://cody.run/docs/github_oauth/
-# triggers(webhook: true)
-# Another example:
-# Docs: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projecttriggers.html
-# {type: "EVENT", pattern: "PUSH"} is required
-# Also, note the extra brackets: [[]] is actually the proper format. I know weird.
-# triggers(
-#   webhook: true,
-#   filter_groups: [[{type: "HEAD_REF", pattern: "my-branch"}, {type: "EVENT", pattern: "PUSH"}]]
-# )
-
-# Shorthand to enable all local cache modes
-# local_cache(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cody
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 1.0.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,6 +94,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws_data
+  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: cfn-status
+  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: cfn_camelizer
+  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: cli-format
   requirement: !ruby/object:Gem::Requirement
@@ -276,47 +318,45 @@ files:
 - lib/cody/autoloader.rb
 - lib/cody/aws_services.rb
 - lib/cody/aws_services/helpers.rb
-- lib/cody/badge.rb
-- lib/cody/base.rb
 - lib/cody/cli.rb
+- lib/cody/cli/badge.rb
+- lib/cody/cli/base.rb
+- lib/cody/cli/delete.rb
+- lib/cody/cli/deploy.rb
+- lib/cody/cli/help.rb
+- lib/cody/cli/help/deploy.md
+- lib/cody/cli/help/init.md
+- lib/cody/cli/help/logs.md
+- lib/cody/cli/help/start.md
+- lib/cody/cli/help/stop.md
+- lib/cody/cli/init.rb
+- lib/cody/cli/list.rb
+- lib/cody/cli/logs.rb
+- lib/cody/cli/sequence.rb
+- lib/cody/cli/start.rb
+- lib/cody/cli/status.rb
+- lib/cody/cli/stop.rb
 - lib/cody/command.rb
-- lib/cody/completer.rb
-- lib/cody/completer/script.rb
-- lib/cody/completer/script.sh
 - lib/cody/core.rb
-- lib/cody/create.rb
 - lib/cody/default/settings.yml
-- lib/cody/delete.rb
-- lib/cody/deploy.rb
+- lib/cody/dsl/base.rb
 - lib/cody/dsl/project.rb
 - lib/cody/dsl/project/ssm.rb
 - lib/cody/dsl/role.rb
 - lib/cody/dsl/schedule.rb
 - lib/cody/evaluate.rb
 - lib/cody/evaluate/interface.rb
-- lib/cody/help.rb
-- lib/cody/help/completion.md
-- lib/cody/help/completion_script.md
-- lib/cody/help/deploy.md
-- lib/cody/help/init.md
-- lib/cody/help/logs.md
-- lib/cody/help/start.md
-- lib/cody/help/stop.md
-- lib/cody/init.rb
-- lib/cody/list.rb
+- lib/cody/list/no_builds_project.rb
 - lib/cody/list/project.rb
-- lib/cody/logs.rb
 - lib/cody/project.rb
 - lib/cody/role.rb
 - lib/cody/schedule.rb
-- lib/cody/sequence.rb
 - lib/cody/setting.rb
 - lib/cody/stack.rb
-- lib/cody/start.rb
-- lib/cody/status.rb
-- lib/cody/stop.rb
+- lib/cody/stack/base.rb
+- lib/cody/stack/create.rb
+- lib/cody/stack/update.rb
 - lib/cody/tailer.rb
-- lib/cody/update.rb
 - lib/cody/variables.rb
 - lib/cody/version.rb
 - lib/template/project/buildspec.yml
@@ -328,50 +368,6 @@ files:
 - lib/template/top/variables/base.rb
 - lib/template/top/variables/development.rb
 - lib/template/top/variables/production.rb
-- vendor/aws_data/CHANGELOG.md
-- vendor/aws_data/Gemfile
-- vendor/aws_data/Gemfile.lock
-- vendor/aws_data/LICENSE.txt
-- vendor/aws_data/README.md
-- vendor/aws_data/Rakefile
-- vendor/aws_data/aws_data.gemspec
-- vendor/aws_data/bin/console
-- vendor/aws_data/bin/setup
-- vendor/aws_data/lib/aws_data.rb
-- vendor/aws_data/lib/aws_data/version.rb
-- vendor/aws_data/pkg/aws_data-0.1.0.gem
-- vendor/aws_data/spec/aws_data_spec.rb
-- vendor/aws_data/spec/spec_helper.rb
-- vendor/cfn-status/Gemfile
-- vendor/cfn-status/Gemfile.lock
-- vendor/cfn-status/LICENSE.txt
-- vendor/cfn-status/README.md
-- vendor/cfn-status/Rakefile
-- vendor/cfn-status/bin/console
-- vendor/cfn-status/bin/setup
-- vendor/cfn-status/cfn-status.gemspec
-- vendor/cfn-status/lib/cfn/aws_service.rb
-- vendor/cfn-status/lib/cfn/status.rb
-- vendor/cfn-status/lib/cfn/status/version.rb
-- vendor/cfn-status/spec/cfn/status_spec.rb
-- vendor/cfn-status/spec/fixtures/cfn/stack-events-complete.json
-- vendor/cfn-status/spec/fixtures/cfn/stack-events-in-progress.json
-- vendor/cfn-status/spec/fixtures/cfn/stack-events-update-rollback-complete.json
-- vendor/cfn-status/spec/spec_helper.rb
-- vendor/cfn_camelizer/CHANGELOG.md
-- vendor/cfn_camelizer/Gemfile
-- vendor/cfn_camelizer/Gemfile.lock
-- vendor/cfn_camelizer/LICENSE.txt
-- vendor/cfn_camelizer/README.md
-- vendor/cfn_camelizer/Rakefile
-- vendor/cfn_camelizer/bin/console
-- vendor/cfn_camelizer/bin/setup
-- vendor/cfn_camelizer/cfn_camelizer.gemspec
-- vendor/cfn_camelizer/lib/camelizer.yml
-- vendor/cfn_camelizer/lib/cfn_camelizer.rb
-- vendor/cfn_camelizer/lib/cfn_camelizer/version.rb
-- vendor/cfn_camelizer/spec/cfn_camelizer_spec.rb
-- vendor/cfn_camelizer/spec/spec_helper.rb
 homepage: https://github.com/tongueroo/cody
 licenses:
 - MIT