kennel 1.92.2 → 1.94.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/kennel/importer.rb +12 -1
- data/lib/kennel/models/dashboard.rb +1 -1
- data/lib/kennel/syncer.rb +1 -0
- data/lib/kennel/tasks.rb +1 -1
- data/lib/kennel/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1d984d593aa96ff9c939af26662e0595041e6f7fe24878965c721ead9063ee0f
|
4
|
+
data.tar.gz: 12279d2909c96279d8a69a0cca222bbf29a900bfeb1fadf1a00e375275993cca
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: aeb78440808f08f268b112b91c294f94f199544f49c8a941132dbe9666d721500e00b30360bc5b9aacbfaae13301e04cb9f16531183cb014991f8eb3700d8bf0
|
7
|
+
data.tar.gz: e071f1ce423eaca94cbce0c7bc9906b1caf8a08e114edd201f5a0c4184bae34668bfa70132c72703fdb4eaee6463f70e909865f3e1feb4f63d7fb741ff95e53e
|
data/lib/kennel/importer.rb
CHANGED
@@ -132,8 +132,9 @@ module Kennel
|
|
132
132
|
.gsub(": null", ": nil")
|
133
133
|
.gsub(/(^\s*)"([a-zA-Z][a-zA-Z\d_]*)":/, "\\1\\2:") # "foo": 1 -> foo: 1
|
134
134
|
.gsub(/: \[\n\s+\]/, ": []") # empty arrays on a single line
|
135
|
-
.gsub(/^/, " ") # indent
|
136
135
|
.gsub('q: "metadata"', "q: :metadata") # bring symbols back
|
136
|
+
.gsub(/^/, " ") # indent
|
137
|
+
pretty = convert_strings_to_heredoc(pretty)
|
137
138
|
|
138
139
|
"\n#{pretty}\n "
|
139
140
|
elsif k == :message
|
@@ -147,6 +148,16 @@ module Kennel
|
|
147
148
|
end.join(",\n")
|
148
149
|
end
|
149
150
|
|
151
|
+
def convert_strings_to_heredoc(text)
|
152
|
+
text.gsub(/^(\s*)(.*)"([^"]+\\n[^"]+)"(,)?/) do
|
153
|
+
indent = $1
|
154
|
+
prefix = $2
|
155
|
+
string = $3
|
156
|
+
comma = $4
|
157
|
+
"#{indent}#{prefix}<<~TXT#{comma}\n#{indent} #{string.gsub("\\n", "\n#{indent} ").rstrip}\n#{indent}TXT"
|
158
|
+
end
|
159
|
+
end
|
160
|
+
|
150
161
|
# sort dashboard widgets + nesting
|
151
162
|
def sort_widgets(outer)
|
152
163
|
outer[:widgets]&.each do |widgets|
|
@@ -6,7 +6,7 @@ module Kennel
|
|
6
6
|
include OptionalValidations
|
7
7
|
|
8
8
|
READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [
|
9
|
-
:author_handle, :author_name, :modified_at, :url, :is_read_only, :notify_list
|
9
|
+
:author_handle, :author_name, :modified_at, :url, :is_read_only, :notify_list, :restricted_roles
|
10
10
|
]
|
11
11
|
TRACKING_FIELD = :description
|
12
12
|
REQUEST_DEFAULTS = {
|
data/lib/kennel/syncer.rb
CHANGED
@@ -160,6 +160,7 @@ module Kennel
|
|
160
160
|
ensure_all_ids_found
|
161
161
|
@create = @expected.map { |e| [nil, e] }
|
162
162
|
@delete.sort_by! { |_, _, a| DELETE_ORDER.index a.fetch(:klass).api_resource }
|
163
|
+
@update.sort_by! { |_, e, _| DELETE_ORDER.index e.class.api_resource } # slo needs to come before slo alert
|
163
164
|
end
|
164
165
|
end
|
165
166
|
|
data/lib/kennel/tasks.rb
CHANGED
@@ -48,7 +48,7 @@ namespace :kennel do
|
|
48
48
|
url = Kennel::Utils.path_to_url "/account/settings"
|
49
49
|
puts "Invalid mentions found, either ignore them by adding to `KNOWN` env var or add them via #{url}"
|
50
50
|
bad.each { |f, v| puts "Invalid mention #{v} in monitor message of #{f}" }
|
51
|
-
Kennel::Tasks.abort
|
51
|
+
Kennel::Tasks.abort ENV["KNOWN_WARNING"]
|
52
52
|
end
|
53
53
|
end
|
54
54
|
|
data/lib/kennel/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kennel
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.94.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Michael Grosser
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-10-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: faraday
|