Skip to content

Commit 813350a

Browse files
frevafreva
authored
Merge pull request #33154 from vespa-engine/revert-33153-revert-33150-revert-33144-evgiz/zookeeper-serialization-for-zoneendpoint-auth-methods
Revert "Add serialization for zone endpoint auth methods in load balancer (zookeeper)"
2 parents 2d2f114 + f9b7f18 commit 813350a

4 files changed

Lines changed: 10 additions & 34 deletions

File tree

‎config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.yahoo.config.provision.ZoneEndpoint;
1111
import com.yahoo.config.provision.ZoneEndpoint.AllowedUrn;
1212
import com.yahoo.config.provision.ZoneEndpoint.AccessType;
13-
import com.yahoo.config.provision.zone.AuthMethod;
1413
import com.yahoo.slime.ArrayTraverser;
1514
import com.yahoo.slime.Cursor;
1615
import com.yahoo.slime.Inspector;
@@ -46,7 +45,6 @@ public class AllocatedHostsSerializer {
4645
private static final String loadBalancerSettingsKey = "zoneEndpoint";
4746
private static final String publicField = "public";
4847
private static final String privateField = "private";
49-
private static final String authMethodsField = "authMethods";
5048
private static final String allowedUrnsField = "allowedUrns";
5149
private static final String accessTypeField = "type";
5250
private static final String urnField = "urn";
@@ -235,12 +233,6 @@ private static ClusterMembership membershipFromSlime(Inspector object) {
235233
private static void toSlime(Cursor settingsObject, ZoneEndpoint settings) {
236234
settingsObject.setBool(publicField, settings.isPublicEndpoint());
237235
settingsObject.setBool(privateField, settings.isPrivateEndpoint());
238-
239-
Cursor authMethods = settingsObject.setArray(authMethodsField);
240-
for(AuthMethod method : settings.authMethods()) {
241-
authMethods.addString(method.name());
242-
}
243-
244236
if (settings.isPrivateEndpoint()) {
245237
Cursor allowedUrnsArray = settingsObject.setArray(allowedUrnsField);
246238
for (AllowedUrn urn : settings.allowedUrns()) {
@@ -259,9 +251,6 @@ private static ZoneEndpoint zoneEndpoint(Inspector settingsObject) {
259251
if ( ! settingsObject.valid()) return ZoneEndpoint.defaultEndpoint;
260252
return new ZoneEndpoint(settingsObject.field(publicField).asBool(),
261253
settingsObject.field(privateField).asBool(),
262-
SlimeUtils.entriesStream(settingsObject.field(authMethodsField))
263-
.map(value -> AuthMethod.valueOf(value.asString()))
264-
.toList(),
265254
SlimeUtils.entriesStream(settingsObject.field(allowedUrnsField))
266255
.map(urnObject -> new AllowedUrn(switch (urnObject.field(accessTypeField).asString()) {
267256
case "awsPrivateLink" -> AccessType.awsPrivateLink;
@@ -272,6 +261,7 @@ private static ZoneEndpoint zoneEndpoint(Inspector settingsObject) {
272261
.toList());
273262
}
274263

264+
275265
private static Optional<String> optionalString(Inspector inspector) {
276266
if ( ! inspector.valid()) return Optional.empty();
277267
return Optional.of(inspector.asString());

‎config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.yahoo.config.provision.ZoneEndpoint;
1212
import com.yahoo.config.provision.ZoneEndpoint.AccessType;
1313
import com.yahoo.config.provision.ZoneEndpoint.AllowedUrn;
14-
import com.yahoo.config.provision.zone.AuthMethod;
1514
import org.junit.jupiter.api.Test;
1615

1716
import java.io.IOException;
@@ -71,7 +70,7 @@ void testAllocatedHostsSerialization() throws IOException {
7170
bigSlowDiskSpeedNode,
7271
anyDiskSpeedNode,
7372
ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"),
74-
Optional.empty(), new ZoneEndpoint(true, true, List.of(AuthMethod.mtls, AuthMethod.token), List.of(new AllowedUrn(AccessType.awsPrivateLink, "burn")))),
73+
Optional.empty(), new ZoneEndpoint(true, true, List.of(new AllowedUrn(AccessType.awsPrivateLink, "burn")))),
7574
Optional.empty(),
7675
Optional.empty(),
7776
Optional.empty()));

‎node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.yahoo.config.provision.ZoneEndpoint;
77
import com.yahoo.config.provision.ZoneEndpoint.AllowedUrn;
88
import com.yahoo.config.provision.ZoneEndpoint.AccessType;
9-
import com.yahoo.config.provision.zone.AuthMethod;
109
import com.yahoo.slime.ArrayTraverser;
1110
import com.yahoo.slime.Cursor;
1211
import com.yahoo.slime.Inspector;
@@ -64,7 +63,6 @@ public class LoadBalancerSerializer {
6463
private static final String settingsField = "settings";
6564
private static final String publicField = "public";
6665
private static final String privateField = "private";
67-
private static final String authMethodsField = "authMethods";
6866
private static final String allowedUrnsField = "allowedUrns";
6967
private static final String accessTypeField = "type";
7068
private static final String urnField = "urn";
@@ -155,12 +153,6 @@ public static LoadBalancer fromJson(byte[] data) {
155153
private static void toSlime(Cursor settingsObject, ZoneEndpoint settings) {
156154
settingsObject.setBool(publicField, settings.isPublicEndpoint());
157155
settingsObject.setBool(privateField, settings.isPrivateEndpoint());
158-
159-
Cursor authMethods = settingsObject.setArray(authMethodsField);
160-
for(AuthMethod method : settings.authMethods()) {
161-
authMethods.addString(method.name());
162-
}
163-
164156
if (settings.isPrivateEndpoint()) {
165157
Cursor allowedUrnsArray = settingsObject.setArray(allowedUrnsField);
166158
for (AllowedUrn urn : settings.allowedUrns()) {
@@ -179,18 +171,14 @@ private static ZoneEndpoint zoneEndpoint(Inspector settingsObject) {
179171
if ( ! settingsObject.valid()) return ZoneEndpoint.defaultEndpoint;
180172
return new ZoneEndpoint(settingsObject.field(publicField).asBool(),
181173
settingsObject.field(privateField).asBool(),
182-
SlimeUtils.entriesStream(settingsObject.field(authMethodsField))
183-
.map(field -> AuthMethod.valueOf(field.asString()))
184-
.toList(),
185174
SlimeUtils.entriesStream(settingsObject.field(allowedUrnsField))
186-
.map(urnObject -> new AllowedUrn(
187-
switch (urnObject.field(accessTypeField).asString()) {
188-
case "awsPrivateLink" -> AccessType.awsPrivateLink;
189-
case "gcpServiceConnect" -> AccessType.gcpServiceConnect;
190-
default -> throw new IllegalArgumentException("unknown service access type in '" + urnObject + "'");
191-
},
192-
urnObject.field(urnField).asString()))
193-
.toList());
175+
.map(urnObject -> new AllowedUrn(switch (urnObject.field(accessTypeField).asString()) {
176+
case "awsPrivateLink" -> AccessType.awsPrivateLink;
177+
case "gcpServiceConnect" -> AccessType.gcpServiceConnect;
178+
default -> throw new IllegalArgumentException("unknown service access type in '" + urnObject + "'");
179+
},
180+
urnObject.field(urnField).asString()))
181+
.toList());
194182
}
195183

196184
private static <T> Optional<T> optionalValue(Inspector field, Function<Inspector, T> fieldMapper) {

‎node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializerTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.yahoo.config.provision.ZoneEndpoint;
99
import com.yahoo.config.provision.ZoneEndpoint.AccessType;
1010
import com.yahoo.config.provision.ZoneEndpoint.AllowedUrn;
11-
import com.yahoo.config.provision.zone.AuthMethod;
1211
import com.yahoo.vespa.hosted.provision.lb.DnsZone;
1312
import com.yahoo.vespa.hosted.provision.lb.LoadBalancer;
1413
import com.yahoo.vespa.hosted.provision.lb.LoadBalancerId;
@@ -53,7 +52,7 @@ public void test_serialization() {
5352
new Real(DomainName.of("real-2"),
5453
"127.0.0.2",
5554
4080)),
56-
new ZoneEndpoint(false, true, List.of(AuthMethod.mtls, AuthMethod.token), List.of(new AllowedUrn(AccessType.awsPrivateLink, "123"))),
55+
new ZoneEndpoint(false, true, List.of(new AllowedUrn(AccessType.awsPrivateLink, "123"))),
5756
List.of(PrivateServiceId.of("foo"), PrivateServiceId.of("bar")),
5857
CloudAccount.from("012345678912"))),
5958
LoadBalancer.State.active,

0 commit comments

Comments
 (0)