From 94023e03464eebf52dd696d987a7f2de5e4fbe8f Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Wed, 31 Jul 2024 13:16:21 -0700 Subject: [PATCH] Capitalize Mondoo Platform in a few places This also updates the short description of the platform that is used in `cnspec scan/shell help` ``` ... mondoo Scan the Mondoo Platform ... ``` Signed-off-by: Tim Smith --- Makefile | 2 +- providers-sdk/v1/upstream/health/errors.go | 5 +++-- providers-sdk/v1/upstream/upstream.pb.go | 2 +- providers-sdk/v1/upstream/upstream.proto | 8 ++++---- providers/mondoo/config/config.go | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index cb2c5c78ce..6278968b3d 100644 --- a/Makefile +++ b/Makefile @@ -609,7 +609,7 @@ lr/docs/markdown: providers/lr --output ../docs/docs/mql/resources/snowflake-pack ./lr markdown providers/mondoo/resources/mondoo.lr \ --pack-name "Mondoo" \ - --description "The Mondoo resource pack lets you interact with the Mondoo platform and its assets and resources." \ + --description "The Mondoo resource pack lets you interact with the Mondoo Platform and its assets and resources." \ --docs-file providers/mondoo/resources/mondoo.lr.manifest.yaml \ --output ../docs/docs/mql/resources/mondoo-pack diff --git a/providers-sdk/v1/upstream/health/errors.go b/providers-sdk/v1/upstream/health/errors.go index 9d39281e89..f014bdeefd 100644 --- a/providers-sdk/v1/upstream/health/errors.go +++ b/providers-sdk/v1/upstream/health/errors.go @@ -6,11 +6,12 @@ package health import ( "context" "fmt" + "runtime/debug" + "github.com/rs/zerolog/log" "go.mondoo.com/cnquery/v11/cli/config" "go.mondoo.com/cnquery/v11/providers-sdk/v1/upstream" "go.mondoo.com/ranger-rpc" - "runtime/debug" ) //go:generate protoc --proto_path=. --go_out=. --go_opt=paths=source_relative --rangerrpc_out=. errors.proto @@ -90,5 +91,5 @@ func sendPanic(product, version, build string, r any, stacktrace []byte) { return } - log.Info().Msg("reported panic to Mondoo platform") + log.Info().Msg("reported panic to Mondoo Platform") } diff --git a/providers-sdk/v1/upstream/upstream.pb.go b/providers-sdk/v1/upstream/upstream.pb.go index b0b8cafc26..608ec0f307 100644 --- a/providers-sdk/v1/upstream/upstream.pb.go +++ b/providers-sdk/v1/upstream/upstream.pb.go @@ -110,7 +110,7 @@ func (x *UpstreamConfig) GetApiProxy() string { return "" } -// ServiceAccountCredentials are used to authenticate with the Mondoo platform +// ServiceAccountCredentials are used to authenticate with the Mondoo Platform type ServiceAccountCredentials struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/providers-sdk/v1/upstream/upstream.proto b/providers-sdk/v1/upstream/upstream.proto index bf8d1cc8fd..6eb13cf649 100644 --- a/providers-sdk/v1/upstream/upstream.proto +++ b/providers-sdk/v1/upstream/upstream.proto @@ -15,7 +15,7 @@ message UpstreamConfig { string api_proxy = 6; } -// ServiceAccountCredentials are used to authenticate with the Mondoo platform +// ServiceAccountCredentials are used to authenticate with the Mondoo Platform message ServiceAccountCredentials { // MRN of the service account string mrn = 1; @@ -33,7 +33,7 @@ message ServiceAccountCredentials { service AgentManager { // RegisterAgent registers a new managed agent - rpc RegisterAgent(AgentRegistrationRequest) + rpc RegisterAgent(AgentRegistrationRequest) returns (AgentRegistrationConfirmation); // UnRegister removes the managed agent from management @@ -82,7 +82,7 @@ message AgentRegistrationConfirmation { ServiceAccountCredentials credential = 2; } -message Mrn { +message Mrn { string mrn = 1; } @@ -121,4 +121,4 @@ message SshSignature { string alg = 1; string kid = 2; string sig = 3; -} \ No newline at end of file +} diff --git a/providers/mondoo/config/config.go b/providers/mondoo/config/config.go index 03e6c37336..7e87b44370 100644 --- a/providers/mondoo/config/config.go +++ b/providers/mondoo/config/config.go @@ -17,7 +17,7 @@ var Config = plugin.Provider{ { Name: "mondoo", Use: "mondoo", - Short: "a Mondoo platform", + Short: "the Mondoo Platform", MinArgs: 0, MaxArgs: 4, Discovery: []string{},