Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@minwoox
minwoox committed Aug 5, 2024
1 parent cae4a30 commit 3d5cddb
Show file tree
Hide file tree
Showing 13 changed files with 298 additions and 498 deletions.
14 changes: 8 additions & 6 deletions xds/src/main/java/com/linecorp/centraldogma/xds/internal/ControlPlanePlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

package com.linecorp.centraldogma.xds.internal;

import static com.linecorp.centraldogma.xds.internal.XdsServiceUtil.JSON_MESSAGE_MARSHALLER;

import java.io.IOException;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
Expand All @@ -31,7 +34,6 @@

import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.base.MoreObjects;
import com.google.protobuf.InvalidProtocolBufferException;

import com.linecorp.armeria.common.grpc.GrpcJsonMarshaller;
import com.linecorp.armeria.common.util.UnmodifiableFuture;
Expand Down Expand Up @@ -179,23 +181,23 @@ private void init0(PluginInitContext pluginInitContext) {
}

private void setXdsResources(String path, String contentAsText, String repoName)
throws InvalidProtocolBufferException {
throws IOException {
if (path.startsWith(CLUSTERS_DIRECTORY)) {
final Cluster.Builder builder = Cluster.newBuilder();
JsonFormatUtil.parser().merge(contentAsText, builder);
JSON_MESSAGE_MARSHALLER.mergeValue(contentAsText, builder);
centralDogmaXdsResources.setCluster(repoName, builder.build());
} else if (path.startsWith(ENDPOINTS_DIRECTORY)) {
final ClusterLoadAssignment.Builder builder =
ClusterLoadAssignment.newBuilder();
JsonFormatUtil.parser().merge(contentAsText, builder);
JSON_MESSAGE_MARSHALLER.mergeValue(contentAsText, builder);
centralDogmaXdsResources.setEndpoint(repoName, builder.build());
} else if (path.startsWith(LISTENERS_DIRECTORY)) {
final Listener.Builder builder = Listener.newBuilder();
JsonFormatUtil.parser().merge(contentAsText, builder);
JSON_MESSAGE_MARSHALLER.mergeValue(contentAsText, builder);
centralDogmaXdsResources.setListener(repoName, builder.build());
} else if (path.startsWith(ROUTES_DIRECTORY)) {
final RouteConfiguration.Builder builder = RouteConfiguration.newBuilder();
JsonFormatUtil.parser().merge(contentAsText, builder);
JSON_MESSAGE_MARSHALLER.mergeValue(contentAsText, builder);
centralDogmaXdsResources.setRoute(repoName, builder.build());
} else {
// ignore
Expand Down
50 changes: 0 additions & 50 deletions xds/src/main/java/com/linecorp/centraldogma/xds/internal/JsonFormatUtil.java
View file

This file was deleted.

1 change: 1 addition & 0 deletions xds/src/main/java/com/linecorp/centraldogma/xds/internal/XdsServiceUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public final class XdsServiceUtil {
public static final String RESOURCE_ID_PATTERN_STRING = "[a-z](?:[a-z0-9-_/]*[a-z0-9])?";
public static final Pattern RESOURCE_ID_PATTERN = Pattern.compile('^' + RESOURCE_ID_PATTERN_STRING + '$');

//TODO(minwoox): Automate the registration of the extension message types.
public static final MessageMarshaller JSON_MESSAGE_MARSHALLER =
MessageMarshaller.builder().omittingInsignificantWhitespace(true)
.register(Listener.getDefaultInstance())
Expand Down
59 changes: 19 additions & 40 deletions xds/src/test/java/com/linecorp/centraldogma/xds/cluster/v1/XdsClusterServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@

import static com.linecorp.centraldogma.xds.internal.XdsServiceUtil.JSON_MESSAGE_MARSHALLER;
import static com.linecorp.centraldogma.xds.internal.XdsTestUtil.cluster;
import static com.linecorp.centraldogma.xds.internal.XdsTestUtil.createCluster;
import static com.linecorp.centraldogma.xds.internal.XdsTestUtil.createGroup;
import static com.linecorp.centraldogma.xds.internal.XdsTestUtil.updateCluster;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;

import java.io.IOException;
import java.util.List;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
Expand All @@ -40,7 +42,6 @@
import com.linecorp.armeria.common.HttpHeaderNames;
import com.linecorp.armeria.common.HttpMethod;
import com.linecorp.armeria.common.HttpStatus;
import com.linecorp.armeria.common.MediaType;
import com.linecorp.armeria.common.RequestHeaders;
import com.linecorp.centraldogma.testing.junit.CentralDogmaExtension;
import com.linecorp.centraldogma.xds.cluster.v1.XdsClusterServiceGrpc.XdsClusterServiceBlockingStub;
Expand All @@ -59,45 +60,29 @@ class XdsClusterServiceTest {

@BeforeAll
static void setup() {
final AggregatedHttpResponse response = createGroup("groups/foo");
final AggregatedHttpResponse response = createGroup("groups/foo", dogma.httpClient());
assertThat(response.status()).isSameAs(HttpStatus.OK);
}

private static AggregatedHttpResponse createGroup(String groupName) {
final RequestHeaders headers = RequestHeaders.builder(HttpMethod.POST, "/api/v1/xds/groups").set(
HttpHeaderNames.AUTHORIZATION, "Bearer anonymous").contentType(MediaType.JSON_UTF_8).build();
return dogma.httpClient().execute(headers, "{\"group\": {\"name\":\"" + groupName + "\"}}").aggregate()
.join();
}

@Test
void createClusterViaHttp() throws Exception {
final Cluster cluster = cluster("this_cluster_name_will_be_ignored_and_replaced", 1);
AggregatedHttpResponse response = createCluster("foo", "@invalid_cluster_id", cluster);
AggregatedHttpResponse response = createCluster("groups/foo", "@invalid_cluster_id", cluster,
dogma.httpClient());
assertThat(response.status()).isSameAs(HttpStatus.BAD_REQUEST);

response = createCluster("non-existent-group", "foo-cluster/1", cluster);
response = createCluster("groups/non-existent-group", "foo-cluster/1", cluster, dogma.httpClient());
assertThat(response.status()).isSameAs(HttpStatus.NOT_FOUND);

response = createCluster("foo", "foo-cluster/1", cluster);
response = createCluster("groups/foo", "foo-cluster/1", cluster, dogma.httpClient());
assertOk(response);
final Cluster.Builder clusterBuilder = Cluster.newBuilder();
JSON_MESSAGE_MARSHALLER.mergeValue(response.contentUtf8(), clusterBuilder);
final Cluster actualCluster = clusterBuilder.build();
final String clusterName = "groups/foo/clusters/foo-cluster/1";
assertThat(actualCluster).isEqualTo(cluster.toBuilder().setName(clusterName).build());
checkResourceViaDiscoveryRequest(actualCluster, clusterName, true);
}

private static AggregatedHttpResponse createCluster(String groupName, String clusterId, Cluster cluster)
throws IOException {
final RequestHeaders headers =
RequestHeaders.builder(HttpMethod.POST,
"/api/v1/xds/groups/" + groupName + "/clusters?cluster_id=" + clusterId)
.set(HttpHeaderNames.AUTHORIZATION, "Bearer anonymous")
.contentType(MediaType.JSON_UTF_8).build();
return dogma.httpClient().execute(headers, JSON_MESSAGE_MARSHALLER.writeValueAsString(cluster))
.aggregate().join();
await().pollInterval(100, TimeUnit.MILLISECONDS).untilAsserted(
() -> checkResourceViaDiscoveryRequest(actualCluster, clusterName, true));
}

private static void assertOk(AggregatedHttpResponse response) {
Expand Down Expand Up @@ -142,21 +127,23 @@ public void onCompleted() {}
@Test
void updateClusterViaHttp() throws Exception {
final Cluster cluster = cluster("this_cluster_name_will_be_ignored_and_replaced", 1);
AggregatedHttpResponse response = updateCluster("foo-cluster/2", cluster);
AggregatedHttpResponse response = updateCluster("groups/foo", "foo-cluster/2",
cluster, dogma.httpClient());
assertThat(response.status()).isSameAs(HttpStatus.NOT_FOUND);

response = createCluster("foo", "foo-cluster/2", cluster);
response = createCluster("groups/foo", "foo-cluster/2", cluster, dogma.httpClient());
assertOk(response);
final Cluster.Builder clusterBuilder = Cluster.newBuilder();
JSON_MESSAGE_MARSHALLER.mergeValue(response.contentUtf8(), clusterBuilder);
final Cluster actualCluster = clusterBuilder.build();
final String clusterName = "groups/foo/clusters/foo-cluster/2";
assertThat(actualCluster).isEqualTo(cluster.toBuilder().setName(clusterName).build());
checkResourceViaDiscoveryRequest(actualCluster, clusterName, true);
await().pollInterval(100, TimeUnit.MILLISECONDS).untilAsserted(
() -> checkResourceViaDiscoveryRequest(actualCluster, clusterName, true));

final Cluster updatingCluster = cluster.toBuilder().setConnectTimeout(
Duration.newBuilder().setSeconds(2).build()).setName(clusterName).build();
response = updateCluster("foo-cluster/2", updatingCluster);
response = updateCluster("groups/foo", "foo-cluster/2", updatingCluster, dogma.httpClient());
assertOk(response);
final Cluster.Builder clusterBuilder2 = Cluster.newBuilder();
JSON_MESSAGE_MARSHALLER.mergeValue(response.contentUtf8(), clusterBuilder2);
Expand All @@ -166,27 +153,19 @@ void updateClusterViaHttp() throws Exception {
() -> checkResourceViaDiscoveryRequest(actualCluster2, clusterName, true));
}

private static AggregatedHttpResponse updateCluster(String clusterId, Cluster cluster) throws IOException {
final RequestHeaders headers = RequestHeaders.builder(HttpMethod.PATCH,
"/api/v1/xds/groups/foo/clusters/" + clusterId)
.set(HttpHeaderNames.AUTHORIZATION, "Bearer anonymous")
.contentType(MediaType.JSON_UTF_8).build();
return dogma.httpClient().execute(headers, JSON_MESSAGE_MARSHALLER.writeValueAsString(cluster))
.aggregate().join();
}

@Test
void deleteClusterViaHttp() throws Exception {
final String clusterName = "groups/foo/clusters/foo-cluster/3/4";
AggregatedHttpResponse response = deleteCluster(clusterName);
assertThat(response.status()).isSameAs(HttpStatus.NOT_FOUND);

final Cluster cluster = cluster("this_cluster_name_will_be_ignored_and_replaced", 1);
response = createCluster("foo", "foo-cluster/3/4", cluster);
response = createCluster("groups/foo", "foo-cluster/3/4", cluster, dogma.httpClient());
assertOk(response);

final Cluster actualCluster = cluster.toBuilder().setName(clusterName).build();
checkResourceViaDiscoveryRequest(actualCluster, clusterName, true);
await().pollInterval(100, TimeUnit.MILLISECONDS).untilAsserted(
() -> checkResourceViaDiscoveryRequest(actualCluster, clusterName, true));

// Add permission test.

Expand Down
Loading

0 comments on commit 3d5cddb

Please sign in to comment.