pipedawg 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 041e80c36e4a1f30695c0d60233c8fcc3261ac734dee7d0770dde11ad1e0ac71
-  data.tar.gz: ee48577c9c00e3ef4f76cabe22895d435b26bb10cd6dd4ff5a950dbaebaaf5bc
+  metadata.gz: 064c29963799087a56d2cde36f785bc9762cd50870dc9eeede4f9efbfc577f0f
+  data.tar.gz: fd51dfa82c3d16c215f284dfd7c84c5600906738fef8d6f6b0d69b22e967af33
 SHA512:
-  metadata.gz: 83e2ef040fbdbec747968ca61d58079e720dd32cea77fd0dc0b39f451dab618e247cf85617f6f6f6dbaf881263e90c4b2f7b90b3df96d5c60e6a338db5b007d1
-  data.tar.gz: 34cccd812da30055338afc7368a5f62f46c0df7ba8e7dc7c21e9590fdcd4a5d398df30be22f0e5aac6c7a9a3944f4683b1b96be79da9b75276aca89ee13e8d89
+  metadata.gz: c7241f30f45d72d1d43e03ef7b007c24756b1a16c483f605c179a02eb02c89b900926fd20c93502fbc94585cc9f1fa94ba41fefa27cabf497568b05ff252a75e
+  data.tar.gz: 7c72d19557c1f449dd56315465d1f22d66277005dfb39c59a67d83ef5389800511fcbbfc7fae3409f235d66834256d5f9566d63d8610f37b1a718c0d4f99285a

data/lib/pipedawg/helm_copy_job.rb

@@ -7,7 +7,7 @@ module Pipedawg
 
     def initialize(name = 'build', opts = {}, helm_opts = {})
       @helm_opts = {
-        chart: name,
+        chart: name, debug: true,
         destinations: [{ user: nil, password: nil, url: nil }],
         helm: 'helm',
         image: { entrypoint: [''], name: 'alpine/helm' },
@@ -17,13 +17,21 @@ module Pipedawg
       update
     end
 
-    def update
+    def update # rubocop:disable Metrics/AbcSize
       opts[:image] = helm_opts[:image] if helm_opts[:image]
-      opts[:script] = [] + pull + (helm_opts[:destinations].map { |d| push(d) }).flatten(1)
+      opts[:script] = debug + pull + (helm_opts[:destinations].map { |d| push(d) }).flatten(1)
     end
 
     private
 
+    def debug
+      if helm_opts[:debug]
+        Pipedawg::Util.echo_proxy_vars
+      else
+        []
+      end
+    end
+
     def pull
       case helm_opts[:url]
       when nil

data/lib/pipedawg/kaniko_job.rb

@@ -11,13 +11,12 @@ module Pipedawg
         config: {
           '$CI_REGISTRY': { username: '$CI_REGISTRY_USER', password: '$CI_REGISTRY_PASSWORD' }
         },
-        config_file: '/kaniko/.docker/config.json', context: '${CI_PROJECT_DIR}',
-        destinations: [], dockerfile: 'Dockerfile', executor: '/kaniko/executor',
-        external_files: {}, flags: [], ignore_paths: [], insecure_registries: [],
-        image: { entrypoint: [''], name: 'gcr.io/kaniko-project/executor:debug' },
-        options: {}, registry_certificates: {}, registry_mirrors: [],
-        skip_tls_verify_registry: [], trusted_ca_cert_source_files: [],
-        trusted_ca_cert_target_file: '/kaniko/ssl/certs/ca-certificates.crt'
+        config_file: '/kaniko/.docker/config.json', context: '${CI_PROJECT_DIR}', debug: true,
+        destinations: [], dockerfile: 'Dockerfile', executor: '/kaniko/executor', external_files: {},
+        flags: [], ignore_paths: [], insecure_registries: [],
+        image: { entrypoint: [''], name: 'gcr.io/kaniko-project/executor:debug' }, options: {},
+        registry_certificates: {}, registry_mirrors: [], skip_tls_verify_registry: [],
+        trusted_ca_cert_source_files: [], trusted_ca_cert_target_file: '/kaniko/ssl/certs/ca-certificates.crt'
       }.merge(kaniko_opts)
       super name, opts
       update
@@ -26,11 +25,19 @@ module Pipedawg
     def update # rubocop:disable Metrics/AbcSize
       require 'json'
       opts[:image] = kaniko_opts[:image] if kaniko_opts[:image]
-      opts[:script] = config + cert_copies + file_copies + Array(kaniko_cmd)
+      opts[:script] = debug + config + cert_copies + file_copies + Array(kaniko_cmd)
     end
 
     private
 
+    def debug
+      if kaniko_opts[:debug]
+        Pipedawg::Util.echo_proxy_vars
+      else
+        []
+      end
+    end
+
     def config
       ["echo #{kaniko_opts[:config].to_json.inspect} > \"#{kaniko_opts[:config_file]}\""]
     end

data/lib/pipedawg/util.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Pipedawg
+  # util class
+  class Util
+    def self.expand_env_vars(item) # rubocop:disable Metrics/MethodLength
+      case item
+      when Array
+        item.map { |i| expand_env_vars(i) }
+      when Hash
+        item.each { |k, v| item[k] = expand_env_vars(v) }
+        item
+      when String
+        item.gsub(/\${([^} ]+)}/) do |e|
+          ENV[e.gsub('${', '').gsub('}', '')]
+        end
+      else
+        item
+      end
+    end
+
+    def self.puts_proxy_vars
+      puts 'Proxy settings:'
+      puts "http_proxy: #{ENV['http_proxy']}"
+      puts "https_proxy: #{ENV['https_proxy']}"
+      puts "no_proxy: #{ENV['no_proxy']}"
+      puts "HTTP_PROXY: #{ENV['HTTP_PROXY']}"
+      puts "HTTPS_PROXY: #{ENV['HTTPS_PROXY']}"
+      puts "NO_PROXY: #{ENV['NO_PROXY']}"
+    end
+
+    def self.echo_proxy_vars
+      script = ['echo Proxy settings:']
+      script << 'echo   http_proxy: "${http_proxy}"'
+      script << 'echo   https_proxy: "${https_proxy}"'
+      script << 'echo   no_proxy: "${no_proxy}"'
+      script << 'echo   HTTP_PROXY: "${HTTP_PROXY}"'
+      script << 'echo   HTTPS_PROXY: "${HTTPS_PROXY}"'
+      script << 'echo   NO_PROXY: "${NO_PROXY}"'
+      script
+    end
+  end
+end

data/lib/pipedawg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pipedawg
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/lib/pipedawg.rb

@@ -4,6 +4,7 @@ require 'pipedawg/job'
 require 'pipedawg/helm_copy_job'
 require 'pipedawg/kaniko_job'
 require 'pipedawg/pipeline'
+require 'pipedawg/util'
 require 'pipedawg/version'
 
 module Pipedawg

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pipedawg
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - harbottle
@@ -24,6 +24,7 @@ files:
 - lib/pipedawg/job.rb
 - lib/pipedawg/kaniko_job.rb
 - lib/pipedawg/pipeline.rb
+- lib/pipedawg/util.rb
 - lib/pipedawg/version.rb
 homepage: https://github.com/liger1978/pipedawg
 licenses: