fix: namespaces references

filipeforattini · May 10, 2022 · 871218c · 871218c
1 parent 4c53bd7
commit 871218c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 33 deletions.
diff --git a/.github/workflows/self.yml b/.github/workflows/self.yml
@@ -14,8 +14,14 @@ jobs:
       # pre-job
       - name: Setup | Cloning repository
         uses: actions/checkout@v3
+        with:
+          fetch-depth: '0'
+          persist-credentials: false
 
       #job
+      - name: Run GitLeaks
+        uses: zricethezav/gitleaks-action@master
+
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
 
@@ -27,9 +33,6 @@ jobs:
       #   with:
       #     category: ${{ env.GITHUB_SHA }}
 
-      - name: Run GitLeaks
-        uses: zricethezav/gitleaks-action@master
-
 
   Release:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/service-push.yml b/.github/workflows/service-push.yml
@@ -100,24 +100,6 @@ jobs:
         run: echo $PIPELINE_SETUP
 
 
-  #--------------------------------------------------#
-  #                   Base Analysis                  # 
-  #--------------------------------------------------#
-  Base-Analysis:
-    runs-on: ubuntu-latest
-    needs: Setup
-
-    steps:
-
-      # pre-job
-      - name: Setup | Cloning repository
-        uses: actions/checkout@v3
-
-      #job
-      - name: Run GitLeaks
-        uses: zricethezav/gitleaks-action@master
-
-
   #--------------------------------------------------#
   #                  Analysis: Node                  # 
   #--------------------------------------------------#
@@ -134,8 +116,14 @@ jobs:
       # pre-job
       - name: Setup | Cloning repository
         uses: actions/checkout@v3
+        with:
+          fetch-depth: '0'
+          persist-credentials: false
 
       #job
+      - name: Run GitLeaks
+        uses: zricethezav/gitleaks-action@master
+
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:
@@ -164,8 +152,14 @@ jobs:
       # pre-job
       - name: Setup | Cloning repository
         uses: actions/checkout@v3
+        with:
+          fetch-depth: '0'
+          persist-credentials: false
 
       #job
+      - name: Run GitLeaks
+        uses: zricethezav/gitleaks-action@master
+
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:
@@ -282,7 +276,6 @@ jobs:
     needs: 
       - Setup
       - Tests-Node
-      - Base-Analysis
       - Node-Analysis
 
     outputs:

diff --git a/src/scrappers/deploy.class.js b/src/scrappers/deploy.class.js
@@ -6,11 +6,6 @@ module.exports = class Deploy extends Scrapper {
   setup () {
     const repository = this.context.payload.repository.name
     const containerRegistry = this.inputs.containerRegistry
-
-    const namespace = [true, 'true'].includes(this.inputs.environmentsAsNamespaces)
-      ? repository
-      : `${repository}-${this.inputs.environment}`
-
     const podName = repository.includes('-svc-')
       ? 'svc'
       : repository.includes('-app-')
@@ -44,13 +39,13 @@ module.exports = class Deploy extends Scrapper {
       .add('deploy', {
         podName,
         ecosystem,
-        namespace,
+        namespace: repository,
         namespaces: {
-          dev: `${namespace}-dev`,
-          stg: `${namespace}-stg`,
-          prd: `${namespace}-prd`,
-          sbx: `${namespace}-sbx`,
-          dry: `${namespace}-dry`,
+          dev: `${repository}-dev`,
+          stg: `${repository}-stg`,
+          prd: `${repository}-prd`,
+          sbx: `${repository}-sbx`,
+          dry: `${repository}-dry`,
         },
         deployAsK8s,
         hasDevSecrets,