chore: Pass prefix name to Utils for ITs (googleapis#8420)

* chore: Add required status checks

* chore: Fix format for repo settings sync

* chore: Make Java 17 Unit required

* chore: Remove TEST_ALL_MODULES env_var from presubmits

* chore: Cleanup Util classes for ITs

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

.kokoro/presubmit/graalvm-native-17-aiplatform.cfg

@@ -35,9 +35,4 @@ env_vars: {
 env_vars: {
   key: "MAVEN_MODULES"
   value: "java-aiplatform"
-}
-
-env_vars: {
-  key: "TEST_ALL_MODULES"
-  value: "false"
 }

.kokoro/presubmit/graalvm-native-17-compute.cfg

@@ -35,9 +35,4 @@ env_vars: {
 env_vars: {
   key: "MAVEN_MODULES"
   value: "java-compute"
-}
-
-env_vars: {
-  key: "TEST_ALL_MODULES"
-  value: "false"
 }

.kokoro/presubmit/graalvm-native-aiplatform.cfg

@@ -35,9 +35,4 @@ env_vars: {
 env_vars: {
   key: "MAVEN_MODULES"
   value: "java-aiplatform"
-}
-
-env_vars: {
-  key: "TEST_ALL_MODULES"
-  value: "false"
 }

.kokoro/presubmit/graalvm-native-compute.cfg

@@ -35,9 +35,4 @@ env_vars: {
 env_vars: {
   key: "MAVEN_MODULES"
   value: "java-compute"
-}
-
-env_vars: {
-  key: "TEST_ALL_MODULES"
-  value: "false"
 }

java-compute/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/ITAddressesTest.java

@@ -46,7 +46,7 @@ public static void setUp() throws IOException {
     addresses = new ArrayList<>();
     AddressesSettings addressesSettings = AddressesSettings.newBuilder().build();
     addressesClient = AddressesClient.create(addressesSettings);
-    Util.cleanUpComputeAddresses(addressesClient, DEFAULT_PROJECT, DEFAULT_REGION);
+    Util.cleanUpComputeAddresses(addressesClient, DEFAULT_PROJECT, DEFAULT_REGION, COMPUTE_PREFIX);
   }
 
   @Before

java-compute/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/ITSmokeInstancesTest.java

@@ -73,7 +73,7 @@ public static void setUp() throws IOException {
     InstancesSettings instanceSettings = InstancesSettings.newBuilder().build();
     instancesClient = InstancesClient.create(instanceSettings);
 
-    Util.cleanUpComputeInstances(instancesClient, DEFAULT_PROJECT, DEFAULT_ZONE);
+    Util.cleanUpComputeInstances(instancesClient, DEFAULT_PROJECT, DEFAULT_ZONE, COMPUTE_PREFIX);
   }
 
   @Before

java-compute/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/Util.java

@@ -1,7 +1,5 @@
 package com.google.cloud.compute.v1.integration;
 
-import static com.google.cloud.compute.v1.integration.BaseTest.COMPUTE_PREFIX;
-
 import com.google.cloud.compute.v1.Address;
 import com.google.cloud.compute.v1.AddressesClient;
 import com.google.cloud.compute.v1.DeleteInstanceRequest;
@@ -20,12 +18,12 @@ public class Util {
 
   /** Bring down any instances that are older than 24 hours */
   public static void cleanUpComputeInstances(
-      InstancesClient instancesClient, String project, String zone) {
+      InstancesClient instancesClient, String project, String zone, String prefix) {
     ListPagedResponse listPagedResponse = instancesClient.list(project, zone);
     for (Instance instance : listPagedResponse.iterateAll()) {
       if (isCreatedBeforeThresholdTime(
-          ZonedDateTime.parse(instance.getCreationTimestamp()).toInstant())
-          && instance.getName().startsWith(BaseTest.COMPUTE_PREFIX)) {
+              ZonedDateTime.parse(instance.getCreationTimestamp()).toInstant())
+          && instance.getName().startsWith(prefix)) {
         instancesClient.deleteAsync(
             DeleteInstanceRequest.newBuilder()
                 .setInstance(instance.getName())
@@ -37,12 +35,12 @@ public static void cleanUpComputeInstances(
   }
 
   /** Bring down any addresses that are older than 24 hours */
-  public static void cleanUpComputeAddresses(AddressesClient addressesClient, String project,
-      String region) {
+  public static void cleanUpComputeAddresses(
+      AddressesClient addressesClient, String project, String region, String prefix) {
     AddressesClient.ListPagedResponse listPagedResponse = addressesClient.list(project, region);
     for (Address address : listPagedResponse.iterateAll()) {
-      if (isCreatedBeforeThresholdTime(address.getCreationTimestamp()) && address.getName()
-          .startsWith(COMPUTE_PREFIX)) {
+      if (isCreatedBeforeThresholdTime(address.getCreationTimestamp())
+          && address.getName().startsWith(prefix)) {
         addressesClient.deleteAsync(project, region, address.getName());
       }
     }

java-container/.github/CODEOWNERS

@@ -5,7 +5,7 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
 # The @googleapis/yoshi-java is the default owner for changes in this repo
-*                       @googleapis/yoshi-java
+*                       @googleapis/yoshi-java @googleapis/yoshi-java
 
 
 # The java-samples-reviewers team is the default owner for samples changes

java-container/README.md

@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-container'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-container:2.5.1'
+implementation 'com.google.cloud:google-cloud-container:2.5.2'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-container" % "2.5.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-container" % "2.5.2"
 ```
 
 ## Authentication

java-container/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/ITSystemTest.java

@@ -38,14 +38,13 @@
 
 public class ITSystemTest {
 
-  protected static final String CONTAINER_PREFIX = "it-test-container";
-
   private static ClusterManagerClient client;
   private static Operation operation;
 
   private static final Logger LOG = Logger.getLogger(ITSystemTest.class.getName());
   private static final String PROJECT_ID = ServiceOptions.getDefaultProjectId();
   private static final String ZONE = "us-central1-a";
+  private static final String CONTAINER_PREFIX = "it-test-container";
   private static final String CLUSTER_NAME =
       CONTAINER_PREFIX + "-cluster-" + UUID.randomUUID().toString().substring(0, 8);
   private static final String NODE_POOL_NAME =
@@ -64,7 +63,7 @@ public class ITSystemTest {
   @BeforeClass
   public static void beforeClass() throws Exception {
     client = ClusterManagerClient.create();
-    Util.cleanUpExistingInstanceCluster(PROJECT_ID, ZONE, client);
+    Util.cleanUpExistingInstanceCluster(client, PROJECT_ID, ZONE, CONTAINER_PREFIX);
 
     /* create node pool* */
     NodePool nodePool =

java-container/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/Util.java

@@ -31,14 +31,14 @@ public class Util {
 
   /** tear down any clusters that are older than 24 hours * */
   public static void cleanUpExistingInstanceCluster(
-      String projectId, String zone, ClusterManagerClient client) {
+      ClusterManagerClient client, String projectId, String zone, String prefix) {
 
     ListClustersResponse clustersResponse = client.listClusters(projectId, zone);
     List<Cluster> clusters = clustersResponse.getClustersList();
 
     for (Cluster cluster : clusters) {
       if (isCreatedBeforeThresholdTime(cluster.getCreateTime())
-          && cluster.getName().startsWith(ITSystemTest.CONTAINER_PREFIX)) {
+          && cluster.getName().startsWith(prefix)) {
         client.deleteCluster(projectId, zone, cluster.getName());
       }
     }

java-notebooks/google-cloud-notebooks/src/test/java/com/google/cloud/notebooks/v1beta1/it/ITNotebookServiceClientTest.java

@@ -48,13 +48,12 @@
 
 public class ITNotebookServiceClientTest {
 
-  protected static final String NOTEBOOK_PREFIX = "it-test-notebook";
-
   private static final String PROJECT_ID = ServiceOptions.getDefaultProjectId();
   private static final String LOCATION = "us-central1-a";
   private static final String PARENT = "projects/" + PROJECT_ID + "/locations/" + LOCATION;
   private static NotebookServiceClient client;
   private static final String ID = UUID.randomUUID().toString().substring(0, 8);
+  private static final String NOTEBOOK_PREFIX = "it-test-notebook";
   private static final String NOTEBOOK_INSTANCE_ID = NOTEBOOK_PREFIX + "-instance-id-" + ID;
   private static final String ENVIRONMENT_ID = NOTEBOOK_PREFIX + "-environment-id-" + ID;
   private static final String INSTANCE_NAME = PARENT + "/instances/" + NOTEBOOK_INSTANCE_ID;
@@ -68,7 +67,7 @@ public class ITNotebookServiceClientTest {
   public static void setUp() throws IOException, ExecutionException, InterruptedException {
     // Create Test Notebook Instance
     client = NotebookServiceClient.create();
-    Util.cleanUpNotebookInstances(client, PARENT);
+    Util.cleanUpNotebookInstances(client, PARENT, NOTEBOOK_PREFIX);
 
     ContainerImage containerImage =
         ContainerImage.newBuilder().setRepository(FieldBehavior.OPTIONAL.name()).build();

java-notebooks/google-cloud-notebooks/src/test/java/com/google/cloud/notebooks/v1beta1/it/Util.java

@@ -15,13 +15,14 @@ public class Util {
   private static final int DELETION_THRESHOLD_TIME_HOURS = 24;
 
   /** Bring down any instances that are older than 24 hours */
-  public static void cleanUpNotebookInstances(NotebookServiceClient client, String parent) {
+  public static void cleanUpNotebookInstances(
+      NotebookServiceClient client, String parent, String prefix) {
     ListInstancesPagedResponse listInstancesPagedResponse =
         client.listInstances(ListInstancesRequest.newBuilder().setParent(parent).build());
     for (Instance instance : listInstancesPagedResponse.iterateAll()) {
       if (isCreatedBeforeThresholdTime(
               Instant.ofEpochMilli(Timestamps.toMillis(instance.getCreateTime())))
-          && instance.getName().startsWith(ITNotebookServiceClientTest.NOTEBOOK_PREFIX)) {
+          && instance.getName().startsWith(prefix)) {
         client.deleteInstanceAsync(
             DeleteInstanceRequest.newBuilder().setName(instance.getName()).build());
       }