TerraformDevKit 0.2.7 → 0.3.1.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7670b9014d091bfa76b33918447c49e5b1bc35b4
-  data.tar.gz: 674548302e91878a01cf8d45fed5fa09e4e2587f
+  metadata.gz: 61324a6263f32fec652b3c6daea0cd8ee4122fdd
+  data.tar.gz: 110251680246f79e70f9852c6daf7ac544f0a459
 SHA512:
-  metadata.gz: f9e17fff69052fd24a31d2864634a819ec0785df1678bb2e561edeef01475651eaf1365985bbff7603a72d1f46540b76d1aa25e2e9b62b8bde2964a32f3f3ddb
-  data.tar.gz: 11458936dde76c2f88e2cf2878dee89498c8884b467eddc5defeefd7f082504e633d78482f517fdce26c98b6a05af88f1181015745a62c936588e95c6e210811
+  metadata.gz: 2479eee7bea5199c2a23f6ce00b34e635ccee5d1ae93c1701af70322158883088def53933d4ab5f41c61502499969d48e48359b150f592649d23c68365300b64
+  data.tar.gz: ce79833600dc8e75b7f67d4e2bf283669287c5db096ba9ce123f37d0444ad3c02e861796095b00d6cb058c9c7e6468e7cc7b4b7f9c9498c5499ab92df2f48f4d

data/TerraformDevKit.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   
   spec.add_runtime_dependency 'aws-sdk-core', '~> 3'
   spec.add_runtime_dependency 'aws-sdk-dynamodb', '~> 1'
+  spec.add_runtime_dependency 'aws-sdk-cloudfront', '~> 1'
   spec.add_runtime_dependency 'aws-sdk-s3', '~> 1'
   spec.add_runtime_dependency 'mustache', '~> 1.0'
   spec.add_runtime_dependency 'rainbow', '~> 3.0'

data/lib/TerraformDevKit/aws/aws.rb

@@ -0,0 +1,65 @@
+require 'aws-sdk-core'
+
+Aws.use_bundled_cert!
+
+module TerraformDevKit
+  module Aws
+    class AwsConfig
+      def initialize(config)
+        unless config.nil?
+          @profile = config.fetch('profile', nil)
+          @region = config.fetch('region', nil)
+          @access_key_id = config.fetch('access_key_id', nil)
+          @secret_access_key = config.fetch('secret_access_key', nil)
+        end
+      end
+
+      def credentials
+        unless profile.nil?
+          credentials = ::Aws::SharedCredentials.new(profile_name: profile)
+          return credentials if credentials.set?
+        end
+
+        return ::Aws::Credentials.new(*access_keys) if access_keys_available?
+
+        raise 'Cannot find AWS credentials'
+      end
+
+      def region
+        @region || ENV['AWS_REGION']
+      end
+
+      def profile
+        @profile || ENV['AWS_PROFILE']
+      end
+
+      private
+
+      def access_keys
+        return config_access_keys if config_has_access_keys?
+        return environment_access_keys if environment_has_access_keys?
+        nil
+      end
+
+      def access_keys_available?
+        config_has_access_keys? || environment_has_access_keys?
+      end
+
+      def config_has_access_keys?
+        !@access_key_id.nil? && !@secret_access_key.nil?
+      end
+
+      def config_access_keys
+        return @access_key_id, @secret_access_key
+      end
+
+      def environment_has_access_keys?
+        ENV.key?('AWS_ACCESS_KEY_ID') && ENV.key?('AWS_SECRET_ACCESS_KEY')
+      end
+
+      def environment_access_keys
+        return ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY']
+      end
+    end
+  end
+end

data/lib/TerraformDevKit/aws/cloudfront.rb

@@ -0,0 +1,20 @@
+require 'aws-sdk-cloudfront'
+
+module TerraformDevKit
+  module Aws
+    class CloudFront 
+      def initialize(credentials, region)
+        @cloudfront = ::Aws::CloudFront::Client.new(
+          region: region, 
+          credentials:credentials
+        )
+      end
+
+      def distribution_is_deployed?(distribution_id)
+        @cloudfront.get_distribution({
+          id: distribution_id, 
+        }).distribution.status == 'Deployed'
+      end
+    end
+  end
+end

data/lib/TerraformDevKit/aws/dynamodb.rb

@@ -0,0 +1,46 @@
+require 'aws-sdk-dynamodb'
+
+Aws.use_bundled_cert!
+
+module TerraformDevKit
+  module Aws
+    # Wrapper class around aws dynamodb
+    class DynamoDB
+      def initialize(credentials, region)
+        @db_client = ::Aws::DynamoDB::Client.new(
+          credentials: credentials,
+          region: region
+        )
+      end
+
+      def put_item(table_name, item)
+        @db_client.put_item({item: item, table_name: table_name})
+      end
+
+      def create_table(table_name, attributes, keys, read_capacity, write_capacity)
+        @db_client.create_table(
+          attribute_definitions: attributes,
+          key_schema: keys,
+          provisioned_throughput: {
+            read_capacity_units: read_capacity,
+            write_capacity_units: write_capacity
+          },
+          table_name: table_name
+        )
+      end
+
+      def get_table_status(table_name)
+        resp = @db_client.describe_table({
+          table_name: table_name,
+        })
+        resp.table.table_status
+      end
+
+      def delete_table(table_name)
+        @db_client.delete_table({
+          table_name: table_name,
+        })
+      end
+    end
+  end
+end

data/lib/TerraformDevKit/aws/s3.rb

@@ -0,0 +1,44 @@
+require 'aws-sdk-s3'
+
+Aws.use_bundled_cert!
+
+module TerraformDevKit
+  module Aws
+    class S3
+      def initialize(credentials, region)
+        @s3_client = ::Aws::S3::Client.new(
+          credentials: credentials,
+          region: region
+        )
+      end
+
+      def create_bucket(bucket_name)
+        @s3_client.create_bucket(
+          bucket: bucket_name
+        )
+      end
+
+      def delete_bucket(bucket_name)
+        empty_bucket(bucket_name)
+
+        @s3_client.delete_bucket(
+          bucket: bucket_name
+        )
+      end
+
+      def empty_bucket(bucket_name)
+        keys_to_delete = @s3_client
+                        .list_objects_v2(bucket: bucket_name)
+                        .contents
+                        .map { |x| { key: x.key } }
+
+        @s3_client.delete_objects(
+          bucket: bucket_name,
+          delete: {
+            objects: keys_to_delete
+          }
+        )
+      end
+    end
+  end
+end

data/lib/TerraformDevKit/aws/terraform_remote_state.rb

@@ -0,0 +1,67 @@
+require 'aws-sdk-dynamodb'
+require 'aws-sdk-s3'
+
+module TerraformDevKit
+  module Aws
+    class TerraformRemoteState
+      ATTRIBUTES = [
+          {
+            attribute_name: 'LockID',
+            attribute_type: 'S'
+          }
+        ]
+      KEYS = [
+          {
+            attribute_name: 'LockID',
+            key_type: 'HASH'
+          }
+        ]
+
+      def initialize(dynamodb, s3)
+        @dynamodb = dynamodb
+        @s3 = s3
+      end
+
+      def init(environment, project)
+        table_name = table_name(environment, project)
+        return if lock_table_exists_and_is_active(table_name)
+
+        @dynamodb.create_table(table_name, ATTRIBUTES, KEYS, 1, 1)
+
+        begin
+          @s3.create_bucket(state_bucket_name(environment, project))
+        rescue Aws::S3::Errors::BucketAlreadyOwnedByYou
+          return
+        end
+
+        sleep(0.2) until lock_table_exists_and_is_active(table_name)
+      end
+
+      def destroy(environment, project)
+        table_name = table_name(environment, project)
+
+        @dynamodb.delete_table(table_name)
+        @s3.delete_bucket(state_bucket_name(environment, project))
+      end
+
+      private_class_method
+      def lock_table_exists_and_is_active(table_name)
+        begin
+          return @dynamodb.get_table_status(table_name) == 'ACTIVE'
+        rescue Aws::DynamoDB::Errors::ResourceNotFoundException
+          return false
+        end
+      end
+
+      private_class_method
+      def table_name(environment, project)
+        "#{project.acronym}-#{environment.name}-lock-table"
+      end
+
+      private_class_method
+      def state_bucket_name(environment, project)
+        "#{project.name}-#{environment.name}-state"
+      end
+    end
+  end
+end

data/lib/TerraformDevKit/version.rb

@@ -1,3 +1,3 @@
 module TerraformDevKit
-  VERSION = '0.2.7'.freeze
+  VERSION = '0.3.1-rc1'.freeze
 end

data/lib/TerraformDevKit.rb

@@ -1,18 +1,19 @@
-require 'TerraformDevKit/aws'
+require 'TerraformDevKit/aws/aws'
+require 'TerraformDevKit/aws/cloudfront'
+require 'TerraformDevKit/aws/dynamodb'
+require 'TerraformDevKit/aws/terraform_remote_state'
+require 'TerraformDevKit/aws/s3'
 require 'TerraformDevKit/backup_state'
 require 'TerraformDevKit/command'
 require 'TerraformDevKit/config'
-require 'TerraformDevKit/dynamodb'
 require 'TerraformDevKit/environment'
 require 'TerraformDevKit/extended_file_utils'
 require 'TerraformDevKit/os'
 require 'TerraformDevKit/request'
 require 'TerraformDevKit/retry'
-require 'TerraformDevKit/s3'
 require 'TerraformDevKit/terraform_config_manager'
 require 'TerraformDevKit/terraform_env_manager'
 require 'TerraformDevKit/terraform_installer'
-require 'TerraformDevKit/terraform_remote_state'
 require 'TerraformDevKit/terraform_log_filter'
 require 'TerraformDevKit/terraform_project_config'
 require 'TerraformDevKit/terraform_template_config_file'

data/tasks/devkit.rake

@@ -40,16 +40,16 @@ def task_in_current_namespace(task_name, current_task)
 end
 
 def remote_state
-  aws_config = TDK::AwsConfig.new(TDK::Configuration.get('aws'))
-  dynamo_db = TDK::DynamoDB.new(
+  aws_config = TDK::Aws::AwsConfig.new(TDK::Configuration.get('aws'))
+  dynamo_db = TDK::Aws::DynamoDB.new(
     aws_config.credentials,
     aws_config.region
   )
-  s3 = TDK::S3.new(
+  s3 = TDK::Aws::S3.new(
     aws_config.credentials,
     aws_config.region
   )
-  TDK::TerraformRemoteState.new(dynamo_db, s3)
+  TDK::Aws::TerraformRemoteState.new(dynamo_db, s3)
 end
 
 desc 'Prepares the environment to create the infrastructure'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: TerraformDevKit
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.1.pre.rc1
 platform: ruby
 authors:
 - Victor Jimenez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-cloudfront
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -171,24 +185,25 @@ files:
 - bin/setup
 - exe/wait_for_url
 - lib/TerraformDevKit.rb
-- lib/TerraformDevKit/aws.rb
+- lib/TerraformDevKit/aws/aws.rb
+- lib/TerraformDevKit/aws/cloudfront.rb
+- lib/TerraformDevKit/aws/dynamodb.rb
+- lib/TerraformDevKit/aws/s3.rb
+- lib/TerraformDevKit/aws/terraform_remote_state.rb
 - lib/TerraformDevKit/backup_state.rb
 - lib/TerraformDevKit/command.rb
 - lib/TerraformDevKit/config.rb
 - lib/TerraformDevKit/download.rb
-- lib/TerraformDevKit/dynamodb.rb
 - lib/TerraformDevKit/environment.rb
 - lib/TerraformDevKit/extended_file_utils.rb
 - lib/TerraformDevKit/os.rb
 - lib/TerraformDevKit/request.rb
 - lib/TerraformDevKit/retry.rb
-- lib/TerraformDevKit/s3.rb
 - lib/TerraformDevKit/terraform_config_manager.rb
 - lib/TerraformDevKit/terraform_env_manager.rb
 - lib/TerraformDevKit/terraform_installer.rb
 - lib/TerraformDevKit/terraform_log_filter.rb
 - lib/TerraformDevKit/terraform_project_config.rb
-- lib/TerraformDevKit/terraform_remote_state.rb
 - lib/TerraformDevKit/terraform_template_config_file.rb
 - lib/TerraformDevKit/url.rb
 - lib/TerraformDevKit/version.rb
@@ -209,9 +224,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13

data/lib/TerraformDevKit/aws.rb

@@ -1,63 +0,0 @@
-require 'aws-sdk-core'
-
-Aws.use_bundled_cert!
-
-module TerraformDevKit
-  class AwsConfig
-    def initialize(config)
-      unless config.nil?
-        @profile = config.fetch('profile', nil)
-        @region = config.fetch('region', nil)
-        @access_key_id = config.fetch('access_key_id', nil)
-        @secret_access_key = config.fetch('secret_access_key', nil)
-      end
-    end
-
-    def credentials
-      unless profile.nil?
-        credentials = Aws::SharedCredentials.new(profile_name: profile)
-        return credentials if credentials.set?
-      end
-
-      return Aws::Credentials.new(*access_keys) if access_keys_available?
-
-      raise 'Cannot find AWS credentials'
-    end
-
-    def region
-      @region || ENV['AWS_REGION']
-    end
-
-    def profile
-      @profile || ENV['AWS_PROFILE']
-    end
-
-    private
-
-    def access_keys
-      return config_access_keys if config_has_access_keys?
-      return environment_access_keys if environment_has_access_keys?
-      nil
-    end
-
-    def access_keys_available?
-      config_has_access_keys? || environment_has_access_keys?
-    end
-
-    def config_has_access_keys?
-      !@access_key_id.nil? && !@secret_access_key.nil?
-    end
-
-    def config_access_keys
-      return @access_key_id, @secret_access_key
-    end
-
-    def environment_has_access_keys?
-      ENV.key?('AWS_ACCESS_KEY_ID') && ENV.key?('AWS_SECRET_ACCESS_KEY')
-    end
-
-    def environment_access_keys
-      return ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY']
-    end
-  end
-end

data/lib/TerraformDevKit/dynamodb.rb

@@ -1,45 +0,0 @@
-require 'aws-sdk-dynamodb'
-
-Aws.use_bundled_cert!
-
-module TerraformDevKit
-  # Wrapper class around aws dynamodb
-  class DynamoDB
-    def initialize(credentials, region)
-      @db_client = Aws::DynamoDB::Client.new(
-        credentials: credentials,
-        region: region
-      )
-    end
-
-    def put_item(table_name, item)
-      @db_client.put_item({item: item, table_name: table_name})
-    end
-
-    def create_table(table_name, attributes, keys, read_capacity, write_capacity)
-      @db_client.create_table(
-        attribute_definitions: attributes,
-        key_schema: keys,
-        provisioned_throughput: {
-          read_capacity_units: read_capacity,
-          write_capacity_units: write_capacity
-        },
-        table_name: table_name
-      )
-    end
-
-    def get_table_status(table_name)
-      resp = @db_client.describe_table({
-        table_name: table_name,
-      })
-      resp.table.table_status
-    end
-
-    def delete_table(table_name)
-      @db_client.delete_table({
-        table_name: table_name,
-      })
-    end
-
-  end
-end

data/lib/TerraformDevKit/s3.rb

@@ -1,43 +0,0 @@
-require 'aws-sdk-s3'
-
-Aws.use_bundled_cert!
-
-module TerraformDevKit
-  # Wrapper class around aws s3
-  class S3
-    def initialize(credentials, region)
-      @s3_client = Aws::S3::Client.new(
-        credentials: credentials,
-        region: region
-      )
-    end
-
-    def create_bucket(bucket_name)
-      @s3_client.create_bucket(
-        bucket: bucket_name
-      )
-    end
-
-    def delete_bucket(bucket_name)
-      empty_bucket(bucket_name)
-
-      @s3_client.delete_bucket(
-        bucket: bucket_name
-      )
-    end
-
-    def empty_bucket(bucket_name)
-      keys_to_delete = @s3_client
-                       .list_objects_v2(bucket: bucket_name)
-                       .contents
-                       .map { |x| { key: x.key } }
-
-      @s3_client.delete_objects(
-        bucket: bucket_name,
-        delete: {
-          objects: keys_to_delete
-        }
-      )
-    end
-  end
-end

data/lib/TerraformDevKit/terraform_remote_state.rb

@@ -1,66 +0,0 @@
-require 'aws-sdk-dynamodb'
-require 'aws-sdk-s3'
-
-module TerraformDevKit
-  # Represents a terraform lock table.
-  class TerraformRemoteState
-    ATTRIBUTES = [
-        {
-          attribute_name: 'LockID',
-          attribute_type: 'S'
-        }
-      ]
-    KEYS = [
-        {
-          attribute_name: 'LockID',
-          key_type: 'HASH'
-        }
-      ]
-
-    def initialize(dynamodb, s3)
-      @dynamodb = dynamodb
-      @s3 = s3
-    end
-
-    def init(environment, project)
-      table_name = table_name(environment, project)
-      return if lock_table_exists_and_is_active(table_name)
-
-      @dynamodb.create_table(table_name, ATTRIBUTES, KEYS, 1, 1)
-
-      begin
-        @s3.create_bucket(state_bucket_name(environment, project))
-      rescue Aws::S3::Errors::BucketAlreadyOwnedByYou
-        return
-      end
-
-      sleep(0.2) until lock_table_exists_and_is_active(table_name)
-    end
-
-    def destroy(environment, project)
-      table_name = table_name(environment, project)
-
-      @dynamodb.delete_table(table_name)
-      @s3.delete_bucket(state_bucket_name(environment, project))
-    end
-
-    private_class_method
-    def lock_table_exists_and_is_active(table_name)
-      begin
-        return @dynamodb.get_table_status(table_name) == 'ACTIVE'
-      rescue Aws::DynamoDB::Errors::ResourceNotFoundException
-        return false
-      end
-    end
-
-    private_class_method
-    def table_name(environment, project)
-      "#{project.acronym}-#{environment.name}-lock-table"
-    end
-
-    private_class_method
-    def state_bucket_name(environment, project)
-      "#{project.name}-#{environment.name}-state"
-    end
-  end
-end