environments-list-builder 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b2b20fdbab58465704fda937945c41e9540e121
-  data.tar.gz: 82c7d922fc1be3b139ec96a2c0f536d8a71e8326
+  metadata.gz: d8bffe360af78d91a16d39cc846005da7d71a322
+  data.tar.gz: 38b99640addaf84a77dfd9a4177230d97bd67940
 SHA512:
-  metadata.gz: 558440a865cb918b61da36274e6ce574afa41f240169a3941b90247a304e3c4443789eef42d0b29d3ee60573b12e028fbfad269270bd674e1af1089996e131e7
-  data.tar.gz: d63e21fa73dd64e2f30d3a489d7d8851e0910a3005cbc35bc03e8f1efcba54d3337a318e822068df712fdfdac0adff3373847144ffcb7818d9806804a6c3cd10
+  metadata.gz: 82d806b20e546257194fa20107d3d316a5c6b60e832aa3412898a918bfbde9748860341d778d578b6f7e54c830f96f4a20c4cc081e419ddb2a18a3a142c9202f
+  data.tar.gz: a589f3446a8b10784400f9cb3ed99d1f9f4376c09c4dc5c860f42873f1066dd32c760ae8ac8b29d05129f01892403b25fd814cc99592e503c314eccc8c1642ce

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    environments-list-builder (0.2.0)
+    environments-list-builder (0.3.0)
       archive-tar-minitar (= 0.5.2)
       awesome_print
       aws-sdk (>= 2.0, < 2.1)
@@ -24,7 +24,7 @@ PATH
 PATH
   remote: ../cicd-builder
   specs:
-    cicd-builder (0.9.60)
+    cicd-builder (0.9.61)
       artifactory (>= 2.2.1, < 2.3)
       awesome_print (>= 1.6, < 2.0)
       aws-sdk (>= 2.0, < 2.1)

data/lib/cicd/builder/environments-list.rb

@@ -31,15 +31,34 @@ module CiCd
           }
         end
 
+        # ---------------------------------------------------------------------------------------------------------------
+        def checkEnvironment()
+          @logger.step CLASS+'::'+__method__.to_s
+          # We fake some of the keys that the will need later ...
+          fakes = @default_options[:env_keys].select{|key| key =~ /^(CLASSES|REPO_PRODUCTS|MANIFEST_FILE)/}
+          faked = {}
+          fakes.each do |key|
+            unless ENV.has_key?(key)
+              ENV[key]='faked'
+              faked[key] = true
+            end
+          end
+          ret = super
+          faked.each do |k,_|
+            ENV.delete k
+            @default_options[:env_unused].delete k if @default_options[:env_unused]
+          end
+          @default_options[:env_unused] = @default_options[:env_unused].select{|k| k !~ /^(ARTIFACTORY|AWS_INI)/} if @default_options[:env_unused]
+          ret
+        end
+
         # ---------------------------------------------------------------------------------------------------------------
         def setup()
           $stdout.write("EnvironmentsListBuilder v#{CiCd::Builder::EnvironmentsList::VERSION}\n")
           @default_options[:env_keys] << %w(
-                                            REPO_PRODUCTS
                                             ARTIFACTORY_RELEASE_REPO
                                             ARTIFACTORY_ENVIRONMENTS_MODULE
                                            )
-          @default_options[:env_keys] = @default_options[:env_keys].select{|key| key !~ /^CLASSES/}
           super
         end
 

data/lib/cicd/builder/environments-list/mixlib/build.rb

@@ -26,6 +26,25 @@ module CiCd
           @vars[:return_code]
         end
 
+        # ---------------------------------------------------------------------------------------------------------------
+        def loadEnvironments(filename,version,changed=false)
+          require 'hashie'
+          @vars[:environments] = {
+              file: filename,
+              version: version,
+              changed: (changed or not File.exists?(filename)),
+          }
+          data = IO.read(filename) rescue '{}'
+          json = begin
+            JSON.parse(data)
+          rescue
+            eval(data)
+          end
+          IO.write(filename, JSON.pretty_generate(json, {indent: "\t", space: ' '})) # Just to be tidy :)
+          @vars[:environments][:data] = Hashie::Mash.new(json)
+          @logger.info "#{ENV['ARTIFACTORY_ENVIRONMENTS_MODULE']}-#{version}"
+        end
+
         # ---------------------------------------------------------------------------------------------------------------
         def getLatestEnvironments(oldver=nil)
           version = @repo.latestArtifactoryVersion(ENV['ARTIFACTORY_ENVIRONMENTS_MODULE'], ENV['ARTIFACTORY_RELEASE_REPO'])
@@ -37,23 +56,7 @@ module CiCd
                   @logger.error "Too many versions found for #{ENV['ARTIFACTORY_RELEASE_REPO']}/#{ENV['ARTIFACTORY_ENVIRONMENTS_MODULE']}-#{version} during preparation?"
                   @vars[:return_code] = Errors::ARTIFACT_MULTI_MATCH
                 else
-                  require 'hashie'
-                  filename = objects[0].download()
-                  @vars[:environments] = {
-                      file: filename,
-                      # artifact: objects[0],
-                      version: version,
-                      changed: false,
-                  }
-                  data = IO.read(filename)
-                  json = begin
-                    JSON.parse(data)
-                  rescue
-                    eval(data)
-                  end
-                  IO.write(filename, JSON.pretty_generate(json, {indent: "\t", space: ' '})) # Just to be tidy :)
-                  @vars[:environments][:data] = Hashie::Mash.new(json)
-                  @logger.info "#{ENV['ARTIFACTORY_ENVIRONMENTS_MODULE']}-#{version}"
+                  loadEnvironments(objects[0].download(), version)
                 end
               else
                 @logger.error "Version not found for #{ENV['ARTIFACTORY_RELEASE_REPO']}/#{ENV['ARTIFACTORY_ENVIRONMENTS_MODULE']}-#{version} during preparation?"
@@ -63,8 +66,9 @@ module CiCd
               @logger.info "Alread have the latest version (#{oldver})"
             end
           else
-            @logger.error "No version found for #{ENV['ARTIFACTORY_RELEASE_REPO']}/#{ENV['ARTIFACTORY_ENVIRONMENTS_MODULE']} during preparation?"
-            @vars[:return_code] = Errors::ARTIFACT_NOT_FOUND
+            @logger.warn "No version found for #{ENV['ARTIFACTORY_RELEASE_REPO']}/#{ENV['ARTIFACTORY_ENVIRONMENTS_MODULE']} during preparation?"
+            # @vars[:return_code] = Errors::ARTIFACT_NOT_FOUND
+            loadEnvironments('/tmp/environments.json', '1', true)
           end
           @vars[:return_code]
         end
@@ -97,13 +101,19 @@ module CiCd
               helper.options[:profiles] = ENV['AWS_PROFILES'] if ENV['AWS_PROFILES']
               helper.prepare_accounts
               if helper.accounts.size > 0
-                helper.get_environments()
-                if helper.environments.size > 0
+                helper_environments = loadCachedEnvironments()
+                unless helper_environments.size > 0
+                  helper.get_environments()
+                  helper_environments = helper.environments
+                  saveCachedEnvironments(helper_environments)
+                end
+
+                if helper_environments.size > 0
                   getLatestEnvironments(@vars[:environments][:version])
                   if 0 == @vars[:return_code]
                     environments = Hashie::Mash.new(@vars[:environments][:data])
                     exclude_regex = ENV['ENVS_EXCLUDE_REGEX'] || '-repo'
-                    helper.environments.select{|e,_| e !~ /#{exclude_regex}/ }.each do |envnam,_|
+                    helper_environments.select{|e,_| e !~ /#{exclude_regex}/ }.each do |envnam,_|
                       environments[envnam] ||= {}
                     end
                     if environments.size != @vars[:environments][:data].size
@@ -129,6 +139,32 @@ module CiCd
 
         protected
 
+        CACHE_FILE = '/tmp/aws_cloudformation_environments_stacks.json'
+        # ---------------------------------------------------------------------------------------------------------------
+        def loadCachedEnvironments
+          hash = {}
+          # if File.exists?(CACHE_FILE)
+          # end
+          begin
+            stat = File.stat(CACHE_FILE)
+            age  = (Time.now - stat.mtime)
+            @logger.info "Environment stacks cache #{CACHE_FILE} age is #{age}s"
+            if age < 3600
+              hash = JSON.parse(IO.read(CACHE_FILE))
+            else
+              hash = {}
+            end
+          rescue
+            hash = {}
+          end
+          hash
+        end
+
+        # ---------------------------------------------------------------------------------------------------------------
+        def saveCachedEnvironments(environments)
+          IO.write(CACHE_FILE,JSON.pretty_generate(environments,{ indent: "\t", space: ' '}))
+        end
+
         def prepare_accounts
           @accounts = []
           if @options[:iniglob]

data/lib/cicd/builder/environments-list/version.rb

@@ -2,7 +2,7 @@ module CiCd
   module Builder
     module EnvironmentsList
       # environments-list-builder version
-      VERSION = '0.2.0'
+      VERSION = '0.3.0'
       MAJOR, MINOR, TINY = VERSION.split('.')
       PATCH = TINY
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: environments-list-builder
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: manifest-builder