fix: Fixed CodeQL alert 57

zscaler · Jun 21, 2024 · 1b99653 · 1b99653
1 parent 331c0d3
commit 1b99653
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 58 deletions.
diff --git a/.github/workflows/zpa-test.yml b/.github/workflows/zpa-test.yml
@@ -74,68 +74,68 @@ jobs:
           OKTA_CLIENT_ORGURL: ${{ secrets.OKTA_CLIENT_ORGURL }}
           OKTA_CLIENT_TOKEN: ${{ secrets.OKTA_CLIENT_TOKEN }}
 
-  zpa-qa2-tenants:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        goVersion: ["1.21"]
-        environment:
-          - ZPA_QA2_TENANT01
-          # - ZPA_QA2_TENANT02
-    environment: ${{ matrix.environment }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-              token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Clean existing Go modules
-        run: go clean -modcache
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ matrix.goVersion }}
+  # zpa-qa2-tenants:
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       goVersion: ["1.21"]
+  #       environment:
+  #         - ZPA_QA2_TENANT01
+  #         # - ZPA_QA2_TENANT02
+  #   environment: ${{ matrix.environment }}
+  #   steps:
+  #     - name: Checkout code
+  #       uses: actions/checkout@v4
+  #       with:
+  #             token: ${{ secrets.GITHUB_TOKEN }}
+  #     - name: Clean existing Go modules
+  #       run: go clean -modcache
+  #     - name: Setup Go
+  #       uses: actions/setup-go@v5
+  #       with:
+  #         go-version: ${{ matrix.goVersion }}
 
-      - name: Cache Go modules
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/go/pkg/mod
-            ~/.cache/go-build
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+  #     - name: Cache Go modules
+  #       uses: actions/cache@v4
+  #       with:
+  #         path: |
+  #           ~/go/pkg/mod
+  #           ~/.cache/go-build
+  #         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+  #         restore-keys: |
+  #           ${{ runner.os }}-go-
 
-      - name: Set Go env
-        run: |
-          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
-          echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
+  #     - name: Set Go env
+  #       run: |
+  #         echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
+  #         echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
 
-      - name: Install dependencies
-        run: go mod download
+  #     - name: Install dependencies
+  #       run: go mod download
 
-      - name: Run tests with retry
-        uses: nick-fields/retry@v2
-        with:
-          max_attempts: 3
-          timeout_minutes: 20
-          command: |
-            make test:unit:zpa
-            make sweep:zpa
-            make test:integration:zpa
-            make sweep:zpa
-        env:
-          ZPA_CLIENT_ID: ${{ secrets.ZPA_CLIENT_ID }}
-          ZPA_CLIENT_SECRET: ${{ secrets.ZPA_CLIENT_SECRET }}
-          ZPA_CUSTOMER_ID: ${{ secrets.ZPA_CUSTOMER_ID }}
-          ZPA_CLOUD: ${{ secrets.ZPA_CLOUD }}
-          ZPA_SDK_TEST_SWEEP: ${{ secrets.ZPA_SDK_TEST_SWEEP }}
-          ZSCALER_SDK_CACHE_DISABLED: ${{ secrets.ZSCALER_SDK_CACHE_DISABLED }}
-          OKTA_CLIENT_ORGURL: ${{ secrets.OKTA_CLIENT_ORGURL }}
-          OKTA_CLIENT_TOKEN: ${{ secrets.OKTA_CLIENT_TOKEN }}
+  #     - name: Run tests with retry
+  #       uses: nick-fields/retry@v2
+  #       with:
+  #         max_attempts: 3
+  #         timeout_minutes: 20
+  #         command: |
+  #           make test:unit:zpa
+  #           make sweep:zpa
+  #           make test:integration:zpa
+  #           make sweep:zpa
+  #       env:
+  #         ZPA_CLIENT_ID: ${{ secrets.ZPA_CLIENT_ID }}
+  #         ZPA_CLIENT_SECRET: ${{ secrets.ZPA_CLIENT_SECRET }}
+  #         ZPA_CUSTOMER_ID: ${{ secrets.ZPA_CUSTOMER_ID }}
+  #         ZPA_CLOUD: ${{ secrets.ZPA_CLOUD }}
+  #         ZPA_SDK_TEST_SWEEP: ${{ secrets.ZPA_SDK_TEST_SWEEP }}
+  #         ZSCALER_SDK_CACHE_DISABLED: ${{ secrets.ZSCALER_SDK_CACHE_DISABLED }}
+  #         OKTA_CLIENT_ORGURL: ${{ secrets.OKTA_CLIENT_ORGURL }}
+  #         OKTA_CLIENT_TOKEN: ${{ secrets.OKTA_CLIENT_TOKEN }}
 
   zpa-beta-tenants:
-    needs: [zpa-qa1-tenants, zpa-qa2-tenants]
+    needs: [zpa-qa1-tenants]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -197,7 +197,7 @@ jobs:
           OKTA_CLIENT_TOKEN: ${{ secrets.OKTA_CLIENT_TOKEN }}
 
   zpa-prod-tenants:
-    needs: [zpa-beta-tenants, zpa-qa1-tenants, zpa-qa2-tenants]
+    needs: [zpa-beta-tenants, zpa-qa1-tenants]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

diff --git a/zia/config.go b/zia/config.go
@@ -237,7 +237,7 @@ func (c *Client) refreshSession() error {
 		c.Logger.Printf("[INFO] PasswordExpiryTime is -1, setting sessionTimeout to 1 minute")
 		c.sessionTimeout = 30 * time.Minute
 	} else {
-		c.Logger.Printf("[INFO] Setting sessionTimeout to %v seconds based on PasswordExpiryTime", c.session.PasswordExpiryTime)
+		c.Logger.Printf("[INFO] Setting session timeout based on PasswordExpiryTime")
 		c.sessionTimeout = time.Duration(c.session.PasswordExpiryTime) * time.Second
 	}
 	return nil