codebuild 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95697bfe6c4ae37bb84258a9b2067494efcc83e259f9a03bd9e4a2088d579f52
-  data.tar.gz: b472131c142171e67aa7fa5f0d4e7f12e35efe18572408d3f002ead4cb230687
+  metadata.gz: a61acb91b1f2eb181094bd20117879da0219931178fec03054f930f06cf3fd4a
+  data.tar.gz: 9c462974ca5f372d437f490a44a88763373f852aca75c727bfcf58e9f853f599
 SHA512:
-  metadata.gz: ee5f2784e0986fbd38ed79df15089ed8eb031a8da983dbb7c690fbf1084ab0a21b2e4327ec8d4ac99cf29aecb2431f217b3ca745a22c6797f986f0eaf39ac5e0
-  data.tar.gz: f4334660cfc0c108b03fecc451d1cbf7742ec5c223b4964bd8969006d8a9aaea6e7a9ddb54dfe8ce7fdaa1ab633d7ccbd2e39130e33b958f7b015ce59973430f
+  metadata.gz: 30a6738433fb64cd50b2237f6f7a8d78c3dcd9bc281b836eed6f869bb295d462f0778499e17c79adb06031af8908d2c89581fef74d49cb59d08026e50b18adc4
+  data.tar.gz: dd6342bfdfb19de9a91c16736b3a2edf939b7bd05e72675797f22777d0c6c44171cf960c225b4f0c97ac35294f177291c9a1b45fb872f70a08ce68c940fe0bc7

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.
 
+## [0.6.1]
+- cb init: no variables by default
+- fix handle rollback
+
 ## [0.6.0]
 - named stack with -cb at the very end
 - add docs

data/docs/_docs/examples/ecs.md

@@ -85,6 +85,8 @@ managed_iam_policy("AmazonS3ReadOnlyAccess") # optional but common to need read
 
 From a security perspective, using CodeBuild gives us a stronger security posture. The **only** permission the user calling [cb start]({% link _docs/start.md %}) really needs is CodeBuild access.  The permissions to create the ECS service and other deployment resources are delegated to the CodeBuild project itself. We know that the CodeBuild project will not run any arbitrary commands unless we update `buildspec.yml` and explicitly give permission to it's IAM role.
 
+{% include examples-steps.md %}
+
 ## CodePipeline ECS Deploy Action
 
 If you are using CodePipeline also, you may be wondering why not just use the provided Amazon ECS deployment action instead.  It comes down to control. With a CodeBuild project, we have full control of how we want to build and deploy the Docker image to ECS.

data/docs/_docs/examples/jets.md

@@ -13,13 +13,15 @@ Here's the project DSL.
 
 
 ```ruby
-github_url("https://github.com/tongueroo/jets-hello-examples")
-linux_image("aws/codebuild/ruby:2.5.3-1.7.0") # currently must used ruby 2.5
+github_url("https://github.com/tongueroo/jets-codebuild")
+linux_image("timbru31/ruby-node:2.5") # currently must used ruby 2.5 for Lambda
 environment_variables(
   JETS_ENV: Codebuild.env,
 )
 ```
 
+The [.codebuild/project.rb](.codebuild/project.rb) uses a Docker image that has ruby, node, and yarn already installed.  If you prefer to use another image, update the `linux_image` setting, and update your `buildspec.yml` accordingly. IE: Install the necessary packages.
+
 Here's the buildspec:
 
 .codebuild/buildspec.yml
@@ -30,20 +32,20 @@ version: 0.2
 phases:
   install:
     commands:
-      - apt-get update -y && apt-get install -y rsync # prequisite for jets
+      - apt-get update -y
+      - apt-get install -y rsync zip
   build:
     commands:
       - echo Build started on `date`
       - sed -i '/BUNDLED WITH/Q' Gemfile.lock # hack to fix bundler issue: allow different versions of bundler to work
-      - gem install bundler:1.16.6
-      - export JETS_ENV=test
       - bundle
-      - bundle exec rspec
+      - JETS_ENV=test bundle exec rspec
   post_build:
     commands:
       - bash -c 'if [ "$CODEBUILD_BUILD_SUCCEEDING" == "0" ]; then exit 1; fi'
       - export JETS_AGREE=yes
       - bundle exec jets deploy $JETS_ENV
+
 ```
 
 And here are the IAM permissions required as described in [Jets Minimal IAM Deploy Policy](https://rubyonjets.com/docs/extras/minimal-deploy-iam/).
@@ -65,4 +67,13 @@ iam_policy(
 )
 ```
 
+Here's also Github repo with CodeBuild examples with Jets: [tongueroo/jets-codebuild](https://github.com/tongueroo/jets-codebuild).  The example on the master branch is a similar simple approach with 1 CodeBuild project.
+
+You may be interested in the [separate-unit-and-deploy branch](https://github.com/tongueroo/jets-codebuild/tree/separate-unit-and-deploy). The example shows how to set up 2 separate CodeBuild projects. Some advantages:
+
+* The projects are decoupled and you can run them separately.
+* Only the deploy project requires IAM access to create the AWS resources.
+
+{% include examples-steps.md %}
+
 {% include prev_next.md %}

data/docs/_docs/examples/ruby.md

@@ -5,7 +5,7 @@ categories: example
 nav_order: 18
 ---
 
-This examples show to run ruby unit tests.
+This examples show to run Ruby unit tests.
 
 Here's the project DSL.
 
@@ -30,15 +30,15 @@ version: 0.2
 phases:
   install:
     commands:
-      - apt-get update -y && apt-get install -y rsync # prequisite for jets
+      - apt-get update -y apt-get install -y rsync
   build:
     commands:
       - echo Build started on `date`
       - sed -i '/BUNDLED WITH/Q' Gemfile.lock # hack to fix bundler issue: allow different versions of bundler to work
-      - gem install bundler:1.16.6
-      - export JETS_ENV=test
       - bundle
-      - bundle exec rspec
+      - JETS_ENV=test bundle exec rspec
 ```
 
-{% include prev_next.md %}
+{% include examples-steps.md %}
+
+{% include prev_next.md %}

data/docs/_includes/commands.html

@@ -39,10 +39,9 @@ cb delete
                                 <div class="commands">
 {% highlight sh %}
 cb deploy # infers the CloudFormation name from the parent folder
-cb deploy stack-name # explicitly specify stack name
+cb deploy project-name # explicitly specify project name
 
 cb start # infers the name from the parent folder
-cb start stack-name # looks up project via CloudFormation stack
 cb start demo-project # looks up project via CodeBuild project name
 {% endhighlight %}
                                 </div>

data/docs/_includes/examples-steps.md

@@ -0,0 +1,17 @@
+## Create CodeBuild Project
+
+To create the CodeBuild project via CloudFormation run:
+
+    cb deploy demo
+
+This creates the CodeBuild project as well as the necessary IAM role.
+
+## Start Build
+
+To start a build:
+
+    cb start
+
+You can also start a build with a specific branch. Remember to `git push` your branch.
+
+    cb start -b mybranch

data/lib/codebuild/deploy.rb

@@ -1,11 +1,39 @@
 module Codebuild
   class Deploy < Stack
     def run
+      handle_rollback_completed!
       if stack_exists?(@stack_name)
         Update.new(@options).run
       else
         Create.new(@options).run
       end
     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 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/codebuild/init.rb

@@ -8,7 +8,7 @@ module Codebuild
         [:template, desc: "Custom template to use"],
         [:template_mode, desc: "Template mode: replace or additive"],
         [:type, desc: "Type option creates a subfolder under .codebuild"],
-        [:variables, type: :boolean, default: true, desc: "Create variables starter files"],
+        [:variables, type: :boolean, default: false, desc: "Create variables starter files"],
       ]
     end
     cli_options.each { |o| class_option(*o) }

data/lib/codebuild/stack.rb

@@ -45,15 +45,6 @@ module Codebuild
       return if @options[:noop]
       puts "Deploying stack #{@stack_name.color(:green)} with CodeBuild project #{@full_project_name.color(:green)}"
 
-      @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
-
       begin
         perform
         url_info
@@ -64,7 +55,7 @@ module Codebuild
         if e.message.include?("No updates") # No updates are to be performed.
           puts "WARN: #{e.message}".color(:yellow)
         else
-          puts "ERROR: #{e.message}".color(:red)
+          puts "ERROR ValidationError: #{e.message}".color(:red)
           exit 1
         end
       end

data/lib/codebuild/version.rb

@@ -1,3 +1,3 @@
 module Codebuild
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebuild
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -256,6 +256,7 @@ files:
 - docs/_includes/commands.html
 - docs/_includes/content.html
 - docs/_includes/edit-on-github.html
+- docs/_includes/examples-steps.md
 - docs/_includes/footer.html
 - docs/_includes/google_analytics.html
 - docs/_includes/head.html
@@ -290,7 +291,6 @@ files:
 - docs/_sass/_variables.scss
 - docs/bin/web
 - docs/docs.md
-- docs/favicon.ico
 - docs/img/docs/codebuild-output.png
 - docs/img/logos/boltops-logo-full.png
 - docs/img/logos/boltops-logo.png