Skaffold init support for polyglot-maven projects #4871
Conversation
MarlonGamez
requested review from
chanseokoh,
loosebazooka and
a team
as code owners
MarlonGamez
changed the title
Codecov Report
@@ Coverage Diff @@
## master #4871 +/- ##
==========================================
- Coverage 71.88% 71.84% -0.04%
==========================================
Files 356 356
Lines 12218 12233 +15
==========================================
+ Hits 8783 8789 +6
- Misses 2785 2792 +7
- Partials 650 652 +2
Continue to review full report at Codecov.
|
pkg/skaffold/build/jib/init.go
Outdated
| builderType = JibMaven | ||
| executable = "mvn" | ||
| wrapper = "mvnw" | ||
| searchString = "<artifactId>jib-maven-plugin</artifactId>" | ||
| taskName = "jib:_skaffold-init" | ||
| consoleFlag = "--batch-mode" | ||
|
|
||
| // Polyglot maven support: support pom files of different extension types |
There was a problem hiding this comment.
There's an easier and more robust way: polyglot maven requires a .mvn/extensions.xml file. Polyglot supports a bunch of other languages, including yaml 🙀
pkg/skaffold/build/jib/init.go
Outdated
| @@ -89,13 +89,30 @@ func validate(path string, enableGradleAnalysis bool) []ArtifactConfig { | |||
| var builderType PluginType | |||
| var executable, wrapper, taskName, searchString, consoleFlag string | |||
| switch { | |||
| case strings.HasSuffix(path, "pom.xml"): | |||
| case isPomFile(path): | |||
| builderType = JibMaven | |||
| executable = "mvn" | |||
| wrapper = "mvnw" | |||
| searchString = "<artifactId>jib-maven-plugin</artifactId>" | |||
There was a problem hiding this comment.
TBH I think just searching for jib-maven-plugin is enough. After all, this string would be fooled if someone had jib-maven-plugin as a <dependency>.
|
@briandealwis So do you think anything needs to be done beyond checking if something's a pom.* file and then searching for "jib-maven-plugin"? |
Fixes #4335
Adds support for
skaffold initto detect jib as a builder in different pom file extensions that are supported by https://github.com/takari/polyglot-maven.I've added tests for a couple of extensions, but wasn't sure if I should for each case because I didn't want to clutter the tests with what is essentially just testing string matching