This is an automated email from the ASF dual-hosted git repository.
lcwik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 7d6b7b8 [BEAM-5433] Deprecate environment url field.
new 7840f4a [BEAM-5433] Deprecate environment url field.
7d6b7b8 is described below
commit 7d6b7b89f5832d5d375059f9c1980181b443835b
Author: Luke Cwik <[email protected]>
AuthorDate: Wed Apr 3 10:38:05 2019 -0700
[BEAM-5433] Deprecate environment url field.
---
model/pipeline/src/main/proto/beam_runner_api.proto | 5 ++---
.../java/org/apache/beam/runners/core/construction/Environments.java | 1 -
.../org/apache/beam/runners/core/construction/EnvironmentsTest.java | 1 -
sdks/go/pkg/beam/core/runtime/graphx/translate_test.go | 2 +-
sdks/go/pkg/beam/runners/dataflow/dataflow.go | 1 -
sdks/go/pkg/beam/runners/universal/universal.go | 1 -
.../java/org/apache/beam/fn/harness/WindowMergingFnRunnerTest.java | 4 ++--
sdks/python/apache_beam/runners/portability/portable_runner.py | 1 -
sdks/python/apache_beam/runners/portability/portable_runner_test.py | 2 --
9 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/model/pipeline/src/main/proto/beam_runner_api.proto
b/model/pipeline/src/main/proto/beam_runner_api.proto
index 28891df..75fc0cd 100644
--- a/model/pipeline/src/main/proto/beam_runner_api.proto
+++ b/model/pipeline/src/main/proto/beam_runner_api.proto
@@ -1029,15 +1029,14 @@ message SideInput {
// An environment for executing UDFs. By default, an SDK container URL, but
// can also be a process forked by a command, or an externally managed process.
message Environment {
- // Deprecated. Tracked in BEAM-5433
- string url = 1;
-
// (Required) The URN of the payload
string urn = 2;
// (Optional) The data specifying any parameters to the URN. If
// the URN does not require any arguments, this may be omitted.
bytes payload = 3;
+
+ reserved 1;
}
message StandardEnvironments {
diff --git
a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java
b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java
index 0d8c9c3..a052756 100644
---
a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java
+++
b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java
@@ -107,7 +107,6 @@ public class Environments {
public static Environment createDockerEnvironment(String dockerImageUrl) {
return Environment.newBuilder()
- .setUrl(dockerImageUrl)
.setUrn(BeamUrns.getUrn(StandardEnvironments.Environments.DOCKER))
.setPayload(
DockerPayload.newBuilder().setContainerImage(dockerImageUrl).build().toByteString())
diff --git
a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/EnvironmentsTest.java
b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/EnvironmentsTest.java
index d7a6c0a..3df9920 100644
---
a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/EnvironmentsTest.java
+++
b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/EnvironmentsTest.java
@@ -63,7 +63,6 @@ public class EnvironmentsTest implements Serializable {
Environments.createOrGetDefaultEnvironment(Environments.ENVIRONMENT_DOCKER,
"java"),
is(
Environment.newBuilder()
- .setUrl("java")
.setUrn(BeamUrns.getUrn(StandardEnvironments.Environments.DOCKER))
.setPayload(
DockerPayload.newBuilder().setContainerImage("java").build().toByteString())
diff --git a/sdks/go/pkg/beam/core/runtime/graphx/translate_test.go
b/sdks/go/pkg/beam/core/runtime/graphx/translate_test.go
index e12c251..ec2a8b7 100644
--- a/sdks/go/pkg/beam/core/runtime/graphx/translate_test.go
+++ b/sdks/go/pkg/beam/core/runtime/graphx/translate_test.go
@@ -85,7 +85,7 @@ func TestParDo(t *testing.T) {
t.Fatal(err)
}
p, err := graphx.Marshal(edges,
- &graphx.Options{Environment: pb.Environment{Url: "foo", Urn:
"beam:env:docker:v1", Payload: payload}})
+ &graphx.Options{Environment: pb.Environment{Urn:
"beam:env:docker:v1", Payload: payload}})
if err != nil {
t.Fatal(err)
}
diff --git a/sdks/go/pkg/beam/runners/dataflow/dataflow.go
b/sdks/go/pkg/beam/runners/dataflow/dataflow.go
index b87ab86..14389a7 100644
--- a/sdks/go/pkg/beam/runners/dataflow/dataflow.go
+++ b/sdks/go/pkg/beam/runners/dataflow/dataflow.go
@@ -220,7 +220,6 @@ func createEnvironment(ctx context.Context) pb.Environment {
"Failed to serialize Environment payload %v for
config %v: %v", payload, config, err))
}
environment = pb.Environment{
- Url: config,
Urn: urn,
Payload: serializedPayload,
}
diff --git a/sdks/go/pkg/beam/runners/universal/universal.go
b/sdks/go/pkg/beam/runners/universal/universal.go
index 539c1e7..3a470a9 100644
--- a/sdks/go/pkg/beam/runners/universal/universal.go
+++ b/sdks/go/pkg/beam/runners/universal/universal.go
@@ -81,7 +81,6 @@ func createEnvironment(ctx context.Context) pb.Environment {
"Failed to serialize Environment payload %v for
config %v: %v", payload, config, err))
}
environment = pb.Environment{
- Url: config,
Urn: urn,
Payload: serializedPayload,
}
diff --git
a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/WindowMergingFnRunnerTest.java
b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/WindowMergingFnRunnerTest.java
index 6b259c5..35e9aa5 100644
---
a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/WindowMergingFnRunnerTest.java
+++
b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/WindowMergingFnRunnerTest.java
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertThat;
import java.util.Collections;
import org.apache.beam.model.pipeline.v1.RunnerApi;
-import org.apache.beam.model.pipeline.v1.RunnerApi.Environment;
+import org.apache.beam.runners.core.construction.Environments;
import org.apache.beam.runners.core.construction.SdkComponents;
import org.apache.beam.runners.core.construction.WindowingStrategyTranslation;
import org.apache.beam.sdk.function.ThrowingFunction;
@@ -110,7 +110,7 @@ public class WindowMergingFnRunnerTest {
private static <W extends BoundedWindow> RunnerApi.PTransform
createMergeTransformForWindowFn(
WindowFn<?, W> windowFn) throws Exception {
SdkComponents components = SdkComponents.create();
-
components.registerEnvironment(Environment.newBuilder().setUrl("java").build());
+
components.registerEnvironment(Environments.createDockerEnvironment("test"));
RunnerApi.FunctionSpec functionSpec =
RunnerApi.FunctionSpec.newBuilder()
.setUrn(WindowMergingFnRunner.URN)
diff --git a/sdks/python/apache_beam/runners/portability/portable_runner.py
b/sdks/python/apache_beam/runners/portability/portable_runner.py
index eec5579..cb52b92 100644
--- a/sdks/python/apache_beam/runners/portability/portable_runner.py
+++ b/sdks/python/apache_beam/runners/portability/portable_runner.py
@@ -114,7 +114,6 @@ class PortableRunner(runner.PipelineRunner):
portable_options.environment_config
or PortableRunner.default_docker_image())
return beam_runner_api_pb2.Environment(
- url=docker_image,
urn=common_urns.environments.DOCKER.urn,
payload=beam_runner_api_pb2.DockerPayload(
container_image=docker_image
diff --git
a/sdks/python/apache_beam/runners/portability/portable_runner_test.py
b/sdks/python/apache_beam/runners/portability/portable_runner_test.py
index ae9ac0a..efafbf9 100644
--- a/sdks/python/apache_beam/runners/portability/portable_runner_test.py
+++ b/sdks/python/apache_beam/runners/portability/portable_runner_test.py
@@ -230,7 +230,6 @@ class PortableRunnerInternalTest(unittest.TestCase):
self.assertEqual(
PortableRunner._create_environment(PipelineOptions.from_dictionary({})),
beam_runner_api_pb2.Environment(
- url=docker_image,
urn=common_urns.environments.DOCKER.urn,
payload=beam_runner_api_pb2.DockerPayload(
container_image=docker_image
@@ -243,7 +242,6 @@ class PortableRunnerInternalTest(unittest.TestCase):
'environment_type': 'DOCKER',
'environment_config': docker_image,
})), beam_runner_api_pb2.Environment(
- url=docker_image,
urn=common_urns.environments.DOCKER.urn,
payload=beam_runner_api_pb2.DockerPayload(
container_image=docker_image
