chore: remove commented

Author: ajasnosz

.github/workflows/main.yml

@@ -60,8 +60,8 @@ jobs:
           publishToken: ${{ secrets.SEMGREP_PUBLISH_TOKEN }}
 
   create-env:
-#    needs:
-#      - workflow_approval
+    needs:
+      - workflow_approval
     runs-on: ubuntu-latest
     timeout-minutes: 60
     outputs:
@@ -87,7 +87,8 @@ jobs:
 
       - name: Claim environment and wait
         run: |
-          echo "ENV_ID=5089" >> "$GITHUB_ENV"
+          echo ENV_ID="$(./selfservice claimAndWait isv_ci_tas_srt_4_0 | jq -r '.id')" >> "$GITHUB_ENV"
+          echo "::add-mask::$ENV_ID"
 
       - name: Set up Go
         uses: actions/setup-go@v3
@@ -117,6 +118,14 @@ jobs:
           echo ENV_ID=$ENV_ID >> "$GITHUB_OUTPUT"
           echo AUTH_TOKEN="$AUTH_TOKEN" >> "$GITHUB_OUTPUT"
 
+      - name: Mask environments
+        run: |
+          echo "::add-mask::$API_ENDPOINT"
+          echo "::add-mask::$API_UAA_ENDPOINT"
+          echo "::add-mask::$API_PASSWORD"
+          echo "::add-mask::$API_CLIENT_PASSWORD"
+          
+
   build:
     runs-on: ubuntu-latest
     needs:
@@ -352,30 +361,31 @@ jobs:
         if: always()
         run: |
           echo "Teardown deployment env"
+          cf target -o "splunk-ci-org" -s "splunk-ci-space"
           cf delete splunk-firehose-nozzle -f
           cf delete data_gen -f
           cf delete-org splunk-ci-org -f
 
 
-#  teardown-env:
-#    runs-on: ubuntu-latest
-#    needs:
-#      - create-env
-#      - execute_tests
-#    if: ${{ always() }}
-#    env:
-#      ENV_ID: ${{ needs.create-env.outputs.ENV_ID  }}
-#    steps:
-#      - name: install-selfservice
-#        run: |
-#          wget https://github.com/cf-platform-eng/selfservice/releases/download/0.2.9/selfservice
-#          chmod +x selfservice
-#          ls -latr
-#      - name: auth
-#        run: |
-#          echo "$(./selfservice auth $API_TOKEN  | cut -c 8-)" >> "$GITHUB_ENV"
-#        env:
-#          API_TOKEN: ${{ secrets.API_TOKEN }}
-#      - name: release environment
-#        run: |
-#          ./selfservice release $ENV_ID
+  teardown-env:
+    runs-on: ubuntu-latest
+    needs:
+      - create-env
+      - execute_tests
+    if: ${{ always() }}
+    env:
+      ENV_ID: ${{ needs.create-env.outputs.ENV_ID  }}
+    steps:
+      - name: install-selfservice
+        run: |
+          wget https://github.com/cf-platform-eng/selfservice/releases/download/0.2.9/selfservice
+          chmod +x selfservice
+          ls -latr
+      - name: auth
+        run: |
+          echo "$(./selfservice auth $API_TOKEN  | cut -c 8-)" >> "$GITHUB_ENV"
+        env:
+          API_TOKEN: ${{ secrets.API_TOKEN }}
+      - name: release environment
+        run: |
+          ./selfservice release $ENV_ID

scripts/ci_nozzle_manifest.yml

@@ -31,7 +31,6 @@ applications:
       EVENTS: ValueMetric,CounterEvent,Error,HttpStartStop,LogMessage,ContainerMetric
       EXTRA_FIELDS: name:update-ci-test
       FIREHOSE_SUBSCRIPTION_ID: splunk-ci
-      FIREHOSE_KEEP_ALIVE: 25s
       FLUSH_INTERVAL: 5s
       CONSUMER_QUEUE_SIZE: 10000
       HEC_BATCH_SIZE: 1000