Shsengiv patch 1

.github/workflows/build-publish.yml

@@ -6,26 +6,28 @@ on:
 permissions:
   actions: read # for detecting the Github Actions environment.
   id-token: write # for creating OIDC tokens for signing.
-  packages: write # for uploading attestations.
+  packages: write
   contents: read
 jobs:
     build-publish-python:
         runs-on: ubuntu-latest              
         env:
           DOCKER_REPO: 'codeninjas-proj-docker-local'
           IMAGE_NAME: 'my-very-cool-image:${{ github.run_number }}'
-          JF_URL: https://${{ vars.JF_URL }}/
-          DOCKER_CLI_EXPERIMENTAL: enabled
         steps:
             # Use the specific setup-cli branch
             - name: Setup JFrog CLI
               uses: jfrog/setup-jfrog-cli@v4
               id: setup-cli
               env:
-                JF_URL: https://${{ vars.JF_URL }}/
+                JF_URL: https://hts2.jfrog.io
                 JF_PROJECT: ${{ vars.JF_PROJECT }}
               with:
-                  oidc-provider-name: jfrog-github-oidc
+                  oidc-provider-name: vigneshs-oidc
+            - name: Verify OIDC Outputs
+              run: |
+                echo "OIDC User: ${{ steps.setup-cli.outputs.oidc-user }}"
+                echo "OIDC Token available: ${{ steps.setup-cli.outputs.oidc-token != '' }}" 
 
             - name: Checkout the repository
               uses: actions/checkout@v4
@@ -61,7 +63,7 @@ jobs:
             - name: Authenticate Docker
               uses: docker/login-action@v3
               with:
-                registry: ${{ vars.JF_URL }}
+                registry: hts2-codeninjas-proj-docker-local.jfrog.io
                 username: ${{ steps.setup-cli.outputs.oidc-user }}
                 password: ${{ steps.setup-cli.outputs.oidc-token }}
 
@@ -76,12 +78,12 @@ jobs:
               run: |  
                 docker buildx ls
                 jf docker --version
-                jf docker build --tag ${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }} --platform linux/amd64,linux/arm64 --metadata-file  metadata.json --push .
+                jf docker build --tag hts2-codeninjas-proj-docker-local.jfrog.io/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }} --platform linux/amd64,linux/arm64 --metadata-file  metadata.json --push .
 
             - name: docker scan
               run: |  
-                 jf docker pull ${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}
-                 jf docker scan ${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}   
+                 jf docker pull hts2-codeninjas-proj-docker-local.jfrog.io/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}
+                 jf docker scan hts2-codeninjas-proj-docker-local.jfrog.io/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}   
             #- name: docker build
             #  run: |  
             #    jf docker build --tag ${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}-amd64 --platform  linux/amd64 --load .
@@ -109,7 +111,7 @@ jobs:
                  echo "----------------"
                  digest=$(cat metadata.json | jq '.["containerimage.digest"]')
                  echo "digest=$digest"
-                 echo "${{ vars.JF_URL }}/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}@$digest" > metadata.json
+                 echo "hts2-codeninjas-proj-docker-local.jfrog.io/${{ env.DOCKER_REPO }}/${{ env.IMAGE_NAME }}@$digest" > metadata.json
                  jf rt build-docker-create ${{ env.DOCKER_REPO }} --image-file metadata.json 
 
             - name: publish build info

.github/workflows/frogbot-scan-and-fix.yml

@@ -30,7 +30,7 @@ jobs:
 
       - uses: jfrog/frogbot@v2
         with:
-          oidc-provider-name: jfrog-github-oidc
+          oidc-provider-name: vigneshs-oidc
         env:
           # [Mandatory if the two conditions below are met]
           # 1. The project uses npm, yarn 2, NuGet or .NET to download its dependencies
@@ -41,7 +41,7 @@ jobs:
 
           # [Mandatory]
           # JFrog platform URL
-          JF_URL: https://${{ vars.JF_URL }}/
+          JF_URL: https://hts2.jfrog.io
 
           # [Mandatory if JF_USER and JF_PASSWORD are not provided]
           # JFrog access token with 'read' permissions on Xray service

.github/workflows/frogbot-scan-pr.yml

@@ -35,7 +35,7 @@ jobs:
 
       - uses: jfrog/frogbot@v2
         with:
-          oidc-provider-name: jfrog-github-oidc
+          oidc-provider-name: vigneshs-oidc
         env:
           JFROG_CLI_LOG_LEVEL: DEBUG
           # [Mandatory if the two conditions below are met]
@@ -47,7 +47,7 @@ jobs:
 
           # [Mandatory]
           # JFrog platform URL
-          JF_URL: https://${{ vars.JF_URL }}/
+          JF_URL: https://hts2.jfrog.io
 
           # [Mandatory if JF_USER and JF_PASSWORD are not provided]
           # JFrog access token with 'read' permissions on Xray service

requirements.txt

@@ -1,3 +1,5 @@
 PyYAML>3.11
-nltk
-redis == 4.6.0
+redis == 4.6.0
+requests==2.31.0
+PyYAML==5.3
+