From add3d7ec49ac347e20b6ac757f4cbb931a68497d Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Sun, 18 Feb 2024 09:57:23 -0800 Subject: [PATCH] Fix a gcp resource field typo It's correct in the .lr file, but wrong where it's set. Also fix a few other misc things and update the spellcheck matchers Signed-off-by: Tim Smith --- .../actions/spelling/line_forbidden.patterns | 24 ++++++++++++++++++- explorer/scan/discovery.go | 2 +- llx/code.go | 2 +- providers/gcp/resources/pubsub.go | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.github/actions/spelling/line_forbidden.patterns b/.github/actions/spelling/line_forbidden.patterns index 6c021174a8..3068b8c050 100644 --- a/.github/actions/spelling/line_forbidden.patterns +++ b/.github/actions/spelling/line_forbidden.patterns @@ -174,6 +174,16 @@ # s.b. System76 \bSystem 76\b +# +# HashiCorp Products +# + +# s.b. HashiCorp +\bHashicorp\b + +# s.b. Terraform +\bTerraForm\b + # # Microsoft Products # @@ -181,6 +191,14 @@ # s.b. Microsoft \bMicroSoft\b +# s.b. PowerPoint +\bPower Point\b +\bPowerpoint\b + +# s.b. OneNote +\bOne Note\b +\bOnenote\b + # s.b. Windows Server \bWindows server\b @@ -206,12 +224,16 @@ # s.b. BitLocker \bBitlocker\b - +\bbitLocker\b # s.b. VS Code \bVSCode\b \bVScode\b +# s.b. LinkedIn +\bLinked In\b +\bLinkedin\b + # # VMware Products # diff --git a/explorer/scan/discovery.go b/explorer/scan/discovery.go index a3711aaa08..5a4ec565cc 100644 --- a/explorer/scan/discovery.go +++ b/explorer/scan/discovery.go @@ -169,7 +169,7 @@ func DiscoverAssets(ctx context.Context, inv *inventory.Inventory, upstream *ups func createRuntimeForAsset(asset *inventory.Asset, upstream *upstream.UpstreamConfig, recording llx.Recording) (*AssetWithRuntime, error) { var runtime *providers.Runtime var err error - // Close the runtime if an error occured + // Close the runtime if an error occurred defer func() { if err != nil && runtime != nil { runtime.Close() diff --git a/llx/code.go b/llx/code.go index 1b7b584fca..3416ab43d8 100644 --- a/llx/code.go +++ b/llx/code.go @@ -419,7 +419,7 @@ func (l *CodeV2) entrypoint2assessment(bundle *CodeBundle, ref uint64, lookup fu listRef := chunk.Function.Binding // Find the datapoint linked to this listRef // For .all(...) queries and alike, all is bound to a list. - // This list only has the resource ids as datpoints. + // This list only has the resource ids as datapoints. // But earlier on, we also bound a datapoint for the default fields to the list. // We need to find this datapoint and use it as the listRef. OUTER: diff --git a/providers/gcp/resources/pubsub.go b/providers/gcp/resources/pubsub.go index d5f1a96abc..2af53bbff0 100644 --- a/providers/gcp/resources/pubsub.go +++ b/providers/gcp/resources/pubsub.go @@ -386,7 +386,7 @@ func (g *mqlGcpProjectPubsubService) snapshots() ([]interface{}, error) { "projectId": llx.StringData(projectId), "name": llx.StringData(s.ID()), "topic": llx.ResourceData(topic, "gcp.project.pubsubService.topic"), - "expirtaion": llx.TimeData(s.Expiration), + "expiration": llx.TimeData(s.Expiration), }) if err != nil { return nil, err