cody 0.9.7 → 1.0.3

data/lib/cody/core.rb

@@ -19,12 +19,12 @@ module Cody
     end
     memoize :env
 
-    def env_extra
-      env_extra = ENV['CODY_ENV_EXTRA'] if ENV['CODY_ENV_EXTRA'] # highest precedence
-      return if env_extra&.empty?
-      env_extra
+    def extra
+      extra = ENV['CODY_EXTRA'] if ENV['CODY_EXTRA'] # highest precedence
+      return if extra&.empty?
+      extra
     end
-    memoize :env_extra
+    memoize :extra
 
     # Overrides AWS_PROFILE based on the Cody.env if set in configs/settings.yml
     # 2-way binding.

data/lib/cody/dsl/base.rb

@@ -7,5 +7,14 @@ module Cody::Dsl
       @full_project_name = options[:full_project_name] # includes -development at the end
       @properties = default_properties # defaults make project.rb simpler
     end
+
+    # In v1.0.0 defaults to not auto-camelize
+    def auto_camelize(data)
+      if Cody.settings[:auto_camelize]
+        CfnCamelizer.transform(data)
+      else
+        data.deep_stringify_keys!
+      end
+    end
   end
 end

data/lib/cody/dsl/project.rb

@@ -3,35 +3,50 @@ module Cody::Dsl
     include Ssm
 
     PROPERTIES = %w[
-      artifacts
-      badge_enabled
-      cache
-      description
-      encryption_key
-      environment
-      logs_config
-      name
-      queued_timeout_in_minutes
-      secondary_artifacts
-      secondary_sources
-      service_role
-      source
-      tags
-      timeout_in_minutes
-      triggers
-      vpc_config
+      Artifacts
+      BadgeEnabled
+      Cache
+      Description
+      EncryptionKey
+      Environment
+      LogsConfig
+      Name
+      QueuedTimeoutInMinutes
+      SecondaryArtifacts
+      SecondarySources
+      ServiceRole
+      Source
+      Tags
+      TimeoutInMinutes
+      Triggers
+      VpcConfig
     ]
     PROPERTIES.each do |prop|
-      define_method(prop) do |v|
+      define_method(prop.underscore) do |v|
         @properties[prop.to_sym] = v
       end
     end
 
     # Convenience wrapper methods
     def github_url(url)
-      @properties[:source][:location] = url
+      @properties[:Source][:Location] = url
     end
 
+    # Convenience wrapper methods
+    def git_provider(type="GITHUB")
+      @properties[:Source][:Type] = type
+    end
+
+    # Convenience wrapper methods
+    def git_branch(branch_or_tag)
+      @properties[:SourceVersion] = branch_or_tag
+    end
+
+    def buildspec(file=".cody/buildspec.yaml")
+      @properties[:Source][:BuildSpec] = file
+    end
+    alias_method :build_spec, :buildspec
+
     # So it looks like the auth resource property doesnt really get used.
     # Instead an account level credential is worked.  Refer to:
     # https://github.com/tongueroo/cody/blob/master/readme/github_oauth.md
@@ -39,47 +54,50 @@ module Cody::Dsl
     # Keeping this method around in case the CloudFormation method works one day,
     # or end up figuring out to use it properly.
     def github_token(token)
-      @properties[:source][:auth][:resource] = token
+      @properties[:Source][:Auth][:Resource] = token
     end
 
     def github_source(options={})
       source = {
-        type: "GITHUB",
-        location: options[:location],
-        git_clone_depth: 1,
-        git_submodules_config: { fetch_submodules: true },
-        build_spec: options[:buildspec] || ".cody/buildspec.yml", # options[:buildspec] accounts for type already
-        report_build_status: true,
+        Type: options[:Type] || "GITHUB",
+        Location: options[:Location],
+        GitCloneDepth: 1,
+        GitSubmodulesConfig: { fetch_submodules: true },
+        BuildSpec: options[:BuildSpec] || ".cody/buildspec.yml", # options[:Buildspec] accounts for type already
       }
 
-      if options[:oauth_token]
-        source[:auth] = {
-          type: "OAUTH",
-          resource: options[:oauth_token],
+      if source[:Type] =~ /GITHUB/
+        source[:ReportBuildStatus] = true
+      end
+
+      if options[:OauthToken]
+        source[:Auth] = {
+          Type: "OAUTH",
+          Resource: options[:OauthToken],
         }
       end
 
-      @properties[:source] = source
+      @properties[:Source] = source
     end
 
     def linux_image(name)
-      linux_environment(image: name)
+      linux_environment(Image: name)
     end
 
     def linux_environment(options={})
-      image = options[:image] || "aws/codebuild/amazonlinux2-x86_64-standard:2.0"
+      image = options[:Image] || "aws/codebuild/amazonlinux2-x86_64-standard:2.0"
       env = {
-        compute_type: options[:compute_type] || "BUILD_GENERAL1_SMALL",
-        image_pull_credentials_type: "CODEBUILD", # https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-imagepullcredentialstype
-        privileged_mode: true,
-        image: image,
-        type: "LINUX_CONTAINER"
+        ComputeType: options[:ComputeType] || "BUILD_GENERAL1_SMALL",
+        ImagePullCredentialsType: "CODEBUILD", # https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-imagepullcredentialstype
+        PrivilegedMode: true,
+        Image: image,
+        Type: "LINUX_CONTAINER"
       }
       # @mapped_env_vars is in memory
-      env[:environment_variables] = @mapped_env_vars if @mapped_env_vars
+      env[:EnvironmentVariables] = @mapped_env_vars if @mapped_env_vars
       # options has highest precedence
-      env[:environment_variables] = options[:environment_variables] if options[:environment_variables]
-      @properties[:environment] = env
+      env[:EnvironmentVariables] = options[:EnvironmentVariables] if options[:EnvironmentVariables]
+      @properties[:Environment] = env
     end
 
     def environment_variables(vars)
@@ -87,20 +105,20 @@ module Cody::Dsl
       @mapped_env_vars = vars.map { |k,v|
         k, v = k.to_s, v.to_s
         if v =~ /^ssm:/
-          { type: "PARAMETER_STORE", name: k, value: v.sub('ssm:','') }
+          { Type: "PARAMETER_STORE", Name: k, Value: v.sub('ssm:','') }
         else
-          { type: "PLAINTEXT", name: k, value: v }
+          { Type: "PLAINTEXT", Name: k, Value: v }
         end
       }
-      @properties[:environment] ||= {}
-      @properties[:environment][:environment_variables] = @mapped_env_vars
+      @properties[:Environment] ||= {}
+      @properties[:Environment][:EnvironmentVariables] = @mapped_env_vars
     end
 
     def local_cache(enable=true)
       cache = if enable
         {
-          type: "LOCAL",
-          modes: [
+          Type: "LOCAL",
+          Modes: [
               "LOCAL_DOCKER_LAYER_CACHE",
               "LOCAL_SOURCE_CACHE",
               "LOCAL_CUSTOM_CACHE"
@@ -109,11 +127,11 @@ module Cody::Dsl
       else
         {type: "NO_CACHE"}
       end
-      @properties[:cache] = cache
+      @properties[:Cache] = cache
     end
 
     def type
-      @options[:type]
+      @options[:type] # should be lowercase
     end
   end
 end

data/lib/cody/dsl/role.rb

@@ -1,16 +1,16 @@
 module Cody::Dsl
   module Role
     PROPERTIES = %w[
-      assume_role_policy_document
-      managed_policy_arns
-      max_session_duration
-      path
-      permissions_boundary
-      policies
-      role_name
+      AssumeRolePolicyDocument
+      ManagedPolicyArns
+      MaxSessionDuration
+      Path
+      PermissionsBoundary
+      Policies
+      RoleName
     ]
     PROPERTIES.each do |prop|
-      define_method(prop) do |v|
+      define_method(prop.underscore) do |v|
         @properties[prop.to_sym] = v
       end
     end
@@ -27,9 +27,9 @@ module Cody::Dsl
         # Expands simple string from: logs => logs:*
         definition = "#{definition}:*" unless definition.include?(':')
         {
-          action: [definition],
-          effect: "Allow",
-          resource: "*",
+          Action: [definition],
+          Effect: "Allow",
+          Resource: "*",
         }
       when Hash
         definition

data/lib/cody/dsl/schedule.rb

@@ -1,16 +1,16 @@
 module Cody::Dsl
   module Schedule
     PROPERTIES = %w[
-      description
-      event_pattern
-      name
-      role_arn
-      schedule_expression
-      state
-      targets
+      Description
+      EventPattern
+      Name
+      RoleArn
+      ScheduleExpression
+      State
+      Targets
     ]
     PROPERTIES.each do |prop|
-      define_method(prop) do |v|
+      define_method(prop.underscore) do |v|
         @properties[prop.to_sym] = v
       end
     end

data/lib/cody/list/no_builds_project.rb

@@ -1,6 +1,6 @@
 # Represents a project with no builds yet. In this case we just return an info message for the columns.
 # This allows `cody list` to work without breaking for Fresh projects with zero builds.
-class Cody::List
+module Cody::List
   class NoBuildsProject
     def method_missing(meth, *args, &block)
       "no builds"

data/lib/cody/list/project.rb

@@ -1,5 +1,5 @@
 # Wrap project in object to allow lazy loading of status
-class Cody::List
+module Cody::List
   class Project
     include Cody::AwsServices
     extend Memoist

data/lib/cody/project.rb

@@ -20,40 +20,39 @@ module Cody
       load_variables
       evaluate(@project_path)
       resource = {
-        code_build: {
-          type: "AWS::CodeBuild::Project",
-          properties: @properties
+        CodeBuild: {
+          Type: "AWS::CodeBuild::Project",
+          Properties: @properties
         }
       }
-      CfnCamelizer.transform(resource)
+      auto_camelize(resource)
     end
 
     def default_properties
       {
-        name: @full_project_name,
-        description: @full_project_name,
-        artifacts: { type: "NO_ARTIFACTS" },
-        service_role: { ref: "IamRole" },
-        badge_enabled: true,
-        timeout_in_minutes: 20,
-        logs_config: {
-          cloud_watch_logs: {
-            status: "ENABLED",
+        Name: @full_project_name,
+        Description: @full_project_name,
+        Artifacts: { Type: "NO_ARTIFACTS" },
+        ServiceRole: { Ref: "IamRole" },
+        BadgeEnabled: true,
+        TimeoutInMinutes: 20,
+        LogsConfig: {
+          CloudWatchLogs: {
+            Status: "ENABLED",
             # the default log group name is thankfully the project name
           }
         },
-        source: {
-          type: "GITHUB",
+        Source: {
+          Type: "GITHUB",
           # location: "", # required
-          # git_clone_depth: 1,
-          git_submodules_config: { fetch_submodules: true },
-          build_spec: build_spec,
-          # auth doesnt seem to work, refer to https://github.com/tongueroo/cody/blob/master/readme/github_oauth.md
-          # auth: {
-          #   type: "OAUTH",
-          #   # resource: "", # required
+          # GitCloneDepth: 1,
+          GitSubmodulesConfig: { FetchSubmodules: true },
+          BuildSpec: build_spec,
+          # auth doesnt seem to work, refer to https://github.com/tongueroo/cody/blob/master/readme/GithubOauth.md
+          # Auth: {
+          #   Type: "OAUTH",
+          #   # Resource: "", # required
           # },
-          report_build_status: true,
         }
       }
     end

data/lib/cody/role.rb

@@ -15,23 +15,23 @@ module Cody
     def run
       load_variables
       evaluate(@role_path) if File.exist?(@role_path)
-      @properties[:policies] = [{
-        policy_name: "CodeBuildAccess",
-        policy_document: {
-          version: "2012-10-17",
-          statement: derived_iam_statements
+      @properties[:Policies] = [{
+        PolicyName: "CodeBuildAccess",
+        PolicyDocument: {
+          Version: "2012-10-17",
+          Statement: derived_iam_statements
         }
       }]
 
-      @properties[:managed_policy_arns] ||= @managed_policy_arns || default_managed_policy_arns
+      @properties[:ManagedPolicyArns] ||= @managed_policy_arns || default_managed_policy_arns
 
       resource = {
         IamRole: {
-          type: "AWS::IAM::Role",
-          properties: @properties
+          Type: "AWS::IAM::Role",
+          Properties: @properties
         }
       }
-      CfnCamelizer.transform(resource)
+      auto_camelize(resource)
     end
 
   private
@@ -41,17 +41,17 @@ module Cody
 
     def default_properties
       {
-        assume_role_policy_document: {
-          statement: [{
-            action: ["sts:AssumeRole"],
-            effect: "Allow",
-            principal: {
-              service: ["codebuild.amazonaws.com"]
+        AssumeRolePolicyDocument: {
+          Statement: [{
+            Action: ["sts:AssumeRole"],
+            Effect: "Allow",
+            Principal: {
+              Service: ["codebuild.amazonaws.com"]
             }
           }],
-          version: "2012-10-17"
+          Version: "2012-10-17"
         },
-        path: "/"
+        Path: "/"
       }
     end
 
@@ -61,7 +61,7 @@ module Cody
 
     def default_iam_statements
       [{
-        action: [
+        Action: [
           "logs:CreateLogGroup",
           "logs:CreateLogStream",
           "logs:PutLogEvents",
@@ -69,8 +69,8 @@ module Cody
           "ssm:DescribeParameters",
           "ssm:GetParameter*",
         ],
-        effect: "Allow",
-        resource: "*"
+        Effect: "Allow",
+        Resource: "*"
       }]
     end
 

data/lib/cody/schedule.rb

@@ -17,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
 
@@ -48,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
@@ -68,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]}"
               }]
             }
           }]