rubycfn 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98d65cbb897496a9645eab2271bc04e8a7080e2cbf247537e5e5eb65e78f6fbe
-  data.tar.gz: 3da58edcf1ac8f9a58846e8e3ca459090f1590af531640b94fafc137ac949712
+  metadata.gz: b3edf333cbadc6a8996cffd0d68726b7a85dfd8c3cc10726be8bbc5f773d954f
+  data.tar.gz: 76d18eb2f1ab6f4363649fbb7982dcba65256fb255875e726dd74a6b41c3c13c
 SHA512:
-  metadata.gz: 3eed6c4a96dfafb68fa8a4e67058ec1951caea92bd5d6337f55a9d7638735874da321b5ac1c40dc3384a6207d942b0aa9aef463841213adf492d045941ec57a1
-  data.tar.gz: fda4c8d3d8436b2f4554fe15add7172d0f903792cd06086a7d8caf59e43e2fa38be4287714c303e30bb22ab78f5fcfc968232e75f8c3372a30aabbaaa2da5970
+  metadata.gz: 476691b642e3c9bbed9682a268ed25c8b6e7ae4d665895f6f3b339b2142322adfe0b08b86d3ef37886d0a1666a2c81995a5ce5a362d8df728a8cde509da4c502
+  data.tar.gz: d40b8ddc22e3a67e5959a16719029c076cc1d039f097c6943425058a420fc40aa986194241c2537a54797af32578a8daf6598f98efe73bc76030754d4ab97e20

data/CHANGELOG.md

@@ -2,7 +2,15 @@
 All notable changes to Rubycfn will be documented in this file.
 This project uses [Semantic Versioning](http://semver.org/).
 
-## 0.5.1 (Next Release)
+## 0.5.2 (Next Release)
+
+## 0.5.1
+
+  * Added descriptive error messages for common errors -- [@dennisvink][@dennisvink]
+  * Allow `rake compile` to succeed with mock .env.dependency.rspec values
+  * Added `rake update` command
+  * Removed a stray unused variable in template code
+  * Update README.md
 
 ## 0.5.0
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubycfn (0.5.0)
+    rubycfn (0.5.1)
       activesupport (~> 5.1.5)
       dotenv (~> 2.4.0)
       json (~> 2.1.0)

data/README.md

@@ -61,7 +61,7 @@ __________ ____ __________________.___._________ _____________________
  |       _/    |   /|    |  _//   |   |/    \  \/ |    __)   |    |  _/
  |    |   \    |  / |    |   \\____   |\     \____|     \    |    |   \
  |____|_  /______/  |______  // ______| \______  /\___  /    |______  /
-        \/                 \/ \/               \/     \/            \/ [v0.5.0]
+        \/                 \/ \/               \/     \/            \/ [v0.5.1]
 Project name? example
 Account ID? 1234567890
 Select region EU (Frankfurt)

data/lib/rubycfn/version.rb

@@ -1,4 +1,4 @@
 # Rubycfn version
 module Rubycfn
-  VERSION = "0.5.0".freeze
+  VERSION = "0.5.1".freeze
 end

data/templates/README.md

@@ -16,11 +16,12 @@ __________ ____ __________________.___._________ _____________________
 
 ## Rake commands
 
-`rake` - Compile the code into CloudFormation templates and run unit tests
+`rake` - Retrieve required outputs from DependencyStack, Compile the code into CloudFormation templates and run unit tests
 `rake init` - Deploy the DependencyStack in the AWS account
 `rake compile` - Compile the code into CloudFormation templates
 `rake spec` - Run unit tests
 `rake upload` - Upload the CloudFormation templates to s3
+`rake update` - Save required outputs from DependencyStack to .env.dependencies
 `rake apply` - Deploy the CloudFormation templates
 
 ## Stack configuration

data/templates/Rakefile

@@ -51,7 +51,8 @@ RuboCop::RakeTask.new(:rubocop) do |t|
   t.options = ["--display-cop-names"]
 end
 
+task apply: %i(dependencies apply_stack)
+task compile: %i(compile_stack)
 task default: %i(dependencies compile_stack spec)
-task compile: %i(dependencies compile_stack)
+task update: %i(dependencies)
 task upload: %i(dependencies upload_stack)
-task apply: %i(dependencies apply_stack)

data/templates/lib/aws_helper/dependencies.rb

@@ -6,10 +6,11 @@ def load_env_vars
 
   check_dependencies
   {
+    artifact_bucket: ENV["ARTIFACTBUCKET"],
     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["ARTIFACTBUCKET"],
+    cloudformation_bucket: ENV["CLOUDFORMATIONBUCKET"],
     environment: ENV["ENVIRONMENT"],
     stack_name: ENV["STACK_NAME"]
   }
@@ -17,9 +18,10 @@ end
 
 def check_dependencies
   ENV["AWS_REGION"] ||= ENV["AWS_DEFAULT_REGION"]
-  raise "AWS_REGION not set" unless ENV["AWS_REGION"]
-  raise "ARTIFACTBUCKET not set" unless ENV["ARTIFACTBUCKET"]
-  raise "ENVIRONMENT not set" unless ENV["ENVIRONMENT"]
+  raise "AWS_REGION not set." unless ENV["AWS_REGION"]
+  raise "CLOUDFORMATIONBUCKET not set. Run `rake init` and `rake update` first!" unless ENV["CLOUDFORMATIONBUCKET"]
+  raise "ARTIFACTBUCKET not set. Run `rake init` and `rake update` first!" unless ENV["ARTIFACTBUCKET"]
+  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/lib/aws_helper/deploy.rb

@@ -45,7 +45,6 @@ def get_parent_stack_s3_location(bucket, environment)
     JSON.parse(stack)["Resources"].each do |_resource, payload|
       if payload["Type"] == "AWS::CloudFormation::Stack"
         parent_stack = stack_name
-        json_file = "build/#{environment}-#{stack_name.downcase}.json"
         file_hash = git_revision
         break
       end

data/templates/lib/core/dependencies.rb

@@ -10,10 +10,16 @@ ENV["AWS_DEFAULT_REGION"] ||= "eu-west-1"
 ENV["AWS_REGION"] ||= ENV["AWS_DEFAULT_REGION"]
 
 client = Aws::CloudFormation::Client.new(region: ENV["AWS_REGION"])
-res = client.describe_stacks(
-  stack_name: "DependencyStack"
-)
 
+begin
+  res = client.describe_stacks(
+    stack_name: "DependencyStack"
+  )
+rescue Aws::CloudFormation::Errors::InvalidClientTokenId
+  raise "ERROR: Your AWS credentials are not set or invalid."
+end
+
+raise "ERROR: .env.dependencies does not exist. Run `rake init` and `rake dependencies` first!" unless File.file?(".env.dependencies")
 dep_file = File.open(".env.dependencies", "w")
 res[:stacks].each do |stack|
   stack[:outputs].each do |output|

data/templates/lib/core/deploy.rb

@@ -8,7 +8,7 @@ require_relative "../aws_helper/main"
 
 Dotenv.load(".env.private")
 Dotenv.load(".env.dependencies")
-raise "CLOUDFORMATIONBUCKET not found in DependencyStack outputs" unless ENV["CLOUDFORMATIONBUCKET"]
+raise "CLOUDFORMATIONBUCKET not set. Run `rake init` and `rake update` first!" unless ENV["CLOUDFORMATIONBUCKET"]
 
 env_vars = load_env_vars
 

data/templates/lib/shared_concerns/shared_methods.rb

@@ -35,7 +35,9 @@ module Concerns
       end
 
       def generate_bootstrap_parameters
-        File.open(".env.dependencies#{environment == "rspec" && ".rspec" || ""}").read.each_line do |line|
+        warn "WARNING: .env.dependencies does not exist. Run `rake dependencies` first!" unless File.file?(".env.dependencies")
+        filename = File.file?(".env.dependencies") && ".env.dependencies#{environment == "rspec" && ".rspec" || ""}" || ".env.dependencies.rspec"
+        File.open(filename).read.each_line do |line|
           line.strip!
           param, _value = line.split("=")
           parameter param.to_sym,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubycfn
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Dennis Vink