Merge remote-tracking branch 'origin/main' into cx-hide-dev-dep-AST-105457

Author: cx-anand-nandeshwar

.github/workflows/release.yml

@@ -51,6 +51,29 @@ jobs:
           chmod +x ./.github/scripts/update_cli.sh
           ./.github/scripts/update_cli.sh ${{ inputs.cliTag }}
 
+      - name: Extract CLI version
+        id: extract_cli_version
+        run: |
+          CLI_VERSION=$(./src/main/resources/cx-linux version | grep -Eo '^[0-9]+\.[0-9]+\.[0-9]+')
+          echo "CLI version being packed is $CLI_VERSION"
+          echo "CLI_VERSION=$CLI_VERSION" >> $GITHUB_ENV
+          echo "::set-output name=CLI_VERSION::$CLI_VERSION"
+
+      - name: Check if CLI version is latest
+        if: ${{ github.event.inputs.dev == 'false' && !github.event.inputs.cliTag && github.ref == 'refs/heads/main' }}
+        id: check_latest_cli_version
+        run: |
+          LATEST_CLI_VERSION=$(curl -s https://api.github.com/repos/Checkmarx/ast-cli/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
+          echo "CLI_VERSION=[$CLI_VERSION]"
+          echo "LATEST_CLI_VERSION=[$LATEST_CLI_VERSION]"
+          echo "Latest CLI version from GitHub: $LATEST_CLI_VERSION"
+          if [ "$CLI_VERSION" = "$LATEST_CLI_VERSION" ]; then
+            echo "CLI_VERSION ($CLI_VERSION) matches the latest released version ($LATEST_CLI_VERSION). Proceeding."
+          else
+            echo "CLI_VERSION ($CLI_VERSION) does not match the latest released version ($LATEST_CLI_VERSION). Failing workflow."
+            exit 1
+          fi    
+
       - name: Tag
         id: set_tag_name
         run: |
@@ -94,14 +117,6 @@ jobs:
           fi
           echo "AID_PROP=${prop}" >> $GITHUB_ENV
 
-      - name: Extract CLI version
-        id: extract_cli_version
-        run: |
-          CLI_VERSION=$(./src/main/resources/cx-linux version | grep -Eo '^[0-9]+\.[0-9]+\.[0-9]+')
-          echo "CLI version being packed is $CLI_VERSION"
-          echo "CLI_VERSION=$CLI_VERSION" >> $GITHUB_ENV
-          echo "::set-output name=CLI_VERSION::$CLI_VERSION"
-
       - name: Publish package
         run: mvn --batch-mode deploy -DskipTests ${{ env.AID_PROP }}
         env:

pom.xml

@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.18.0</version>
+            <version>3.14.0</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.12.0</version>
+            <version>2.10.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

src/main/java/com/checkmarx/ast/wrapper/CxConfig.java

@@ -5,6 +5,7 @@
 import lombok.Data;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -33,7 +34,15 @@ public void setAdditionalParameters(String additionalParameters) {
     List<String> toArguments() {
         List<String> commands = new ArrayList<>();
 
-        if (StringUtils.isNotBlank(getApiKey())) {
+        if (StringUtils.isNotBlank(getClientId()) && StringUtils.isNotBlank(getApiKey())) {
+            /*
+             * Added dynamic client-id support for refresh_token grant flow
+             */
+            commands.add(CxConstants.CLIENT_ID);
+            commands.add(getClientId());
+            commands.add(CxConstants.API_KEY);
+            commands.add(getApiKey());
+        } else if (StringUtils.isNotBlank(getApiKey())) {
             commands.add(CxConstants.API_KEY);
             commands.add(getApiKey());
         } else if (StringUtils.isNotBlank(getClientId()) && StringUtils.isNotBlank(getClientSecret())) {