idlc-sdk-pfm 1.0.0.rc12 → 1.0.0.rc13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8bd0163690bfb2993bc37fc9c209cb41c39e13e
-  data.tar.gz: a0d401d92ff2729cd72af3471d0c026e7963e64b
+  metadata.gz: c8ba8ceed47dcdc4995186b2eb8d947f11f989bc
+  data.tar.gz: 95b58c9409b4958a1521231920d73af4de539a94
 SHA512:
-  metadata.gz: 865323c94db5b019dec72bbd01d0a39af6ed91965516b18430e2e58c723702f23596e24a83cd5ceafaaf3b649dd0f44f2216dc41b562fb5927b732f876e6ac80
-  data.tar.gz: a6c84d33f87fa6bfa4557160710cfc6c324ed66544db358e76929f3b408e716b5cae5591ebffc1a70ba9611cd9fb928f8e8c029e7f4dbaf1f118ea3135d1eb05
+  metadata.gz: 3213b642518b3b9d54bee82e4b3b366212582a63b0ba806c183a2029f96b892014bbe4dabfddb54a116dd78e83349a2cdac9503bedd65c326d30b0a5d107597a
+  data.tar.gz: 93f9fa665c16878ad462a5a1685503f9333bf51cd4b0a0d7fa6407e945e7ba3c6eb6a7799423f101669a291c65e630d7a79e208e6a8796eca47ef678e4bcf98d

data/lib/idlc-sdk-pfm/command/apply.rb

@@ -18,6 +18,16 @@ module Pfm
              description:  'Server Build Number to Deploy',
              default:      ENV['SERVER_BUILD']
 
+      option :config_file,
+             long:         '--config-file',
+             description:  'Optional environment metadata file',
+             default:      ''
+
+      option :working_dir,
+             long:         '--dir',
+             description:  'Optional directory of infrastructure configuration to use',
+             default:      ''
+
       def initialize
         super
         @params_valid = true
@@ -29,8 +39,13 @@ module Pfm
         read_and_validate_params
 
         if params_valid?
-          deploy_setup
-          apply
+          if (@config[:config_file])
+            deploy_setupv2
+            apply(@config[:working_dir])
+          else
+            deploy_setup
+            apply(@workspace.tmp_dir)
+          end
           # @workspace.cleanup causing bundler issues
           0
         else
@@ -44,8 +59,8 @@ module Pfm
         1
       end
 
-      def apply
-        Terraform::Binary.apply(@workspace.tmp_dir.to_s) || raise
+      def apply(dir)
+        Terraform::Binary.apply(dir.to_s) || raise
       rescue
         raise DeploymentFailure, 'Finished with errors'
       end

data/lib/idlc-sdk-pfm/command/base.rb

@@ -1,6 +1,7 @@
 require 'mixlib/cli'
 require 'idlc-sdk-pfm/helpers'
 require 'securerandom'
+require 'json'
 
 module Pfm
   module Command
@@ -158,6 +159,40 @@ module Pfm
         config.configure_state(bucket_name, sub_bucket, @workspace.tmp_dir)
       end
 
+      def deploy_setupv2
+        Terraform::Binary.configure do |config|
+          config.version = SETTINGS['TERRAFORM_VERSION']
+          config.download_path = "/tmp/#{SecureRandom.uuid}"
+        end
+
+        env_metadata = JSON.parse(open(@config[:config_file]).read)
+        env_metadata['account'].each do |key, value|
+          Idlc::Deploy::Config.add_deployment_var(key, value)
+        end
+        env_metadata['environment'].each do |key, value|
+          Idlc::Deploy::Config.add_deployment_var(key, value)
+        end
+        env_metadata['ec2'].each do |key, value|
+          Idlc::Deploy::Config.add_deployment_var(key, value)
+        end
+
+        # Pass some extra vars for Terraform
+        Idlc::Deploy::Config.add_deployment_var('environment_key', env_metadata['environment_key'])
+        Idlc::Deploy::Config.add_deployment_var('version', env_metadata['environment']['inf_version'])
+        Idlc::Deploy::Config.add_deployment_var('major_minor', Idlc::Utility.major_minor(env_metadata['environment']['inf_version']))
+        Idlc::Deploy::Config.add_deployment_var('major_minor_patch', Idlc::Utility.major_minor_patch(env_metadata['environment']['inf_version']))
+        Idlc::Deploy::Config.add_deployment_var('build', @config[:server_build])
+        Idlc::Deploy::Config.add_deployment_var('app_release', @config[:app_release])
+
+        Idlc::Deploy::Keypair.generate("#{@config[:working_dir]}/env/kp")
+
+        config.configure_state(
+          env_metadata['account']['tfstate_bucket'],
+          env_metadata['environment_key'],
+          @config[:working_dir]
+        )
+      end
+
       def templates_dir
         "#{__dir__}/templates/#{@build_metadata.attributes['build_stage'].value}"
       end

data/lib/idlc-sdk-pfm/command/plan.rb

@@ -25,6 +25,16 @@ module Pfm
              boolean:      true,
              default:      false
 
+      option :config_file,
+             long:         '--config-file',
+             description:  'Optional environment metadata file',
+             default:      ''
+
+      option :working_dir,
+             long:         '--dir',
+             description:  'Optional directory of infrastructure configuration to use',
+             default:      ''
+
       def initialize
         super
         @params_valid = true
@@ -36,8 +46,13 @@ module Pfm
         read_and_validate_params
 
         if params_valid?
-          deploy_setup
-          plan
+          if (@config[:config_file])
+            deploy_setupv2
+            plan(@config[:working_dir])
+          else
+            deploy_setup
+            plan(@workspace.tmp_dir)
+          end
           # @workspace.cleanup causing bundler issues
           0
         else
@@ -51,10 +66,10 @@ module Pfm
         1
       end
 
-      def plan
+      def plan(dir)
         begin
-          Terraform::Binary.plan(@workspace.tmp_dir) unless @config[:landscape]
-          Terraform::Binary.plan("#{@workspace.tmp_dir} | landscape") if @config[:landscape]
+          Terraform::Binary.plan(dir.to_s) unless @config[:landscape]
+          Terraform::Binary.plan("#{dir} | landscape") if @config[:landscape]
         rescue
           raise DeploymentFailure, 'Finished with errors'
         end

data/lib/idlc-sdk-pfm/version.rb

@@ -1,3 +1,3 @@
 module Pfm
-  VERSION = '1.0.0.rc12'.freeze
+  VERSION = '1.0.0.rc13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idlc-sdk-pfm
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc12
+  version: 1.0.0.rc13
 platform: ruby
 authors:
 - Nathan Cazell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler