cody 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a118fa82eafeb143c7566480627541b108c910a45147bb7d3211ea1bccae158e
-  data.tar.gz: e1505f9f0813a481eccdf1220b44b77879ff3720de6ee5ad8903056853d8568c
+  metadata.gz: fd70b6f28e07b8c790325ac4a3c0e7703f60c91bf787d757e2827a61b2eaed48
+  data.tar.gz: 353f4fe4eec6dc7b4e0d473f29cc9389a6e907ecfef2a3552b8e4b960873784f
 SHA512:
-  metadata.gz: 91a9d29d494a3b75f0f0752924baa5f06236c4d93017f1f02cf0f9059d167de10600fae3f62d5cf7db543c733a7fe4c53dc39ef522329ad0c2cc8df3f2e1606c
-  data.tar.gz: bad64d35ea10286323bd76d735f8b71e10d81b7b37e327a81137c3e1a2d17735fdc73f260277cf577cd1bb072f10aedd0d93410e3250d1a3f3da62460e250334
+  metadata.gz: 1d17eed03ad6069022ca100899bb10739acf31804a7743beed5deb2e9ed17c9dac3967a8e6ae51c6dd268c586e7d86f9f5db21de8763cefe7be1c883da8765bd
+  data.tar.gz: 91dfd9d4df7923fb6cb26081a53ec5eb8b6c8d1eda2dddb9882095cab80f9bc253aef38dd694e3ddc1b14eebc824b42885a4f4763a5c8c1da34076ba5d719718

data/CHANGELOG.md

@@ -3,6 +3,22 @@
 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.
 
+## [1.1.0] - 2022-03-03
+- [#33](https://github.com/tongueroo/cody/pull/33) fix cfn status when auto deleting rollback completed stack
+- [#34](https://github.com/tongueroo/cody/pull/34) iam roles: support multiple calls
+- update iam role docs
+
+## [1.0.6] - 2021-12-17
+- [#32](https://github.com/tongueroo/cody/pull/32) fix activesupport require
+- fix warn not found ssm param message
+
+## [1.0.5] - 2021-08-28
+- add params overrides option
+- docs: fix ecs permission, add iam:GetRole
+- edge case: yaml has nothing but comments
+- improve settings merge
+- update vpc config exmaple with camelcase
+
 ## [1.0.4] - 2021-01-08
 - loosen activesupport version pin
 

data/README.md

@@ -9,6 +9,8 @@
 
 [![BoltOps Badge](https://img.boltops.com/boltops/badges/boltops-badge.png)](https://www.boltops.com)
 
+Please **watch/star** this repo to help grow and support the project.
+
 Cody is an AWS CodeBuild Management Tool. Cody lets you create AWS CodeBuild projects with a beautiful DSL. The documentation site is at: [cody.run](https://cody.run/)
 
 ## Quick Start

data/cody.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "cfn-status"
   spec.add_dependency "cfn_camelizer"
   spec.add_dependency "cli-format"
+  spec.add_dependency "dsl_evaluator"
   spec.add_dependency "memoist"
   spec.add_dependency "rainbow"
   spec.add_dependency "render_me_pretty"
@@ -41,6 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "cli_markdown"
+  spec.add_development_dependency "nokogiri"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

data/lib/cody/cli/start.rb

@@ -15,6 +15,7 @@ class Cody::CLI
         source_version: source_version
       }
       params[:environment_variables_override] = environment_variables_override if @options[:env_vars]
+      params.merge!(@options[:overrides]) if @options[:overrides]
       resp = codebuild.start_build(params)
 
       puts "Build started for project: #{project_name}"

data/lib/cody/cli.rb

@@ -37,7 +37,7 @@ module Cody
     long_desc Help.text(:start)
     option :source_version, default: "master", desc: "git branch"
     option :branch, aliases: "b", default: "master", desc: "git branch"
-    option :env_vars, type: :array, desc: "env var overrides. IE: KEY1=VALUE1 KEY2=VALUE2"
+    option :env_vars, aliases: "e", type: :array, desc: "env var overrides. IE: KEY1=VALUE1 KEY2=VALUE2"
     common_options.call
     def start(project_name=nil)
       Start.new(options.merge(project_name: project_name)).run

data/lib/cody/core.rb

@@ -1,6 +1,5 @@
 require 'pathname'
 require 'yaml'
-require 'active_support/core_ext/string'
 
 module Cody
   module Core

data/lib/cody/dsl/base.rb

@@ -1,9 +1,10 @@
 module Cody::Dsl
   class Base
-    attr_reader :project_name, :full_project_name
+    attr_reader :options, :project_name, :full_project_name, :type
     def initialize(options={})
       @options = options
       @project_name = options[:project_name]
+      @type = options[:type]
       @full_project_name = options[:full_project_name] # includes -development at the end
       @properties = default_properties # defaults make project.rb simpler
     end

data/lib/cody/dsl/project/ssm.rb

@@ -12,7 +12,7 @@ module Cody::Dsl::Project
 
       resp.parameter.value
     rescue Aws::SSM::Errors::ParameterNotFound
-      puts "WARN: #{name} found on AWS SSM.".color(:yellow)
+      puts "WARN: #{name} not found on AWS SSM.".color(:yellow)
     end
 
     def ssm_client

data/lib/cody/dsl/role/registry.rb

@@ -0,0 +1,25 @@
+require "set"
+
+module Cody::Dsl::Role
+  class Registry
+    class_attribute :iam_statements
+    self.iam_statements = nil # nil to allow fallback to default_iam_statements in cody/role.rb
+    class_attribute :managed_policy_arns
+    self.managed_policy_arns = nil # nil to allow fallback to default_managed_policy_arns in cody/role.rb
+
+    class << self
+      def register_policy(*statements)
+        statements.flatten!
+        self.iam_statements ||= []
+        self.iam_statements += statements # using set so DSL can safely be evaluated multiple times
+      end
+
+      def register_managed_policy(*policies)
+        policies.flatten!
+        self.managed_policy_arns ||= []
+        self.managed_policy_arns += policies # using set so DSL can safely be evaluated multiple times
+        self.managed_policy_arns.uniq!
+      end
+    end
+  end
+end

data/lib/cody/dsl/role.rb

@@ -1,5 +1,7 @@
 module Cody::Dsl
   module Role
+    extend Memoist
+
     PROPERTIES = %w[
       AssumeRolePolicyDocument
       ManagedPolicyArns
@@ -17,7 +19,13 @@ module Cody::Dsl
 
     # convenience wrapper methods
     def iam_policy(*definitions)
-      @iam_statements = definitions.map { |definition| standardize_iam_policy(definition) }
+      statements = definitions.map { |definition| standardize_iam_policy(definition) }
+      Registry.register_policy(statements)
+    end
+
+    def managed_iam_policy(*definitions)
+      managed_policy_arns = definitions.map { |definition| standardize_managed_iam_policy(definition) }
+      Registry.register_managed_policy(managed_policy_arns)
     end
 
     # Returns standarized IAM statement
@@ -36,15 +44,15 @@ module Cody::Dsl
       end
     end
 
-    def managed_iam_policy(*definitions)
-      @managed_policy_arns = definitions.map { |definition| standardize_managed_iam_policy(definition) }
-    end
-
     # AmazonEC2ReadOnlyAccess => arn:aws:iam::aws:policy/AmazonEC2ReadOnlyAccess
     def standardize_managed_iam_policy(definition)
       return definition if definition.include?('iam::aws:policy')
-
       "arn:aws:iam::aws:policy/#{definition}"
     end
+
+    def aws
+      AwsData.new
+    end
+    memoize :aws
   end
 end

data/lib/cody/evaluate.rb

@@ -1,47 +1,8 @@
 module Cody
   module Evaluate
+    include DslEvaluator
     include Interface
 
-    def evaluate(path)
-      source_code = IO.read(path)
-      begin
-        instance_eval(source_code, path)
-      rescue Exception => e
-        if e.class == SystemExit # allow exit to happen normally
-          raise
-        else
-          task_definition_error(e)
-          puts "\nFull error:"
-          raise
-        end
-      end
-    end
-
-  private
-    # Prints out a user friendly task_definition error message
-    def task_definition_error(e)
-      error_info = e.backtrace.first
-      path, line_no, _ = error_info.split(':')
-      line_no = line_no.to_i
-      puts "Error evaluating #{path}:".color(:red)
-      puts e.message
-      puts "Here's the line in #{path} with the error:\n\n"
-
-      contents = IO.read(path)
-      content_lines = contents.split("\n")
-      context = 5 # lines of context
-      top, bottom = [line_no-context-1, 0].max, line_no+context-1
-      spacing = content_lines.size.to_s.size
-      content_lines[top..bottom].each_with_index do |line_content, index|
-        line_number = top+index+1
-        if line_number == line_no
-          printf("%#{spacing}d %s\n".color(:red), line_number, line_content)
-        else
-          printf("%#{spacing}d %s\n", line_number, line_content)
-        end
-      end
-    end
-
     def lookup_cody_file(name)
       [".cody", @options[:type], name].compact.join("/")
     end

data/lib/cody/project.rb

@@ -18,7 +18,7 @@ module Cody
 
     def run
       load_variables
-      evaluate(@project_path)
+      evaluate_file(@project_path)
       resource = {
         CodeBuild: {
           Type: "AWS::CodeBuild::Project",

data/lib/cody/role.rb

@@ -2,9 +2,9 @@ require "yaml"
 
 module Cody
   class Role < Dsl::Base
-    include Cody::Dsl::Role
     include Evaluate
     include Variables
+    include Dsl::Role
 
     def initialize(options={})
       super
@@ -14,7 +14,8 @@ module Cody
 
     def run
       load_variables
-      evaluate(@role_path) if File.exist?(@role_path)
+      evaluate_file(@role_path) if File.exist?(@role_path) # registers definitions to registry
+      build # build definitions from registry. can set: @iam_statements and @managed_policy_arns
       @properties[:Policies] = [{
         PolicyName: "CodeBuildAccess",
         PolicyDocument: {
@@ -35,6 +36,12 @@ module Cody
     end
 
   private
+    Registry = Cody::Dsl::Role::Registry
+    def build
+      @iam_statements = Registry.iam_statements if Registry.iam_statements
+      @managed_policy_arns = Registry.managed_policy_arns if Registry.managed_policy_arns
+    end
+
     def get_role_path
       lookup_cody_file("role.rb")
     end

data/lib/cody/schedule.rb

@@ -15,7 +15,7 @@ module Cody
 
       old_properties = @properties.clone
       load_variables
-      evaluate(@schedule_path)
+      evaluate_file(@schedule_path)
 
       @properties[:ScheduleExpression] = @schedule_expression if @schedule_expression
       set_rule_event! if @rule_event_props

data/lib/cody/setting.rb

@@ -25,7 +25,10 @@ module Cody
 
       all_envs = default.deep_merge(user.deep_merge(project))
       all_envs = merge_base(all_envs)
-      data = all_envs[cb_env] || all_envs["base"] || {}
+
+      env_data = all_envs[cb_env] || {}
+      base_data = all_envs["base"] || {}
+      data = base_data.merge(env_data)
       data.deep_symbolize_keys
     end
     memoize :data
@@ -37,6 +40,7 @@ module Cody
       path = "#{cb_root}/.cody/settings.yml"
       if File.exist?(path)
         settings = YAML.load_file(path)
+        settings = {} unless settings.is_a?(Hash) # in case YAML has nothing but comments
         env = settings.find do |_env, section|
           section ||= {}
           ENV['AWS_PROFILE'] && ENV['AWS_PROFILE'] == section['aws_profile']
@@ -54,6 +58,7 @@ module Cody
 
       content = RenderMePretty.result(path)
       data = YAML.load(content)
+      data = {} unless data.is_a?(Hash) # in case YAML has nothing but comments
       # If key is is accidentally set to nil it screws up the merge_base later.
       # So ensure that all keys with nil value are set to {}
       data.each do |env, _setting|

data/lib/cody/stack/base.rb

@@ -1,6 +1,7 @@
 class Cody::Stack
   class Base
     include Cody::AwsServices
+    include Status
 
     def initialize(options)
       @options = options
@@ -40,6 +41,7 @@ class Cody::Stack
       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)}"
 
@@ -68,10 +70,6 @@ class Cody::Stack
       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

data/lib/cody/stack/status.rb

@@ -0,0 +1,7 @@
+class Cody::Stack
+  module Status
+    def status
+      @status ||= CfnStatus.new(@stack_name)
+    end
+  end
+end

data/lib/cody/stack.rb

@@ -3,6 +3,7 @@ require "aws-sdk-cloudformation"
 module Cody
   class Stack
     include Cody::AwsServices
+    include Status
 
     def initialize(options)
       @options = options

data/lib/cody/version.rb

@@ -1,3 +1,3 @@
 module Cody
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

data/lib/cody.rb

@@ -1,8 +1,11 @@
 $:.unshift(File.expand_path("../", __FILE__))
+require "active_support"
+require "active_support/core_ext/string"
 require "aws_data"
 require "cfn_camelizer"
 require "cfn_status"
 require "cody/version"
+require "dsl_evaluator"
 require "memoist"
 require "rainbow/ext/string"
 require "yaml"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cody
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dsl_evaluator
+  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: memoist
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +276,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -343,6 +371,7 @@ files:
 - lib/cody/dsl/project.rb
 - lib/cody/dsl/project/ssm.rb
 - lib/cody/dsl/role.rb
+- lib/cody/dsl/role/registry.rb
 - lib/cody/dsl/schedule.rb
 - lib/cody/evaluate.rb
 - lib/cody/evaluate/interface.rb
@@ -355,6 +384,7 @@ files:
 - lib/cody/stack.rb
 - lib/cody/stack/base.rb
 - lib/cody/stack/create.rb
+- lib/cody/stack/status.rb
 - lib/cody/stack/update.rb
 - lib/cody/tailer.rb
 - lib/cody/variables.rb
@@ -387,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Cody provides a beautiful DSL to create and manage AWS CodeBuild projects