terraspace 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 672cf9e56e84babb2bc53f8e076a13cb51aa9741416fcd6128e66b3774d335fb
-  data.tar.gz: 10417698653e7ae38863e1c9d3a1fafebb2ea937693e8c5c0f65cb14e81b1f0b
+  metadata.gz: 0c7a68a82f374785998967cf8af6d56f78130d7e03e8b0d7e64e85a9483e61cd
+  data.tar.gz: 2883619576b4a57c0e049edbc2cdae9d44b6c23926e3fe85084170bed5afb6c3
 SHA512:
-  metadata.gz: fbb895751949a30c32caaadad94a7d24c711313ca3675bb849f8ec9ab04b21e00901051ba5914d2c6a9317cabd91345cf8efe2ed053b90f61bb56228117b2249
-  data.tar.gz: d2fcb5d16322d8a2c7bdf15be9d8108aefaee66505deb4c54acaad2339958d4a9cf4def684e4a08a44ff467f2ce9e7269a9d38924bf668634bdd93e3cd55d69d
+  metadata.gz: fbbd8c9339438902bc05b507292497c7714ccf9264a0155ab4fcd51c9e7d89d8ea0fc0a94f60228273fb9830f4458269eefa259a014d14a5754692a3d7747a2a
+  data.tar.gz: e62b1db8f363a94bbea6ed69ec1a6323171ab4442ff9059f0141fc2017837167659f741b2a7bf7e88f6d643320ac2040ff4e35e6564e0725861f030cd48809d4

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [2.2.2] - 2022-09-14
+- [#268](https://github.com/boltops-tools/terraspace/pull/268) custom config.build.dependency_words ability
+
+## [2.2.1] - 2022-09-08
+- [#265](https://github.com/boltops-tools/terraspace/pull/265) import command
+
 ## [2.2.0] - 2022-09-02
 - [#261](https://github.com/boltops-tools/terraspace/pull/261) extra layer also process env-extra
 - [#262](https://github.com/boltops-tools/terraspace/pull/262) improve graph dependency processing: replace tfvars so only output and depends_on are evaluated

data/lib/terraspace/app.rb

@@ -42,6 +42,7 @@ module Terraspace
       config.build.clean_cache = nil # defaults to true
       config.build.default_pass_files = ["/files/"]
       config.build.pass_files = []
+      config.build.dependency_words = []
 
       config.bundle = ActiveSupport::OrderedOptions.new
       config.bundle.logger = ts_logger

data/lib/terraspace/cli/help/import.md

@@ -0,0 +1,29 @@
+## Examples
+
+    terraspace import ec2 aws_instance.this i-088a0a47e2e852cc8
+    terraspace import vpc module.vpc.aws_vpc.this vpc-000782e4951a734c7
+    terraspace import vpc module.vpc.aws_vpc.this vpc-000782e4951a734c7
+
+A general workflow is to use terraspace plan, inspect what resources, are missing and and import resources based on that. The `state list` command is also useful.
+
+    terraspace plan vpc
+    terraspace import vpc module.vpc.aws_vpc.this vpc-000782e4951a734c7
+    terraspace plan vpc
+    terraspace import vpc module.vpc.aws_internet_gateway.this[0] igw-0fa4bec3b4b46948a
+    terraspace state list vpc
+
+Example with output:
+
+    $ terraspace import vpc module.vpc.aws_internet_gateway.this[0] igw-0fa4bec3b4b46948a
+    Building .terraspace-cache/us-west-2/dev/stacks/vpc
+    Current directory: .terraspace-cache/us-west-2/dev/stacks/vpc
+    => terraform import module.vpc.aws_internet_gateway.this[0] igw-0fa4bec3b4b46948a
+    module.vpc.aws_internet_gateway.this[0]: Importing from ID "igw-0fa4bec3b4b46948a"...
+    module.vpc.aws_internet_gateway.this[0]: Import prepared!
+      Prepared aws_internet_gateway for import
+    module.vpc.aws_internet_gateway.this[0]: Refreshing state... [id=igw-0fa4bec3b4b46948a]
+
+    Import successful!
+
+    The resources that were imported are shown above. These resources are now in
+    your Terraform state and will henceforth be managed by Terraform.

data/lib/terraspace/cli/import.rb

@@ -0,0 +1,12 @@
+class Terraspace::CLI
+  class Import < Base
+    def run
+      commander.run
+    end
+
+    def commander
+      Commander.new("import", @options)
+    end
+    memoize :commander
+  end
+end

data/lib/terraspace/cli.rb

@@ -109,6 +109,12 @@ module Terraspace
       Fmt.new(options.merge(mod: mod)).run
     end
 
+    desc "import ADDR ID", "Import existing infrastructure into your Terraform state"
+    long_desc Help.text(:import)
+    def import(mod, addr, id)
+      Import.new(options.merge(mod: mod, addr: addr, id: id)).run
+    end
+
     desc "info STACK", "Get info about stack."
     long_desc Help.text(:info)
     instance_option.call

data/lib/terraspace/compiler/erb/rewrite.rb

@@ -26,7 +26,10 @@ module Terraspace::Compiler::Erb
     def new_line(line)
       md = line.match(/.*(<% |<%=)/) || line.match(/.*<%$/)
       if md
-        words = %w[output depends_on] # TODO: consider allowing user customizations
+        words = %w[output depends_on]
+        dependency_words = [Terraspace.config.build.dependency_words].flatten
+        words += dependency_words # custom user words to evaluated in first pass also
+        return line if words.include?('*') # passthrough for special case '*'
         # IE: <%= output or <% depends_on
         regexp = Regexp.new(".*<%.*#{words.join('|')}.*")
         if line.match(regexp)

data/lib/terraspace/terraform/args/thor.rb

@@ -117,6 +117,10 @@ module Terraspace::Terraform::Args
       auto_approve_arg
     end
 
+    def import_args
+      [@options[:addr], @options[:id]]
+    end
+
     def auto_approve_arg
       @options[:yes] || @options[:auto] ? ["-auto-approve"] : []
     end

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "2.2.0"
+  VERSION = "2.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -571,6 +571,7 @@ files:
 - lib/terraspace/cli/help/down.md
 - lib/terraspace/cli/help/fmt.md
 - lib/terraspace/cli/help/force_unlock.md
+- lib/terraspace/cli/help/import.md
 - lib/terraspace/cli/help/info.md
 - lib/terraspace/cli/help/init.md
 - lib/terraspace/cli/help/list.md
@@ -604,6 +605,7 @@ files:
 - lib/terraspace/cli/help/tfc/sync.md
 - lib/terraspace/cli/help/up.md
 - lib/terraspace/cli/help/validate.md
+- lib/terraspace/cli/import.rb
 - lib/terraspace/cli/info.rb
 - lib/terraspace/cli/init.rb
 - lib/terraspace/cli/list.rb