forked from eclipse-jkube/jkube
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
…o wrong arguments in PortForwardService Make order of port forward arguments consistent across Service classes. Now all methods have containerPort, remotePort argument format Signed-off-by: Rohan Kumar <rohaan@redhat.com>
- Loading branch information
1 parent
288f55e
commit e08809d
Showing
7 changed files
with
170 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
...e/src/test/java/org/eclipse/jkube/kit/config/service/PortForwardServicePortOrderTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /** | ||
| * Copyright (c) 2019 Red Hat, Inc. | ||
| * This program and the accompanying materials are made | ||
| * available under the terms of the Eclipse Public License 2.0 | ||
| * which is available at: | ||
| * | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Red Hat, Inc. - initial API and implementation | ||
| */ | ||
| package org.eclipse.jkube.kit.config.service; | ||
|
|
||
| import io.fabric8.kubernetes.client.KubernetesClient; | ||
| import mockit.Mocked; | ||
| import mockit.Verifications; | ||
| import org.eclipse.jkube.kit.common.KitLogger; | ||
| import org.junit.Test; | ||
|
|
||
| public class PortForwardServicePortOrderTest { | ||
| @Mocked | ||
| private KubernetesClient kubernetesClient; | ||
|
|
||
| @Mocked | ||
| private KitLogger logger; | ||
|
|
||
| @Test | ||
| public void testPortsSpecifiedInCorrectOrderPortForward() { | ||
| // Given | ||
| PortForwardService portForwardService = new PortForwardService(kubernetesClient, logger); | ||
|
|
||
| // When | ||
| portForwardService.forwardPortAsync("foo-pod", "foo-ns", 8080, 312323); | ||
|
|
||
| // Then | ||
| new Verifications() {{ | ||
| kubernetesClient.pods().inNamespace("foo-ns").withName("foo-pod").portForward(8080, 312323); | ||
| times = 1; | ||
| }}; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
...spring-boot/src/test/java/org/eclipse/jkube/springboot/watcher/SpringBootWatcherTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /** | ||
| * Copyright (c) 2019 Red Hat, Inc. | ||
| * This program and the accompanying materials are made | ||
| * available under the terms of the Eclipse Public License 2.0 | ||
| * which is available at: | ||
| * | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Red Hat, Inc. - initial API and implementation | ||
| */ | ||
| package org.eclipse.jkube.springboot.watcher; | ||
|
|
||
| import io.fabric8.kubernetes.api.model.HasMetadata; | ||
| import io.fabric8.kubernetes.api.model.LabelSelector; | ||
| import io.fabric8.kubernetes.api.model.ServiceBuilder; | ||
| import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder; | ||
| import mockit.Expectations; | ||
| import mockit.Mocked; | ||
| import mockit.Verifications; | ||
| import org.eclipse.jkube.kit.common.JKubeConfiguration; | ||
| import org.eclipse.jkube.kit.common.JavaProject; | ||
| import org.eclipse.jkube.kit.common.util.KubernetesHelper; | ||
| import org.eclipse.jkube.kit.common.util.SpringBootUtil; | ||
| import org.eclipse.jkube.kit.config.service.PortForwardService; | ||
| import org.eclipse.jkube.watcher.api.WatcherContext; | ||
| import org.junit.Test; | ||
|
|
||
| import java.net.URLClassLoader; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Properties; | ||
|
|
||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| @SuppressWarnings({"ResultOfMethodCallIgnored", "AccessStaticViaInstance", "unused"}) | ||
| public class SpringBootWatcherTest { | ||
| @Mocked | ||
| private PortForwardService portForwardService; | ||
|
|
||
| @Mocked | ||
| private WatcherContext watcherContext; | ||
|
|
||
| @Mocked | ||
| private JKubeConfiguration jkubeConfiguration; | ||
|
|
||
| @Mocked | ||
| private JavaProject javaProject; | ||
|
|
||
| @Mocked | ||
| private KubernetesHelper kubernetesHelper; | ||
|
|
||
| @Mocked | ||
| private SpringBootUtil springBootUtil; | ||
|
|
||
| @Test | ||
| public void testGetPortForwardUrl() { | ||
| // Given | ||
| List<HasMetadata> resources = new ArrayList<>(); | ||
| resources.add(new DeploymentBuilder().withNewMetadata().withName("d1").endMetadata() | ||
| .withNewSpec() | ||
| .withNewSelector() | ||
| .withMatchLabels(Collections.singletonMap("foo", "bar")) | ||
| .endSelector() | ||
| .endSpec() | ||
| .build()); | ||
| resources.add(new ServiceBuilder().withNewMetadata().withName("s1").endMetadata().build()); | ||
| new Expectations() {{ | ||
| watcherContext.getBuildContext(); | ||
| result = jkubeConfiguration; | ||
|
|
||
| jkubeConfiguration.getProject(); | ||
| result = javaProject; | ||
|
|
||
| javaProject.getProperties(); | ||
| result = new Properties(); | ||
|
|
||
| javaProject.getCompileClassPathElements(); | ||
| result = Collections.singletonList("/foo"); | ||
|
|
||
| javaProject.getOutputDirectory().getAbsolutePath(); | ||
| result = "target/classes"; | ||
|
|
||
| Properties properties = new Properties(); | ||
| properties.put("server.port", "9001"); | ||
| springBootUtil.getSpringBootApplicationProperties((URLClassLoader) any); | ||
| result = properties; | ||
| }}; | ||
| SpringBootWatcher springBootWatcher = new SpringBootWatcher(watcherContext); | ||
|
|
||
| // When | ||
| String portForwardUrl = springBootWatcher.getPortForwardUrl(resources); | ||
|
|
||
| // Then | ||
| assertTrue(portForwardUrl.contains("http://localhost:")); | ||
| new Verifications() {{ | ||
| portForwardService.forwardPortAsync((LabelSelector) any, 9001, anyInt); | ||
| }}; | ||
| } | ||
| } |