Skip to content

Commit

Permalink
Update copyright date + spellcheck config
Browse files Browse the repository at this point in the history
Minor cleanup

Signed-off-by: Tim Smith <[email protected]>
  • Loading branch information
tas50 committed Apr 30, 2024
1 parent 9242331 commit f78af0c
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .copywrite.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ schema_version = 1
project {
license = "BUSL-1.1"
copyright_holder = "Mondoo, Inc."
copyright_year = 2023
copyright_year = 2024

# (OPTIONAL) A list of globs that should not have copyright/license headers.
# Supports doublestar glob patterns for more flexibility in defining which
Expand Down
62 changes: 53 additions & 9 deletions .github/actions/spelling/line_forbidden.patterns
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Catch placeholder text
#

\b[Lo]orem [Ii]psum\
\b[Ll]orem [Ii]psum\b

#
# Terms to avoid
Expand Down Expand Up @@ -38,6 +38,16 @@
# s.b. Compliance Hub
\s[Cc]ompliance hub\b

#
# Compliance Terms
#

# s.b. SOC 2
\bSOC2\b

# s.b. ISO 270001
\bISO270001\b

#
# Industry Terms
#
Expand All @@ -50,7 +60,8 @@
\bDevops\b

# s.b. SaaS
\b[Ss]aas\b
# \b[Ss]aas\b # disabled due to false positives
\bSaas\b

# s.b. Docker Hub
\bDocker[Hh]ub\b
Expand All @@ -68,6 +79,9 @@
# s.b. email
\be-mail\b

# s.b. APIs
\bapis\b

#
# Product Names
#
Expand Down Expand Up @@ -170,23 +184,46 @@
\bopenSSL\b

# s.b. CloudBees
\bCloudbees\b
\b[Cc]loudbees\b

# s.b. System76
\bSystem 76\b

# s.b. VirtualBox
\bvirtualbox\b
\bVirtualbox\b
\b[Vv]irtualbox\b
\bVirtual Box\b

# s.b. SentinelOne
\bSentinalOne\b
\bSentinal[Oo]ne\b
\bSentinelone\b
\bSentinal One\b

# s.b. CrowdStrike
\bCrowd Strike\b
\bCrowdstrike\b
\b[Cc]rowdstrike\b

#
# Kubernetes Terms
#

# s.b. DaemonSet
\bDaemonset\b

# s.b. Dockershim
\bDockerShim\b
\bdockershim\b

# s.b. LimitRange
\bLimitrange\b

# s.b. Minikube
\bMiniKube\b

# s.b. ReplicaSet
\bReplicaset\b

# s.b. StatefulSet
\bStatefulset\b

#
# HashiCorp Products
Expand Down Expand Up @@ -295,8 +332,7 @@
\bCloudfront\b

# s.b. CloudHSM
\bCloudHsm\b
\bCloudhsm\b
\bCloud[Hh]sm\b

# s.b. CloudSearch
\bCloudsearch\b
Expand Down Expand Up @@ -623,3 +659,11 @@
# Reject duplicate words
\s([A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})\s\g{-1}\s

# s.b. it's or its
\bits['’]

# s.b. understand
\bunder stand\b

# find spaces before a comma
( )+,
37 changes: 32 additions & 5 deletions .github/actions/spelling/patterns.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
\b([A-Za-z])\g{-1}{3,}\b

# ignore funky space IDs that blow up spell checking
api\.mondoo\.app\/space.*\b
console\.mondoo\.com\/space.*\b
api\.mondoo\.app\/.*\b
console\.mondoo\.com\/.*\b

# azure subscription ID
[0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}
Expand All @@ -39,7 +39,7 @@ Key Vault Vault
\broot root\b

# AWS resources
(ami|subnet|vpc|sg)-[0-9a-fA-F]{17}
(ami|subnet|vpc|sg|fs)-[0-9a-fA-F]{17}

# http and https URLs
https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)
Expand All @@ -53,8 +53,8 @@ HKEY_[\w\\]*
# mime types
\bapplication\/\S*

# skip mql uids
uid:\s.*$
# mql certificate IDs
certificate:\w*

# ARN values
\barn:\S*
Expand Down Expand Up @@ -92,3 +92,30 @@ aws_secret_access_key\s+\=(\s+)?.+

# score score is valid in MQL docs
score score

# macOS temp folders
/var/folders/\w\w/[+\w]+/(?:T|-Caches-)/

# ssh
(?:ssh-\S+|-nistp256) [-a-zA-Z=;:\/0-9+]{12,}

# kubernetes object suffix
-[0-9a-f]{10}-\w{5}\s

# sed regular expressions
sed 's/(?:[^/]*?[a-zA-Z]{3,}[^/]*?/){2}

# UNIX device paths
\/dev\/\w*

# AWS RDS instance types
db.\w{2}.\w*

# uuid
[<({"'>][0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}[<'"})>]

# rsa private keys
MII[BCEJ]\w*

# UID in MQL policy
- uid: \S*
2 changes: 2 additions & 0 deletions .github/actions/spelling/reject.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ Sorce
^untilling$
^wether.*
\w*(?<!right-)click
deets
organisation

Check warning on line 15 in .github/actions/spelling/reject.txt

View workflow job for this annotation

GitHub Actions / Run spell check

No newline at eof. (no-newline-at-eof)
5 changes: 3 additions & 2 deletions .github/workflows/cla.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: "CLA Assistant & License Check"
---
name: "CLA Assistant"
on:
issue_comment:
types: [created]
Expand All @@ -19,7 +20,7 @@ jobs:
path-to-signatures: "signatures/version1/cla.json"
path-to-document: "https://github.com/mondoohq/.github/blob/master/CLA.md"
custom-pr-sign-comment: "I have read the Mondoo CLA Document and I hereby sign the CLA"
custom-notsigned-prcomment: "Thank you for your submission, we really appreciate it. Before we can accept your contribution, we ask that you sign the [Mondoo Contributor License Agreement](https://github.com/mondoohq/.github/blob/master/CLA.md). You can sign the CLA by adding a new comment to this pull request and pasting exactly the following text."
custom-notsigned-prcomment: "Thank you for your submission. We really appreciate it. Before we can accept your contribution, we ask that you sign the [Mondoo Contributor License Agreement](https://github.com/mondoohq/.github/blob/master/CLA.md). You can sign the CLA by adding a new comment to this pull request and pasting exactly the following text."
remote-repository-name: cla
remote-organization-name: mondoohq
branch: "main"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Parameters

Licensor: Mondoo, Inc. (“Mondoo”)
Licensed Work(s): cnquery packs version 1.14.0 and
later. The Licensed Work is (c) 2023 Mondoo, Inc.
later. The Licensed Work is (c) 2024 Mondoo, Inc.
Additional Use Grant: You may use, distribute or host the Licensed Work in
your own or your direct customers’ production
environment, provided that such use, distribution or
Expand Down

0 comments on commit f78af0c

Please sign in to comment.