Skip to content

Commit 18e7b3d

Browse files
dazumadazuma
authored
chore(monitoring): Switch to multi-wrapper owlbot postprocessor (googleapis#18960)
1 parent d5ceb98 commit 18e7b3d

8 files changed

Lines changed: 71 additions & 43 deletions

File tree

‎google-cloud-monitoring/.OwlBot.yaml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
deep-copy-regex:
22
- source: /google/monitoring/[^/]+-ruby/(.*)
3-
dest: /owl-bot-staging/google-cloud-monitoring/$1
4-
- source: /google/monitoring/dashboard/[^/]+-ruby/lib/google/cloud/monitoring/dashboard\.rb
5-
dest: /owl-bot-staging/google-cloud-monitoring/lib/google/cloud/monitoring/dashboard.rb
6-
- source: /google/monitoring/dashboard/[^/]+-ruby/test/google/cloud/monitoring/dashboard/client_test\.rb
7-
dest: /owl-bot-staging/google-cloud-monitoring/test/google/cloud/monitoring/dashboard/client_test.rb
8-
- source: /google/monitoring/metricsscope/[^/]+-ruby/lib/google/cloud/monitoring/metrics_scope\.rb
9-
dest: /owl-bot-staging/google-cloud-monitoring/lib/google/cloud/monitoring/metrics_scope.rb
10-
- source: /google/monitoring/metricsscope/[^/]+-ruby/test/google/cloud/monitoring/metrics_scope/client_test\.rb
11-
dest: /owl-bot-staging/google-cloud-monitoring/test/google/cloud/monitoring/metrics_scope/client_test.rb
3+
dest: /owl-bot-staging/google-cloud-monitoring/google-cloud-monitoring/$1
4+
- source: /google/monitoring/dashboard/[^/]+-ruby/(.*)
5+
dest: /owl-bot-staging/google-cloud-monitoring/google-cloud-monitoring-dashboard/$1
6+
- source: /google/monitoring/metricsscope/[^/]+-ruby/(.*)
7+
dest: /owl-bot-staging/google-cloud-monitoring/google-cloud-monitoring-metrics_scope/$1

‎google-cloud-monitoring/.owlbot-manifest.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@
1414
"lib/google-cloud-monitoring.rb",
1515
"lib/google/cloud/monitoring.rb",
1616
"lib/google/cloud/monitoring/dashboard.rb",
17+
"lib/google/cloud/monitoring/dashboard/version.rb",
1718
"lib/google/cloud/monitoring/metrics_scope.rb",
19+
"lib/google/cloud/monitoring/metrics_scope/version.rb",
1820
"lib/google/cloud/monitoring/version.rb",
1921
"test/google/cloud/monitoring/client_test.rb",
2022
"test/google/cloud/monitoring/dashboard/client_test.rb",
23+
"test/google/cloud/monitoring/dashboard/version_test.rb",
2124
"test/google/cloud/monitoring/metrics_scope/client_test.rb",
25+
"test/google/cloud/monitoring/metrics_scope/version_test.rb",
2226
"test/google/cloud/monitoring/version_test.rb",
2327
"test/helper.rb"
2428
],
@@ -27,8 +31,6 @@
2731
".owlbot.rb",
2832
"MIGRATING.md",
2933
"acceptance/google/cloud/monitoring/v3/metric_service_smoke_test.rb",
30-
"lib/google/cloud/monitoring/dashboard/version.rb",
31-
"lib/google/cloud/monitoring/metrics_scope/version.rb",
3234
"samples/Gemfile",
3335
"samples/README.md",
3436
"samples/Rakefile",

‎google-cloud-monitoring/.owlbot.rb‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# Modify the gemspec so it includes the dashboard and metricsscope gems
16-
OwlBot.modifier path: "google-cloud-monitoring.gemspec" do |content|
17-
content.sub(
18-
%r{\n gem.add_dependency "google-cloud-monitoring-v3", "([^\n]+)"\n\n}m,
19-
"\n gem.add_dependency \"google-cloud-monitoring-v3\", \"\\1\"" \
20-
"\n gem.add_dependency \"google-cloud-monitoring-dashboard-v1\", \">= 0.5\", \"< 2.a\"" \
21-
"\n gem.add_dependency \"google-cloud-monitoring-metrics_scope-v1\", \">= 0.0\", \"< 2.a\"\n\n"
22-
)
23-
end
24-
25-
# Modify the Gemfile so includes the dashboard and metricsscope gems
26-
OwlBot.modifier path: "Gemfile" do |content|
27-
content.sub(
28-
"\ngem \"google-cloud-monitoring-v3\", path: \"../google-cloud-monitoring-v3\"\n",
29-
"\ngem \"google-cloud-monitoring-v3\", path: \"../google-cloud-monitoring-v3\"" \
30-
"\ngem \"google-cloud-monitoring-dashboard-v1\", path: \"../google-cloud-monitoring-dashboard-v1\"" \
31-
"\ngem \"google-cloud-monitoring-metrics_scope-v1\", path: \"../google-cloud-monitoring-metrics_scope-v1\"\n"
32-
)
33-
end
34-
35-
# Modify the entrypoint so it requires dashboard and metricsscope
36-
OwlBot.modifier path: "lib/google-cloud-monitoring.rb" do |content|
37-
content.sub(
38-
"\nrequire \"google/cloud/monitoring\" unless defined? Google::Cloud::Monitoring::VERSION\n",
39-
"\nrequire \"google/cloud/monitoring\" unless defined? Google::Cloud::Monitoring::VERSION" \
40-
"\nrequire \"google/cloud/monitoring/dashboard\" unless defined? Google::Cloud::Monitoring::Dashboard::VERSION" \
41-
"\nrequire \"google/cloud/monitoring/metrics_scope\" unless defined? Google::Cloud::Monitoring::MetricsScope::VERSION\n"
42-
)
43-
end
15+
OwlBot.prepare_multi_wrapper [
16+
"google-cloud-monitoring",
17+
"google-cloud-monitoring-dashboard",
18+
"google-cloud-monitoring-metrics_scope"
19+
]
4420

4521
OwlBot.move_files

‎google-cloud-monitoring/README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ for this library, google-cloud-monitoring, to see the convenience methods for
1616
constructing client objects. Reference documentation for the client objects
1717
themselves can be found in the client library documentation for the versioned
1818
client gems:
19-
[google-cloud-monitoring-v3](https://googleapis.dev/ruby/google-cloud-monitoring-v3/latest).
19+
[google-cloud-monitoring-v3](https://googleapis.dev/ruby/google-cloud-monitoring-v3/latest),
20+
[google-cloud-monitoring-dashboard-v1](https://googleapis.dev/ruby/google-cloud-monitoring-dashboard-v1/latest),
21+
[google-cloud-monitoring-metrics_scope-v1](https://googleapis.dev/ruby/google-cloud-monitoring-metrics_scope-v1/latest).
2022

2123
See also the [Product Documentation](https://cloud.google.com/monitoring)
2224
for more usage information.

‎google-cloud-monitoring/lib/google/cloud/monitoring/dashboard/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module Google
2121
module Cloud
2222
module Monitoring
2323
module Dashboard
24-
# @private
24+
# @private Unused
2525
VERSION = ""
2626
end
2727
end

‎google-cloud-monitoring/lib/google/cloud/monitoring/metrics_scope/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module Google
2121
module Cloud
2222
module Monitoring
2323
module MetricsScope
24-
# @private
24+
# @private Unused
2525
VERSION = ""
2626
end
2727
end

‎google-cloud-monitoring/test/google/cloud/monitoring/dashboard/version_test.rb‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# frozen_string_literal: true
2+
3+
# Copyright 2022 Google LLC
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# https://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
# Auto-generated by gapic-generator-ruby. DO NOT EDIT!
18+
19+
require "helper"
20+
require "google/cloud/monitoring/dashboard/version"
21+
22+
class Google::Cloud::Monitoring::Dashboard::VersionMinitest < Minitest::Test
23+
def test_has_a_version
24+
refute_nil Google::Cloud::Monitoring::Dashboard::VERSION
25+
end
26+
end

‎google-cloud-monitoring/test/google/cloud/monitoring/metrics_scope/version_test.rb‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# frozen_string_literal: true
2+
3+
# Copyright 2022 Google LLC
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# https://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
# Auto-generated by gapic-generator-ruby. DO NOT EDIT!
18+
19+
require "helper"
20+
require "google/cloud/monitoring/metrics_scope/version"
21+
22+
class Google::Cloud::Monitoring::MetricsScope::VersionMinitest < Minitest::Test
23+
def test_has_a_version
24+
refute_nil Google::Cloud::Monitoring::MetricsScope::VERSION
25+
end
26+
end

0 commit comments

Comments
 (0)