terraspace-bundler 0.4.0 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8245c4a3b7fd5b149298bdf0084bddeee9153ff1cd7016e7e13facb0f3bede2
-  data.tar.gz: 761d564519e6958842cc5386e7b84f4a2b2cc90e3801fc2c3845f752983241b2
+  metadata.gz: 152f604d7d2ba7bd4b6cfeccad223aa81c598d2f68ac1c6cb91f5b7ea5457c43
+  data.tar.gz: 794f51b937c2559483912e007f3160b0957fa9276140167bb7b628aebd52e871
 SHA512:
-  metadata.gz: d23b49ddabd983bf1927c62aabc2a9bf4165970a32b7325e41965bc804267297cf269741677582e4c0c4f7603e15dc21fef9d5370200b18adb2f369733b653ae
-  data.tar.gz: 38bf841d2c9d721b34930786c46567a47e881e3951153272eb7f9dea66e23e974994071e5514a4e92091db0fb19d787ce22893bfb514464ae967fcc04bb34959
+  metadata.gz: 06e52a0ea25a5bddeb5b46018a6eca99c18301c6a532c4f9c7750707cce67afea7df938d8744026e445ef96fb3a9007bc5522846eab1f560e8f963f2e84ba8da
+  data.tar.gz: 0726b7ee532842d720ad59a189181ff26982dc5663b94f0f081fa71a7262de82e05e65fa385d527e32813762d2c7666955ca65ec22fa23f5acd755223ad7b385

data/CHANGELOG.md

@@ -3,6 +3,16 @@
 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
+
+## [0.4.1] - 2021-09-30
+- [#13](https://github.com/boltops-tools/terraspace-bundler/pull/13) fix stacks Array option
+
 ## [0.4.0] - 2021-08-10
 - [#10](https://github.com/boltops-tools/terraspace-bundler/pull/10) terraspace bundle info: warning when no lockfile
 - [#12](https://github.com/boltops-tools/terraspace-bundler/pull/12) support for: private registry, s3, gcs, local

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/exporter/stacks/stack.rb

@@ -3,6 +3,7 @@ class TerraspaceBundler::Exporter::Stacks
     attr_reader :mod
     def initialize(mod, options={})
       @mod, @options = mod, options
+      @src = @options[:src] || @options[:example] || @options[:name]
     end
 
     def export
@@ -25,7 +26,7 @@ class TerraspaceBundler::Exporter::Stacks
     end
 
     def src
-      src = @options[:src]
+      src = @src
       without_examples = [mod_path, src].compact.join('/')
       with_examples = [examples_folder, src].compact.join('/')
       paths = [with_examples, without_examples]

data/lib/terraspace_bundler/mod/concerns/stack_concern.rb

@@ -5,6 +5,8 @@ module TerraspaceBundler::Mod::Concerns
       return unless stacks
       if all_stacks?(stacks)
         stacks = all_stacks
+      elsif stacks.is_a?(Array)
+        stacks = array_stacks(stacks)
       end
       normalize_stacks(stacks)
     end
@@ -28,6 +30,19 @@ module TerraspaceBundler::Mod::Concerns
       end
     end
 
+    def array_stacks(stacks)
+      stacks.map do |example|
+        if example.is_a?(Hash)
+          example
+        else
+          {
+            name: example,
+            src: example,
+          }
+        end
+      end
+    end
+
     # Normalizes stack options to an Array of Hashes or just a single Hash
     def normalize_stacks(option)
       defaults = TB.config.stack_options.dup

data/lib/terraspace_bundler/mod/fetcher/gcs.rb

@@ -1,4 +1,25 @@
-require "google/cloud/storage"
+begin
+  require "google/cloud/storage"
+rescue LoadError => e
+  $stderr.puts "#{e.class}: #{e.message}".color(:red)
+  $stderr.puts <<~EOL
+
+    Unable to: require "google/cloud/storage"
+
+    In order to use gcs as a terraspace bundler source,
+    please add the google-cloud-storage gem to
+    your Terraspace project's Gemfile and run bundle.
+
+    To add the gem to your Gemfile, you can run:
+
+        bundle add google-cloud-storage
+
+    Then download modules in defined your Terrafile with:
+
+        terraspace bundle
+  EOL
+  exit 1
+end
 
 class TerraspaceBundler::Mod::Fetcher
   class Gcs < Base

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.0"
+  VERSION = "0.4.4"
 end

data/terraspace-bundler.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "aws-sdk-s3"
   spec.add_dependency "dsl_evaluator"
-  spec.add_dependency "google-cloud-storage"
   spec.add_dependency "memoist"
   spec.add_dependency "nokogiri"
   spec.add_dependency "rainbow"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace-bundler
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: google-cloud-storage
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: memoist
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +216,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 +232,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
@@ -321,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Bundles terraform modules