Use JavaContainerBuilder in plugins #1572

TadCordle · 2019-03-21T16:50:27Z

Fixes #1373.

Notable changes:

Replaced all uses of JavaLayerConfigurations in plugins with JavaContainerBuilder (aside from a couple global constants; should these be moved?)
Added ProjectProperties.getClassFiles(); since project properties no longer hold layer configurations, we need another way to pass a list of class files to MainClassResolver
GradleLayerConfigurations and MavenLayerConfigurations were consolidated enough that I decided to just move their logic straight into GradleProjectProperties/MavenProjectProperties
As such, GradleLayerConfigurationsTest and MavenLayerConfigurationsTest were moved into their respective ProjectProperties tests
The extra files layer is added in PluginConfigurationProcessor instead of the ProjectProperties, to avoid passing around too many parameters/share code between the plugins
Some redundant info-level log messages were removed; they showed which files were added to the container, but most of the same information is logged on containerize()

…com:GoogleContainerTools/jib into i1373-javacontainerbuilder-plugins

…73-javacontainerbuilder-plugins

jib-core/src/main/java/com/google/cloud/tools/jib/frontend/JavaLayerConfigurations.java

jib-core/src/main/java/com/google/cloud/tools/jib/api/JibContainerBuilder.java

...mmon/src/main/java/com/google/cloud/tools/jib/plugins/common/JavaContainerBuilderHelper.java

chanseokoh

Another early set of comments. (Sorry, there may be another set later, due to the magnitude of the API/structural changes.)

jib-core/src/main/java/com/google/cloud/tools/jib/api/JavaContainerBuilder.java

jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/GradleProjectProperties.java

jib-core/src/main/java/com/google/cloud/tools/jib/api/JavaContainerBuilder.java

jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/GradleProjectProperties.java

jib-core/src/main/java/com/google/cloud/tools/jib/api/JavaContainerBuilder.java

chanseokoh

Moving the extra layer code out of ProjectProperties looks nice. I'll go over the PR once more. Sorry for the delay.

...on/src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java

jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/GradleProjectProperties.java

jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/MavenProjectProperties.java

jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/GradleProjectProperties.java

briandealwis

Here are some comments. I need to make another pass through this; so many helpers.

jib-core/src/main/java/com/google/cloud/tools/jib/api/JavaContainerBuilder.java

...mmon/src/main/java/com/google/cloud/tools/jib/plugins/common/JavaContainerBuilderHelper.java

jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/GradleProjectProperties.java

.../src/test/java/com/google/cloud/tools/jib/plugins/common/JavaContainerBuilderHelperTest.java

jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/MavenProjectProperties.java

jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/GradleProjectProperties.java

...mmon/src/main/java/com/google/cloud/tools/jib/plugins/common/JavaContainerBuilderHelper.java

chanseokoh · 2019-03-25T22:40:03Z

LGTM for what I can check. I'll leave @briandealwis to approve this.

briandealwis

Could we have a better name than getContainerBuilderWithLayers? It's really starting the containerization process. The {Gradle,Maven}ProjectProperties doesn't seem like the right place for this, or maybe they just need to be renamed. That can be done later.

briandealwis · 2019-03-26T18:53:44Z

jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/MavenProjectProperties.java

+  public JibContainerBuilder getContainerBuilderWithLayers(RegistryImage baseImage)
+      throws IOException {
+    try {
+      if (isWarProject()) {


Ditto my comment in GradleProjectProperties: it feels like we should have MavenWarProjectProperties and MavenJarProjectProperties.

Yeah, I'll file an issue for this.

briandealwis · 2019-03-26T18:53:59Z

jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/GradleProjectProperties.java

+  public JibContainerBuilder getContainerBuilderWithLayers(RegistryImage baseImage) {
+    try {
+      if (isWarProject()) {
+        logger.info("WAR project identified, creating WAR image: " + project.getDisplayName());


So this seems… out of place. It feels like we should have subclasses a GradleWarProjectProperties and GradleJarProjectProperties.

TadCordle added 12 commits March 19, 2019 17:33

Progress

ba8c652

Progress

54aee3d

Don't add empty layers in JavaLayerConfigurations

8fef152

Remove newline

dcf7319

Merge branch 'ignore-empty-javalayerconfigurations-layers' of github.…

f5433f2

…com:GoogleContainerTools/jib into i1373-javacontainerbuilder-plugins

Move tests around

ae1320d

Merge branch 'master' of github.com:GoogleContainerTools/jib into i13…

70fd0a9

…73-javacontainerbuilder-plugins

Progress

a3c62a0

Gradle tests pass

6acf1cf

Tests pass

8cb7202

Test cleanup

30fec16

Cleanup

5c0b824

googlebot added the cla: yes label Mar 21, 2019

chanseokoh reviewed Mar 21, 2019

View reviewed changes

TadCordle added 2 commits March 21, 2019 15:09

More cleanup

95eee03

Add new method

077470b

chanseokoh reviewed Mar 21, 2019

View reviewed changes

Some feedback

4b5a19d

briandealwis reviewed Mar 21, 2019

View reviewed changes

jib-core/src/main/java/com/google/cloud/tools/jib/api/JavaContainerBuilder.java Outdated Show resolved Hide resolved

TadCordle added 3 commits March 22, 2019 13:50

Move adding extra directory layer to plugins-common

5332dd9

Re-add extra directory layer test

29d62e0

Reduce unnecessary changes

de8bc49

TadCordle marked this pull request as ready for review March 22, 2019 19:03

TadCordle requested a review from a team March 25, 2019 15:31

chanseokoh reviewed Mar 25, 2019

View reviewed changes

...on/src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java Show resolved Hide resolved

chanseokoh reviewed Mar 25, 2019

View reviewed changes

Feedback

c59611b

briandealwis reviewed Mar 25, 2019

View reviewed changes

chanseokoh reviewed Mar 25, 2019

View reviewed changes

TadCordle added 2 commits March 25, 2019 17:20

Feedback

1075351

Fix

1d007f7

briandealwis approved these changes Mar 26, 2019

View reviewed changes

Naming

0847516

TadCordle merged commit d69aec5 into master Mar 27, 2019

TadCordle deleted the i1373-javacontainerbuilder-plugins branch March 27, 2019 14:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use JavaContainerBuilder in plugins #1572

Use JavaContainerBuilder in plugins #1572

TadCordle commented Mar 21, 2019 •

edited

Loading

chanseokoh left a comment

chanseokoh left a comment

briandealwis left a comment

chanseokoh commented Mar 25, 2019

briandealwis left a comment

briandealwis Mar 26, 2019

TadCordle Mar 27, 2019

briandealwis Mar 26, 2019

Use JavaContainerBuilder in plugins #1572

Use JavaContainerBuilder in plugins #1572

Conversation

TadCordle commented Mar 21, 2019 • edited Loading

chanseokoh left a comment

Choose a reason for hiding this comment

chanseokoh left a comment

Choose a reason for hiding this comment

briandealwis left a comment

Choose a reason for hiding this comment

chanseokoh commented Mar 25, 2019

briandealwis left a comment

Choose a reason for hiding this comment

briandealwis Mar 26, 2019

Choose a reason for hiding this comment

TadCordle Mar 27, 2019

Choose a reason for hiding this comment

briandealwis Mar 26, 2019

Choose a reason for hiding this comment

TadCordle commented Mar 21, 2019 •

edited

Loading