clean

CheckPointSW · May 13, 2022 · 38a9c3b · 38a9c3b
1 parent 33c4f4d
commit 38a9c3b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 33 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,9 +15,8 @@ jobs:
       - name: Install and run Spectral CI
         uses: ./
         with:
-          spectral-dsn: $SPECTRAL_DSN
+          spectral-dsn: ${{ secrets.SPECTRAL_DSN }}
           spectral-args: --ok
-          scan-type: "CI"
   ubuntu-audit:
     name: Spectral ubuntu audit
     runs-on: ubuntu-latest
@@ -26,9 +25,8 @@ jobs:
       - name: Install and run Spectral Audit
         uses: ./
         with:
-          spectral-dsn: $SPECTRAL_DSN
+          spectral-dsn: ${{ secrets.SPECTRAL_DSN }}
           spectral-args: github -k repo -t ${{ secrets.MY_GITHUB_TOKEN }} https://github.com/SpectralOps/spectral-github-action --include-tags base,audit --ok
-          scan-type: "Audit"
   macos-ci:
     name: Spectral macos CI
     runs-on: ubuntu-latest
@@ -37,9 +35,8 @@ jobs:
       - name: Install and run Spectral CI
         uses: ./
         with:
-          spectral-dsn: $SPECTRAL_DSN
+          spectral-dsn: ${{ secrets.SPECTRAL_DSN }}
           spectral-args: --ok
-          scan-type: "CI"
   macos-audit:
     name: Spectral macos audit
     runs-on: ubuntu-latest
@@ -48,9 +45,8 @@ jobs:
       - name: Install and run Spectral Audit
         uses: ./
         with:
-          spectral-dsn: $SPECTRAL_DSN
+          spectral-dsn: ${{ secrets.SPECTRAL_DSN }}
           spectral-args: github -k repo -t ${{ secrets.MY_GITHUB_TOKEN }} https://github.com/SpectralOps/spectral-github-action --include-tags base,audit --ok
-          scan-type: "Audit"
   windows-ci:
     name: Spectral windows CI
     runs-on: windows-latest
@@ -59,9 +55,8 @@ jobs:
       - name: Install and run Spectral CI
         uses: ./
         with:
-          spectral-dsn: $SPECTRAL_DSN
+          spectral-dsn: ${{ secrets.SPECTRAL_DSN }}
           spectral-args: --ok
-          scan-type: "CI"
   windows-audit:
     name: Spectral windows audit
     runs-on: windows-latest
@@ -70,6 +65,5 @@ jobs:
       - name: Install and run Spectral Audit
         uses: ./
         with:
-          spectral-dsn: $SPECTRAL_DSN
+          spectral-dsn: ${{ secrets.SPECTRAL_DSN }}
           spectral-args: github -k repo -t ${{ secrets.MY_GITHUB_TOKEN }} https://github.com/SpectralOps/spectral-github-action --include-tags base,audit --ok
-          scan-type: "Audit"
diff --git a/README.md b/README.md
@@ -26,7 +26,6 @@ uses: spectral/spectral-action@v2
 with:
   spectral-dsn: $SPECTRAL_DSN
   spectral-args: --ok
-  scan-type: "CI"
 ```
 
 You can see an example of this Action [here](https://github.com/SpectralOps/spectral-github-action/tree/main/.github/workflows/main.yml)
@@ -58,7 +57,6 @@ jobs:
 ```
 
 Spectral provides another scan option to audit your Github/Gitlab organizaion, user or repo.
-Notice that you need to provide the audit scan type.
 
 ```yaml
 name: Spectral
@@ -78,7 +76,6 @@ jobs:
         with:
           spectral-dsn: ${{ secrets.SPECTRAL_DSN }}
           spectral-args: github -k repo -t ${{ secrets.MY_GITHUB_TOKEN }} https://github.com/SpectralOps/spectral-github-action --include-tags base,audit --ok
-          scan-type: "audit"
 ```
 
 ### How to Contribute

diff --git a/action.yml b/action.yml
@@ -7,10 +7,6 @@ inputs:
   spectral-args:
     description: "Arguments for Spectral scan"
     required: false
-  scan-type:
-    description: "CI or audit"
-    default: "CI"
-    required: false
 branding:
   icon: "download"
   color: "purple"

diff --git a/index.js b/index.js
@@ -53,19 +53,6 @@ async function runSpectral() {
 }
 
 function getScanCommand() {
-    const scanType = core.getInput('scan-type')
     const spectralArgs = core.getInput('spectral-args')
-    switch (scanType.toLowerCase()) {
-        case 'ci':
-            return `${process.platform === 'win32' ? 'spectral.exe scan' : 'spectral scan'} ${spectralArgs}`
-        case 'audit':
-            if (process.platform === win32) {
-                return `spectral.exe ${spectralArgs}`
-            }
-            else {
-                return `spectral ${spectralArgs}`
-            }
-        default:
-            throw new Error(`Unknown scan type: ${scanType}`);
-    }
+    return `${process.platform === 'win32' ? 'spectral.exe scan' : 'spectral scan'} ${spectralArgs}`
 }