Skip to content

Commit f5bb59d

Browse files
Amar3ttoAmar3tto
committed
Revert #36891 
1 parent 82dea87 commit f5bb59d

File tree

12 files changed

+15
-784
lines changed

12 files changed

+15
-784
lines changed

‎buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,6 @@ class BeamModulePlugin implements Plugin<Project> {
755755
google_cloud_dataflow_java_proto_library_all: "com.google.cloud.dataflow:google-cloud-dataflow-java-proto-library-all:0.5.160304",
756756
google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:2.33.0", // [bomupgrader] sets version
757757
google_cloud_firestore : "com.google.cloud:google-cloud-firestore", // google_cloud_platform_libraries_bom sets version
758-
google_cloud_kms : "com.google.cloud:google-cloud-kms", // google_cloud_platform_libraries_bom sets version
759758
google_cloud_pubsub : "com.google.cloud:google-cloud-pubsub", // google_cloud_platform_libraries_bom sets version
760759
google_cloud_pubsublite : "com.google.cloud:google-cloud-pubsublite", // google_cloud_platform_libraries_bom sets version
761760
// [bomupgrader] the BOM version is set by scripts/tools/bomupgrader.py. If update manually, also update
@@ -766,7 +765,6 @@ class BeamModulePlugin implements Plugin<Project> {
766765
google_cloud_spanner_bom : "com.google.cloud:google-cloud-spanner-bom:$google_cloud_spanner_version",
767766
google_cloud_spanner : "com.google.cloud:google-cloud-spanner", // google_cloud_platform_libraries_bom sets version
768767
google_cloud_spanner_test : "com.google.cloud:google-cloud-spanner:$google_cloud_spanner_version:tests",
769-
google_cloud_tink : "com.google.crypto.tink:tink:1.19.0",
770768
google_cloud_vertexai : "com.google.cloud:google-cloud-vertexai", // google_cloud_platform_libraries_bom sets version
771769
google_code_gson : "com.google.code.gson:gson:$google_code_gson_version",
772770
// google-http-client's version is explicitly declared for sdks/java/maven-archetypes/examples
@@ -868,7 +866,6 @@ class BeamModulePlugin implements Plugin<Project> {
868866
proto_google_cloud_datacatalog_v1beta1 : "com.google.api.grpc:proto-google-cloud-datacatalog-v1beta1", // google_cloud_platform_libraries_bom sets version
869867
proto_google_cloud_datastore_v1 : "com.google.api.grpc:proto-google-cloud-datastore-v1", // google_cloud_platform_libraries_bom sets version
870868
proto_google_cloud_firestore_v1 : "com.google.api.grpc:proto-google-cloud-firestore-v1", // google_cloud_platform_libraries_bom sets version
871-
proto_google_cloud_kms_v1 : "com.google.api.grpc:proto-google-cloud-kms-v1", // google_cloud_platform_libraries_bom sets version
872869
proto_google_cloud_pubsub_v1 : "com.google.api.grpc:proto-google-cloud-pubsub-v1", // google_cloud_platform_libraries_bom sets version
873870
proto_google_cloud_pubsublite_v1 : "com.google.api.grpc:proto-google-cloud-pubsublite-v1", // google_cloud_platform_libraries_bom sets version
874871
proto_google_cloud_secret_manager_v1 : "com.google.api.grpc:proto-google-cloud-secretmanager-v1", // google_cloud_platform_libraries_bom sets version

‎sdks/java/build-tools/src/main/resources/beam/checkstyle/suppressions.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
<suppress checks="JavadocPackage" files=".*[\\\/]maven-archetypes[\\\/].*"/>
2222
<suppress checks="JavadocPackage" files=".*[\\\/]examples[\\\/].*"/>
2323
<suppress checks="JavadocPackage" files=".*[\\\/]build[\\\/]source-overrides[\\\/].*"/>
24-
24+
2525
<suppress checks="JavadocMethod" files=".*Test\.java"/>
2626
<suppress checks="JavadocMethod" files=".*[\\\/]src[\\\/]test[\\\/].*"/>
2727
<suppress checks="JavadocMethod" files=".*[\\\/]examples[\\\/].*"/>
28-
28+
2929

3030
<!-- suppress all checks in the generated directories -->
3131
<suppress checks=".*" files=".+[\\\/]generated[\\\/].+\.java" />
@@ -57,7 +57,6 @@
5757
<!-- gRPC/protobuf exceptions -->
5858
<!-- Non-vendored gRPC/protobuf imports are allowed for files that depend on libraries that expose gRPC/protobuf in its public API -->
5959
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*sdk.*extensions.*protobuf.*" />
60-
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*sdk.*core.*GcpHsmGeneratedSecret.*" />
6160
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*sdk.*core.*GroupByEncryptedKeyTest.*" />
6261
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*sdk.*core.*GroupByKeyTest.*" />
6362
<suppress id="ForbidNonVendoredGrpcProtobuf" files=".*sdk.*core.*GroupByKeyIT.*" />

‎sdks/java/core/build.gradle‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ dependencies {
102102
shadow library.java.snappy_java
103103
shadow library.java.joda_time
104104
implementation enforcedPlatform(library.java.google_cloud_platform_libraries_bom)
105-
implementation library.java.gax
106-
implementation library.java.google_cloud_kms
107-
implementation library.java.proto_google_cloud_kms_v1
108-
implementation library.java.google_cloud_tink
109105
implementation library.java.google_cloud_secret_manager
110106
implementation library.java.proto_google_cloud_secret_manager_v1
111107
implementation library.java.protobuf_java
@@ -134,8 +130,6 @@ dependencies {
134130
shadowTest library.java.log4j2_api
135131
shadowTest library.java.jamm
136132
shadowTest 'com.google.cloud:google-cloud-secretmanager:2.75.0'
137-
shadowTest 'com.google.cloud:google-cloud-kms:2.75.0'
138-
shadowTest 'com.google.crypto.tink:tink:1.19.0'
139133
testRuntimeOnly library.java.slf4j_jdk14
140134
}
141135

‎sdks/java/core/src/main/java/org/apache/beam/sdk/util/GcpHsmGeneratedSecret.java‎

Lines changed: 0 additions & 191 deletions
This file was deleted.

‎sdks/java/core/src/main/java/org/apache/beam/sdk/util/Secret.java‎

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.HashSet;
2424
import java.util.Map;
2525
import java.util.Set;
26-
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions;
2726

2827
/**
2928
* A secret management interface used for handling sensitive data.
@@ -71,48 +70,16 @@ static Secret parseSecretOption(String secretOption) {
7170
paramName, gcpSecretParams));
7271
}
7372
}
74-
String versionName =
75-
Preconditions.checkNotNull(
76-
paramMap.get("version_name"),
77-
"version_name must contain a valid value for versionName parameter");
78-
return new GcpSecret(versionName);
79-
case "gcphsmgeneratedsecret":
80-
Set<String> gcpHsmGeneratedSecretParams =
81-
new HashSet<>(
82-
Arrays.asList("project_id", "location_id", "key_ring_id", "key_id", "job_name"));
83-
for (String paramName : paramMap.keySet()) {
84-
if (!gcpHsmGeneratedSecretParams.contains(paramName)) {
85-
throw new RuntimeException(
86-
String.format(
87-
"Invalid secret parameter %s, GcpHsmGeneratedSecret only supports the following parameters: %s",
88-
paramName, gcpHsmGeneratedSecretParams));
89-
}
73+
String versionName = paramMap.get("version_name");
74+
if (versionName == null) {
75+
throw new RuntimeException(
76+
"version_name must contain a valid value for versionName parameter");
9077
}
91-
String projectId =
92-
Preconditions.checkNotNull(
93-
paramMap.get("project_id"),
94-
"project_id must contain a valid value for projectId parameter");
95-
String locationId =
96-
Preconditions.checkNotNull(
97-
paramMap.get("location_id"),
98-
"location_id must contain a valid value for locationId parameter");
99-
String keyRingId =
100-
Preconditions.checkNotNull(
101-
paramMap.get("key_ring_id"),
102-
"key_ring_id must contain a valid value for keyRingId parameter");
103-
String keyId =
104-
Preconditions.checkNotNull(
105-
paramMap.get("key_id"), "key_id must contain a valid value for keyId parameter");
106-
String jobName =
107-
Preconditions.checkNotNull(
108-
paramMap.get("job_name"),
109-
"job_name must contain a valid value for jobName parameter");
110-
return new GcpHsmGeneratedSecret(projectId, locationId, keyRingId, keyId, jobName);
78+
return new GcpSecret(versionName);
11179
default:
11280
throw new RuntimeException(
11381
String.format(
114-
"Invalid secret type %s, currently only GcpSecret and GcpHsmGeneratedSecret are supported",
115-
secretType));
82+
"Invalid secret type %s, currently only GcpSecret is supported", secretType));
11683
}
11784
}
11885
}

0 commit comments

Comments
 (0)