From 699d980ec456def409cf27e99fb5cad147c27c79 Mon Sep 17 00:00:00 2001
From: Shawn Hurley <shawn@hurley.page>
Date: Mon, 25 Mar 2024 12:29:49 -0400
Subject: [PATCH] Fixing location of provided programs in the base image

Signed-off-by: Shawn Hurley <shawn@hurley.page>
---
 .github/workflows/demo-testing.yml | 14 ++++++++++++--
 Dockerfile                         | 12 ++++++------
 provider_container_settings.json   | 12 ++++++------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/demo-testing.yml b/.github/workflows/demo-testing.yml
index 89e43ddd..1d4b95bc 100644
--- a/.github/workflows/demo-testing.yml
+++ b/.github/workflows/demo-testing.yml
@@ -6,6 +6,16 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
+      - name: Extract pull request number from inputs or PR description
+        run: |
+          echo "${{ github.event.pull_request.body }}"
+          PULL_REQUEST_NUMBER=$(echo "${{ github.event.pull_request.body }}" | grep -oP 'Addon PR: \K\d+' || true)
+          if [ -z "$PULL_REQUEST_NUMBER" ]; then
+            echo "ADDON_REF=main" >>$GITHUB_ENV
+          else
+            echo "ADDON_REF=refs/pull/$PULL_REQUEST_NUMBER/merge" >>$GITHUB_ENV
+          fi
+
       - uses: actions/checkout@v3
 
       - name: build image
@@ -19,7 +29,7 @@ jobs:
 
       - name: run demo image and ensure violations output unchanged
         run: |
-          podman run --entrypoint /usr/bin/konveyor-analyzer -v $(pwd)/demo-dep-output.yaml:/analyzer-lsp/demo-dep-output.yaml:Z -v $(pwd)/demo-output.yaml:/analyzer-lsp/output.yaml:Z localhost/testing:latest --dep-output-file=demo-dep-output.yaml
+          podman run --entrypoint /usr/local/bin/konveyor-analyzer -v $(pwd)/demo-dep-output.yaml:/analyzer-lsp/demo-dep-output.yaml:Z -v $(pwd)/demo-output.yaml:/analyzer-lsp/output.yaml:Z localhost/testing:latest --dep-output-file=demo-dep-output.yaml
           diff \
             <(yq -P 'sort_keys(..)' -o=props <(git show HEAD:demo-output.yaml)) \
             <(yq -P 'sort_keys(..)' -o=props <(cat demo-output.yaml))
@@ -38,7 +48,7 @@ jobs:
         with:
           fetch-depth: 0
           repository: konveyor/tackle2-addon-analyzer
-          ref: main
+          ref: "${{ env.ADDON_REF}}"
           path: tackle2-addon-analyzer
 
       - name: Build addon and save image
diff --git a/Dockerfile b/Dockerfile
index 5c9ac914..b4d1fef9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,12 +41,12 @@ RUN microdnf install nodejs -y
 RUN npm install -g typescript-language-server typescript
 
 COPY --from=jaeger-builder /go/bin/all-in-one-linux /usr/local/bin/all-in-one-linux
-COPY --from=yq-builder /usr/bin/yq /usr/bin/yq
-COPY --from=builder /analyzer-lsp/konveyor-analyzer /usr/bin/konveyor-analyzer
-COPY --from=builder /analyzer-lsp/konveyor-analyzer-dep /usr/bin/konveyor-analyzer-dep
-COPY --from=builder /analyzer-lsp/external-providers/generic-external-provider/generic-external-provider /usr/bin/generic-external-provider
-COPY --from=builder /analyzer-lsp/external-providers/yq-external-provider/yq-external-provider /usr/bin/yq-external-provider
-COPY --from=builder /analyzer-lsp/external-providers/golang-dependency-provider/golang-dependency-provider /usr/bin/golang-dependency-provider
+COPY --from=yq-builder /usr/bin/yq /usr/local/bin/yq
+COPY --from=builder /analyzer-lsp/konveyor-analyzer /usr/local/bin/konveyor-analyzer
+COPY --from=builder /analyzer-lsp/konveyor-analyzer-dep /usr/local/bin/konveyor-analyzer-dep
+COPY --from=builder /analyzer-lsp/external-providers/generic-external-provider/generic-external-provider /usr/local/bin/generic-external-provider
+COPY --from=builder /analyzer-lsp/external-providers/yq-external-provider/yq-external-provider /usr/local/bin/yq-external-provider
+COPY --from=builder /analyzer-lsp/external-providers/golang-dependency-provider/golang-dependency-provider /usr/local/bin/golang-dependency-provider
 
 COPY provider_container_settings.json /analyzer-lsp/provider_settings.json
 
diff --git a/provider_container_settings.json b/provider_container_settings.json
index b1da5bd4..220d4a8d 100644
--- a/provider_container_settings.json
+++ b/provider_container_settings.json
@@ -1,7 +1,7 @@
 [
     {
         "name": "go",
-        "binaryPath": "/usr/bin/generic-external-provider",
+        "binaryPath": "/usr/local/bin/generic-external-provider",
         "initConfig": [{
             "analysisMode": "full",
             "providerSpecificConfig": {
@@ -13,25 +13,25 @@
                 "workspaceFolders": ["file:///analyzer-lsp/examples/golang"],
                 "dependencyFolders": [],
 
-                "dependencyProviderPath": "/usr/bin/golang-dependency-provider"
+                "dependencyProviderPath": "/usr/local/bin/golang-dependency-provider"
             }
         }]
     },
     {
         "name": "yaml",
-        "binaryPath": "/usr/bin/yq-external-provider",
+        "binaryPath": "/usr/local/bin/yq-external-provider",
         "initConfig": [{
             "location": "examples/yaml",
             "analysisMode": "full",
             "providerSpecificConfig": {
                 "name": "yq",
-                "lspServerPath": "/usr/bin/yq"
+                "lspServerPath": "/usr/local/bin/yq"
             }
         }]
     },
     {
         "name": "python",
-        "binaryPath": "/usr/bin/generic-external-provider",
+        "binaryPath": "/usr/local/bin/generic-external-provider",
         "initConfig": [{
             "analysisMode": "full",
             "providerSpecificConfig": {
@@ -49,7 +49,7 @@
     },
     {
         "name": "nodejs",
-        "binaryPath": "/usr/bin/generic-external-provider",
+        "binaryPath": "/usr/local/bin/generic-external-provider",
         "initConfig": [{
             "analysisMode": "full",
             "providerSpecificConfig": {