terraspace-bundler 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d61db038a37cd472b7be9b5f3d15a2388254a4b2a3c0d3af3dabb2e10e8c4fc1
-  data.tar.gz: 83630195dceb5e35dee5be326311806cb8b06a3eedad4ca10f6b98c4962fe0bb
+  metadata.gz: c21958fbce8f8bf1da181ab8d0fa28959ce010d8dda1b39aa179a10d4a1bd4fe
+  data.tar.gz: 3b7603b433569c0f3882ebab829103a1d76857a0b09ca798aa95466ba5d2e590
 SHA512:
-  metadata.gz: 7d4cc8ad358e17708a27085a4a523e4fcddfb007c81d507c07a7c736a851c48f5ed93ca4d9f6b5f64561c822a1e813a4850d7076f1c419869e01626f91e12682
-  data.tar.gz: 322b70b512a594212f3530d7d0b99d0f55fa15ecfa496c4aee13f0df0bede32f7628c541179697171a1384e81a07a18871378d348dfe90b2bd131c0592e4008a
+  metadata.gz: 5cd549097ef26f461dd14d2b462020f7925ab0522d00437e5002c17c5a052876ead3a9b45e534559aa5c03f73a1762f98b92c4457a9b3c778d5a1da3e52722b2
+  data.tar.gz: bb2b95860f590d7e30a3ae1972dc227cf31abb7f14fa32f897b8b49242c1955052f7fd931c73973988c3992a52d94315fdf099404e9e64649fdf04af9686eca9

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.
 
+## [0.4.3] - 2021-11-20
+- [#14](https://github.com/boltops-tools/terraspace-bundler/pull/14) get version and use only that part of api since the latest version is currently down with a 502
+- [#15](https://github.com/boltops-tools/terraspace-bundler/pull/15) terraspace bundle example command
+
 ## [0.4.2] - 2021-10-02
 - stack src option: also understand example and name
 

data/lib/terraspace_bundler/cli/bundle.rb

@@ -39,5 +39,15 @@ class TerraspaceBundler::CLI
       TB.update_mode = true
       TB::Runner.new(options.merge(mods: mods)).run
     end
+
+    desc "example MOD EXAMPLE", "Import example from module as a stack"
+    long_desc Help.text("bundle/example")
+    terrafile_option.call
+    option :name, desc: "The stack name. IE: app/stacks/NAME. By default, the mod's name is used.	"
+    option :dest, default: "app/stacks", desc: "The default destination folder is app/stacks. Though you can change it to locations like vendor/stacks, it’s recommended to keep the default."
+    option :purge, type: :boolean, default: true, desc: "If set to `true`, then the existing `app/stacks/vpc` folder is removed."
+    def example(mod, example)
+      TB::Example.new(options.merge(mod: mod, example: example)).run
+    end
   end
 end

data/lib/terraspace_bundler/cli/help/bundle/example.md

@@ -0,0 +1,9 @@
+## Examples
+
+    $ terraspace bundle example eks managed_node_groups
+    Example from vendor/modules/eks/examples/managed_node_groups imported to app/stacks/managed_node_groups
+
+Specify the stack name:
+
+    $ terraspace bundle example eks managed_node_groups --name eks
+    Example from vendor/modules/eks/examples/managed_node_groups imported to app/stacks/eks

data/lib/terraspace_bundler/example.rb

@@ -0,0 +1,39 @@
+module TerraspaceBundler
+  class Example < TB::CLI::Base
+    def run
+      check_mod!
+      stack = Exporter::Stacks::Stack.new(mod, stack_options)
+      stack.export
+      logger.info "Example from vendor/modules/#{@options[:mod]}/examples/#{@src} imported to #{@dest}/#{@name}"
+    end
+
+    def stack_options
+      @name = @options[:name] || @options[:example]
+      @purge = @options[:purge].nil? ? true : @options[:purge]
+      @dest = @options[:dest] || "app/stacks"
+      @src = @options[:example]
+      {
+        name: @name,
+        src: @src,
+        dest: @dest,
+        purge: @purge,
+      }
+    end
+
+    def mod
+      lockfile.mods.find { |mod| mod.name == @options[:mod] }
+    end
+
+    def check_mod!
+      unless mod
+        logger.error "ERROR: mod #{@options[:mod]} not found in Terrafile.lock".color(:red)
+        exit 1
+      end
+    end
+
+  private
+    def lockfile
+      Lockfile.instance
+    end
+  end
+end

data/lib/terraspace_bundler/mod/registry.rb

@@ -85,20 +85,17 @@ class TerraspaceBundler::Mod
     def public_github_url
       base_site = "https://registry.terraform.io"
       base_url = "#{base_site}/v1/modules"
-      version = @version.sub(/^v/,'') if @version # v1.0 => 1.0
+      version = get_version(base_url)
       api_url = [base_url, @source, version, "download"].compact.join('/')
 
       resp = http_request(api_url)
 
       case resp.code.to_i
-      when 204
-        download_url = resp.header["x-terraform-get"]
-      when 302
-        next_url = "#{base_site}#{resp.header["location"]}"
-        resp = http_request(next_url)
+      when 204 # IE: curl -v https://registry.terraform.io/v1/modules/terraform-aws-modules/security-group/aws/3.10.0/download
         download_url = resp.header["x-terraform-get"]
       else
         logger.error "ERROR: Unable to lookup up module in Terraform Registry: #{@source}".color(:red)
+        logger.error "api_url: #{api_url}"
         puts "resp.code #{resp.code}"
         pp resp
         exit 1
@@ -109,6 +106,14 @@ class TerraspaceBundler::Mod
       url.sub(/^git::/,'').sub(/\?.*/,'')
     end
 
+    def get_version(base_url)
+      return @version.sub(/^v/,'') if @version # v1.0 => 1.0
+      api_url = [base_url, @source].join('/')
+      resp = http_request(api_url)
+      data = JSON.load(resp.body)
+      data['version']
+    end
+
   private
     def auth_error_exit!(resp=nil, domain=nil)
       logger.error <<~EOL.color(:red)

data/lib/terraspace_bundler/version.rb

@@ -1,3 +1,3 @@
 module TerraspaceBundler
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace-bundler
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-02 00:00:00.000000000 Z
+date: 2021-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -230,6 +230,7 @@ files:
 - lib/terraspace_bundler/cli/base.rb
 - lib/terraspace_bundler/cli/bundle.rb
 - lib/terraspace_bundler/cli/help.rb
+- lib/terraspace_bundler/cli/help/bundle/example.md
 - lib/terraspace_bundler/cli/help/bundle/info.md
 - lib/terraspace_bundler/cli/help/bundle/install.md
 - lib/terraspace_bundler/cli/help/bundle/list.md
@@ -245,6 +246,7 @@ files:
 - lib/terraspace_bundler/core.rb
 - lib/terraspace_bundler/dsl.rb
 - lib/terraspace_bundler/dsl/syntax.rb
+- lib/terraspace_bundler/example.rb
 - lib/terraspace_bundler/exporter.rb
 - lib/terraspace_bundler/exporter/base.rb
 - lib/terraspace_bundler/exporter/copy.rb