Skip to content
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

Merge from main #9978

Open
wants to merge 42 commits into
base: ludo-java21
Choose a base branch
from
Open

Merge from main #9978

wants to merge 42 commits into from

Conversation

ludoch
Copy link
Contributor

@ludoch ludoch commented Jan 16, 2025

Description

Fixes #

Note: Before submitting a pull request, please open an issue for discussion if you are not associated with Google.

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

OremGLG and others added 30 commits December 17, 2024 17:05
…ons (#9857)

* chore(endpoints): delete region swagger to openapi-v1.yaml

* chore(endpoints): delete region swagger to openapi-v2.yaml
* chore(job): delete sample jobs_java_dependencies_beta

* chore(job): delete region_tab 'jobs_java_dependencies_beta' and update 'google-api-services-jobs' version
* Implemented compute_disk_regional_replicated sample, created test

* Fixed zone

* Fixed test

* Fixed test

* Fixed disk size

* Fixed code as requested in the comment
* Implemented compute_disk_start_replication and compute_disk_stop_replication samples, created tests

* Fixed test

* Deleted not related classes

* Fixed lint issue

* Increased timeout

* Split samples for zonal location

* Fixed code

* Fixed code

* Increased timeout

* Increased timeout
* Changed package, added information to CODEOWNERS

* Added information to CODEOWNERS

* Added timeout

* Fixed parameters for test

* Fixed DeleteTpuVm and naming

* Added comment, created Util class

* Fixed naming

* Fixed whitespace

* Split PR into smaller, deleted redundant code

* Implemented tpu_vm_create_spot sample, created test

* changed zone

* Changed zone

* Fixed empty lines and tests, deleted cleanup method

* Changed zone

* Deleted redundant test class

* Increased timeout

* Fixed test
* Changed package, added information to CODEOWNERS

* Added information to CODEOWNERS

* Added timeout

* Fixed parameters for test

* Fixed DeleteTpuVm and naming

* Added comment, created Util class

* Fixed naming

* Fixed whitespace

* Split PR into smaller, deleted redundant code

* Implemented tpu_vm_create_startup_script sample, created test

* Fixed tests and empty lines

* Changed zone

* Deleted redundant test classes

* Increased timeout

* Fixed code
* Changed package, added information to CODEOWNERS

* Added information to CODEOWNERS

* Added timeout

* Fixed parameters for test

* Fixed DeleteTpuVm and naming

* Added comment, created Util class

* Fixed naming

* Fixed whitespace

* Split PR into smaller, deleted redundant code

* Implemented tpu_queued_resources_create, tpu_queued_resources_get, tpu_queued_resources_delete_force and tpu_queued_resources_delete samples, created tests

* Fixed test

* Fixed tests

* Fixed error massage

* Fixed typo

* Fixed zone

* Fixed test

* Fixed code

* Deleted commented imports

* Fixed code as requested in comments
Add a code sample for tpu_queued_resources_create_spot
…Module code samples (Create, Delete, List, Get) (#9743)

* sample codes for event threat detection custom modules

* addressed comments

* addressed comments

* addressed comments

* addressed comments
… to use mocked client (#9840)

* Fixed sample and test to use mocked client

* Fixed code as requested in the comments
#9735)

* Implemented compute_instance_create_replicated_boot_disk sample, created test

* Fixed test

* Fixed code as requested in the comments

* Fixed Util class

* Fixed code
* Implemented compute_consistency_group_create and compute_consistency_group_delete samples, created test

* Implemented compute_consistency_group_stop_replication sample

* Implemented compute_consistency_group_stop_replication sample

* Created test and added needed classes for testing

* Fixed test

* Moved clean up methods

* Added clean up methods for reservations

* Fixed clean up method

* Fixed clean up method

* Added timeout

* Reverted not related changes

* Reverted not related changes

* Reverted not related changes

* Reverted not related changes

* Fixed code

* Split samples for zonal location

* Added comments for methods

* Fixed comments
* feat(secretmanager): add optional ttl to create secret sample

* nit: Update secretmanager/src/main/java/secretmanager/CreateSecret.java

Co-authored-by: code-review-assist[bot] <182814678+code-review-assist[bot]@users.noreply.github.com>

* fix(secretmanager): fix comment indentation to resolve linting issues

---------

Co-authored-by: Jennifer Davis <[email protected]>
Co-authored-by: code-review-assist[bot] <182814678+code-review-assist[bot]@users.noreply.github.com>
* Changed package, added information to CODEOWNERS

* Added information to CODEOWNERS

* Added timeout

* Fixed parameters for test

* Fixed DeleteTpuVm and naming

* Added comment, created Util class

* Fixed naming

* Fixed whitespace

* Split PR into smaller, deleted redundant code

* Implemented tpu_queued_resources_create, tpu_queued_resources_get, tpu_queued_resources_delete_force and tpu_queued_resources_delete samples, created tests

* Implemented tpu_queued_resources_list sample, created test

* Fixed test

* Fixed tests, deleted cleanup method

* Fixed test

* Fixed imports
* Implemented compute_disk_create_secondary_regional. created test

* Fixed test

* Fixed test

* Fixed test

* Fixed zone

* Fixed naming

* Fixed spaces

* Fixed code

* Fixed indentations

* Fixed variable

* Fixed code

* Added cleanup methods

* Fixed lint issue

* Fixed lint issue

* Fixed test

* Fixed code

* Fixed code

* Fixed code

* Deleted duplicated assertion
* Implemented compute_disk_create_secondary sample, created test

* Fixed code

* Fixed variable

* Fixed code

* Merged changes from main

* Fixed lint issue
* Implemented compute_snapshot_schedule_attach sample, created test

* Implemented compute_snapshot_schedule_remove sample, created test

* Fixed code

* Fixed code as requested in the comments
* Implemented compute_consistency_group_clone and compute_consistency_group_clone_regional_disk samples, created tests

* Fixed naming
…#9730)

* Implemented compute_instance_attach_regional_disk_force sample, created test

* Added clean up method

* Fixed comments and parameters

* Test order deleted

* Fixed code

* Fixed code

* Fixed code

* Increased timeout

* Increased timeout

* Increased timeout

* Fixed code

* Fixed code

* Fixed code

* Fixed naming
* Implemented compute_disk_create_secondary_custom sample, created test

* Fixed code

* Fixed variable

* Fixed code

* Fixed whitespace

* Fixed whitespace
…ete samples (#9742)

* Implemented compute_snapshot_schedule_delete and compute_snapshot_schedule_create samples, created test

* Fixed test

* Added compute_snapshot_schedule_get sample, created test

* Fixed naming

* Implemented compute_snapshot_schedule_edit, created test

* Fixed naming

* Implemented compute_snapshot_schedule_list sample, created test

* Cleaned resources

* Cleaned resources

* Cleaned resources

* Cleaned resources

* Fixed test

* Added comment

* Fixed tests

* Fixed code

* Fixed code as requested in the comments
* Implemented compute_disk_create_with_snapshot_schedule sample, created test

* Fixed code

* Fixed code

* Fixed test

* Fixed code

* Fixed code as requested in the comments

* Fixed lint issue

* Fixed lint issue

* Deleted redundant code
* Changed package, added information to CODEOWNERS

* Added information to CODEOWNERS

* Added timeout

* Fixed parameters for test

* Fixed DeleteTpuVm and naming

* Added comment, created Util class

* Fixed naming

* Fixed whitespace

* Split PR into smaller, deleted redundant code

* Implemented tpu_queued_resources_create, tpu_queued_resources_get, tpu_queued_resources_delete_force and tpu_queued_resources_delete samples, created tests

* Implemented tpu_queued_resources_time_bound sample, created test

* Changed zone for tpu

* Cleanup resources

* Fixed tests

* Fixed test

* Fixed code as requested in the comments

* Fixed code as requested in the comments
@product-auto-label product-auto-label bot added samples Issues that are directly related to samples. api: compute Issues related to the Compute Engine API. labels Jan 16, 2025
Copy link

google-cla bot commented Jan 16, 2025

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

Copy link
Contributor

@code-review-assist code-review-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.

Hi @ludoch and reviewers,

I'm currently reviewing this pull request, and will post my full review in a few minutes. In the meantime, here's a summary of the changes for you and other reviewers to quickly get up to speed:

This pull request, titled "Merge from main", aims to merge changes from the main branch into the current branch. The description mentions it fixes issue # and includes a checklist for ensuring code quality and compliance. Based on the changes, it appears to be primarily focused on updating code ownership and removing some test logging.

Here's a breakdown of the changes:

  • .github/CODEOWNERS (lines 79-85): Added @GoogleCloudPlatform/cloud-ml-translate-dev as a code owner for the /translate directory. This suggests the addition of new functionality or a change in ownership for the translation samples.
  • .kokoro/tests/run_prptst_tests.sh (lines 90-93): Removed code related to sending test logs to FlakyBot for periodic builds (except Java 8). This simplifies the testing process.
  • .kokoro/tests/run_test_java.sh (lines 96-99): Similar to the previous change, removed FlakyBot test log submission for periodic builds (except Java 8).
  • compute/cloud-client/src/main/java/compute/CreateInstanceWithRegionalDiskFromSnapshot.java (lines 1-109): Added a new Java file, CreateInstanceWithRegionalDiskFromSnapshot.java, which appears to implement functionality for creating a Compute Engine instance with a regional disk from a snapshot. This is a significant addition.
  • compute/cloud-client/src/main/java/compute/disks/AttachRegionalDiskForce.java (lines 1-81): Added a new Java file, AttachRegionalDiskForce.java, which seems to provide functionality for forcefully attaching a regional disk to a Compute Engine instance. This is also a substantial addition.
  • compute/cloud-client/src/main/java/compute/disks/CreateDiskSecondaryRegional.java (lines 1-103): Added a new Java file, CreateDiskSecondaryRegional.java, which appears to implement functionality for creating a secondary regional disk from an existing disk. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/disks/CreateDiskSecondaryZonal.java (lines 1-92): Added a new Java file, CreateDiskSecondaryZonal.java, which appears to implement functionality for creating a secondary zonal disk from an existing disk. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/disks/CreateDiskWithSnapshotSchedule.java (lines 1-73): Added a new Java file, CreateDiskWithSnapshotSchedule.java, which appears to implement functionality for creating a disk with a linked snapshot schedule. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/disks/CreateReplicatedDisk.java (lines 1-88): Added a new Java file, CreateReplicatedDisk.java, which appears to implement functionality for creating a replicated regional disk. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/disks/CreateSecondaryCustomDisk.java (lines 1-111): Added a new Java file, CreateSecondaryCustomDisk.java, which appears to implement functionality for creating a secondary custom disk. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/disks/StartRegionalDiskReplication.java (lines 1-82): Added a new Java file, StartRegionalDiskReplication.java, which appears to implement functionality for starting regional disk replication. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/disks/StartZonalDiskReplication.java (lines 1-82): Added a new Java file, StartZonalDiskReplication.java, which appears to implement functionality for starting zonal disk replication. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/disks/StopRegionalDiskReplication.java (lines 1-67): Added a new Java file, StopRegionalDiskReplication.java, which appears to implement functionality for stopping regional disk replication. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/disks/StopZonalDiskReplication.java (lines 1-67): Added a new Java file, StopZonalDiskReplication.java, which appears to implement functionality for stopping zonal disk replication. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/disks/consistencygroup/AddDiskToConsistencyGroup.java (lines 22, 50-51): Updated the addDiskToConsistencyGroup method to return Status instead of Operation.Status.
  • compute/cloud-client/src/main/java/compute/disks/consistencygroup/CloneRegionalDisksFromConsistencyGroup.java (lines 1-73): Added a new Java file, CloneRegionalDisksFromConsistencyGroup.java, which appears to implement functionality for cloning regional disks from a consistency group. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/disks/consistencygroup/CloneZonalDisksFromConsistencyGroup.java (lines 1-73): Added a new Java file, CloneZonalDisksFromConsistencyGroup.java, which appears to implement functionality for cloning zonal disks from a consistency group. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/disks/consistencygroup/CreateConsistencyGroup.java (lines 19, 42-43): Updated the createConsistencyGroup method to return Status instead of Operation.Status.
  • compute/cloud-client/src/main/java/compute/disks/consistencygroup/DeleteConsistencyGroup.java (lines 18, 40-41): Updated the deleteConsistencyGroup method to return Status instead of Operation.Status.
  • compute/cloud-client/src/main/java/compute/disks/consistencygroup/RemoveDiskFromConsistencyGroup.java (lines 20, 51-52): Updated the removeDiskFromConsistencyGroup method to return Status instead of Operation.Status.
  • compute/cloud-client/src/main/java/compute/disks/consistencygroup/StopRegionalDiskReplicationConsistencyGroup.java (lines 1-72): Added a new Java file, StopRegionalDiskReplicationConsistencyGroup.java, which appears to implement functionality for stopping regional disk replication within a consistency group. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/disks/consistencygroup/StopZonalDiskReplicationConsistencyGroup.java (lines 1-73): Added a new Java file, StopZonalDiskReplicationConsistencyGroup.java, which appears to implement functionality for stopping zonal disk replication within a consistency group. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/reservation/CreateSharedReservation.java (lines 18, 29-30, 48-49): Updated the createSharedReservation method to return Status instead of void, and made other minor changes.
  • compute/cloud-client/src/main/java/compute/snapshotschedule/AttachSnapshotScheduleToDisk.java (lines 1-77): Added a new Java file, AttachSnapshotScheduleToDisk.java, which appears to implement functionality for attaching a snapshot schedule to a disk. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/snapshotschedule/CreateSnapshotSchedule.java (lines 1-116): Added a new Java file, CreateSnapshotSchedule.java, which appears to implement functionality for creating a snapshot schedule. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/snapshotschedule/DeleteSnapshotSchedule.java (lines 1-64): Added a new Java file, DeleteSnapshotSchedule.java, which appears to implement functionality for deleting a snapshot schedule. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/snapshotschedule/EditSnapshotSchedule.java (lines 1-113): Added a new Java file, EditSnapshotSchedule.java, which appears to implement functionality for editing a snapshot schedule. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/snapshotschedule/GetSnapshotSchedule.java (lines 1-57): Added a new Java file, GetSnapshotSchedule.java, which appears to implement functionality for getting a snapshot schedule. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/snapshotschedule/ListSnapshotSchedules.java (lines 1-61): Added a new Java file, ListSnapshotSchedules.java, which appears to implement functionality for listing snapshot schedules. This is another significant addition.
  • compute/cloud-client/src/main/java/compute/snapshotschedule/RemoveSnapshotScheduleFromDisk.java (lines 1-81): Added a new Java file, RemoveSnapshotScheduleFromDisk.java, which appears to implement functionality for removing a snapshot schedule from a disk. This is another significant addition.
  • compute/cloud-client/src/test/java/compute/InstanceOperationsIT.java (lines 20, 52-59, 72-86, 121-132): Added several new tests and updated existing ones. The changes appear to be related to the new disk and snapshot functionality.
  • compute/cloud-client/src/test/java/compute/Util.java (lines 30, 217-223, 266-272, 291-297): Added helper methods for cleaning up resources.
  • compute/cloud-client/src/test/java/compute/disks/ConsistencyGroupIT.java (lines 27, 53-68, 91-92, 115-116, 139-140, 192-304): Added tests for consistency groups and updated existing ones.
  • compute/cloud-client/src/test/java/compute/disks/DiskReplicationIT.java (lines 1-151): Added a new test file for disk replication functionality.
  • compute/cloud-client/src/test/java/compute/disks/DisksIT.java (lines 18, 31-49, 69-100, 170-176, 210, 239-240, 276-277, 296-406): Added tests for various disk operations and updated existing ones.
  • compute/cloud-client/src/test/java/compute/disks/HyperdiskIT.java (lines 32, 78-79, 116-117): Updated tests for hyperdisk operations.
  • compute/cloud-client/src/test/java/compute/disks/InstanceAttachDiskIT.java (lines 1-75): Added a new test file for attaching disks to instances.
  • compute/cloud-client/src/test/java/compute/reservation/CrudOperationsReservationIT.java (lines 22, 63-64): Updated tests for reservation operations.
  • compute/cloud-client/src/test/java/compute/reservation/ReservationIT.java (lines 18, 51-52, 113-114, 180-229): Added tests for reservation operations and updated existing ones.
  • compute/cloud-client/src/test/java/compute/snapshotschedule/SnapshotScheduleIT.java (lines 1-228): Added a new test file for snapshot schedule operations.
  • compute/mailjet/src/main/java/com/example/compute/mailjet/MailjetSender.java (lines 16, 27, 82-83): Updated comments and added a closing comment.
  • endpoints/getting-started/k8s/esp_echo_http.yaml (lines 38-47, 56-66): Added comments to the YAML file.
  • endpoints/multiple-versions/openapi-v1.yaml (lines 12-22): Removed unnecessary comments.
  • endpoints/multiple-versions/openapi-v2.yaml (lines 12-22): Removed unnecessary comments.
  • jobs/v3/src/main/java/com/google/samples/AutoCompleteSample.java (lines 38, 60-64, 79): Updated comments and added closing comments.
  • jobs/v3/src/main/java/com/google/samples/BasicCompanySample.java (lines 46, 61, 83, 99, 124, 150): Updated comments and added closing comments.
  • jobs/v3/src/main/java/com/google/samples/BasicJobSample.java (lines 73, 93, 132): Updated comments and added closing comments.
  • jobs/v3/src/main/java/com/google/samples/LocationSearchSample.java (lines 48, 80-84, 114-118, 145-149, 181): Updated comments and added closing comments.
  • jobs/v4/pom.xml (lines 40-63): Updated the dependency versions.
  • secretmanager/src/main/java/secretmanager/CreateSecret.java (lines 21, 41-52): Added functionality to set a TTL for the secret.
  • tpu/src/main/java/tpu/CreateQueuedResource.java (lines 1-98): Added a new file for creating a queued resource.
  • tpu/src/main/java/tpu/CreateSpotQueuedResource.java (lines 1-103): Added a new file for creating a spot queued resource.
  • tpu/src/main/java/tpu/CreateSpotTpuVm.java (lines 1-80): Added a new file for creating a spot TPU VM.
  • tpu/src/main/java/tpu/CreateTimeBoundQueuedResource.java (lines 1-110): Added a new file for creating a time-bound queued resource.
  • tpu/src/main/java/tpu/CreateTpuVmWithStartupScript.java (lines 1-84): Added a new file for creating a TPU VM with a startup script.
  • tpu/src/main/java/tpu/DeleteForceQueuedResource.java (lines 74): Updated the closing comment.
  • tpu/src/main/java/tpu/DeleteQueuedResource.java (lines 1-58): Added a new file for deleting a queued resource.
  • tpu/src/main/java/tpu/GetQueuedResource.java (lines 28, 50): Updated the zone and closing comment.
  • tpu/src/main/java/tpu/ListQueuedResources.java (lines 1-55): Added a new file for listing queued resources.
  • tpu/src/test/java/tpu/QueuedResourceIT.java (lines 16, 28-44, 50-57, 94-127, 136-172, 192-214): Added tests for queued resource operations and updated existing ones.
  • tpu/src/test/java/tpu/TpuVmIT.java (lines 210-266): Added tests for creating spot TPU VMs and TPU VMs with startup scripts.

Let me know if you have any questions!

Small changes, big impact,
Code flows like a river,
Reviewing with glee.

Copy link
Contributor

@code-review-assist code-review-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.

This pull request introduces several new samples related to disks and reservations, removes FlakyBot integration, and updates CODEOWNERS. The samples demonstrate good structure and adherence to project conventions. A few minor suggestions are included below.

@ludoch ludoch marked this pull request as ready for review January 16, 2025 14:13
@ludoch ludoch requested review from yoshi-approver and a team as code owners January 16, 2025 14:13
Copy link

snippet-bot bot commented Jan 16, 2025

Here is the summary of changes.

You are about to add 57 region tags.
You are about to delete 19 region tags.

This comment is generated by snippet-bot.
If you find problems with this result, please file an issue at:
https://github.com/googleapis/repo-automation-bots/issues.
To update this comment, add snippet-bot:force-run label or use the checkbox below:

  • Refresh this comment

@ludoch ludoch removed request for a team January 16, 2025 14:34
* fix(compute): migrate old region "dependecies" to "compute_sendgrid_dependecies_java"

* fix(compute): migrate region "example" to "compute_sendgrid"

* fix(compute): migrate region example to compute_sendgrid
…ependecies_java" (#9941)

* fix(compute): migrate old region "dependecies" to "compute_sendgrid_dependecies_java"

* fix(compute): migrate region dependencies to compute_sendgrid_dependencies_java
* fix(compute): delete old region tag

* fix(compute): delete old region tag
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api: compute Issues related to the Compute Engine API. samples Issues that are directly related to samples.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants