googleapis · loferris · Feb 25, 2022 · Feb 25, 2022 · Feb 25, 2022 · Feb 25, 2022
diff --git a/google-cloud-dataproc/pom.xml b/google-cloud-dataproc/pom.xml
@@ -45,6 +45,7 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-dataproc-v1</artifactId>
+      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

diff --git a/samples/snippets/src/test/java/CreateClusterTest.java b/samples/snippets/src/test/java/CreateClusterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC
+ * Copyright 2022 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,21 +40,22 @@ public class CreateClusterTest {
   private static final String CLUSTER_NAME =
       String.format("java-cc-test-%s", UUID.randomUUID().toString());
   private static final String REGION = "us-central1";
-  // private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
-  private static final String PROJECT_ID = "gcloud-devel";
+  private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private ByteArrayOutputStream bout;
 
   private static void requireEnv(String varName) {
     assertNotNull(
         String.format("Environment variable '%s' is required to perform these tests.", varName),
         System.getenv(varName));
   }
+
   /*
-  @BeforeClass
-  public static void checkRequirements() {
-    requireEnv("GOOGLE_APPLICATION_CREDENTIALS");
-    requireEnv("GOOGLE_CLOUD_PROJECT");
-  }*/
+    @BeforeClass
+    public static void checkRequirements() {
+      requireEnv("GOOGLE_APPLICATION_CREDENTIALS");
+     requireEnv("GOOGLE_CLOUD_PROJECT");
+    }
+  */
 
   @Before
   public void setUp() {
@@ -66,7 +67,6 @@ public void setUp() {
   public void createClusterTest() throws IOException, InterruptedException {
     CreateCluster.createCluster(PROJECT_ID, REGION, CLUSTER_NAME);
     String output = bout.toString();
-
     assertThat(output, CoreMatchers.containsString(CLUSTER_NAME));
   }
 

diff --git a/samples/snippets/src/test/java/SubmitHadoopFsJobTest.java b/samples/snippets/src/test/java/SubmitHadoopFsJobTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2022 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,11 @@
 
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.dataproc.v1.Cluster;
+import com.google.cloud.dataproc.v1.ClusterConfig;
 import com.google.cloud.dataproc.v1.ClusterControllerClient;
 import com.google.cloud.dataproc.v1.ClusterControllerSettings;
 import com.google.cloud.dataproc.v1.ClusterOperationMetadata;
+import com.google.cloud.dataproc.v1.InstanceGroupConfig;
 import com.google.protobuf.Empty;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -70,8 +72,25 @@ public void setUp() throws IOException, ExecutionException, InterruptedException
 
     try (ClusterControllerClient clusterControllerClient =
         ClusterControllerClient.create(clusterControllerSettings)) {
+      // Configure the settings for our cluster.
+      InstanceGroupConfig masterConfig =
+          InstanceGroupConfig.newBuilder()
+              .setMachineTypeUri("n1-standard-2")
+              .setNumInstances(1)
+              .build();
+      InstanceGroupConfig workerConfig =
+          InstanceGroupConfig.newBuilder()
+              .setMachineTypeUri("n1-standard-2")
+              .setNumInstances(2)
+              .build();
+      ClusterConfig clusterConfig =
+          ClusterConfig.newBuilder()
+              .setMasterConfig(masterConfig)
+              .setWorkerConfig(workerConfig)
+              .build();
       // Create the Dataproc cluster.
-      Cluster cluster = Cluster.newBuilder().setClusterName(CLUSTER_NAME).build();
+      Cluster cluster =
+          Cluster.newBuilder().setClusterName(CLUSTER_NAME).setConfig(clusterConfig).build();
       OperationFuture<Cluster, ClusterOperationMetadata> createClusterAsyncRequest =
           clusterControllerClient.createClusterAsync(PROJECT_ID, REGION, cluster);
       createClusterAsyncRequest.get();

diff --git a/samples/snippets/src/test/java/SubmitJobTest.java b/samples/snippets/src/test/java/SubmitJobTest.java
@@ -19,9 +19,11 @@
 
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.dataproc.v1.Cluster;
+import com.google.cloud.dataproc.v1.ClusterConfig;
 import com.google.cloud.dataproc.v1.ClusterControllerClient;
 import com.google.cloud.dataproc.v1.ClusterControllerSettings;
 import com.google.cloud.dataproc.v1.ClusterOperationMetadata;
+import com.google.cloud.dataproc.v1.InstanceGroupConfig;
 import com.google.protobuf.Empty;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -69,8 +71,25 @@ public void setUp() throws IOException, ExecutionException, InterruptedException
 
     try (ClusterControllerClient clusterControllerClient =
         ClusterControllerClient.create(clusterControllerSettings)) {
+      // Configure the settings for our cluster.
+      InstanceGroupConfig masterConfig =
+          InstanceGroupConfig.newBuilder()
+              .setMachineTypeUri("n1-standard-2")
+              .setNumInstances(1)
+              .build();
+      InstanceGroupConfig workerConfig =
+          InstanceGroupConfig.newBuilder()
+              .setMachineTypeUri("n1-standard-2")
+              .setNumInstances(2)
+              .build();
+      ClusterConfig clusterConfig =
+          ClusterConfig.newBuilder()
+              .setMasterConfig(masterConfig)
+              .setWorkerConfig(workerConfig)
+              .build();
       // Create the Dataproc cluster.
-      Cluster cluster = Cluster.newBuilder().setClusterName(CLUSTER_NAME).build();
+      Cluster cluster =
+          Cluster.newBuilder().setClusterName(CLUSTER_NAME).setConfig(clusterConfig).build();
       OperationFuture<Cluster, ClusterOperationMetadata> createClusterAsyncRequest =
           clusterControllerClient.createClusterAsync(PROJECT_ID, REGION, cluster);
       createClusterAsyncRequest.get();