krane 2.3.1 → 2.3.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/.github/CODEOWNERS +1 -1
  3. data/CHANGELOG.md +12 -0
  4. data/krane.gemspec +2 -0
  5. data/lib/krane/renderer.rb +1 -1
  6. data/lib/krane/template_sets.rb +1 -1
  7. data/lib/krane/version.rb +1 -1
  8. metadata +30 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d7f54da6a63441ed0e9478eae5fe7c93f2cdaf94e149c08d70557922aca753fe
4
- data.tar.gz: b5a87622de42abbd3c9f6e7528faafc4f8efee53645b60d32783edc6d43321d6
3
+ metadata.gz: 3e1fd1232d053c7f2bc648a315551c103ebd4792165f7b8c9b81f1c0b2f810bc
4
+ data.tar.gz: 214360319ed90c6bc752d99ee1b3e08244703ad56d3b5e964993fccee2b7562c
5
5
  SHA512:
6
- metadata.gz: aacd21670e0b2bdba17321635e69150de7d44ef5dcfd87d959cb0a2fba428c11b326c2cc81b6e9d868a1efb7027b3e307445641bcd3b9364f3f7364d44b0190b
7
- data.tar.gz: b6fbeb6e6aad2311be81cfdd69a459c57a1d679ca5ef6a45e23d1345c020d51d4a76a02cd94015721fdb6d2cf36a6a2ee000f9efbdb4edb74ea7f4e9d7e5bea5
6
+ metadata.gz: a98198f5aed91b383295bf7ddcd9dad6bdcc68d5361582ef873fa53b7b191d92963c9bd359c841f0c95b7e3c007e0f32dbc331019d5c8a4bf2c4358ccf0aac5c
7
+ data.tar.gz: 6267bef54343cdf3c301cab0bd377a1d6110b1c2862bdf2dc5288fd0ffba8337a1cc88aa7e708e8a19dd042646699e3ad64c3d23171e0f23a9a5f5a85fcf470c
data/.github/CODEOWNERS CHANGED
@@ -1 +1 @@
1
- * @Shopify/krane
1
+ * @Shopify/app-lifecycle
data/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  ## next
2
2
 
3
+ ## 2.3.4
4
+
5
+ - Fix for [CVE-2021-41817](https://www.ruby-lang.org/en/news/2021/11/15/date-parsing-method-regexp-dos-cve-2021-41817/). See [ServicesDB action item here](https://services.shopify.io/action_items/definitions/isolated/59).
6
+
7
+ ## 2.3.3
8
+
9
+ - Another Psych 4.0 compatibility fix [#844](https://github.com/Shopify/krane/pull/844)
10
+
11
+ ## 2.3.2
12
+
13
+ - Fix compatibility with Psych 4.0 [#843](https://github.com/Shopify/krane/pull/843)
14
+
3
15
  ## 2.3.1
4
16
 
5
17
  - Fix a bug in RestartTask where a NoMethodError is thrown if any of the target resources do not have annotations [#841](https://github.com/Shopify/krane/pull/841)
data/krane.gemspec CHANGED
@@ -27,6 +27,8 @@ Gem::Specification.new do |spec|
27
27
 
28
28
  spec.required_ruby_version = '>= 2.6.0'
29
29
  spec.add_dependency("activesupport", ">= 5.0")
30
+ spec.add_dependency("cgi")
31
+ spec.add_dependency("date")
30
32
  spec.add_dependency("kubeclient", "~> 4.3")
31
33
  spec.add_dependency("googleauth", "~> 0.8")
32
34
  spec.add_dependency("ejson", "~> 1.0")
data/lib/krane/renderer.rb CHANGED
@@ -58,7 +58,7 @@ module Krane
58
58
  template = File.read(partial_path)
59
59
  expanded_template = ERB.new(template, trim_mode: '-').result(erb_binding)
60
60
 
61
- docs = Psych.parse_stream(expanded_template, partial_path)
61
+ docs = Psych.parse_stream(expanded_template, filename: partial_path)
62
62
  # If the partial contains multiple documents or has an explicit document header,
63
63
  # we know it cannot validly be indented in the parent, so return it immediately.
64
64
  return expanded_template unless docs.children.one? && docs.children.first.implicit
data/lib/krane/template_sets.rb CHANGED
@@ -77,7 +77,7 @@ module Krane
77
77
  def templates(filename:, raw:)
78
78
  file_content = File.read(File.join(@template_dir, filename))
79
79
  rendered_content = @renderer ? @renderer.render_template(filename, file_content) : file_content
80
- YAML.load_stream(rendered_content, "<rendered> #{filename}") do |doc|
80
+ YAML.load_stream(rendered_content, filename: "<rendered> #{filename}") do |doc|
81
81
  next if doc.blank?
82
82
  unless doc.is_a?(Hash)
83
83
  raise InvalidTemplateError.new("Template is not a valid Kubernetes manifest",
data/lib/krane/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module Krane
3
- VERSION = "2.3.1"
3
+ VERSION = "2.3.4"
4
4
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: krane
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.1
4
+ version: 2.3.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Katrina Verey
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: exe
12
12
  cert_chain: []
13
- date: 2021-11-15 00:00:00.000000000 Z
13
+ date: 2021-11-24 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: activesupport
@@ -26,6 +26,34 @@ dependencies:
26
26
  - - ">="
27
27
  - !ruby/object:Gem::Version
28
28
  version: '5.0'
29
+ - !ruby/object:Gem::Dependency
30
+ name: cgi
31
+ requirement: !ruby/object:Gem::Requirement
32
+ requirements:
33
+ - - ">="
34
+ - !ruby/object:Gem::Version
35
+ version: '0'
36
+ type: :runtime
37
+ prerelease: false
38
+ version_requirements: !ruby/object:Gem::Requirement
39
+ requirements:
40
+ - - ">="
41
+ - !ruby/object:Gem::Version
42
+ version: '0'
43
+ - !ruby/object:Gem::Dependency
44
+ name: date
45
+ requirement: !ruby/object:Gem::Requirement
46
+ requirements:
47
+ - - ">="
48
+ - !ruby/object:Gem::Version
49
+ version: '0'
50
+ type: :runtime
51
+ prerelease: false
52
+ version_requirements: !ruby/object:Gem::Requirement
53
+ requirements:
54
+ - - ">="
55
+ - !ruby/object:Gem::Version
56
+ version: '0'
29
57
  - !ruby/object:Gem::Dependency
30
58
  name: kubeclient
31
59
  requirement: !ruby/object:Gem::Requirement