rubycfn 0.4.10 → 0.5.4

data/templates/{vpc_stack.rb.erb → lib/stacks/vpc_stack/main.rb}

@@ -1,11 +1,10 @@
 module VpcStack
   extend ActiveSupport::Concern
   include Rubycfn
-
   included do
     include Concerns::GlobalVariables
     include Concerns::SharedMethods
-    include VpcStack::Main
+    include VpcStack::InfraVpc
 
     description generate_stack_description("VpcStack")
   end

data/templates/{parent_stack_spec.rb.erb → spec/lib/parent_spec.rb}

@@ -8,10 +8,10 @@ module ParentSpec
   include Rubycfn
 
   included do
-    description "<%= name %> RSpec"
+    description "Infra Stack RSpec"
     include Concerns::GlobalVariables
     include Concerns::SharedMethods
-    include <%= name %>Stack::Parent
+    include InfraStack::Parent
   end
 end
 
@@ -23,15 +23,12 @@ describe ParentSpec do
 
   context "Renders template" do
     subject { template }
-
     it { should have_key "Resources" }
 
     context "Has Required Resources" do
       let(:resources) { template["Resources"] }
       subject { resources }
 
-      it { should have_key "VpcStack" }
-      it { should have_key "EcsStack" }
     end
   end
 end

data/templates/{spec_helper.rb.erb → spec/spec_helper.rb}

@@ -22,7 +22,7 @@ RSpec.configure do |config|
   config.filter_run_excluding broken: true
   config.filter_run_excluding turn_off: true
   config.filter_run focus: true
-  config.run_all_when_everything_filtered = true
   config.filter_run_excluding :slow unless ENV["SLOW_SPECS"]
   config.filter_run_excluding :debug unless ENV["DEBUG_SPECS"]
-end
+  config.run_all_when_everything_filtered = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubycfn
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.5.4
 platform: ruby
 authors:
 - Dennis Vink
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-29 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -265,7 +265,6 @@ files:
 - README.md
 - Rakefile
 - bin/rubycfn
-- format.vim
 - lib/cli_methods.rb
 - lib/monkeypatch.rb
 - lib/rubycfn.rb
@@ -273,47 +272,59 @@ files:
 - rubycfn.gemspec
 - spec/lib/rubycfn_spec.rb
 - spec/spec_helper.rb
-- templates/.env.erb
-- templates/.env.production.erb
-- templates/.env.rspec.erb
-- templates/.env.test.erb
-- templates/.gitignore.erb
-- templates/.gitlab-ci.yml.erb
-- templates/.rubocop.yml.erb
-- templates/Gemfile.erb
-- templates/Rakefile.erb
-- templates/aws_sdk.rb.erb
-- templates/compiler.rb.erb
-- templates/core_compile.rb.erb
-- templates/core_deploy.rb.erb
-- templates/core_diff.rb.erb
-- templates/core_upload.rb.erb
-- templates/dependencies.rb.erb
-- templates/deploy.rb.erb
-- templates/ecs_stack.rb.erb
-- templates/ecs_stack_concern.rb.erb
-- templates/global_variables.rb.erb
-- templates/helper_methods.rb.erb
-- templates/helpers.rb.erb
-- templates/main.rb.erb
-- templates/main_aws_helper.rb.erb
-- templates/new_concern.rb.erb
-- templates/new_stack.rb.erb
-- templates/parent_stack_spec.rb.erb
-- templates/project_concern.rb.erb
-- templates/project_stack.rb.erb
-- templates/shared_methods.rb.erb
-- templates/spec_helper.rb.erb
-- templates/subnets.rb.erb
-- templates/upload_stack.rb.erb
-- templates/vpc_concerns.rb.erb
-- templates/vpc_spec.rb.erb
-- templates/vpc_stack.rb.erb
+- templates/.env
+- templates/.env.acceptance
+- templates/.env.dependencies.rspec
+- templates/.env.development
+- templates/.env.private
+- templates/.env.production
+- templates/.env.rspec
+- templates/.env.test
+- templates/.gitignore
+- templates/.rubocop.yml
+- templates/Gemfile
+- templates/README.md
+- templates/Rakefile
+- templates/config.yaml
+- templates/lib/aws_helper/aws_sdk.rb
+- templates/lib/aws_helper/compiler.rb
+- templates/lib/aws_helper/dependencies.rb
+- templates/lib/aws_helper/deploy.rb
+- templates/lib/aws_helper/helpers.rb
+- templates/lib/aws_helper/main.rb
+- templates/lib/aws_helper/upload_stack.rb
+- templates/lib/core/applications.rb
+- templates/lib/core/assume_role.rb
+- templates/lib/core/classes.rb
+- templates/lib/core/compile.rb
+- templates/lib/core/dependencies.rb
+- templates/lib/core/deploy.rb
+- templates/lib/core/git.rb
+- templates/lib/core/init.rb
+- templates/lib/core/upload.rb
+- templates/lib/main.rb
+- templates/lib/shared_concerns/global_variables.rb
+- templates/lib/shared_concerns/helper_functions.rb
+- templates/lib/shared_concerns/helper_methods.rb
+- templates/lib/shared_concerns/shared_methods.rb
+- templates/lib/stacks/acm_stack/certificate_manager.rb
+- templates/lib/stacks/acm_stack/main.rb
+- templates/lib/stacks/ecs_stack/ecs_cluster.rb
+- templates/lib/stacks/ecs_stack/lifecycle_hook.rb
+- templates/lib/stacks/ecs_stack/load_balancer.rb
+- templates/lib/stacks/ecs_stack/main.rb
+- templates/lib/stacks/ecs_stack/rollback.rb
+- templates/lib/stacks/parent_stack/main.rb
+- templates/lib/stacks/parent_stack/parent.rb
+- templates/lib/stacks/vpc_stack/infra_vpc.rb
+- templates/lib/stacks/vpc_stack/main.rb
+- templates/spec/lib/parent_spec.rb
+- templates/spec/spec_helper.rb
 homepage: https://github.com/dennisvink/rubycfn
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -328,17 +339,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Rubycfn
 test_files:
 - rubycfn.gemspec
 - spec/lib/rubycfn_spec.rb
 - spec/spec_helper.rb
-- templates/.env.rspec.erb
-- templates/.env.test.erb
-- templates/parent_stack_spec.rb.erb
-- templates/spec_helper.rb.erb
-- templates/vpc_spec.rb.erb
+- templates/.env.dependencies.rspec
+- templates/.env.rspec
+- templates/.env.test
+- templates/spec/lib/parent_spec.rb
+- templates/spec/spec_helper.rb

data/format.vim

@@ -1,3 +0,0 @@
-gg=G
-:retab
-ZZ

data/templates/.env.erb

@@ -1,4 +0,0 @@
-AWS_ACCOUNT_ID="<%= account_id %>"
-AWS_REGION="<%= region %>"
-ENVIRONMENT="test"
-PROJECT_NAME="<%= project_name %>"

data/templates/.env.production.erb

@@ -1,6 +0,0 @@
-# ENV vars for production environment
-CLOUD_TRAIL_MONITOR_SNS_RECIPIENTS="changeme@example.com,changemetoo@example.com"
-ROOT_MONITOR_SNS_RECIPIENTS="changeme@example.com,changemetoo@example.com"
-VPC_CIDR_BLOCK="10.200.0.0/16"
-ARTIFACT_BUCKET="my-awesome-cloudformation-artifact-bucket-for-production"
-STACK_NAME="production"

data/templates/.env.rspec.erb

@@ -1,6 +0,0 @@
-# ENV vars for rspec environment
-CLOUD_TRAIL_MONITOR_SNS_RECIPIENTS="should@match"
-ROOT_MONITOR_SNS_RECIPIENTS="should@match"
-VPC_CIDR_BLOCK="10.0.0.0/16"
-ARTIFACT_BUCKET="my-mock-bucket"
-STACK_NAME="rspec"

data/templates/.env.test.erb

@@ -1,6 +0,0 @@
-# ENV vars for test environment
-CLOUD_TRAIL_MONITOR_SNS_RECIPIENTS="changeme@example.com,changemetoo@example.com"
-ROOT_MONITOR_SNS_RECIPIENTS="changeme@example.com,changemetoo@example.com"
-VPC_CIDR_BLOCK="10.100.0.0/16"
-ARTIFACT_BUCKET="my-awesome-cloudformation-artifact-bucket"
-STACK_NAME="test"

data/templates/.gitlab-ci.yml.erb

@@ -1,75 +0,0 @@
-image: rubycfn/rubycfn:latest
-
-before_script:
-  - bundle
-
-variables:
-  CFN_ARTIFACT_BUCKET: "my-awesome-cloudformation-bucket"
-  STAGING_AWS_REGION: eu-west-1
-  PROD_AWS_REGION: eu-west-1
-
-stages:
-  - build
-  - test
-  - upload
-  - staging
-  - production
-
-build:
-  stage: build
-  variables:
-    ARTIFACT_BUCKET: ${CFN_ARTIFACT_BUCKET}
-  script:
-    - export SLACK_WEBHOOK=$K8S_SECRET_SLACK_POST_HOOK
-    - ENVIRONMENT="test" rake compile
-    - ENVIRONMENT="production" rake compile
-    - rubocop
-    - cfn_nag_scan --input-path build/ || true
-  artifacts:
-    paths:
-      - build/
-
-test:
-  stage: test
-  script: 
-    - rake spec
-  dependencies:
-    - build
-
-upload:
-  stage: upload
-  variables:
-    ARTIFACT_BUCKET: ${CFN_ARTIFACT_BUCKET}
-    AWS_REGION: ${STAGING_AWS_REGION}
-  script:
-    - export AWS_SECRET_ACCESS_KEY=$K8S_SECRET_AWS_SECRET_ACCESS_KEY
-    - export AWS_ACCESS_KEY_ID=$K8S_SECRET_AWS_ACCESS_KEY_ID
-    - ENVIRONMENT="test" rake upload
-    - ENVIRONMENT="production" rake upload
-
-deploy_staging:
-  stage: staging
-  variables:
-    ARTIFACT_BUCKET: ${CFN_ARTIFACT_BUCKET}
-    AWS_REGION: ${STAGING_AWS_REGION}
-  script:
-    - export AWS_SECRET_ACCESS_KEY=$K8S_SECRET_AWS_SECRET_ACCESS_KEY
-    - export AWS_ACCESS_KEY_ID=$K8S_SECRET_AWS_ACCESS_KEY_ID
-    - export ENVIRONMENT="test"
-    - rake apply
-  allow_failure: false
-
-deploy_prod:
-  stage: production
-  variables:
-    ARTIFACT_BUCKET: ${CFN_ARTIFACT_BUCKET}
-    AWS_REGION: ${PROD_AWS_REGION}
-  script:
-    - export AWS_SECRET_ACCESS_KEY=$K8S_SECRET_AWS_SECRET_ACCESS_KEY
-    - export AWS_ACCESS_KEY_ID=$K8S_SECRET_AWS_ACCESS_KEY_ID
-    - export ENVIRONMENT="production"
-    - rake apply
-  dependencies:
-    - deploy_staging
-  when: manual
-  allow_failure: false

data/templates/aws_sdk.rb.erb

@@ -1,18 +0,0 @@
-def create_bucket_if_not_exists(aws_region, artifact_bucket)
-  s3 = Aws::S3::Resource.new(region: aws_region)
-  begin
-    s3.create_bucket(bucket: artifact_bucket)
-  rescue => exception
-    raise exception unless exception.class == Aws::S3::Errors::BucketAlreadyOwnedByYou
-  end
-  s3
-end
-
-def set_aws_credentials(region, access_key_id, secret_access_key)
-  Aws.config.update(
-    region: region,
-    credentials: Aws::Credentials.new(
-      access_key_id, secret_access_key
-    )
-  )
-end

data/templates/core_diff.rb.erb

@@ -1,59 +0,0 @@
-require "diffy"
-require_relative "../aws_helper/main"
-
-env_vars = load_env_vars
-
-set_aws_credentials(
-  env_vars[:aws_region],
-  env_vars[:aws_access_key_id],
-  env_vars[:aws_secret_access_key]
-)
-
-client = Aws::CloudFormation::Client.new
-template = client.get_template(
-  stack_name: "#{ENV["ENVIRONMENT"]}-#{ENV["PROJECT_NAME"]}"
-)
-
-s3 = Aws::S3::Resource.new(region: env_vars[:aws_region])
-orig_template = {}
-
-template = JSON.parse(template.template_body)
-template["Resources"].each do |resource_name, content|
-  if content["Type"] == "AWS::CloudFormation::Stack"
-    stack_name = "#{ENV["PROJECT_NAME"].capitalize}Stack"
-    orig_template[stack_name] = JSON.pretty_generate(
-      JSON.parse(
-        template.to_json
-      )
-    )
-  end
-  next unless content["Type"] == "AWS::CloudFormation::Stack"
-  s3_filename = content["Properties"]["TemplateURL"].split("/").last
-  orig_template[resource_name] = JSON.pretty_generate(
-    JSON.parse(
-      s3.client.get_object(
-        bucket: env_vars[:artifact_bucket],
-        key: s3_filename
-      ).body.read
-    )
-  )
-end
-
-stacks = compile_stacks(true)
-@stack_hashes.each do |stack_name, _hash|
-  new_template = JSON.pretty_generate(
-    JSON.parse(
-      stacks[stack_name]
-    )
-  )
-  diff = Diffy::Diff.new(
-    orig_template[stack_name.to_s], new_template
-  ).to_s(:color)
-
-  if diff.strip.empty?
-    puts "No difference between local #{stack_name} and remote #{stack_name}"
-  else
-    puts "Orig #{stack_name} vs #{stack_name}:"
-    puts diff
-  end
-end

data/templates/dependencies.rb.erb

@@ -1,23 +0,0 @@
-def load_env_vars
-  Dotenv.load(".env")
-  Dotenv.load(".env.#{ENV["ENVIRONMENT"]}")
-  Dotenv.load(".env.private")
-  check_dependencies
-  {
-    aws_region: ENV["AWS_REGION"],
-    aws_access_key_id: ENV["AWS_ACCESS_KEY_ID"],
-    aws_secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"],
-    artifact_bucket: ENV["ARTIFACT_BUCKET"],
-    environment: ENV["ENVIRONMENT"],
-    stack_name: ENV["STACK_NAME"]
-  }
-end
-
-def check_dependencies
-  ENV["AWS_REGION"] ||= ENV["AWS_DEFAULT_REGION"]
-  raise "AWS_REGION not set" unless ENV["AWS_REGION"]
-  raise "ARTIFACT_BUCKET not set" unless ENV["ARTIFACT_BUCKET"]
-  raise "ENVIRONMENT not set" unless ENV["ENVIRONMENT"]
-  raise "STACK_NAME not set" unless ENV["STACK_NAME"]
-  raise "AWS CREDENTIALS NOT SET" unless ENV["AWS_ACCESS_KEY_ID"] && ENV["AWS_SECRET_ACCESS_KEY"]
-end

data/templates/ecs_stack_concern.rb.erb

@@ -1,20 +0,0 @@
-module EcsStack
-  module EcsCluster
-    extend ActiveSupport::Concern
-
-    included do
-      transform
-      parameter :vpc,
-                description: "VPC ID"
-
-      # Create an empty ECS Cluster to launch fargate bastions (or other things) in
-      resource :<%= name.downcase %>_ecs_cluster,
-               type: "AWS::ECS::Cluster"
-
-      output :<%= name.downcase %>_ecs_cluster,
-             value: "<%= name %>EcsCluster".ref
-      output :<%= name.downcase %>_ecs_cluster_arn,
-             value: "<%= name.downcase %>EcsCluster".ref("Arn")
-    end
-  end
-end