Merge pull request #103 from contentstack/development

staging PR

Author: harshithad0703

.github/CODEOWNERS

@@ -1 +1,9 @@
-* @contentstack/security-admin
+* @contentstack/devex-pr-reviewers
+
+.github/workflows/sca-scan.yml @contentstack/security-admin
+
+**/.snyk @contentstack/security-admin
+
+.github/workflows/policy-scan.yml @contentstack/security-admin
+
+.github/workflows/issues-jira.yml @contentstack/security-admin

.github/workflows/policy-scan.yml

@@ -24,4 +24,23 @@ jobs:
       - uses: actions/checkout@master
       - name: Checks for License file
         run: |
-          if ! [[ -f "LICENSE" || -f "License.txt" || -f "LICENSE.md" ]]; then exit 1; fi
+          expected_license_files=("LICENSE" "LICENSE.txt" "LICENSE.md" "License.txt")
+          license_file_found=false
+          current_year=$(date +"%Y")
+
+          for license_file in "${expected_license_files[@]}"; do
+              if  [ -f "$license_file" ]; then
+                 license_file_found=true
+                 # check the license file for the current year, if not exists, exit with error
+                  if  ! grep -q "$current_year" "$license_file"; then
+                      echo "License file $license_file does not contain the current year."
+                      exit 2
+                  fi
+                  break
+              fi        
+          done
+
+          if [ "$license_file_found" = false ]; then
+              echo "No license file found. Please add a license file to the repository."
+              exit 1
+          fi

.talismanrc

@@ -1,4 +1,7 @@
 fileignoreconfig:
+- filename: .github/workflows/secrets-scan.yml
+  ignore_detectors:
+    - filecontent
 - filename: package-lock.json
   checksum: e78fc9c4b8032c8a0fd0c0fef9b0b85808aa51e0c3a9c291f8c6227e116705a6
 - filename: src/typings/@contentstack/cli-command.d.ts

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "contentstack-cli-content-type",
   "description": "Retrieve information about Content Types in a Stack.",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "author": "Contentstack Developer",
   "bugs": "https://github.com/contentstack/contentstack-cli-content-type/issues",
   "dependencies": {

package.json

@@ -71,7 +71,7 @@ export default class AuditCommand extends Command {
       const output = buildOutput(audit.logs, users)
       this.printOutput(output, 'Audit Logs', flags['content-type'], stack.name)
     } catch (error: any) {
-      this.error(error, { exit: 1, suggestions: error.suggestions })
+      this.error(error?.message || 'An error occurred.', { exit: 1, suggestions: error.suggestions })
     }
   }
 }

src/commands/content-type/audit.ts

@@ -48,7 +48,7 @@ export default class CompareRemoteCommand extends Command {
       const remoteStackApi = flags['remote-stack'] as string
 
       if (originStackApi === remoteStackApi) {
-        this.warn('Comparing the same Stack does not produce useful results.')
+        this.warn('You cannot compare the same stack. Please choose different stacks to compare.')
       }
 
       const spinner = cliux.loaderV2(Command.RequestDataMessage)
@@ -75,7 +75,7 @@ export default class CompareRemoteCommand extends Command {
       const output = await buildOutput(flags['content-type'], originContentTypeResp, remoteContentTypeResp)
       this.printOutput(output, 'changes', flags['content-type'], `${originStackResp.name} <-> ${remoteStackResp.name}`)
     } catch (error: any) {
-      this.error(error, { exit: 1, suggestions: error.suggestions })
+      this.error(error?.message || 'An error occurred.', { exit: 1, suggestions: error.suggestions })
     }
   }
 }

src/commands/content-type/compare-remote.ts

@@ -110,10 +110,10 @@ export default class CompareCommand extends Command {
       this.printOutput(output, 'changes', flags['content-type'], stack.name)
 
       if (flags.left && flags.left === flags.right) {
-        this.warn('Comparing the same version does not produce useful results.')
+        this.warn('You cannot compare the same version. Please select different versions to compare.')
       }
     } catch (error: any) {
-      this.error(error, { exit: 1, suggestions: error.suggestions })
+      this.error(error?.message || 'An error occurred.', { exit: 1, suggestions: error.suggestions })
     }
   }
 }

src/commands/content-type/compare.ts

@@ -82,7 +82,7 @@ export default class DetailsCommand extends Command {
       })
       this.printOutput(output, 'details', flags['content-type'], stack.name)
     } catch (error: any) {
-      this.error(error, { exit: 1, suggestions: error.suggestions })
+      this.error(error?.message || 'An error occurred.', { exit: 1, suggestions: error.suggestions })
     }
   }
 }

src/commands/content-type/details.ts

@@ -110,7 +110,7 @@ export default class DiagramCommand extends Command {
       const output = await createDiagram(diagramOptions)
       this.log(`Created Graph: ${output.outputPath}`)
     } catch (error: any) {
-      this.error(error, { exit: 1, suggestions: error.suggestions })
+      this.error(error?.message || 'An error occurred.', { exit: 1, suggestions: error.suggestions })
     }
   }
 }