Skip to content

Fix cloud_build_machine_type option#39342

Merged
Abacn merged 1 commit into
apache:masterfrom
Abacn:fix-builder
Jul 15, 2026
Merged

Fix cloud_build_machine_type option#39342
Abacn merged 1 commit into
apache:masterfrom
Abacn:fix-builder

Conversation

@Abacn

@Abacn Abacn commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

Please add a meaningful description for your change here

Fix #39340


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses an issue where the machine type configuration for Cloud Build was failing due to an incorrect attribute name. By updating the attribute to the correct snake_case format, the configuration is now properly passed to the Google Cloud Build API. Additionally, a regression test has been included to ensure this functionality remains stable.

Highlights

  • Bug Fix: Corrected the attribute name from 'machineType' to 'machine_type' when configuring Cloud Build options to align with the expected API structure.
  • Test Coverage: Added a new unit test to verify that the 'cloud_build_machine_type' pipeline option is correctly applied to the Cloud Build configuration.
New Features

🧠 You can now enable Memory (public preview) to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize the Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counterproductive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Code Review

This pull request updates the Cloud Build machine type option assignment from camelCase (machineType) to snake_case (machine_type) and adds a corresponding unit test. The reviewer feedback suggests making the mock assertion in the new test more robust against different argument passing styles and removing extra blank lines to adhere to PEP 8 formatting guidelines.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

Comment on lines +152 to +155
create_build_request = mock_cloudbuild_client.create_build.call_args[0][0]
self.assertEqual(
create_build_request.build.options.machine_type,
cloud_build_types.BuildOptions.MachineType.N1_HIGHCPU_8)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

The assertion relies on create_build being called with positional arguments (call_args[0][0]). If create_build is called using keyword arguments (e.g., create_build(request=...) or create_build(project_id=..., build=...)), this will raise an IndexError.

To make the test more robust against different calling conventions of the Google Cloud client library, consider extracting the build/request object safely from both args and kwargs.

Suggested change
create_build_request = mock_cloudbuild_client.create_build.call_args[0][0]
self.assertEqual(
create_build_request.build.options.machine_type,
cloud_build_types.BuildOptions.MachineType.N1_HIGHCPU_8)
args, kwargs = mock_cloudbuild_client.create_build.call_args
build_obj = (
kwargs.get('build') or
getattr(kwargs.get('request'), 'build', None) or
getattr(args[0], 'build', args[0])
)
self.assertEqual(
build_obj.options.machine_type,
cloud_build_types.BuildOptions.MachineType.N1_HIGHCPU_8)

Comment on lines 156 to 159




Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

medium

There are too many blank lines added at the end of the test method. According to PEP 8, there should be exactly two blank lines between top-level definitions (such as the class containing this test and the if __name__ == '__main__': block). Please remove the extra blank lines.

Suggested change
References
  1. PEP 8: Blank Lines. Two blank lines are expected before top-level definitions. (link)

@Abacn

Abacn commented Jul 15, 2026

Copy link
Copy Markdown
Contributor Author

R: @jrmccluskey @paul1u5

@github-actions

Copy link
Copy Markdown
Contributor

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control. If you'd like to restart, comment assign set of reviewers

@Abacn Abacn merged commit 8e63c07 into apache:master Jul 15, 2026
105 of 106 checks passed
@Abacn Abacn deleted the fix-builder branch July 15, 2026 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: AttributeError: Unknown field for BuildOptions: machineType when using --cloud_build_machine_type with google-cloud-build >= 3.35

2 participants