Merge pull request #89 from PublicisSapient/hotfix/13.3.2-fixes

Hotfix/13.3.2 fixes

Author: renukaprasaddk21

.github/workflows/Processors_CI_CD_Workflow.yaml

@@ -28,7 +28,7 @@ on:
           - dev1
           - qa
           - stage
-      
+
       processor:
         description: 'Processor to build and deploy'
         required: true
@@ -58,7 +58,7 @@ env:
   sonarurl: ${{ secrets.SONARURL }}  # SonarQube URL stored in secrets
 
 jobs:
- 
+
   # ✅ Building & Testing Processors
   build:
     runs-on: ubuntu-latest
@@ -71,23 +71,15 @@ jobs:
           if [[ "$ENV" == "qa" ]]; then
             echo "IMAGE_TAG=qa-${GITHUB_SHA::8}" >> $GITHUB_ENV
             echo "VALUES_FILE=values-qa.yaml" >> $GITHUB_ENV
-            echo "ARGOCD_APP_NAME=knh-api-qa" >> $GITHUB_ENV
-            echo "argocd_app_name=knh-api-qa" >> $GITHUB_OUTPUT
           elif [[ "$ENV" == "stage" ]]; then
             echo "IMAGE_TAG=master-${GITHUB_SHA::8}" >> $GITHUB_ENV
             echo "VALUES_FILE=values-stage.yaml" >> $GITHUB_ENV
-            echo "ARGOCD_APP_NAME=knh-api-stage" >> $GITHUB_ENV
-            echo "argocd_app_name=knh-api-stage" >> $GITHUB_OUTPUT
           elif [[ "$ENV" == "dev1" ]]; then
             echo "IMAGE_TAG=dev1-${GITHUB_SHA::8}" >> $GITHUB_ENV
             echo "VALUES_FILE=values-dev1.yaml" >> $GITHUB_ENV
-            echo "ARGOCD_APP_NAME=knh-api-dev1" >> $GITHUB_ENV
-            echo "argocd_app_name=knh-api-dev1" >> $GITHUB_OUTPUT
           else
             echo "IMAGE_TAG=dev-${GITHUB_SHA::8}" >> $GITHUB_ENV
             echo "VALUES_FILE=values-dev.yaml" >> $GITHUB_ENV
-            echo "ARGOCD_APP_NAME=knh-api-dev" >> $GITHUB_ENV
-            echo "argocd_app_name=knh-api-dev" >> $GITHUB_OUTPUT
           fi
       - name: Checkout Repository
         uses: actions/checkout@v2
@@ -134,21 +126,21 @@ jobs:
             </activeProfiles>
           </settings>
           EOF
-      
+
       - name: Clone & Build knowhow-common dependency
         run: |
           BRANCH_TO_CLONE="${{ github.event.inputs.knowhow_common_branch }}"
           git clone --branch $BRANCH_TO_CLONE https://github.com/PublicisSapient/knowhow-common.git
           cd knowhow-common
           mvn clean install -Ddockerfile.skip=true
-      
+
       - name: Get common version using Maven Help Plugin
         run: |
           cd knowhow-common
           COMMON_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
           echo "COMMON_VERSION=$COMMON_VERSION"
           echo "COMMON_VERSION=$COMMON_VERSION" >> $GITHUB_ENV
-      
+
       - name: Updating the common version in processor project
         run: |
           mvn versions:use-dep-version \
@@ -180,39 +172,39 @@ jobs:
         run: |
           chmod +x SonarQG.sh
           ./SonarQG.sh ./target/sonar/report-task.txt
-      
+
       - name: Build & Push Jira Docker Image
         if: ${{ github.event.inputs.processor == 'all' || github.event.inputs.processor == 'jira' }}
         run: |
           docker login $ACR_LOGIN_SERVER --username ${{ secrets.SPEEDTOOLS_ACR_USERNAME }} --password ${{ secrets.SPEEDTOOLS_ACR_PASSWORD }}
-          docker build -t $ACR_LOGIN_SERVER/$JIRA_IMAGE_NAME:$IMAGE_TAG .
+          docker build -t $ACR_LOGIN_SERVER/$JIRA_IMAGE_NAME:$IMAGE_TAG jira/.
           docker push $ACR_LOGIN_SERVER/$JIRA_IMAGE_NAME:$IMAGE_TAG
           echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
-      
+
       - name: Build & Push DevOps Docker Image
         if: ${{ github.event.inputs.processor == 'all' || github.event.inputs.processor == 'devops' }}
         run: |
           docker login $ACR_LOGIN_SERVER --username ${{ secrets.SPEEDTOOLS_ACR_USERNAME }} --password ${{ secrets.SPEEDTOOLS_ACR_PASSWORD }}
-          docker build -t $ACR_LOGIN_SERVER/$DEVOPS_IMAGE_NAME:$IMAGE_TAG .
+          docker build -t $ACR_LOGIN_SERVER/$DEVOPS_IMAGE_NAME:$IMAGE_TAG -f devops-processor-startup/Dockerfile .
           docker push $ACR_LOGIN_SERVER/$DEVOPS_IMAGE_NAME:$IMAGE_TAG
           echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
-      
+
       - name: Build & Push AzureBoard Docker Image
         if: ${{ github.event.inputs.processor == 'all' || github.event.inputs.processor == 'azureboard' }}
         run: |
           docker login $ACR_LOGIN_SERVER --username ${{ secrets.SPEEDTOOLS_ACR_USERNAME }} --password ${{ secrets.SPEEDTOOLS_ACR_PASSWORD }}
-          docker build -t $ACR_LOGIN_SERVER/$AZUREBOARD_IMAGE_NAME:$IMAGE_TAG .
+          docker build -t $ACR_LOGIN_SERVER/$AZUREBOARD_IMAGE_NAME:$IMAGE_TAG azure-boards/.
           docker push $ACR_LOGIN_SERVER/$AZUREBOARD_IMAGE_NAME:$IMAGE_TAG
           echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
-      
+
       - name: Build & Push Azure Pipeline repo Docker Image
         if: ${{ github.event.inputs.processor == 'all' || github.event.inputs.processor == 'azurepipelines' }}
         run: |
           docker login $ACR_LOGIN_SERVER --username ${{ secrets.SPEEDTOOLS_ACR_USERNAME }} --password ${{ secrets.SPEEDTOOLS_ACR_PASSWORD }}
-          docker build -t $ACR_LOGIN_SERVER/$AZUREPIPELINE_IMAGE_NAME:$IMAGE_TAG .
+          docker build -t $ACR_LOGIN_SERVER/$AZUREPIPELINE_IMAGE_NAME:$IMAGE_TAG -f azure-pipeline-repo-processor-startup/Dockerfile .
           docker push $ACR_LOGIN_SERVER/$AZUREPIPELINE_IMAGE_NAME:$IMAGE_TAG
           echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
-      
+
       - name: Build & Push SCM Processor Docker Image
         if: ${{ github.event.inputs.processor == 'all' || github.event.inputs.processor == 'scm-processor' }}
         run: |
@@ -233,7 +225,7 @@ jobs:
           git add $VALUES_FILE
           git diff --cached --quiet || git commit -m "Update image tag values to ${IMAGE_TAG}"
           git push origin HEAD
-      
+
       - name: Checkout devops Helm charts from Bitbucket
         if: ${{ github.event.inputs.processor == 'all' || github.event.inputs.processor == 'devops' }}
         run: |
@@ -272,7 +264,7 @@ jobs:
           git add $VALUES_FILE
           git diff --cached --quiet || git commit -m "Update image tag values to ${IMAGE_TAG}"
           git push origin HEAD
-      
+
       - name: Checkout scm Helm charts from Bitbucket
         if: ${{ github.event.inputs.processor == 'all' || github.event.inputs.processor == 'scm-processor' }}
         run: |
@@ -326,7 +318,7 @@ jobs:
         run: |
           argocd app sync knh-azure-board-${{ github.event.inputs.env }}
           argocd app wait knh-azure-board-${{ github.event.inputs.env }} --health --timeout 300
-  
+
   deploy-az-pipeline:
     runs-on: github-actions-self-hosted-runner
     timeout-minutes: 30
@@ -353,9 +345,9 @@ jobs:
     runs-on: github-actions-self-hosted-runner
     timeout-minutes: 30
     needs: [build, argocd-setup]
-    steps:    
+    steps:
       - name: Deploy DevOps Processor
         if: ${{ github.event.inputs.processor == 'all' || github.event.inputs.processor == 'devops' }}
         run: |
           argocd app sync knh-devops-processor-${{ github.event.inputs.env }}
-          argocd app wait knh-devops-processor-${{ github.event.inputs.env }} --health --timeout 600
+          argocd app wait knh-devops-processor-${{ github.event.inputs.env }} --health --timeout 900

jira/pom.xml

@@ -270,6 +270,11 @@
       <artifactId>htmlunit</artifactId>
       <version>3.9.0</version>
     </dependency>
+    <dependency>
+      <groupId>com.konghq</groupId>
+      <artifactId>unirest-java</artifactId>
+      <version>3.14.5</version>
+    </dependency>
     <!-- https://mvnrepository.com/artifact/com.atlassian.sal/sal-api -->
     <dependency>
       <groupId>com.atlassian.sal</groupId>
@@ -442,6 +447,10 @@
         </exclusion>
       </exclusions>
     </dependency>
+      <dependency>
+          <groupId>org.springframework.batch</groupId>
+          <artifactId>spring-batch-core</artifactId>
+      </dependency>
   </dependencies>
   <repositories>
     <repository>

jira/src/main/java/com/publicissapient/kpidashboard/jira/constant/JiraConstants.java

@@ -50,13 +50,15 @@ public final class JiraConstants {
 	public static final String FALSE = "False";
 	public static final String START_AT_ATTRIBUTE = "startAt";
 	public static final String MAX_RESULTS_ATTRIBUTE = "maxResults";
+	public static final String FIELDS_BY_KEYS_ATTRIBUTE = "fieldsByKeys";
 	public static final int MAX_JQL_LENGTH_FOR_HTTP_GET = 3000;
 	public static final String JQL_ATTRIBUTE = "jql";
 	public static final String FILTER_FAVOURITE_PATH = "filter/favourite";
 	public static final String FILTER_PATH_FORMAT = "filter/%s";
 	public static final String SEARCH_URI_PREFIX = "search";
 	public static final String EXPAND_ATTRIBUTE = "expand";
 	public static final String FIELDS_ATTRIBUTE = "fields";
+	public static final String NEXT_PAGE_TOKEN_ATTRIBUTE = "nextPageToken";
 	public static final String DATE_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
 	public static final String AGGREGATED_TIME_SPENT = "aggregatetimespent";
 	public static final String AGGREGATED_TIME_ORIGINAL = "aggregatetimeoriginalestimate";

jira/src/main/java/com/publicissapient/kpidashboard/jira/exception/JiraApiException.java

@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright 2014 CapitalOne, LLC.
+ * Further development Copyright 2022 Sapient Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ******************************************************************************/
+
+package com.publicissapient.kpidashboard.jira.exception;
+
+public class JiraApiException extends Exception {
+    public JiraApiException(String message) {
+        super(message);
+    }
+}
+

jira/src/main/java/com/publicissapient/kpidashboard/jira/model/JiraSearchResponse.java

@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright 2014 CapitalOne, LLC.
+ * Further development Copyright 2022 Sapient Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ******************************************************************************/
+
+package com.publicissapient.kpidashboard.jira.model;
+
+import com.atlassian.jira.rest.client.api.domain.Issue;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class JiraSearchResponse {
+    private final Iterable<Issue> issues;
+    private boolean isLast;
+    private String nextPageToken;
+}
+

jira/src/main/java/com/publicissapient/kpidashboard/jira/parser/JiraSearchResponseParser.java

@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright 2014 CapitalOne, LLC.
+ * Further development Copyright 2022 Sapient Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ******************************************************************************/
+
+package com.publicissapient.kpidashboard.jira.parser;
+
+import com.atlassian.jira.rest.client.api.domain.Issue;
+import com.publicissapient.kpidashboard.jira.model.JiraSearchResponse;
+import com.atlassian.jira.rest.client.internal.json.GenericJsonArrayParser;
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+
+import java.util.Collections;
+
+public class JiraSearchResponseParser {
+
+    public JiraSearchResponse parse(JSONObject json) throws JSONException {
+        JSONArray issuesJsonArray = json.getJSONArray("issues");
+
+        Iterable<Issue> issues;
+        if (issuesJsonArray.length() > 0) {
+            CustomIssueJsonParser issueParser = new CustomIssueJsonParser(
+                    json.optJSONObject("names"), json.optJSONObject("schema"));
+            GenericJsonArrayParser<Issue> issuesParser = GenericJsonArrayParser.create(issueParser);
+            issues = issuesParser.parse(issuesJsonArray);
+        } else {
+            issues = Collections.emptyList();
+        }
+
+        boolean isLast = json.optBoolean("isLast", true);
+        String nextPageToken = json.optString("nextPageToken", null);
+
+        return new JiraSearchResponse(issues, isLast, nextPageToken);
+    }
+}