From abb7e99b25bb516e38256c86555e1c1498dc541b Mon Sep 17 00:00:00 2001 From: Luis Aragon Date: Thu, 8 May 2025 10:12:55 -0700 Subject: [PATCH 1/6] TECH-18358: Add .idea to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7de750e..1a78198 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ /pkg/ /spec/reports/ /tmp/ +.idea # rspec failure tracking .rspec_status From 3ed50960b74b4ee0a4732f776bcee0038bf82969 Mon Sep 17 00:00:00 2001 From: Luis Aragon Date: Thu, 8 May 2025 10:14:47 -0700 Subject: [PATCH 2/6] TECH-18358: Fix prune directory bug to better prune directory --- lib/kubernetes_template_rendering/resource_set.rb | 2 +- spec/kubernetes_template_rendering/resource_set_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/kubernetes_template_rendering/resource_set.rb b/lib/kubernetes_template_rendering/resource_set.rb index 63ff27a..2ec6741 100644 --- a/lib/kubernetes_template_rendering/resource_set.rb +++ b/lib/kubernetes_template_rendering/resource_set.rb @@ -178,7 +178,7 @@ def prune_directory(directory) The `prune` flag is set to true, #{Color.green('pruning')} directory #{Color.magenta(directory)} before rendering MESSAGE - FileUtils.rm_rf("#{directory}/*") + FileUtils.rm_rf(directory) end end diff --git a/spec/kubernetes_template_rendering/resource_set_spec.rb b/spec/kubernetes_template_rendering/resource_set_spec.rb index 86b7908..11d2a62 100644 --- a/spec/kubernetes_template_rendering/resource_set_spec.rb +++ b/spec/kubernetes_template_rendering/resource_set_spec.rb @@ -74,7 +74,7 @@ it "prunes the directory" do expect(FileUtils).to_not receive(:mkdir_p) - expect(FileUtils).to receive(:rm_rf).with("#{expanded_output_directory}/*") + expect(FileUtils).to receive(:rm_rf).with(expanded_output_directory) resource_set.render(args) end end From 4cd9c868e19f529c6f987a17e66bca9a4b8b04b7 Mon Sep 17 00:00:00 2001 From: Luis Aragon Date: Thu, 8 May 2025 10:16:53 -0700 Subject: [PATCH 3/6] TECH-18358: Bump to 0.2.4 pre-release version --- CHANGELOG.md | 4 ++++ Gemfile.lock | 2 +- lib/kubernetes_template_rendering/version.rb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6403840..20a33a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ 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.2.4] - UNRELEASED +### Fixed +- Fixed `--prune` to properly remove files in the rendered directory + ## [0.2.3] - 2025-03-25 ### Fixed - Fixed `--variable-override` to accept multiple arguments to override multiple variables diff --git a/Gemfile.lock b/Gemfile.lock index f3b8de2..267c51d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - kubernetes_template_rendering (0.2.3) + kubernetes_template_rendering (0.2.4.luis.1) activesupport (< 8) invoca-utils jsonnet diff --git a/lib/kubernetes_template_rendering/version.rb b/lib/kubernetes_template_rendering/version.rb index e1746b4..d9c6041 100644 --- a/lib/kubernetes_template_rendering/version.rb +++ b/lib/kubernetes_template_rendering/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module KubernetesTemplateRendering - VERSION = "0.2.3" + VERSION = "0.2.4.luis.1" end From 3853460fe7a84b5a40832c0b16ed9296ffacb31a Mon Sep 17 00:00:00 2001 From: Luis Aragon Date: Thu, 8 May 2025 14:53:40 -0700 Subject: [PATCH 4/6] TECH-18358: Bump to 0.2.4 for release --- CHANGELOG.md | 2 +- Gemfile.lock | 2 +- lib/kubernetes_template_rendering/version.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20a33a7..7e16399 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ 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.2.4] - UNRELEASED +## [0.2.4] - 2025-05-08 ### Fixed - Fixed `--prune` to properly remove files in the rendered directory diff --git a/Gemfile.lock b/Gemfile.lock index 267c51d..8d049f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - kubernetes_template_rendering (0.2.4.luis.1) + kubernetes_template_rendering (0.2.4) activesupport (< 8) invoca-utils jsonnet diff --git a/lib/kubernetes_template_rendering/version.rb b/lib/kubernetes_template_rendering/version.rb index d9c6041..81ff66b 100644 --- a/lib/kubernetes_template_rendering/version.rb +++ b/lib/kubernetes_template_rendering/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module KubernetesTemplateRendering - VERSION = "0.2.4.luis.1" + VERSION = "0.2.4" end From b404f47ec58501cbcda66e9a41dcb226039bb880 Mon Sep 17 00:00:00 2001 From: Luis Aragon Date: Thu, 8 May 2025 15:34:11 -0700 Subject: [PATCH 5/6] TECH-18358: Update rexml gem to 3.4.1 --- Gemfile.lock | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8d049f0..15abbc2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,8 +51,7 @@ GEM rainbow (3.1.1) rake (13.2.1) regexp_parser (2.9.0) - rexml (3.3.0) - strscan + rexml (3.4.1) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -86,7 +85,6 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - strscan (3.1.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) From b6c04daf614a3aa80fa715a1b6cda7feb28d58a3 Mon Sep 17 00:00:00 2001 From: Luis Aragon Date: Thu, 8 May 2025 15:36:56 -0700 Subject: [PATCH 6/6] TECH-18358: Bump to 0.2.5 for release --- CHANGELOG.md | 4 ++++ Gemfile.lock | 2 +- lib/kubernetes_template_rendering/version.rb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e16399..0c8b29b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ 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.2.5] - 2025-05-08 +### Fixed +- Updated `rexml` dependency to avoid security issues + ## [0.2.4] - 2025-05-08 ### Fixed - Fixed `--prune` to properly remove files in the rendered directory diff --git a/Gemfile.lock b/Gemfile.lock index 15abbc2..f9209b7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - kubernetes_template_rendering (0.2.4) + kubernetes_template_rendering (0.2.5) activesupport (< 8) invoca-utils jsonnet diff --git a/lib/kubernetes_template_rendering/version.rb b/lib/kubernetes_template_rendering/version.rb index 81ff66b..d7e91c1 100644 --- a/lib/kubernetes_template_rendering/version.rb +++ b/lib/kubernetes_template_rendering/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module KubernetesTemplateRendering - VERSION = "0.2.4" + VERSION = "0.2.5" end