Skip to content

chore(modelarmor): Added floor settings tests #10106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

mihirvala-crestdata
Copy link

@mihirvala-crestdata mihirvala-crestdata commented Jun 13, 2025

Description

Added Floor settings tests in model armor as issue b/424365799 is fixed.

Checklist

  • I have followed Sample Format Guide
  • pom.xml parent set to latest shared-configuration
  • Appropriate changes to README are included in PR
  • These samples need a new API enabled in testing projects to pass (let us know which ones)
  • These samples need a new/updated env vars in testing projects set to pass (let us know which ones)
  • Tests pass: mvn clean verify required
  • Lint passes: mvn -P lint checkstyle:check required
  • Static Analysis: mvn -P lint clean compile pmd:cpd-check spotbugs:check advisory only
  • This sample adds a new sample directory, and I updated the CODEOWNERS file with the codeowners for this sample
  • This sample adds a new Product API, and I updated the Blunderbuss issue/PR auto-assigner with the codeowners for this sample
  • Please merge this PR for me once it is approved

@product-auto-label product-auto-label bot added api: modelarmor Issues related to the Model Armor API. samples Issues that are directly related to samples. labels Jun 13, 2025
Copy link
Contributor

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

Choose a reason for hiding this comment

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

Summary of Changes

Hello @mihirvala-crestdata, 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 introduces new integration tests for the Model Armor Floor Settings API across different resource levels (Project, Folder, Organization). The tests are currently disabled using @Ignore because of a known issue with the API they interact with. The code includes placeholders for environment variable checks and cleanup that will be enabled once the API is functional.

Highlights

  • New Floor Settings Tests: I've added new integration tests for the Model Armor Floor Settings API, covering Get and Update operations.
  • Resource Hierarchy Coverage: The new tests are designed to verify Floor Settings at the Project, Folder, and Organization levels.
  • Tests Marked as Ignored: All newly added Floor Setting tests are currently marked with @Ignore due to an ongoing issue with the underlying API (referenced by buganizer ticket b/424365799).
  • Setup/Teardown Logic Added: I've included commented-out code in beforeAll and afterAll to handle environment variable requirements and potentially reset floor settings, which should be uncommented once the API issue is resolved.
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 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 found here.

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 the Gemini Code Assist IDE Extension.

Footnotes

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

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot 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

This pull request introduces new integration tests for floor settings in Model Armor. The tests cover getting and updating floor settings for projects, folders, and organizations.

Key changes include:

  • Addition of new test methods, currently marked with @Ignore due to an ongoing API issue (b/424365799).
  • Configuration for FOLDER_ID and ORGANIZATION_ID via environment variables.
  • Implementation of a resetFloorSettings method in @AfterClass to clean up test resources, which is good practice, though currently commented out along with the tests.

The changes are well-structured and the intent to add comprehensive tests is clear. The use of TODO comments to track the pending API fix is appropriate. A few minor stylistic suggestions regarding blank lines have been made.

@mihirvala-crestdata mihirvala-crestdata force-pushed the model-armor-floor-settings-tests branch from 31549ab to a438abf Compare July 3, 2025 08:36
@mihirvala-crestdata mihirvala-crestdata changed the title chore(modelarmor): Added floor settings tests and marked them as ignore/skip chore(modelarmor): Added floor settings tests Jul 4, 2025
@utsav1810 utsav1810 added kokoro:run Add this label to force Kokoro to re-run the tests. kokoro:force-run Add this label to force Kokoro to re-run the tests. labels Jul 7, 2025
@kokoro-team kokoro-team removed kokoro:run Add this label to force Kokoro to re-run the tests. kokoro:force-run Add this label to force Kokoro to re-run the tests. labels Jul 7, 2025
// Tests for Folder setting snippets.
@Test
public void testGetOrganizationFloorSetting() throws IOException {
GetOrganizationFloorSetting.getOrganizationFloorSetting(ORGANIZATION_ID);

Choose a reason for hiding this comment

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

Can we have assertions for the actual value that was fetched by the getOrganizationFloorSetting method? Similarly for other tests.

Copy link
Author

@mihirvala-crestdata mihirvala-crestdata Jul 8, 2025

Choose a reason for hiding this comment

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

We followed a similar pattern to other snippet tests (see Secret Manager tests). The goal of these tests is to verify that the snippets run successfully by asserting the presence of a success log.

@harshnasitcrest
Copy link
Contributor

NOTE: Please set following environment variables required for running tests:
MA_FOLDER_ID: 695279264361
MA_ORG_ID: 951890214235

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api: modelarmor Issues related to the Model Armor API. samples Issues that are directly related to samples.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants