terraspace_ci_github 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4e578a83cdc12bfa854c076f336e8c81e0d716bd479a30006b24a1925ab6033
-  data.tar.gz: f846068d455b7a0bf859ce5d3cc14bb81fa9792dbb865f0c72b2670fdc4207a6
+  metadata.gz: ed3862589c53aacc52e4ef608a40dfc2c497e975972dd4873d14a2187308812a
+  data.tar.gz: f141392dd32495f4ba7297848713a44bb845de03f22881f85afdcd293f06c5f1
 SHA512:
-  metadata.gz: 996cabd891da675d935b7500c1c6d2f5264fea85eaa14150af1ff20b14269a6cfb99a4713f7bb1dda8ad035ec63bf2edc4fa52d22be044be04e4e70083e52456
-  data.tar.gz: 4db815eb1239ec5449db267786adc339694ff8bcc7243cd2202bca8664a309162a49fcdc0488dced8a8d18474bb0b2edeed16fb29ad1b56f1d9ef10c340eb58e
+  metadata.gz: 0a7fe5e22a954b75c84d6a8f0f7d0f4b87dc90a79c0b00dafd85dffc868f7e01bd5467091e78822ac62be3728d9af7c1ffb3dffeeba34a45a79eec5f5dd01cce
+  data.tar.gz: 55f8b17d8cfe9492202792b475ee77ba31dc319310bb29c10c522d6f25ddac0d7d6feb2902018b11f0fcd397b283c4cc350231c5cff62abedac952fd4d36ada6

data/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [0.2.0] - 2022-07-11
+- [#3](https://github.com/boltops-tools/terraspace_ci_github/pull/3) Cost support: install infracost
+- [#4](https://github.com/boltops-tools/terraspace_ci_github/pull/4) Deprecate comment interface method
+- update template: use github.token from github actions ci env instead
+
+## [0.1.3] - 2022-06-15
+- [#2](https://github.com/boltops-tools/terraspace_ci_github/pull/2) get pr url from push commit message
+
+## [0.1.2] - 2022-06-15
+- [#1](https://github.com/boltops-tools/terraspace_ci_github/pull/1) add faraday-retry gem to get rid of warning
+
 ## [0.1.1] - 2022-06-09
 
 - Fix branch name

data/README.md

@@ -1,6 +1,6 @@
 # terraspace_ci_github
 
-[![Gem Version](https://badge.fury.io/rb/terraspace.png)](http://badge.fury.io/rb/terraspace)
+[![Gem Version](https://badge.fury.io/rb/terraspace_ci_github.png)](http://badge.fury.io/rb/terraspace_ci_github)
 
 [![BoltOps Badge](https://img.boltops.com/boltops/badges/boltops-badge.png)](https://www.boltops.com)
 

data/lib/template/.github/bin/install

@@ -1,8 +1,15 @@
 #!/bin/bash
+
+# install terraform
 brew install tfenv
 tfenv install latest
 tfenv use latest
 terraform --version
+
+# install terraspace
 bundle install
 bundle exec terraspace new shim
 terraspace --version
+
+# install infracost
+curl -fsSL https://raw.githubusercontent.com/infracost/infracost/master/scripts/install.sh | sh

data/lib/template/.github/workflows/pull_request.yml.tt

@@ -9,13 +9,13 @@ jobs:
 
     env:
 <%= plugin_env_vars(indent: 6) -%>
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      GH_TOKEN: ${{ github.token }}
       TS_ENV: dev
       TS_TOKEN: ${{ secrets.TS_TOKEN }}
 
     steps:
 <%= partial "init_steps.yml" -%>
 
-    - name: Terraspace Command
+    - name: Run Terraspace
       run: |
         terraspace plan demo

data/lib/template/.github/workflows/push.yml.tt

@@ -11,13 +11,13 @@ jobs:
 
     env:
 <%= plugin_env_vars(indent: 6) -%>
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      GH_TOKEN: ${{ github.token }}
       TS_ENV: dev
       TS_TOKEN: ${{ secrets.TS_TOKEN }}
 
     steps:
 <%= partial "init_steps.yml" -%>
 
-    - name: Terraspace Command
+    - name: Run Terraspace
       run: |
         terraspace up demo -y

data/lib/template/.github/workflows/workflow_dispatch.yml.tt

@@ -18,13 +18,13 @@ jobs:
 
     env:
 <%= plugin_env_vars(indent: 6) -%>
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      GH_TOKEN: ${{ github.token }}
       TS_ENV: ${{ github.event.inputs.env }}
       TS_TOKEN: ${{ secrets.TS_TOKEN }}
 
     steps:
 <%= partial "init_steps.yml" -%>
 
-    - name: Terraspace Command
+    - name: Run Terraspace
       run: |
         terraspace ${{ github.event.inputs.command }} -y

data/lib/template/partials/init_steps.yml

@@ -7,6 +7,6 @@
         ruby-version: 3.1
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
-    - name: Install
+    - name: Install Terraspace
       run:
         .github/bin/install

data/lib/terraspace_ci_github/base.rb

@@ -1,3 +1,5 @@
+require "faraday"
+require "faraday/retry"
 require "octokit"
 
 module TerraspaceCiGithub

data/lib/terraspace_ci_github/interface.rb

@@ -7,6 +7,9 @@ module TerraspaceCiGithub
 
     # optional interface
     def comment(url)
+      puts "DEPRECATED: The comment interface has been replaced by the terraspace_vcs_github gem."
+      puts "Please upgrade your terraspace install and add terraspace_vcs_github to your Terraspace project Gemfile."
+      puts "The comment interface method will be removed from terraspace."
       Pr.new.comment(url)
     end
   end

data/lib/terraspace_ci_github/pr.rb

@@ -1,11 +1,11 @@
 module TerraspaceCiGithub
   class Pr < Base
     def comment(url)
-      return unless ENV['GITHUB_EVENT_NAME'] == 'pull_request'
+      return unless pull_request_available?
       return unless github_token?
 
       repo = ENV['GITHUB_REPOSITORY'] # org/repo
-      number = ENV['GITHUB_REF_NAME'].split('/').first # IE: 2/merge
+      number = pr_number
       marker = "<!-- terraspace marker -->"
       body = marker + "\n"
       body << "Terraspace Cloud Url #{url}"
@@ -25,5 +25,17 @@ module TerraspaceCiGithub
     rescue Octokit::Unauthorized => e
       puts "WARN: #{e.message}. Unable to create pull request comment. Please double check your github token"
     end
+
+    def pull_request_available?
+      !!pr_number
+    end
+
+    def pr_number
+      if ENV['GITHUB_EVENT_NAME'] == 'pull_request'
+        ENV['GITHUB_REF_NAME'].split('/').first # IE: 2/merge
+      else
+        Vars.new.pr_number
+      end
+    end
   end
 end

data/lib/terraspace_ci_github/vars.rb

@@ -10,9 +10,10 @@ module TerraspaceCiGithub
         # urls
         pr_url: pr_url,
         build_url: build_url,
+        branch_url: branch_url,
         # additional properties
         build_type: build_type,   # required IE: pull_request or push
-        pr_number: pr['number'],  # set when build_type=pull_request
+        pr_number: pr_number,  # set when build_type=pull_request
         sha: sha,
         # additional properties
         commit_message: commit_message,
@@ -25,8 +26,31 @@ module TerraspaceCiGithub
       ENV['GITHUB_SERVER_URL'] || 'https://github.com'
     end
 
+    def branch_url
+      "#{host}/#{full_repo}/tree/#{branch_name}" if branch_name
+    end
+
+    COMMIT_PATTERN = %r{Merge pull request #(\d) from (.*)}
     def pr_url
-      "#{host}/#{full_repo}/pull/#{pr['number']}" if pr['number']
+      if pr['number']
+        "#{host}/#{full_repo}/pull/#{pr['number']}"
+      elsif md = commit_message.match(COMMIT_PATTERN)
+        # git push commit has commit with PR info
+        # IE: Merge pull request #4 from tongueroo/feature
+        number = md[1]
+        org_branch = md[2]
+        org = org_branch.split('/').first
+        repo = ENV['GITHUB_REPOSITORY'].split('/').last # IE: tongueroo/infra-ci
+        "#{host}/#{org}/#{repo}/pull/#{number}"
+      end
+    end
+
+    def pr_number
+      if pr['number']
+        pr['number']
+      elsif md = commit_message.match(COMMIT_PATTERN)
+        md[1] # number
+      end
     end
 
     def build_url
@@ -46,6 +70,7 @@ module TerraspaceCiGithub
     rescue Octokit::Unauthorized => e
       puts "WARN: #{e.message}. Error getting commit message. Please double check your github token"
     end
+    memoize :commit_message
 
     def full_repo
       ENV['GITHUB_REPOSITORY']

data/lib/terraspace_ci_github/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TerraspaceCiGithub
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/terraspace_ci_github.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "faraday-retry"
   spec.add_dependency "memoist"
   spec.add_dependency "octokit"
   spec.add_dependency "zeitwerk"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: terraspace_ci_github
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday-retry
+  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