Drop the license stuff for now

Author: pvdz

src/commands/organization/cmd-organization-policy-license.test.ts

@@ -1,4 +1,3 @@
-import { cmdOrganizationPolicyLicense } from './cmd-organization-policy-license'
 import { cmdOrganizationPolicyPolicy } from './cmd-organization-policy-security'
 import { meowWithSubcommands } from '../../utils/meow-with-subcommands'
 
@@ -16,7 +15,6 @@ export const cmdOrganizationPolicy: CliSubcommand = {
   async run(argv, importMeta, { parentName }) {
     await meowWithSubcommands(
       {
-        license: cmdOrganizationPolicyLicense,
         security: cmdOrganizationPolicyPolicy
       },
       {

src/commands/organization/cmd-organization-policy-license.ts

@@ -25,7 +25,6 @@ describe('socket scan report', async () => {
           --fold            Fold reported alerts to some degree
           --help            Print this help.
           --json            Output result as json
-          --license         Report the license policy status. Default: true
           --markdown        Output result as markdown
           --reportLevel     Which policy level alerts should be reported
           --security        Report the security policy status. Default: true
@@ -35,10 +34,7 @@ describe('socket scan report', async () => {
         Note: By default it reports both so by default it consumes 3 quota units.
 
         Your API token will need the \`full-scans:list\` scope regardless. Additionally
-        it needs \`security-policy:read\` to report on the security policy and it needs
-        the \`license-policy:read\` scope to report on the license policy.
-
-        (Use \`--no-security\` or \`--no-license\` to omit one)
+        it needs \`security-policy:read\` to report on the security policy.
 
         By default the result is a nested object that looks like this:
           \`{[ecosystem]: {[pkgName]: {[version]: {[file]: {[type:loc]: policy}}}}\`
@@ -72,22 +68,20 @@ describe('socket scan report', async () => {
       const { code, stderr, stdout } = await invokeNpm(entryPath, cmd)
       expect(stdout).toMatchInlineSnapshot(`""`)
       expect(`\n   ${stderr}`).toMatchInlineSnapshot(`
-      "
-         _____         _       _        /---------------
-        |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
-        |__   | . |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
-        |_____|___|___|_,_|___|_|.dev   | Command: \`socket scan report\`, cwd: <redacted>
-
-      \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[37mInput error\\x1b[39m\\x1b[49m: Please provide the required fields:
+        "
+           _____         _       _        /---------------
+          |   __|___ ___| |_ ___| |_      | Socket.dev CLI ver <redacted>
+          |__   | . |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
+          |_____|___|___|_,_|___|_|.dev   | Command: \`socket scan report\`, cwd: <redacted>
 
-      - Org name as the first argument \\x1b[31m(missing!)\\x1b[39m
+        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[37mInput error\\x1b[39m\\x1b[49m: Please provide the required fields:
 
-      - Full Scan ID to fetch as second argument \\x1b[31m(missing!)\\x1b[39m
+        - Org name as the first argument \\x1b[31m(missing!)\\x1b[39m
 
-      - Not both the --json and --markdown flags \\x1b[32m(ok)\\x1b[39m
+        - Full Scan ID to fetch as second argument \\x1b[31m(missing!)\\x1b[39m
 
-      - At least one policy to report \\x1b[32m(ok)\\x1b[39m"
-    `)
+        - Not both the --json and --markdown flags \\x1b[32m(ok)\\x1b[39m"
+      `)
 
       expect(code, 'dry-run should exit with code 2 if missing input').toBe(2)
     }

src/commands/organization/cmd-organization-policy.ts

@@ -34,11 +34,11 @@ const config: CliCommandConfig = {
       default: 'warn',
       description: 'Which policy level alerts should be reported'
     },
-    license: {
-      type: 'boolean',
-      default: true,
-      description: 'Report the license policy status. Default: true'
-    },
+    // license: {
+    //   type: 'boolean',
+    //   default: true,
+    //   description: 'Report the license policy status. Default: true'
+    // },
     security: {
       type: 'boolean',
       default: true,
@@ -57,10 +57,7 @@ const config: CliCommandConfig = {
     Note: By default it reports both so by default it consumes 3 quota units.
 
     Your API token will need the \`full-scans:list\` scope regardless. Additionally
-    it needs \`security-policy:read\` to report on the security policy and it needs
-    the \`license-policy:read\` scope to report on the license policy.
-
-    (Use \`--no-security\` or \`--no-license\` to omit one)
+    it needs \`security-policy:read\` to report on the security policy.
 
     By default the result is a nested object that looks like this:
       \`{[ecosystem]: {[pkgName]: {[version]: {[file]: {[type:loc]: policy}}}}\`
@@ -95,7 +92,7 @@ async function run(
   const {
     fold = 'none',
     json,
-    license,
+    // license,
     markdown,
     reportLevel = 'warn',
     security
@@ -106,8 +103,8 @@ async function run(
   if (
     !orgSlug ||
     !fullScanId ||
-    (json && markdown) ||
-    (!license && !security)
+    // (!license && !security) ||
+    (json && markdown)
   ) {
     // Use exit status of 2 to indicate incorrect usage, generally invalid
     // options or missing arguments.
@@ -122,9 +119,8 @@ async function run(
       - Full Scan ID to fetch as second argument ${!fullScanId ? colors.red('(missing!)') : colors.green('(ok)')}
 
       - Not both the --json and --markdown flags ${json && markdown ? colors.red('(pick one!)') : colors.green('(ok)')}
-
-      - At least one policy to report ${!license && !security ? colors.red('(do not omit both!)') : colors.green('(ok)')}
     `
+      // - At least one policy to report ${!license && !security ? colors.red('(do not omit both!)') : colors.green('(ok)')}
     )
     return
   }
@@ -137,7 +133,7 @@ async function run(
   await reportFullScan({
     orgSlug,
     fullScanId,
-    includeLicensePolicy: !!license,
+    includeLicensePolicy: false, // !!license,
     includeSecurityPolicy: !!security,
     outputKind: json ? 'json' : markdown ? 'markdown' : 'text',
     filePath: file,