kubernetes_template_rendering 0.1.0 → 0.2.1.pre.dc.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b05563ef123216e666bf9be24a72f445455386367b500a64d202468e5ab3292
-  data.tar.gz: e923ed36b4fdf9267ddb45860425895186c1289582cfb179bc136fb98758432d
+  metadata.gz: f7b242fd586f046697f6e535add0afa36a8788db2525180b8371c6dd21723c3d
+  data.tar.gz: 32d98d08ae6e0f05f5beaffe8a494cbc4bb090983f03c2e7887d2e3818e243df
 SHA512:
-  metadata.gz: 5ffe4df38a962360ca6f1d84ee122182e0abd3c3d220b6577e576fe3237e0cf12736b7fbb03a814e7d10870af3df36761913074b2cb428ebdf940eac64f4eaa1
-  data.tar.gz: 6e6d5b003e44d68c59834bf25f2d0a67be7041f964030b221d2845f3bd7a50c2ef8b0fccc7b3e99f5ea63420572970f0a7679d6c99d3b28141417bad3e81de4f
+  metadata.gz: 6cccee5ee9a9d1bbca7ff720134f7de6acf91cc8eb06b5a8915bb7809465282db7fca7aef639b13b6c874ef4e580aab235bb3b86a287dba349c031f5cb71401f
+  data.tar.gz: 7809594f19e079b1358411bbae0a7c03cf235e5ce84ade1c4fc77b1d87666d6827e7600413b4eafbb38277dda8416252e5bae62ec8371ff1c36cf124582837cf

data/CHANGELOG.md

@@ -4,6 +4,17 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.1.0] - Unreleased
+## [0.2.1] - Unreleased
+### Fixed
+- Fixed a bug allowing child process errors to be ignored while rendering.
+
+## [0.2.0] - 2024-05-06
+### Added
+- Added support for passing `--source-repo` flag into command line so that the rendered manifest comments can include a link to the source repository.
+
+### Changed
+- Updated the code comment to include the variable overrides used when rendering the current version of the templates
+
+## [0.1.0] - 2024-04-22
 
 - Initial release

data/lib/kubernetes_template_rendering/cli.rb

@@ -32,6 +32,7 @@ module KubernetesTemplateRendering
           op.on("--region=REGION",                             "set the specific region to render")                                   { args.region = _1 }
           op.on("--color=COLOR",                               "set the specific color to render")                                    { args.color = _1 }
           op.on("--[no-]prune",                                "enable/disable pruning of untouched resources")                       { args.prune = _1 }
+          op.on("--source-repo=SOURCE_REPO",                   "set the source repo for the rendered templates")                      { args.source_repo = _1 }
 
           op.on("--variable-override=KEY:VALUE", "override a variable value set within definitions.yaml") do |override|
             args.variable_overrides ||= {}
@@ -64,7 +65,8 @@ module KubernetesTemplateRendering
           cluster_type: args.cluster_type,
           region: args.region,
           color: args.color,
-          variable_overrides: args.variable_overrides
+          variable_overrides: args.variable_overrides,
+          source_repo: args.source_repo
         )
       end
 

data/lib/kubernetes_template_rendering/cli_arguments.rb

@@ -12,7 +12,8 @@ module KubernetesTemplateRendering
       :region,
       :color,
       :variable_overrides,
-      :prune
+      :prune,
+      :source_repo
     ) do
       def valid?
         rendered_directory && template_directory

data/lib/kubernetes_template_rendering/resource.rb

@@ -9,14 +9,16 @@ module KubernetesTemplateRendering
   class Resource
     class UnexpectedFileTypeError < StandardError; end
 
-    attr_reader :variables, :template_path, :output_directory
-
-    def initialize(template_path:, definitions_path:, variables:, output_directory:, output_filename: nil)
-      @template_path    = template_path
-      @definitions_path = definitions_path
-      @variables        = variables
-      @output_directory = output_directory
-      @output_filename  = output_filename || template_filename(template_path)
+    attr_reader :variables, :variable_overrides, :template_path, :output_directory, :source_repo
+
+    def initialize(template_path:, definitions_path:, variables:, output_directory:, output_filename: nil, variable_overrides: {}, source_repo: nil)
+      @template_path      = template_path
+      @definitions_path   = definitions_path
+      @variables          = variables
+      @variable_overrides = variable_overrides
+      @output_directory   = output_directory
+      @source_repo        = source_repo
+      @output_filename    = output_filename || template_filename(template_path)
     end
 
     def render(args)
@@ -26,7 +28,7 @@ module KubernetesTemplateRendering
     private
 
     def rendered_template(args)
-      @rendered_template ||= template_klass.render(@template_path, variables, jsonnet_library_path: args.jsonnet_library_path)
+      @rendered_template ||= template_klass.render(@template_path, variables, variable_overrides:, source_repo:, jsonnet_library_path: args.jsonnet_library_path)
     end
 
     def write_template(args)

data/lib/kubernetes_template_rendering/resource_set.rb

@@ -12,9 +12,10 @@ module KubernetesTemplateRendering
   class ResourceSet
     attr_reader :variables, :output_directory, :deploy_group_config, :omitted_resources,
                 :template_directory, :target_output_directory, :regions, :colors,
-                :definitions_path, :kubernetes_cluster_type
+                :definitions_path, :kubernetes_cluster_type, :variable_overrides,
+                :source_repo
 
-    def initialize(config:, template_directory:, rendered_directory:, definitions_path:, kubernetes_cluster_type:)
+    def initialize(config:, template_directory:, rendered_directory:, definitions_path:, kubernetes_cluster_type:, variable_overrides: {}, source_repo: nil)
       @variables               = config["variables"] || {}
       @deploy_group_config     = config["deploy_groups"]
       @omitted_resources       = config["omitted_resources"]
@@ -25,6 +26,8 @@ module KubernetesTemplateRendering
       @rendered_directory      = rendered_directory
       @definitions_path        = definitions_path
       @kubernetes_cluster_type = kubernetes_cluster_type
+      @variable_overrides      = variable_overrides
+      @source_repo             = source_repo
       @resources               = {}
 
       if @kubernetes_cluster_type != "kube-platform"
@@ -185,7 +188,7 @@ module KubernetesTemplateRendering
 
     def standard_resources(output_directory)
       standard_template_paths.map do |path|
-        Resource.new(template_path: path, definitions_path: @definitions_path, variables: variables, output_directory: output_directory)
+        Resource.new(template_path: path, definitions_path:, variables:, output_directory:, variable_overrides:, source_repo:)
       end
     end
 

data/lib/kubernetes_template_rendering/template.rb

@@ -8,10 +8,13 @@ require "yaml"
 # This is a base class for all Templates. Derived classes must implement the render method.
 module KubernetesTemplateRendering
   class Template < OpenStruct
-    attr_reader :template_path, :variables
-    def initialize(template_path, variables)
-      @template_path = template_path
-      @variables = variables
+    attr_reader :template_path, :variables, :source_repo, :variable_overrides
+
+    def initialize(template_path, variables, source_repo: nil, variable_overrides: {})
+      @template_path      = template_path
+      @variables          = variables.merge(variable_overrides)
+      @source_repo        = source_repo
+      @variable_overrides = variable_overrides
     end
 
     def render(args)
@@ -24,9 +27,25 @@ module KubernetesTemplateRendering
       comment = <<~EOS
       # WARNING: DO NO EDIT THIS FILE!
       # Any changes made here will be lost.
-      # This file is autogenerated from #{template_path}
+      # This file is autogenerated from #{full_template_path}
       EOS
-      comment + yaml_string
+      comment + variable_override_comment + yaml_string
+    end
+
+    def full_template_path
+      if source_repo
+        "https://github.com/#{source_repo}/blob/-/#{template_path.start_with?("/") ? template_path[1..-1] : template_path}"
+      else
+        template_path
+      end
+    end
+
+    def variable_override_comment
+      if variable_overrides&.any?
+        <<~EOS
+        # Variable overrides used: #{variable_overrides.to_json}
+        EOS
+      end || ""
     end
 
     class << self
@@ -43,8 +62,8 @@ module KubernetesTemplateRendering
       # The ErbTemplate and JsonnetTemplate classes both inherit from the Template class and implement a render method.
       # However, the erb_binding parameter is used just in ErbTemplate, while the jsonnet_library_path parameter is used just in JsonnetTemplate.
       # This is a little awkward. Potentially this could be refactored.
-      def render(template_path, variables, erb_binding: nil, jsonnet_library_path: nil)
-        new(template_path, variables).render(erb_binding: erb_binding, jsonnet_library_path: jsonnet_library_path)
+      def render(template_path, variables, erb_binding: nil, jsonnet_library_path: nil, source_repo: nil, variable_overrides: {})
+        new(template_path, variables, source_repo:, variable_overrides:).render(erb_binding: erb_binding, jsonnet_library_path: jsonnet_library_path)
       end
     end
   end

data/lib/kubernetes_template_rendering/template_directory_renderer.rb

@@ -13,9 +13,9 @@ module KubernetesTemplateRendering
   class TemplateDirectoryRenderer
     DEFINITIONS_FILENAME = "definitions.yaml"
 
-    attr_reader :directories, :omitted_names, :rendered_directory, :cluster_type, :region, :color, :variable_overrides
+    attr_reader :directories, :omitted_names, :rendered_directory, :cluster_type, :region, :color, :variable_overrides, :source_repo
 
-    def initialize(directories:, rendered_directory:, omitted_names: [], cluster_type: nil, region: nil, color: nil, variable_overrides: nil)
+    def initialize(directories:, rendered_directory:, omitted_names: [], cluster_type: nil, region: nil, color: nil, variable_overrides: nil, source_repo: nil)
       @directories        = directories_with_definitions(Array(directories))
       @omitted_names      = Array(omitted_names)
       @rendered_directory = rendered_directory
@@ -23,6 +23,7 @@ module KubernetesTemplateRendering
       @region             = region
       @color              = color
       @variable_overrides = variable_overrides || {}
+      @source_repo        = source_repo
     end
 
     def render(args)
@@ -48,7 +49,11 @@ module KubernetesTemplateRendering
       end
 
       if args.fork?
-        Process.waitall
+        process_statuses = Process.waitall
+
+        if (failed_processes = process_statuses.select { |_, status| !status.success? }).any?
+          raise "Child process completed with non-zero status: #{failed_processes.inspect}"
+        end
       end
     end
 
@@ -102,7 +107,15 @@ module KubernetesTemplateRendering
           kubernetes_cluster_type = name.sub('SPP-PLACEHOLDER', 'staging').sub(/\..*/, '') # prod.gcp => prod
 
           hash[name] ||= []
-          hash[name] << ResourceSet.new(config: config, template_directory: dir, rendered_directory: @rendered_directory, kubernetes_cluster_type: kubernetes_cluster_type, definitions_path: definitions_path)
+          hash[name] << ResourceSet.new(
+            config: config,
+            template_directory: dir,
+            rendered_directory: @rendered_directory,
+            kubernetes_cluster_type: kubernetes_cluster_type,
+            definitions_path: definitions_path,
+            variable_overrides: @variable_overrides,
+            source_repo: @source_repo
+          )
         end
       end
     end
@@ -156,7 +169,6 @@ module KubernetesTemplateRendering
 
           cluster_type_config.regions   = cluster_type_config.regions & [region] if region
           cluster_type_config.colors    = cluster_type_config.colors & [color]   if color
-          cluster_type_config.variables = (cluster_type_config.variables || {}).merge(variable_overrides)
 
           hash[name] = cluster_type_config if (region.nil? && color.nil?) || (cluster_type_config.regions.any? && cluster_type_config.colors.any?)
         end

data/lib/kubernetes_template_rendering/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KubernetesTemplateRendering
-  VERSION = "0.1.0"
+  VERSION = "0.2.1.pre.dc.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes_template_rendering
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1.pre.dc.0
 platform: ruby
 authors:
 - Octothorpe
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-29 00:00:00.000000000 Z
+date: 2024-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -104,11 +104,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Tool for rendering ERB and Jsonnet templates