pipedawg 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 114b51a7224d92e384383b3485e96547a250ae90cc64a89250d7a45ff3ae35c0
-  data.tar.gz: 98eac24c50bdeb4282077b32e45afc87f9e8f3db01f47c5b837d36a9a3866ca0
+  metadata.gz: 041e80c36e4a1f30695c0d60233c8fcc3261ac734dee7d0770dde11ad1e0ac71
+  data.tar.gz: ee48577c9c00e3ef4f76cabe22895d435b26bb10cd6dd4ff5a950dbaebaaf5bc
 SHA512:
-  metadata.gz: 1504e970a5b8b629f5b95a92a8fd9edc4685d3d98adbf3f94631a0c0d4b12beaadb83a30b5337ba9ad03310956ce1c9e7924f6c04f968bca8287e0c45a69eb5e
-  data.tar.gz: 80e24f54810711abc38902ab44aae67499372f9d73c265aedc82d6d6bc2c3dd7d26f230195a435580674502bb40563e67810be18ebbb51bd2e35c4b735888fb0
+  metadata.gz: 83e2ef040fbdbec747968ca61d58079e720dd32cea77fd0dc0b39f451dab618e247cf85617f6f6f6dbaf881263e90c4b2f7b90b3df96d5c60e6a338db5b007d1
+  data.tar.gz: 34cccd812da30055338afc7368a5f62f46c0df7ba8e7dc7c21e9590fdcd4a5d398df30be22f0e5aac6c7a9a3944f4683b1b96be79da9b75276aca89ee13e8d89

data/lib/pipedawg/kaniko_job.rb

@@ -9,82 +9,93 @@ module Pipedawg
       @kaniko_opts = {
         build_args: {},
         config: {
-          '$CI_REGISTRY': {
-            username: '$CI_REGISTRY_USER',
-            password: '$CI_REGISTRY_PASSWORD'
-          }
+          '$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: [],
+        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'
       }.merge(kaniko_opts)
       super name, opts
       update
     end
 
-    def update # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+    def update # rubocop:disable Metrics/AbcSize
       require 'json'
       opts[:image] = kaniko_opts[:image] if kaniko_opts[:image]
-      script = ["echo #{kaniko_opts[:config].to_json.inspect} > \"#{kaniko_opts[:config_file]}\""]
-      cert_copies = Array(kaniko_opts[:trusted_ca_cert_source_files]).map do |cert|
+      opts[:script] = config + cert_copies + file_copies + Array(kaniko_cmd)
+    end
+
+    private
+
+    def config
+      ["echo #{kaniko_opts[:config].to_json.inspect} > \"#{kaniko_opts[:config_file]}\""]
+    end
+
+    def cert_copies
+      Array(kaniko_opts[:trusted_ca_cert_source_files]).map do |cert|
         "cat \"#{cert}\" >> \"#{kaniko_opts[:trusted_ca_cert_target_file]}\""
       end
-      script.concat cert_copies
-      file_copies = kaniko_opts[:external_files].map do |source, dest|
+    end
+
+    def file_copies
+      kaniko_opts[:external_files].map do |source, dest|
         "cp \"#{source}\" \"#{kaniko_opts[:context]}/#{dest}\""
       end
-      script.concat file_copies
+    end
+
+    def kaniko_cmd # rubocop:disable Metrics/AbcSize
+      ["\"#{kaniko_opts[:executor]}\" --context \"#{kaniko_opts[:context]}\"",
+       "--dockerfile \"#{kaniko_opts[:dockerfile]}\"", flags, options, build_args,
+       ignore_paths, insecure_registries, registry_certificates, registry_mirrors,
+       destinations, skip_tls_verify_registries].reject(&:empty?).join(' ')
+    end
+
+    def flags
       flags = kaniko_opts[:flags].clone
       flags << 'no-push' if kaniko_opts[:destinations].empty?
-      flags_cli = flags.uniq.map { |f| "--#{f}" }.join(' ')
-      options_cli =  kaniko_opts[:options].map { |k, v| "--#{k}=\"#{v}\"" }.join(' ')
-      build_args_cli = kaniko_opts[:build_args].map { |k, v| "--build-arg #{k}=\"#{v}\"" }.join(' ')
-      ignore_paths_cli = Array(kaniko_opts[:ignore_paths]).map { |p| "--ignore-path #{p}" }.join(' ')
-      insecure_registries_cli = Array(kaniko_opts[:insecure_registries]).map do |r|
+      flags.uniq.map { |f| "--#{f}" }.join(' ')
+    end
+
+    def options
+      kaniko_opts[:options].map { |k, v| "--#{k}=\"#{v}\"" }.join(' ')
+    end
+
+    def build_args
+      kaniko_opts[:build_args].map { |k, v| "--build-arg #{k}=\"#{v}\"" }.join(' ')
+    end
+
+    def ignore_paths
+      Array(kaniko_opts[:ignore_paths]).map { |p| "--ignore-path #{p}" }.join(' ')
+    end
+
+    def insecure_registries
+      Array(kaniko_opts[:insecure_registries]).map do |r|
         "--insecure-registry #{r}"
       end.join(' ')
-      registry_certificates_cli = kaniko_opts[:registry_certificates].map do |k, v|
+    end
+
+    def registry_certificates
+      kaniko_opts[:registry_certificates].map do |k, v|
         "--registry-certificate #{k}=\"#{v}\""
       end.join(' ')
-      registry_mirrors_cli = Array(kaniko_opts[:registry_mirrors]).map { |r| "--registry-mirror #{r}" }.join(' ')
-      skip_tls_verify_registrys_cli = Array(kaniko_opts[:skip_tls_verify_registry]).map do |r|
+    end
+
+    def registry_mirrors
+      Array(kaniko_opts[:registry_mirrors]).map { |r| "--registry-mirror #{r}" }.join(' ')
+    end
+
+    def destinations
+      kaniko_opts[:destinations].map { |d| "--destination #{d}" }.join(' ')
+    end
+
+    def skip_tls_verify_registries
+      Array(kaniko_opts[:skip_tls_verify_registry]).map do |r|
         "--skip-tls-verify-registry #{r}"
       end.join(' ')
-      destinations_cli = kaniko_opts[:destinations].map { |d| "--destination #{d}" }.join(' ')
-      kaniko_cmds = [
-        "\"#{kaniko_opts[:executor]}\"",
-        '--context',
-        "\"#{kaniko_opts[:context]}\"",
-        '--dockerfile',
-        "\"#{kaniko_opts[:dockerfile]}\"",
-        flags_cli,
-        options_cli,
-        build_args_cli,
-        ignore_paths_cli,
-        insecure_registries_cli,
-        registry_certificates_cli,
-        registry_mirrors_cli,
-        destinations_cli,
-        skip_tls_verify_registrys_cli
-      ].reject(&:empty?)
-      script << kaniko_cmds.join(' ')
-      opts[:script] = script
     end
   end
 end

data/lib/pipedawg/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipedawg
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - harbottle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies: []
 description: Generate GitLab CI pipelines.
 email: