Skip to content
Open
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 30 additions & 7 deletions .toys/generate-updates.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,14 @@ def run
pr_clean_old_gems if clean
unless @errors.empty?
puts "Errors:", :red, :bold
@errors.each { |name| puts "Error generating #{name}", :red }
@errors.each do |err|
if err.is_a?(Hash)
puts "Error generating #{err[:name]} (exit code #{err[:exit_code]}):", :red, :bold
puts err[:error], :red if err[:error] && !err[:error].empty?
else
puts "Error generating #{err}", :red
end
end
exit 1
end
end
Expand Down Expand Up @@ -160,10 +167,18 @@ def regen_single_gem api, version
"--api=#{api}.#{version}",
"--spot-check",
"--names=#{context_directory}/api_names.yaml",
"--names-out=#{context_directory}/api_names_out.yaml"
"--names-out=#{context_directory}/api_names_out.yaml",
"--verbose"
]
result = exec cmd, in: [:string, "a\n"], e: false
yoshi_pr_generator.abort_capture! unless result.success?
result = exec cmd, in: [:string, "a\n"], out: [:capture, :inherit], err: [:capture, :inherit], e: false
unless result.success?
err_detail = result.captured_err.to_s.strip
err_detail = result.captured_out.to_s.strip if err_detail.empty?
puts "Failed generating google-apis-#{api}_#{version} (exit code #{result.exit_code}):", :red, :bold

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aandreassa addressing your comment from over chat, I went ahead and added more explicit logging for the actual gem here. Below is a sample output:

$ bundle exec toys generate-updates discoveryengine:v1
[2026-08-07 18:41:45  INFO]  exec: ["bundle", "install"]
Bundle complete! 27 Gemfile dependencies, 94 gems now installed.
(1/1) Error when generating google-apis-discoveryengine_v1
Errors:
Failed generating google-apis-discoveryengine_v1 (exit code 1):
Discovery doc: https://raw.githubusercontent.com/googleapis/discovery-artifact-manager/master/discoveries/discoveryengine.v1.json
bundler: failed to load command: bin/generate-api (bin/generate-api)
/usr/local/google/home/torreypayne/google-api-ruby-client/google-apis-generator/lib/google/apis/generator/model.rb:46:in 'Google::Apis::DiscoveryV1::JsonSchema#qualified_name': undefined method 'qualified_name' for nil (NoMethodError)

          parent.qualified_name + '::' + generated_class_name
                ^^^^^^^^^^^^^^^

puts err_detail, :red unless err_detail.empty?
@errors << { name: "google-apis-#{api}_#{version}", exit_code: result.exit_code, error: err_detail }
yoshi_pr_generator.abort_capture!
end
end
end

Expand All @@ -173,10 +188,18 @@ def clean_old_gems
"bundle", "exec",
"bin/generate-api", "gen",
"#{context_directory}/generated",
"--clean"
"--clean",
"--verbose"
]
result = exec cmd, e: false
yoshi_pr_generator.abort_capture! unless result.success?
result = exec cmd, out: [:capture, :inherit], err: [:capture, :inherit], e: false
unless result.success?
err_detail = result.captured_err.to_s.strip
err_detail = result.captured_out.to_s.strip if err_detail.empty?
puts "Failed cleaning obsolete gems (exit code #{result.exit_code}):", :red, :bold
puts err_detail, :red unless err_detail.empty?
@errors << { name: "cleanup of obsolete gems", exit_code: result.exit_code, error: err_detail }
yoshi_pr_generator.abort_capture!
end
end
end

Expand Down
Loading