I have followedSample Guidelines from AUTHORING_GUIDE.MD
README is updated to includeall relevant information
Tests pass:nox -s py-3.9 (seeTest Environment Setup)
Lint pass:nox -s lint (seeTest Environment Setup)
These samples need a newAPI enabled in testing projects to pass (let us know which ones)
These samples need a new/updatedenv vars in testing projects set to pass (let us know which ones)
This sample adds a new sample directory, and I updated theCODEOWNERS file with the codeowners for this sample
This sample adds a newProduct API, and I updated theBlunderbuss issue/PR auto-assigner with the codeowners for this sample
Pleasemerge this PR for me once it is approved

brandonluong-lgtm added11 commits

February 7, 2025 18:52

brandonluong: add sign_proposal.py

ec8456c

Add ykman and gcloud utils

82f7950

add setup command options and modify approve script

8e358e3

Added test to approve command as well as to gcloud module

554078a

Update README.rst

747646c

Merge branch 'GoogleCloudPlatform:main' into brandonluong-sthi

0ef3b45

Added .nox file and lint changes

41528b3

Merge branch 'brandonluong-sthi' ofhttps://github.com/brandonluong-l…

b915240

…gtm/python-docs-samples into brandonluong-sthiUpdated the README.rst file on github. The changes need to be merged.

removed generated challenge and key files

a071e2e

added pin and management key args

8e6f4bd

Merge branch 'GoogleCloudPlatform:main' into brandonluong-sthi

539ef19

brandonluong-lgtm requested review froma team ascode owners

May 5, 2025 18:56

product-auto-labelbot added samples

Issues that are directly related to samples.

api: cloudkmsIssues related to the Cloud Key Management Service API. labels

May 5, 2025

gemini-code-assistbot reviewed

May 5, 2025

View reviewed changes

Copy link

Contributor

gemini-code-assistbot left a comment

Choose a reason for hiding this comment

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

Hello@brandonluong-lgtm, I'm Gemini Code Assist¹! 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!

Summary of Changes

This pull request adds scripts and documentation for setting up and approving Single Tenant HSM instances in Google Cloud KMS. It includes asetup.py script for building a custom gcloud CLI and generating RSA keys on YubiKeys, and anapprove_proposal.py script for fetching, signing, and submitting HSM instance proposal challenges. Additionally, it introduces supporting modules for interacting with gcloud and YubiKeys, along with comprehensive testing and a README for usage instructions.

Highlights

Custom gcloud Build: The pull request introduces asetup.py script that builds a custom gcloud CLI tailored for Single Tenant HSM, streamlining the setup process.
HSM Proposal Approval: The pull request implementsapprove_proposal.py, a script designed to automate the approval of Single Tenant HSM instance proposals by fetching challenges, signing them using a YubiKey, and submitting the signed challenges back to gcloud.
YubiKey Integration: The pull request integrates with YubiKeys for secure signing of HSM proposal challenges, enhancing the security posture of the approval process.
Testing and Mocking: The pull request includes comprehensive testing usingpytest andpytest-mock, with mocking of subprocess calls and YubiKey interactions to ensure the reliability of the scripts.

Changelog

Click here to see the changelog

kms/singletenanthsm/README.rst
- Added a README file providing instructions on how to use the setup and approval scripts for Single Tenant HSM instances.
kms/singletenanthsm/approve_proposal.py
- Created a script to fetch challenges from a Single Tenant HSM instance proposal, sign them using a YubiKey, and send the signed challenges back to gcloud for approval.
- Implements functions to parse challenges from gcloud output, sign them using ykman-utils, and submit the signed challenges.
- Includes argument parsing for specifying the proposal resource.
kms/singletenanthsm/approve_proposal_test.py
- Added tests forapprove_proposal.py, mocking gcloud commands and YubiKey interactions to ensure proper functionality.
- Includes tests for fetching challenges, signing them, and verifying the signatures.
kms/singletenanthsm/challenges/challenge1.txt
- Added a challenge file for testing purposes.
kms/singletenanthsm/challenges/challenge2.txt
- Added a challenge file for testing purposes.
kms/singletenanthsm/challenges/challenge3.txt
- Added a challenge file for testing purposes.
kms/singletenanthsm/challenges/public_key1.pem
- Added a public key file for testing purposes.
kms/singletenanthsm/challenges/public_key2.pem
- Added a public key file for testing purposes.
kms/singletenanthsm/challenges/public_key3.pem
- Added a public key file for testing purposes.
kms/singletenanthsm/gcloud_commands.py
- Created a module to encapsulate gcloud commands for building a custom gcloud CLI and interacting with Single Tenant HSM proposals.
- Implements functions to build the custom gcloud CLI, fetch challenges, and send signed challenges.
kms/singletenanthsm/gcloud_commands_test.py
- Added tests forgcloud_commands.py, mocking subprocess calls to ensure proper command execution and error handling.
- Includes tests for building the custom gcloud CLI, fetching challenges, and sending signed challenges.
kms/singletenanthsm/requirements.txt
- Added dependencies required for the scripts, includingyubikey-manager,cryptography, and testing libraries.
kms/singletenanthsm/setup.py
- Created a script to build a custom gcloud CLI and generate RSA keys on YubiKeys.
- Implements argument parsing for specifying the operation type (build custom gcloud, generate RSA keys, or both).
kms/singletenanthsm/signed_challenges/public_key_1.pem
- Added a public key file for testing purposes.
kms/singletenanthsm/signed_challenges/public_key_2.pem
- Added a public key file for testing purposes.
kms/singletenanthsm/signed_challenges/public_key_3.pem
- Added a public key file for testing purposes.
kms/singletenanthsm/signed_challenges/signed_challenge1.bin
- Added a signed challenge file for testing purposes.
kms/singletenanthsm/ykman_fake.py
- Created a fake ykman module to mock yubikey interactions for testing purposes.
kms/singletenanthsm/ykman_utils.py
- Created a module to provide utility functions for interacting with YubiKeys, including generating private keys, signing challenges, and verifying signatures.
- Implements functions to populate challenges from files, sign them using a YubiKey, and verify the signatures.
kms/singletenanthsm/ykman_utils_test.py
- Added tests forykman_utils.py, mocking YubiKey interactions to ensure proper functionality.
- Includes tests for signing challenges, verifying signatures, and handling errors.

Using Gemini Code Assist

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

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either/gemini <command> or@gemini-code-assist <command>. Below is a summary of the supported commands.

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 issue comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize 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 foundhere.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on@gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with theGemini Code Assist IDE Extension.

A key's born of challenge,
Signed by Yubi's embrace,
HSM's gate swings.

Footnotes

Review thePrivacy Notices,Generative AI Prohibited Use Policy,Terms of Service, and learn how to configure Gemini Code Assist in GitHubhere. Gemini can make mistakes, so double check it anduse code with caution.↩

blunderbuss-gcfbot assignedSita04

May 5, 2025

gemini-code-assistbot suggested changes

May 5, 2025

View reviewed changes

Copy link

Contributor

gemini-code-assistbot left a comment

Choose a reason for hiding this comment

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

Code Review

The pull request introduces scripts for managing Single Tenant HSM instances, including building a custom gcloud environment and approving proposals. The code appears well-structured and includes tests. However, there are several areas where improvements can be made to enhance clarity, maintainability, and security.

Summary of Findings

Error Handling: The error handling inparse_challenges_into_files andsigned_challenges_to_files is basic. Consider logging the full exception with a traceback for better debugging.
Security: Hardcoded Credentials: Theykman_utils.py script contains hardcoded default management key and PIN. These should be removed and instead be passed in as arguments, or retrieved from environment variables.
Code Duplication: There is duplicated code for directory creation inparse_challenges_into_files andsigned_challenges_to_files. Consider refactoring this into a reusable function.
Test Coverage: The test coverage forapprove_proposal.py is limited. More comprehensive tests are needed, especially around failure scenarios.

Merge Readiness

The pull request is not yet ready for merging. The hardcoded credentials inykman_utils.py pose a significant security risk and must be addressed. Additionally, the error handling and code duplication issues should be resolved to improve maintainability. I am unable to approve this pull request, and recommend that it not be merged until the critical and high severity issues are addressed, and that others review and approve this code before merging.

kms/singletenanthsm/ykman_utils.pyShow resolvedHide resolved

kms/singletenanthsm/approve_proposal.py OutdatedShow resolvedHide resolved

kms/singletenanthsm/gcloud_commands.py OutdatedShow resolvedHide resolved

kms/singletenanthsm/ykman_utils_test.pyShow resolvedHide resolved

brandonluong-lgtm added3 commits

May 5, 2025 16:15

Added pin and management key to approve command

db60475

Removed generated challenge files

56e23d2

Add command to install libpcsclite-dev to ReadMe

053e787

Copy link

Author

brandonluong-lgtm commentedMay 5, 2025•
edited
Loading

The kokoro presubmits are failing as libpcsclite-dev is not installed. This is needed to communicate with smartcards. Is there a way to ensure that the machines running the test have it installed?

In the read me the users would install it using the commandsudo apt install libpcsclite-dev