From 4d7bbe222de66160cd440edd7b719f2361742971 Mon Sep 17 00:00:00 2001 From: Thomas Groh Date: Thu, 12 Oct 2017 17:06:43 -0700 Subject: [PATCH] Remove "beta" from the Cancel Command Prefix --- .../org/apache/beam/runners/dataflow/util/MonitoringUtil.java | 2 +- .../apache/beam/runners/dataflow/util/MonitoringUtilTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/MonitoringUtil.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/MonitoringUtil.java index 780a97925210..cf464066c127 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/MonitoringUtil.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/MonitoringUtil.java @@ -46,7 +46,7 @@ */ public class MonitoringUtil { - private static final String GCLOUD_DATAFLOW_PREFIX = "gcloud beta dataflow"; + private static final String GCLOUD_DATAFLOW_PREFIX = "gcloud dataflow"; private static final String ENDPOINT_OVERRIDE_ENV_VAR = "CLOUDSDK_API_ENDPOINT_OVERRIDES_DATAFLOW"; diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/MonitoringUtilTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/MonitoringUtilTest.java index c04877688d75..499198221a72 100644 --- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/MonitoringUtilTest.java +++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/MonitoringUtilTest.java @@ -121,7 +121,7 @@ public void testDontOverrideEndpointWithDefaultApi() { options.setProject(PROJECT_ID); options.setGcpCredential(new TestCredential()); String cancelCommand = MonitoringUtil.getGcloudCancelCommand(options, JOB_ID); - assertEquals("gcloud beta dataflow jobs --project=someProject cancel 1234", cancelCommand); + assertEquals("gcloud dataflow jobs --project=someProject cancel 1234", cancelCommand); } @Test @@ -135,7 +135,7 @@ public void testOverridesEndpointWithStagedDataflowEndpoint() { String cancelCommand = MonitoringUtil.getGcloudCancelCommand(options, JOB_ID); assertEquals( "CLOUDSDK_API_ENDPOINT_OVERRIDES_DATAFLOW=https://dataflow.googleapis.com/v0neverExisted/ " - + "gcloud beta dataflow jobs --project=someProject cancel 1234", + + "gcloud dataflow jobs --project=someProject cancel 1234", cancelCommand); }