gha_config 0.18 → 0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dedc710facebd9c6ac3826132d29dabfa49304d6bb41ba6e143659611ea6f2f
-  data.tar.gz: eebaf08f4252ab8796b005732ed87745e9dea1978ad739fa8a25cd6417a40eed
+  metadata.gz: e131e9a02772785b75fc3cc808850f94fa87257bd287c1b953a4c86592bf6ba8
+  data.tar.gz: 84c4ac5ffdace9fc7434d2b254424170c05a40fcbb3b4f9e24c9fb8f83762bea
 SHA512:
-  metadata.gz: 96212938458677189ca1576df3ec259e917e5b62455bb61c05e95c303588e9a78a69808dd3690fd564779032acf6a42586a4ed98d3adba2b3fed4efaa5aaf291
-  data.tar.gz: 156081246d3e7c70254f2ac1fea31006abe69ed0b2f9fea6ccf9ce3b127f2c5eac615f70c323c3401bed3e8942328915977fd24ca36ef8907446c284a1cc098c
+  metadata.gz: b95fa77057e1d23e7cd5569229a9d529d61d05239993fc6e37d757e0a69f40ceeab381d0693472ced3fd893ccdad8cb8151af2d6614dde2fd1f9913345db2a5c
+  data.tar.gz: c26d179468076535587d36cadb09c8064240d4e00f191d25c7140cabad93e7fed502a130c9c85631a4891e949077c22b5c8637ea65107068be8953fff8d99d69

data/CHANGELOG.md

@@ -5,7 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.18] - 2021-08-06
+# [0.22] - 2021-11-16
+- Fixed so root-level `env` are not overridden by defaults.
+
+## [0.21] - 2021-08-20
+- Added ARTIFACTORY env variables by default for Scala builds.
+
+## [0.20] - 2021-08-09
+- Added `_variables_` for substitution.
+
+## [0.19] - 2021-08-06
 - Add `_options_` for submodules and SSH.
 
 ## [0.17] - 2021-08-04

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gha_config (0.15)
+    gha_config (0.21)
 
 GEM
   remote: https://flipplib.jfrog.io/flipplib/api/gems/flipp-gems/

data/README.md

@@ -131,6 +131,30 @@ Templates get expanded into their contents whenever they are used. Templates can
 
 If you're using Ruby, you can add this gem to your app Gemfile. Otherwise, you can install it locally. Either way, you can re-run it whenever your "source workflow" changes.
 
+### Variables
+
+You can define simple variables in a separate section. These variables will be replaced with their values when they appear anywhere in the input workflow file surrounded by *double underscores*. For example:
+
+```yaml
+_variables_:
+  PROD_BRANCH: master
+  STAGING_BRANCH: develop
+
+on:
+  push:
+    - __PROD_BRANCH__
+    - __STAGING_BRANCH__
+```
+
+will output:
+
+```yaml
+on:
+  push:
+    - master
+    - develop
+```
+
 ### Special options
 
 In addition to `_defaults_`, there are other options that will affect how the output of certain steps is emitted. These options are parsed from the `_options_` key:

data/lib/gha_config/config.rb

@@ -4,12 +4,14 @@ module GhaConfig
     attr_accessor :env
     attr_accessor :parsed_config
     attr_accessor :options
+    attr_accessor :variables
 
     def initialize
       @env = {}
       @defaults = []
       @parsed_config = {}
       @options = {}
+      @variables = {}
     end
   end
 end

data/lib/gha_config/parser.rb

@@ -7,6 +7,7 @@ module GhaConfig
       config = GhaConfig::Config.new
       config.defaults = hash.delete('_defaults_') || {}
       config.options = hash.delete('_options_') || {}
+      config.variables = hash.delete('_variables_') || {}
       config.env = hash.delete('env') || {}
 
       hash['jobs'] = replace_defaults(config, hash['jobs'])

data/lib/gha_config/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GhaConfig
-  VERSION = '0.18'
+  VERSION = '0.22'
 end

data/lib/gha_config/writer.rb

@@ -10,7 +10,7 @@ module GhaConfig
       default_env =  {
         'SLACK_CHANNEL' => ''
       }
-      output_hash['env'] = default_env.merge(config.env).
+      output_hash['env'] = default_env.
         merge({
                 'HOME'                  => '/home/circleci',
                 'AWS_ACCESS_KEY_ID'     => '${{ secrets.AWS_ACCESS_KEY_ID }}',
@@ -26,8 +26,12 @@ module GhaConfig
                 'SERVICE_NAME'          => '${{ secrets.SERVICE_NAME }}',
                 'SERVICE_PROFILE'       => '${{ secrets.SERVICE_PROFILE }}',
                 'SERVICE_TOKEN'         => '${{ secrets.SERVICE_TOKEN }}',
-                'WISHABI_ENVIRONMENT'   => '${{ secrets.WISHABI_ENVIRONMENT }}'
-              })
+                'WISHABI_ENVIRONMENT'   => '${{ secrets.WISHABI_ENVIRONMENT }}',
+                'ARTIFACTORY_HOST'      => '${{ secrets.ARTIFACTORY_HOST }}',
+                'ARTIFACTORY_PASSWORD'  => '${{ secrets.ARTIFACTORY_PASSWORD }}',
+                'ARTIFACTORY_REALM'     => '${{ secrets.ARTIFACTORY_REALM }}',
+                'ARTIFACTORY_USER'      => '${{ secrets.ARTIFACTORY_USER }}'
+      }).merge(config.env)
 
       output_hash['jobs'] = {}
       config.parsed_config['jobs'].each do |name, job|
@@ -47,7 +51,7 @@ module GhaConfig
             'job_status' => '${{ job.status }}'
           }}
         if config.options['enable_ssh']
-          flipp_global['env']['enable_ssh'] = true
+          flipp_global['with']['enable_ssh'] = true
         end
         job['steps'].unshift(flipp_global)
         checkout = {
@@ -56,7 +60,7 @@ module GhaConfig
         }
         if config.options['use_submodules']
           checkout['with'] = {
-            'token' => "${{ secrets.FLIPPCIRCLECIPULLER_REPO_TOKEN || github.token }}",
+            'token' => "${{ secrets.FLIPPCIRCLECIPULLER_REPO_TOKEN }}",
             'submodules' => 'recursive'
           }
         end
@@ -66,7 +70,7 @@ module GhaConfig
         output_hash['jobs'][name] = new_job
       end
       output = output_hash.to_yaml
-      output = cleanup(output)
+      output = cleanup(output, config)
       header = <<-OUT
 ######## GENERATED FROM ./github/workflow-src/CI.yml
 ######## USING gha_config https://github.com/wishabi/gha-config
@@ -77,7 +81,7 @@ module GhaConfig
       File.write(output_file, output)
     end
 
-    def self.cleanup(out)
+    def self.cleanup(out, config)
       out = out.sub("---\n", '')
       out = out.gsub(/'on'/, 'on') # replace 'on' with on
       out = out.gsub(/: ''/, ':') # replace : '' with :
@@ -85,6 +89,10 @@ module GhaConfig
       out = out.gsub(/"\[/, '[')
       out = out.gsub(/\]"/, ']') # change "[...]" to [...]
 
+      config.variables.each do |name, val|
+        out = out.gsub("__#{name}__", val)
+      end
+
       first, last = out.split("\njobs:")
       first = first.gsub(/"/, '') # remove quotes from env block
       last = last.gsub(/\n  (\S)/) { "\n\n  #{$1}" } # add empty line before job keys

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gha_config
 version: !ruby/object:Gem::Version
-  version: '0.18'
+  version: '0.22'
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop