👻 Make bundles location a config setting (konveyor#144)

Signed-off-by: Pranav Gaikwad <[email protected]>
pranavgaikwad · Jan 15, 2024 · b979a67 · b979a67
1 parent 6f6c45d
commit b979a67
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/cmd/analyze.go b/cmd/analyze.go
@@ -406,7 +406,7 @@ func (a *analyzeCommand) getConfigVolumes() (map[string]string, error) {
 				Location:     SourceMountPath,
 				AnalysisMode: provider.AnalysisMode(a.mode),
 				ProviderSpecificConfig: map[string]interface{}{
-					"bundles":                       "/jdtls/java-analyzer-bundle/java-analyzer-bundle.core/target/java-analyzer-bundle.core-1.0.0-SNAPSHOT.jar",
+					"bundles":                       JavaBundlesLocation,
 					"depOpenSourceLabelsFile":       "/usr/local/etc/maven.default.index",
 					provider.LspServerPathConfigKey: "/jdtls/bin/jdtls",
 				},

diff --git a/cmd/settings.go b/cmd/settings.go
@@ -17,6 +17,7 @@ const (
 	OutputPath             = "/opt/output"
 	XMLRulePath            = "/opt/xmlrules"
 	ShimOutputPath         = "/opt/shimoutput"
+	JavaBundlesLocation    = "/jdtls/java-analyzer-bundle/java-analyzer-bundle.core/target/java-analyzer-bundle.core-1.0.0-SNAPSHOT.jar"
 )
 
 type Config struct {

diff --git a/hack/update-settings.sh b/hack/update-settings.sh
@@ -5,8 +5,10 @@
 
 image="${IMAGE:-quay.io/konveyor/kantra}"
 name="${NAME:-kantra}"
+bundle="${BUNDLE:-/jdtls/java-analyzer-bundle/java-analyzer-bundle.core/target/java-analyzer-bundle.core-1.0.0-SNAPSHOT.jar}"
 
 sed -i \
     -e "s,\(RootCommandName *string.*default:\"\)[^\"]*\",\1$name\"," \
     -e "s,\(RunnerImage *string.*default:\"\)[^\"]*\",\1$image\"," \
+    -e "s,\(JavaBundlesLocation *= *\"\)[^\"]*\",\1$bundle\"," \
     ./cmd/settings.go