Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import io.kubernetes.client.openapi.models.V1EndpointSubsetBuilder;
import io.kubernetes.client.openapi.models.V1EndpointAddress;
import org.apache.shenyu.common.config.ssl.ShenyuSniAsyncMapping;
import org.apache.shenyu.common.dto.SelectorData;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.k8s.cache.IngressCache;
import org.apache.shenyu.k8s.cache.IngressSelectorCache;
Expand All @@ -44,6 +45,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;

import java.util.Collections;
import java.util.HashMap;
Expand Down Expand Up @@ -77,6 +79,11 @@ public final class DivideIngressReconcilerTest {

@BeforeEach
public void init() {
// These caches are process-wide singletons; isolate each test case.
IngressCache.getInstance().remove("mockedNamespace", "mockedIngress");
IngressSelectorCache.getInstance().remove("mockedNamespace", "mockedIngress", PluginEnum.DIVIDE.getName());
ServiceIngressCache.getInstance().removeSpecifiedIngressName(
"mockedNamespace", "testService", "mockedNamespace", "mockedIngress");
ingressInformer = mock(SharedIndexInformer.class);
secretInformer = mock(SharedIndexInformer.class);
shenyuCacheRepository = mock(ShenyuCacheRepository.class);
Expand Down Expand Up @@ -127,6 +134,24 @@ public void testReconcile() {
verify(shenyuCacheRepository).saveOrUpdateRuleData(any());
}

/**
* test reconcile with fewer protocols than endpoints.
*/
@Test
public void testReconcileWithFewerProtocolsThanEndpoints() {
V1Ingress ingress = ingressInformer.getIndexer().getByKey("mockedNamespace/mockedIngress");
Map<String, String> annotations = ingress.getMetadata().getAnnotations();
annotations.put("shenyu.apache.org/upstreams-protocol", "https://");
V1Endpoints endpoints = endpointsInformer.getIndexer().getByKey("mockedNamespace/testService");
endpoints.getSubsets().get(0).setAddresses(java.util.Arrays.asList(
new V1EndpointAddress().ip("127.0.0.1"), new V1EndpointAddress().ip("127.0.0.2")));
ingressReconciler.reconcile(new Request("mockedNamespace", "mockedIngress"));
ArgumentCaptor<SelectorData> selectorCaptor = ArgumentCaptor.forClass(SelectorData.class);
verify(shenyuCacheRepository).saveOrUpdateSelectorData(selectorCaptor.capture());
Assertions.assertTrue(selectorCaptor.getValue().getHandle().contains("https://"));
Assertions.assertTrue(selectorCaptor.getValue().getHandle().contains("http://"));
}

/**
* Test reconcile after ingress deletion.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@
import io.kubernetes.client.openapi.models.V1Service;
import io.kubernetes.client.openapi.models.V1ServiceBuilder;
import org.apache.shenyu.common.config.ssl.ShenyuSniAsyncMapping;
import org.apache.shenyu.common.dto.SelectorData;
import org.apache.shenyu.k8s.parser.IngressParser;
import org.apache.shenyu.k8s.reconciler.IngressReconciler;
import org.apache.shenyu.k8s.repository.ShenyuCacheRepository;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;

import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -192,4 +194,22 @@ public void testParseSkipsContextPathWhenDubboEnabled() {
IngressParser ingressParser = new IngressParser(serviceInformer, endpointsInformer);
Assertions.assertEquals(1, ingressParser.parse(ingress, mock(io.kubernetes.client.openapi.apis.CoreV1Api.class)).size());
}

/**
* test reconcile with fewer protocols than endpoints.
*/
@Test
public void testReconcileWithFewerProtocolsThanEndpoints() {
V1Ingress ingress = ingressInformer.getIndexer().getByKey("mockedNamespace/mockedIngress");
Map<String, String> annotations = ingress.getMetadata().getAnnotations();
annotations.put("shenyu.apache.org/upstreams-protocol", "dubbo+ssl://");
V1Endpoints endpoints = endpointsInformer.getIndexer().getByKey("mockedNamespace/testService");
endpoints.getSubsets().get(0).setAddresses(java.util.Arrays.asList(
new V1EndpointAddress().ip("127.0.0.1"), new V1EndpointAddress().ip("127.0.0.2")));
ingressReconciler.reconcile(new Request("mockedNamespace", "mockedIngress"));
ArgumentCaptor<SelectorData> selectorCaptor = ArgumentCaptor.forClass(SelectorData.class);
verify(shenyuCacheRepository).saveOrUpdateSelectorData(selectorCaptor.capture());
Assertions.assertTrue(selectorCaptor.getValue().getHandle().contains("dubbo+ssl://"));
Assertions.assertTrue(selectorCaptor.getValue().getHandle().contains("dubbo://"));
}
}
Loading