-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for defining an entrypoint (#873)
- Loading branch information
1 parent
223c031
commit 84a5002
Showing
13 changed files
with
325 additions
and
36 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
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
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
120 changes: 120 additions & 0 deletions
120
...gin/src/test/java/com/google/cloud/tools/jib/gradle/PluginConfigurationProcessorTest.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,120 @@ | ||
| /* | ||
| * Copyright 2018 Google Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.cloud.tools.jib.gradle; | ||
|
|
||
| import com.google.cloud.tools.jib.configuration.ContainerConfiguration; | ||
| import com.google.cloud.tools.jib.frontend.JavaLayerConfigurations; | ||
| import com.google.cloud.tools.jib.image.InvalidImageReferenceException; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.mockito.Mock; | ||
| import org.mockito.Mockito; | ||
| import org.mockito.junit.MockitoJUnitRunner; | ||
|
|
||
| /** Tests for {@link PluginConfigurationProcessor}. */ | ||
| @RunWith(MockitoJUnitRunner.class) | ||
| public class PluginConfigurationProcessorTest { | ||
|
|
||
| @Mock GradleJibLogger mockGradleJibLogger; | ||
| @Mock JibExtension mockJibExtension; | ||
| @Mock ImageParameters mockImageParameters; | ||
| @Mock ContainerParameters mockContainerParameters; | ||
| @Mock GradleProjectProperties mockProjectProperties; | ||
|
|
||
| @Before | ||
| public void setUp() throws Exception { | ||
| Mockito.doReturn("gcr.io/distroless/java").when(mockJibExtension).getBaseImage(); | ||
| Mockito.doReturn(mockImageParameters).when(mockJibExtension).getFrom(); | ||
| Mockito.doReturn(new AuthParameters("mock")).when(mockImageParameters).getAuth(); | ||
| Mockito.doReturn(mockContainerParameters).when(mockJibExtension).getContainer(); | ||
| Mockito.doReturn(Collections.emptyList()).when(mockContainerParameters).getEntrypoint(); | ||
|
|
||
| Mockito.doReturn(JavaLayerConfigurations.builder().build()) | ||
| .when(mockProjectProperties) | ||
| .getJavaLayerConfigurations(); | ||
| Mockito.doReturn("java.lang.Object").when(mockProjectProperties).getMainClass(mockJibExtension); | ||
| } | ||
|
|
||
| /** Test with our default mocks, which try to mimic the bare Gradle configuration. */ | ||
| @Test | ||
| public void testPluginConfigurationProcessor_defaults() throws InvalidImageReferenceException { | ||
| PluginConfigurationProcessor processor = | ||
| PluginConfigurationProcessor.processCommonConfiguration( | ||
| mockGradleJibLogger, mockJibExtension, mockProjectProperties); | ||
| ContainerConfiguration configuration = processor.getContainerConfigurationBuilder().build(); | ||
| Assert.assertEquals( | ||
| Arrays.asList( | ||
| "java", "-cp", "/app/resources/:/app/classes/:/app/libs/*", "java.lang.Object"), | ||
| configuration.getEntrypoint()); | ||
| Mockito.verifyZeroInteractions(mockGradleJibLogger); | ||
| } | ||
|
|
||
| @Test | ||
| public void testEntrypoint() throws InvalidImageReferenceException { | ||
| Mockito.doReturn(Arrays.asList("custom", "entrypoint")) | ||
| .when(mockContainerParameters) | ||
| .getEntrypoint(); | ||
|
|
||
| PluginConfigurationProcessor processor = | ||
| PluginConfigurationProcessor.processCommonConfiguration( | ||
| mockGradleJibLogger, mockJibExtension, mockProjectProperties); | ||
| ContainerConfiguration configuration = processor.getContainerConfigurationBuilder().build(); | ||
|
|
||
| Assert.assertEquals(Arrays.asList("custom", "entrypoint"), configuration.getEntrypoint()); | ||
| Mockito.verifyZeroInteractions(mockGradleJibLogger); | ||
| } | ||
|
|
||
| @Test | ||
| public void testEntrypoint_warningOnJvmFlags() throws InvalidImageReferenceException { | ||
| Mockito.doReturn(Arrays.asList("custom", "entrypoint")) | ||
| .when(mockContainerParameters) | ||
| .getEntrypoint(); | ||
| Mockito.doReturn(Arrays.asList("jvmFlag")).when(mockJibExtension).getJvmFlags(); | ||
|
|
||
| PluginConfigurationProcessor processor = | ||
| PluginConfigurationProcessor.processCommonConfiguration( | ||
| mockGradleJibLogger, mockJibExtension, mockProjectProperties); | ||
| ContainerConfiguration configuration = processor.getContainerConfigurationBuilder().build(); | ||
|
|
||
| Assert.assertEquals(Arrays.asList("custom", "entrypoint"), configuration.getEntrypoint()); | ||
| Mockito.verify(mockGradleJibLogger) | ||
| .warn("mainClass and jvmFlags are ignored when entrypoint is specified"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testEntrypoint_warningOnMainclass() throws InvalidImageReferenceException { | ||
| Mockito.doReturn(Arrays.asList("custom", "entrypoint")) | ||
| .when(mockContainerParameters) | ||
| .getEntrypoint(); | ||
| Mockito.doReturn("java.util.Object").when(mockJibExtension).getMainClass(); | ||
|
|
||
| PluginConfigurationProcessor processor = | ||
| PluginConfigurationProcessor.processCommonConfiguration( | ||
| mockGradleJibLogger, mockJibExtension, mockProjectProperties); | ||
| ContainerConfiguration configuration = processor.getContainerConfigurationBuilder().build(); | ||
|
|
||
| Assert.assertEquals(Arrays.asList("custom", "entrypoint"), configuration.getEntrypoint()); | ||
| Mockito.verify(mockGradleJibLogger) | ||
| .warn("mainClass and jvmFlags are ignored when entrypoint is specified"); | ||
| } | ||
|
|
||
| // TODO should test other behaviours | ||
| } |
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
Oops, something went wrong.