From 566baf015dad5c8c7a792bb95b9c42059e5e016c Mon Sep 17 00:00:00 2001
From: Jonathan Christison <jochrist@redhat.com>
Date: Tue, 27 Jun 2023 15:50:30 +0100
Subject: [PATCH] Fix object reference comparison rather than comparison and
 change SA name to what we hava available in the container

---
 src/main/java/rest/CreateScanRequest.java | 12 ++++++------
 src/main/java/rest/TektonPipeline.java    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/rest/CreateScanRequest.java b/src/main/java/rest/CreateScanRequest.java
index 99dcb50..c147570 100644
--- a/src/main/java/rest/CreateScanRequest.java
+++ b/src/main/java/rest/CreateScanRequest.java
@@ -41,12 +41,12 @@ public class CreateScanRequest {
     // in theory should take List<String> to clean it up
     public void invokeScanAnalyze(@Valid String scanInvocation) throws JSONException {
         JSONObject jsonData = new JSONObject(scanInvocation);
-        if(jsonData.getString("buildSystemType")=="brew"){
-            invokeBrewScanAnalyze(scanInvocation);
-        } else if(jsonData.getString("buildSystemType")=="pnc"){
-            invokeGitScanAnalyze(scanInvocation);
-        } else if(jsonData.getString("buildSystemType")=="git"){
-            invokePncScanAnalyze(scanInvocation);
+        if(jsonData.getString("buildSystemType").equals("brew")){
+            this.invokeBrewScanAnalyze(scanInvocation);
+        } else if(jsonData.getString("buildSystemType").equals("pnc")){
+            this.invokeGitScanAnalyze(scanInvocation);
+        } else if(jsonData.getString("buildSystemType").equals("git")){
+            this.invokePncScanAnalyze(scanInvocation);
         }
     }
     
diff --git a/src/main/java/rest/TektonPipeline.java b/src/main/java/rest/TektonPipeline.java
index 72d379b..1013d5f 100644
--- a/src/main/java/rest/TektonPipeline.java
+++ b/src/main/java/rest/TektonPipeline.java
@@ -23,7 +23,7 @@ public class TektonPipeline {
     public static final String BUILD_ID = "buildId";
     public static final String SCAN_PROFILE = "scanProfile";
     public static final String TASK_REFERENCE = "osh-scan-task";
-    public static final String SERVICE_ACCOUNT = "osh-wrapper-client-sa";
+    public static final String SERVICE_ACCOUNT = "osh";
 
     @Inject
     TektonClient tektonClient;