terraspace-bundler 0.1.0 → 0.2.0

data/lib/terraspace_bundler/mod/{tmp_paths.rb → path_concern.rb}

@@ -1,5 +1,5 @@
 class TerraspaceBundler::Mod
-  module TmpPaths
+  module PathConcern
     def setup_tmp
       FileUtils.mkdir_p(cache_root)
       FileUtils.mkdir_p(stage_root)

data/lib/terraspace_bundler/mod/props_builder.rb

@@ -0,0 +1,57 @@
+# Use to build mod from Terrafile entry.
+# The Terrafile.lock does not need this because it's simple and just merges the data.
+class TerraspaceBundler::Mod
+  class PropsBuilder
+    extend Memoist
+    include TerraspaceBundler::Dsl::Concern
+
+    def initialize(params={})
+      @params = params
+      @options = params[:options]
+      @source, @version = @options[:source], @options[:version]
+    end
+
+    def build
+      @options.merge(
+        name: name,
+        source: source, # overwrite source. @options is a copy though
+        type: type,
+        url: url,
+      )
+    end
+
+    def name
+      @params[:args].first
+    end
+
+    def source
+      if registry?
+        @source
+      else
+        @source.include?('/') ? @source : "#{dsl.global[:org]}/#{@source}"
+      end
+    end
+
+    def url
+      if registry?
+        registry.github_url
+      else
+        "#{TB.config.base_clone_url}#{source}" # Note: make sure to not use @source, is org may no be added
+      end
+    end
+
+    # IE: git or registry
+    def type
+      registry? ? "registry" : "git"
+    end
+
+    def registry?
+      !@source.nil? && @source.split('/').size == 3
+    end
+
+    def registry
+      Registry.new(@source, @version)
+    end
+    memoize :registry
+  end
+end

data/lib/terraspace_bundler/mod/props_extension.rb

@@ -0,0 +1,15 @@
+class TerraspaceBundler::Mod
+  module PropsExtension
+    def props(*names)
+      names.each { |n| prop(n) }
+    end
+
+    def prop(name)
+      name = name.to_sym
+      define_method(name) do
+        @props[name]
+      end
+    end
+  end
+end
+

data/lib/terraspace_bundler/mod/registry.rb

@@ -3,8 +3,8 @@ require 'open-uri'
 
 class TerraspaceBundler::Mod
   class Registry
-    def initialize(mod)
-      @mod = mod
+    def initialize(source, version)
+      @source, @version = source, version
     end
 
     # Terrafile example
@@ -25,12 +25,12 @@ class TerraspaceBundler::Mod
     #     https://registry.terraform.io/v1/modules/terraform-aws-modules/sqs/aws/download
     #
     # The specific version returns an 204 and then we grab the download url info form the x-terraform-get header.
-    def to_github
+    def github_url
       base_site = "https://registry.terraform.io"
       base_url = "#{base_site}/v1/modules"
 
-      version = @mod.version.sub(/^v/,'') if @mod.version # v1.0 => 1.0
-      api_url = [base_url, @mod.source, version, "download"].compact.join('/')
+      version = @version.sub(/^v/,'') if @version # v1.0 => 1.0
+      api_url = [base_url, @source, version, "download"].compact.join('/')
       resp = http_request(api_url)
 
       case resp.code.to_i
@@ -44,7 +44,9 @@ class TerraspaceBundler::Mod
         raise "Unable to lookup up module in Terraform Registry: #{resp}"
       end
 
-      download_url.sub(%r{/archive/.*},'')
+      url = download_url.sub(%r{/archive/.*},'')
+      # IE: git::https://github.com/terraform-aws-modules/terraform-aws-security-group?ref=v3.10.0
+      url.sub(/^git::/,'').sub(/\?.*/,'')
     end
 
   private

data/lib/terraspace_bundler/syncer.rb

@@ -1,13 +1,71 @@
 module TerraspaceBundler
   class Syncer
-    def initialize(mods)
-      @mods = mods
+    include TB::Util::Logging
+    include Dsl::Concern
+
+    def initialize(options={})
+      @options = options
+      @mod_name = @options[:mod]
     end
 
     def run
-      @mods.each do |mod|
-        mod.sync
+      validate!
+      FileUtils.rm_f(TB.config.lockfile) if update_all?
+      logger.info "Bundling with #{TB.config.terrafile}..."
+      if File.exist?(TB.config.lockfile)
+        sync
+      else
+        create
+      end
+      TB::Lockfile.write
+    end
+
+    def sync
+      sync_mods
+      removed_mods = subtract(lockfile.mods, terrafile.mods)
+      lockfile.prune(removed_mods)
+    end
+
+    def create
+      sync_mods
+    end
+
+    def sync_mods
+      terrafile.mods.each do |mod|
+        update = update?(mod)
+        next unless update
+        lockfile.sync(mod) # update (if version mismatch) or create (if missing)
       end
     end
+
+    def update?(mod)
+      names = @options[:mods]
+      return true if names.nil? || names.empty? # when empty never skip update
+      names.include?(mod.name)
+    end
+
+    def validate!
+      return unless terrafile.missing_org?
+      logger.error "ERROR: org must be set in the #{TB.config.terrafile}.".color(:red)
+      logger.error "Please set org in the Terrafile"
+      exit 1
+    end
+
+    def update_all?
+      @options[:mode] == "update" && @options[:mods].empty?
+    end
+
+    def subtract(mods1, mods2)
+      mod2_names = mods2.map(&:name)
+      mods1.select {|mod1| !mod2_names.include?(mod1.name) }
+    end
+
+    def terrafile
+      Terrafile.instance
+    end
+
+    def lockfile
+      Lockfile.instance
+    end
   end
 end

data/lib/terraspace_bundler/terrafile.rb

@@ -0,0 +1,39 @@
+module TerraspaceBundler
+  class Terrafile
+    include Singleton
+    extend Memoist
+    include TB::Util::Logging
+    include Dsl::Concern
+
+    # dsl meta example:
+    # {:global=>{:org=>"boltopspro"},
+    # :mods=>
+    #   [{:args=>["eks"], :options=>{:source=>"terraform-aws-eks"}},
+    #   {:args=>["vpc"], :options=>{:source=>"terraform-aws-vpc"}}]}
+    def mods
+      dsl.meta[:mods].map do |params|
+        new_mod(params)
+      end
+    end
+    memoize :mods
+
+    def new_mod(params)
+      props = Mod::PropsBuilder.new(params).build
+      Mod.new(props)
+    end
+
+    # Checks if any of the mods defined in Terrafile has an inferred an org
+    # In this case the org must be set
+    # When a source is set with an inferred org and org is not set it looks like this:
+    #
+    #     dsl.meta has {:source=>"terraform-random-pet"}
+    #     mod.source is /terraform-random-pet
+    #
+    # Using info to detect that the org is missing and the Terrafile definition
+    # has at least one mod line that has an inferred org.
+    #
+    def missing_org?
+      !!mods.detect { |mod| mod.source.starts_with?('/') }
+    end
+  end
+end

data/lib/terraspace_bundler/util/git.rb

@@ -0,0 +1,31 @@
+module TerraspaceBundler::Util
+  module Git
+    include TB::Util::Logging
+
+    def sh(command)
+      command = "#{command} 2>&1" # always need output for the sha
+      logger.debug "=> #{command}"
+      out = `#{command}`
+      unless $?.success?
+        if command.include?("git")
+          raise TB::GitError.new("#{command}\n#{out}")
+        else
+          logger.error "ERROR: running #{command}".color(:red)
+          logger.error out
+          exit $?.exitstatus
+        end
+      end
+      out
+    end
+
+    def git(command)
+      sh("git #{command}")
+    rescue TB::GitError => e
+      logger.error "ERROR: There was a git error".color(:red)
+      logger.error "Current dir: #{Dir.pwd}"
+      logger.error "The error occur when running:"
+      logger.error e.message
+      exit 1
+    end
+  end
+end

data/lib/terraspace_bundler/{logging.rb → util/logging.rb}

@@ -1,4 +1,4 @@
-module TerraspaceBundler
+module TerraspaceBundler::Util
   module Logging
     def logger
       TerraspaceBundler.logger

data/lib/terraspace_bundler/version.rb

@@ -1,3 +1,3 @@
 module TerraspaceBundler
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/fixtures/Terrafile

@@ -1,6 +1,6 @@
 org "boltopspro" # set default org
 
 # GitHub repo with default org
-#mod "elb", source: "terraform-aws-elb", version: "master"
-#mod "ec2", source: "terraform-aws-ec2", version: "branch-name"
+# mod "elb", source: "terraform-aws-elb", version: "master"
+# mod "ec2", source: "terraform-aws-ec2", version: "branch-name"
 

data/spec/terraform_bundler/runner_spec.rb

@@ -0,0 +1,17 @@
+describe TB::CLI::Runner do
+  let(:runner) { described_class.new }
+
+  context "runner" do
+    # hacky sanity check
+    it "run" do
+      FileUtils.mkdir_p("tmp")
+      FileUtils.rm_f("tmp/Terrafile.lock")
+      FileUtils.cp("spec/fixtures/Terrafile", "tmp/Terrafile")
+      Dir.chdir("tmp")
+      runner.run
+      # since no mods are configured
+      file_exist = File.exist?("Terrafile.lock")
+      expect(file_exist).to be false
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace-bundler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -173,13 +173,15 @@ files:
 - lib/terraspace_bundler/cli.rb
 - lib/terraspace_bundler/cli/base.rb
 - lib/terraspace_bundler/cli/bundle.rb
-- lib/terraspace_bundler/cli/clean.rb
 - lib/terraspace_bundler/cli/help.rb
+- lib/terraspace_bundler/cli/help/bundle/info.md
 - lib/terraspace_bundler/cli/help/bundle/install.md
+- lib/terraspace_bundler/cli/help/bundle/list.md
+- lib/terraspace_bundler/cli/help/bundle/update.md
 - lib/terraspace_bundler/cli/help/completion.md
 - lib/terraspace_bundler/cli/help/completion_script.md
-- lib/terraspace_bundler/cli/install.rb
-- lib/terraspace_bundler/cli/update.rb
+- lib/terraspace_bundler/cli/purge_cache.rb
+- lib/terraspace_bundler/cli/runner.rb
 - lib/terraspace_bundler/command.rb
 - lib/terraspace_bundler/completer.rb
 - lib/terraspace_bundler/completer/script.rb
@@ -187,26 +189,31 @@ files:
 - lib/terraspace_bundler/config.rb
 - lib/terraspace_bundler/core.rb
 - lib/terraspace_bundler/dsl.rb
+- lib/terraspace_bundler/dsl/concern.rb
 - lib/terraspace_bundler/dsl/syntax.rb
-- lib/terraspace_bundler/helper/git.rb
+- lib/terraspace_bundler/exporter.rb
+- lib/terraspace_bundler/info.rb
 - lib/terraspace_bundler/installer.rb
+- lib/terraspace_bundler/list.rb
+- lib/terraspace_bundler/lockfile.rb
+- lib/terraspace_bundler/lockfile/version_comparer.rb
+- lib/terraspace_bundler/lockfile/yamler.rb
 - lib/terraspace_bundler/logger.rb
-- lib/terraspace_bundler/logging.rb
+- lib/terraspace_bundler/logger/formatter.rb
 - lib/terraspace_bundler/mod.rb
-- lib/terraspace_bundler/mod/export.rb
-- lib/terraspace_bundler/mod/locked.rb
+- lib/terraspace_bundler/mod/downloader.rb
+- lib/terraspace_bundler/mod/path_concern.rb
+- lib/terraspace_bundler/mod/props_builder.rb
+- lib/terraspace_bundler/mod/props_extension.rb
 - lib/terraspace_bundler/mod/registry.rb
-- lib/terraspace_bundler/mod/sync.rb
-- lib/terraspace_bundler/mod/tmp_paths.rb
-- lib/terraspace_bundler/setup.rb
 - lib/terraspace_bundler/syncer.rb
-- lib/terraspace_bundler/updater.rb
-- lib/terraspace_bundler/updater/lockfile.rb
-- lib/terraspace_bundler/util/registry.rb
+- lib/terraspace_bundler/terrafile.rb
+- lib/terraspace_bundler/util/git.rb
+- lib/terraspace_bundler/util/logging.rb
 - lib/terraspace_bundler/version.rb
 - spec/fixtures/Terrafile
 - spec/spec_helper.rb
-- spec/terraform_bundler/installer_spec.rb
+- spec/terraform_bundler/runner_spec.rb
 - terraspace-bundler.gemspec
 homepage: https://github.com/boltops-tools/terraspace-bundler
 licenses:
@@ -234,4 +241,4 @@ summary: Bundles terraform modules
 test_files:
 - spec/fixtures/Terrafile
 - spec/spec_helper.rb
-- spec/terraform_bundler/installer_spec.rb
+- spec/terraform_bundler/runner_spec.rb

data/lib/terraspace_bundler/cli/update.rb

@@ -1,7 +0,0 @@
-class TerraspaceBundler::CLI
-  class Update < Base
-    def run
-      TB::Updater.new(@options).run
-    end
-  end
-end

data/lib/terraspace_bundler/helper/git.rb

@@ -1,21 +0,0 @@
-module TerraspaceBundler::Helper
-  module Git
-    include TB::Logging
-
-    def sh(command)
-      command = "#{command} 2>&1" # always need output for the sha
-      logger.debug "=> #{command}"
-      out = `#{command}`
-      unless $?.success?
-        logger.error "ERROR: running #{command}"
-        logger.error out
-        exit $?.exitstatus
-      end
-      out
-    end
-
-    def git(command)
-      sh("git #{command}")
-    end
-  end
-end

data/lib/terraspace_bundler/mod/export.rb

@@ -1,23 +0,0 @@
-class TerraspaceBundler::Mod
-  class Export
-    include TmpPaths
-
-    def initialize(locked_mod)
-      @locked_mod = locked_mod
-    end
-
-    def run
-      stage_path = stage_path(@locked_mod.full_repo)
-      stage_path = "#{stage_path}/#{@locked_mod.path}" if @locked_mod.path
-      export_path = export_path(@locked_mod.name)
-      FileUtils.rm_rf(export_path)
-      FileUtils.mkdir_p(File.dirname(export_path))
-      FileUtils.cp_r(stage_path, export_path)
-      FileUtils.rm_rf("#{export_path}/.git")
-    end
-
-    def export_path(repo)
-      "#{TB.config.export_path}/#{repo}"
-    end
-  end
-end