From ec5e38106463ce0841f6e89f41747dd61396e6e2 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Thu, 26 Sep 2024 09:42:01 +0000 Subject: [PATCH 1/9] Added heartbeats to started sources Requires https://github.com/overmindtech/discovery/pull/347 Fixes #579 --- cmd/auth_client.go | 16 +++---- cmd/explore.go | 38 +++++++++++++--- cmd/pterm.go | 34 +++++++++++--- cmd/root.go | 100 ++++------------------------------------- cmd/terraform_apply.go | 2 +- cmd/terraform_plan.go | 2 +- 6 files changed, 81 insertions(+), 111 deletions(-) diff --git a/cmd/auth_client.go b/cmd/auth_client.go index 8aee6e50..501669e3 100644 --- a/cmd/auth_client.go +++ b/cmd/auth_client.go @@ -13,7 +13,7 @@ import ( // AuthenticatedApiKeyClient Returns an apikey client that uses the auth // embedded in the context and otel instrumentation -func AuthenticatedApiKeyClient(ctx context.Context, oi OvermindInstance) sdpconnect.ApiKeyServiceClient { +func AuthenticatedApiKeyClient(ctx context.Context, oi sdp.OvermindInstance) sdpconnect.ApiKeyServiceClient { httpClient := NewAuthenticatedClient(ctx, otelhttp.DefaultClient) log.WithContext(ctx).WithField("apiUrl", oi.ApiUrl).Debug("Connecting to overmind apikeys API (pre-authenticated)") return sdpconnect.NewApiKeyServiceClient(httpClient, oi.ApiUrl.String()) @@ -21,14 +21,14 @@ func AuthenticatedApiKeyClient(ctx context.Context, oi OvermindInstance) sdpconn // UnauthenticatedApiKeyClient Returns an apikey client with otel instrumentation // but no authentication. Can only be used for ExchangeKeyForToken -func UnauthenticatedApiKeyClient(ctx context.Context, oi OvermindInstance) sdpconnect.ApiKeyServiceClient { +func UnauthenticatedApiKeyClient(ctx context.Context, oi sdp.OvermindInstance) sdpconnect.ApiKeyServiceClient { log.WithContext(ctx).WithField("apiUrl", oi.ApiUrl).Debug("Connecting to overmind apikeys API") return sdpconnect.NewApiKeyServiceClient(otelhttp.DefaultClient, oi.ApiUrl.String()) } // AuthenticatedBookmarkClient Returns a bookmark client that uses the auth // embedded in the context and otel instrumentation -func AuthenticatedBookmarkClient(ctx context.Context, oi OvermindInstance) sdpconnect.BookmarksServiceClient { +func AuthenticatedBookmarkClient(ctx context.Context, oi sdp.OvermindInstance) sdpconnect.BookmarksServiceClient { httpClient := NewAuthenticatedClient(ctx, otelhttp.DefaultClient) log.WithContext(ctx).WithField("apiUrl", oi.ApiUrl).Debug("Connecting to overmind bookmark API") return sdpconnect.NewBookmarksServiceClient(httpClient, oi.ApiUrl.String()) @@ -36,7 +36,7 @@ func AuthenticatedBookmarkClient(ctx context.Context, oi OvermindInstance) sdpco // AuthenticatedChangesClient Returns a changes client that uses the auth // embedded in the context and otel instrumentation -func AuthenticatedChangesClient(ctx context.Context, oi OvermindInstance) sdpconnect.ChangesServiceClient { +func AuthenticatedChangesClient(ctx context.Context, oi sdp.OvermindInstance) sdpconnect.ChangesServiceClient { httpClient := NewAuthenticatedClient(ctx, otelhttp.DefaultClient) log.WithContext(ctx).WithField("apiUrl", oi.ApiUrl).Debug("Connecting to overmind changes API") return sdpconnect.NewChangesServiceClient(httpClient, oi.ApiUrl.String()) @@ -44,7 +44,7 @@ func AuthenticatedChangesClient(ctx context.Context, oi OvermindInstance) sdpcon // AuthenticatedConfigurationClient Returns a config client that uses the auth // embedded in the context and otel instrumentation -func AuthenticatedConfigurationClient(ctx context.Context, oi OvermindInstance) sdpconnect.ConfigurationServiceClient { +func AuthenticatedConfigurationClient(ctx context.Context, oi sdp.OvermindInstance) sdpconnect.ConfigurationServiceClient { httpClient := NewAuthenticatedClient(ctx, otelhttp.DefaultClient) log.WithContext(ctx).WithField("apiUrl", oi.ApiUrl).Debug("Connecting to overmind configuration API") return sdpconnect.NewConfigurationServiceClient(httpClient, oi.ApiUrl.String()) @@ -52,7 +52,7 @@ func AuthenticatedConfigurationClient(ctx context.Context, oi OvermindInstance) // AuthenticatedManagementClient Returns a management client that uses the auth // embedded in the context and otel instrumentation -func AuthenticatedManagementClient(ctx context.Context, oi OvermindInstance) sdpconnect.ManagementServiceClient { +func AuthenticatedManagementClient(ctx context.Context, oi sdp.OvermindInstance) sdpconnect.ManagementServiceClient { httpClient := NewAuthenticatedClient(ctx, otelhttp.DefaultClient) log.WithContext(ctx).WithField("apiUrl", oi.ApiUrl).Debug("Connecting to overmind management API") return sdpconnect.NewManagementServiceClient(httpClient, oi.ApiUrl.String()) @@ -60,7 +60,7 @@ func AuthenticatedManagementClient(ctx context.Context, oi OvermindInstance) sdp // AuthenticatedSnapshotsClient Returns a Snapshots client that uses the auth // embedded in the context and otel instrumentation -func AuthenticatedSnapshotsClient(ctx context.Context, oi OvermindInstance) sdpconnect.SnapshotsServiceClient { +func AuthenticatedSnapshotsClient(ctx context.Context, oi sdp.OvermindInstance) sdpconnect.SnapshotsServiceClient { httpClient := NewAuthenticatedClient(ctx, otelhttp.DefaultClient) log.WithContext(ctx).WithField("apiUrl", oi.ApiUrl).Debug("Connecting to overmind snapshot API") return sdpconnect.NewSnapshotsServiceClient(httpClient, oi.ApiUrl.String()) @@ -68,7 +68,7 @@ func AuthenticatedSnapshotsClient(ctx context.Context, oi OvermindInstance) sdpc // AuthenticatedInviteClient Returns a Invite client that uses the auth // embedded in the context and otel instrumentation -func AuthenticatedInviteClient(ctx context.Context, oi OvermindInstance) sdpconnect.InviteServiceClient { +func AuthenticatedInviteClient(ctx context.Context, oi sdp.OvermindInstance) sdpconnect.InviteServiceClient { httpClient := NewAuthenticatedClient(ctx, otelhttp.DefaultClient) log.WithContext(ctx).WithField("apiUrl", oi.ApiUrl).Debug("Connecting to overmind invite API") return sdpconnect.NewInviteServiceClient(httpClient, oi.ApiUrl.String()) diff --git a/cmd/explore.go b/cmd/explore.go index b441fcd9..69b8010b 100644 --- a/cmd/explore.go +++ b/cmd/explore.go @@ -8,10 +8,12 @@ import ( "atomicgo.dev/keyboard" "atomicgo.dev/keyboard/keys" "github.com/aws/aws-sdk-go-v2/aws" + "github.com/google/uuid" "github.com/overmindtech/aws-source/proc" "github.com/overmindtech/cli/tfutils" "github.com/overmindtech/discovery" "github.com/overmindtech/pterm" + "github.com/overmindtech/sdp-go" stdlibsource "github.com/overmindtech/stdlib-source/sources" log "github.com/sirupsen/logrus" "github.com/sourcegraph/conc/pool" @@ -34,18 +36,31 @@ var exploreCmd = &cobra.Command{ // any query or request during the runtime of the CLI. for proper cleanup, // execute the returned function. The method returns once the sources are // started. Progress is reported into the provided multi printer. -func StartLocalSources(ctx context.Context, oi OvermindInstance, token *oauth2.Token, tfArgs []string, multi *pterm.MultiPrinter) (func(), error) { +func StartLocalSources(ctx context.Context, oi sdp.OvermindInstance, token *oauth2.Token, tfArgs []string, multi *pterm.MultiPrinter) (func(), error) { var err error stdlibSpinner, _ := pterm.DefaultSpinner.WithWriter(multi.NewWriter()).Start("Starting stdlib source engine") awsSpinner, _ := pterm.DefaultSpinner.WithWriter(multi.NewWriter()).Start("Starting AWS source engine") natsOptions := natsOptions(ctx, oi, token) + heartbeatOptions := heartbeatOptions(oi, token) + + hostname, err := os.Hostname() + if err != nil { + return func() {}, fmt.Errorf("failed to get hostname: %w", err) + } p := pool.NewWithResults[*discovery.Engine]().WithErrors() p.Go(func() (*discovery.Engine, error) { - stdlibEngine, err := stdlibsource.InitializeEngine(natsOptions, 2_000, true) + stdlibEngine, err := stdlibsource.InitializeEngine( + natsOptions, + fmt.Sprintf("stdlib-source-%v", hostname), + uuid.New(), + heartbeatOptions, + 2_000, + true, + ) if err != nil { stdlibSpinner.Fail("Failed to initialize stdlib source engine") return nil, fmt.Errorf("failed to initialize stdlib source engine: %w", err) @@ -90,7 +105,16 @@ func StartLocalSources(ctx context.Context, oi OvermindInstance, token *oauth2.T configs = append(configs, c) } - awsEngine, err := proc.InitializeAwsSourceEngine(ctx, natsOptions, 2_000, configs...) + awsEngine, err := proc.InitializeAwsSourceEngine( + ctx, + fmt.Sprintf("aws-source-%v", hostname), + uuid.New(), + natsOptions, + heartbeatOptions, + 2_000, + 1, // Don't retry as we want the user to get notified immediately + configs..., + ) if err != nil { awsSpinner.Fail("Failed to initialize AWS source engine") return nil, fmt.Errorf("failed to initialize AWS source engine: %w", err) @@ -147,9 +171,13 @@ func Explore(cmd *cobra.Command, args []string) error { pterm.Println() pterm.Println(fmt.Sprintf("Explore your infrastructure graph at %v/explore", oi.FrontendUrl)) pterm.Println() - pterm.Success.Println("Press any key to stop the sources") + pterm.Success.Println("Press Ctrl+C to stop the locally running sources") err = keyboard.Listen(func(keyInfo keys.Key) (stop bool, err error) { - return true, nil + if keyInfo.Code == keys.CtrlC { + return true, nil + } + + return false, nil }) if err != nil { return fmt.Errorf("error reading keyboard input: %w", err) diff --git a/cmd/pterm.go b/cmd/pterm.go index 31339aed..9528bb01 100644 --- a/cmd/pterm.go +++ b/cmd/pterm.go @@ -6,6 +6,7 @@ import ( "encoding/json" "errors" "fmt" + "net/http" "os" "os/exec" "strings" @@ -14,13 +15,16 @@ import ( "connectrpc.com/connect" "github.com/overmindtech/cli/tracing" + "github.com/overmindtech/discovery" "github.com/overmindtech/pterm" "github.com/overmindtech/sdp-go" "github.com/overmindtech/sdp-go/auth" + "github.com/overmindtech/sdp-go/sdpconnect" log "github.com/sirupsen/logrus" "github.com/sourcegraph/conc/pool" "github.com/spf13/cobra" "github.com/spf13/viper" + "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" "golang.org/x/oauth2" ) @@ -58,7 +62,7 @@ func PTermSetup() { } } -func StartSources(ctx context.Context, cmd *cobra.Command, args []string) (context.Context, OvermindInstance, *oauth2.Token, func(), error) { +func StartSources(ctx context.Context, cmd *cobra.Command, args []string) (context.Context, sdp.OvermindInstance, *oauth2.Token, func(), error) { multi := pterm.DefaultMultiPrinter _, _ = multi.Start() defer func() { @@ -67,19 +71,19 @@ func StartSources(ctx context.Context, cmd *cobra.Command, args []string) (conte ctx, oi, token, err := login(ctx, cmd, []string{"explore:read", "changes:write", "config:write", "request:receive"}, multi.NewWriter()) if err != nil { - return ctx, OvermindInstance{}, nil, nil, err + return ctx, sdp.OvermindInstance{}, nil, nil, err } cleanup, err := StartLocalSources(ctx, oi, token, args, &multi) if err != nil { - return ctx, OvermindInstance{}, nil, nil, err + return ctx, sdp.OvermindInstance{}, nil, nil, err } return ctx, oi, token, cleanup, nil } // start revlink warmup in the background -func RunRevlinkWarmup(ctx context.Context, oi OvermindInstance, postPlanPrinter *atomic.Pointer[pterm.MultiPrinter], args []string) *pool.ErrorPool { +func RunRevlinkWarmup(ctx context.Context, oi sdp.OvermindInstance, postPlanPrinter *atomic.Pointer[pterm.MultiPrinter], args []string) *pool.ErrorPool { p := pool.New().WithErrors() p.Go(func() error { ctx, span := tracing.Tracer().Start(ctx, "revlink warmup") @@ -221,7 +225,7 @@ func snapshotDetail(state string, items, edges uint32) string { return detailStr } -func natsOptions(ctx context.Context, oi OvermindInstance, token *oauth2.Token) auth.NATSOptions { +func natsOptions(ctx context.Context, oi sdp.OvermindInstance, token *oauth2.Token) auth.NATSOptions { hostname, err := os.Hostname() if err != nil { hostname = "localhost" @@ -251,6 +255,26 @@ func natsOptions(ctx context.Context, oi OvermindInstance, token *oauth2.Token) } } +func heartbeatOptions(oi sdp.OvermindInstance, token *oauth2.Token) *discovery.HeartbeatOptions { + tokenSource := oauth2.StaticTokenSource(token) + + transport := oauth2.Transport{ + Source: tokenSource, + Base: http.DefaultTransport, + } + authenticatedClient := http.Client{ + Transport: otelhttp.NewTransport(&transport), + } + + return &discovery.HeartbeatOptions{ + ManagementClient: sdpconnect.NewManagementServiceClient( + &authenticatedClient, + oi.ApiUrl.String(), + ), + Frequency: time.Second * 30, + } +} + func HasScopesFlexible(token *oauth2.Token, requiredScopes []string) (bool, string, error) { if token == nil { return false, "", errors.New("HasScopesFlexible: token is nil") diff --git a/cmd/root.go b/cmd/root.go index 8491563b..127c3147 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -7,7 +7,6 @@ import ( "errors" "fmt" "io" - "net/http" "net/url" "os" "os/signal" @@ -30,7 +29,6 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/uptrace/opentelemetry-go-extra/otellogrus" - "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" @@ -41,86 +39,6 @@ import ( //go:embed commit.txt var cliVersion string -type OvermindInstance struct { - FrontendUrl *url.URL - ApiUrl *url.URL - NatsUrl *url.URL - Audience string - Auth0Domain string - CLIClientID string -} - -// GatewayUrl returns the URL for the gateway for this instance. -func (oi OvermindInstance) GatewayUrl() string { - return fmt.Sprintf("%v/api/gateway", oi.ApiUrl.String()) -} - -func (oi OvermindInstance) String() string { - return fmt.Sprintf("Frontend: %v, API: %v, Nats: %v, Audience: %v", oi.FrontendUrl, oi.ApiUrl, oi.NatsUrl, oi.Audience) -} - -type instanceData struct { - Api string `json:"api_url"` - Nats string `json:"nats_url"` - Aud string `json:"aud"` - Auth0Domain string `json:"auth0_domain"` - CLIClientID string `json:"auth0_cli_client_id"` -} - -// NewOvermindInstance creates a new OvermindInstance from the given app URL -// with all URLs filled in, or an error. This makes a request to the frontend to -// lookup Api and Nats URLs. -func NewOvermindInstance(ctx context.Context, app string) (OvermindInstance, error) { - var instance OvermindInstance - var err error - - instance.FrontendUrl, err = url.Parse(app) - if err != nil { - return instance, fmt.Errorf("invalid --app value '%v', error: %w", app, err) - } - - // Get the instance data - instanceDataUrl := fmt.Sprintf("%v/api/public/instance-data", instance.FrontendUrl) - req, err := http.NewRequest("GET", instanceDataUrl, nil) - if err != nil { - log.WithContext(ctx).WithError(err).Error("could not initialize instance-data fetch") - return OvermindInstance{}, fmt.Errorf("could not initialize instance-data fetch: %w", err) - } - - req = req.WithContext(ctx) - log.WithField("instanceDataUrl", instanceDataUrl).Debug("Fetching instance-data") - res, err := otelhttp.DefaultClient.Do(req) - if err != nil { - return OvermindInstance{}, fmt.Errorf("could not fetch instance-data: %w", err) - } - - if res.StatusCode != 200 { - return OvermindInstance{}, fmt.Errorf("instance-data fetch returned non-200 status: %v", res.StatusCode) - } - - defer res.Body.Close() - data := instanceData{} - err = json.NewDecoder(res.Body).Decode(&data) - if err != nil { - return OvermindInstance{}, fmt.Errorf("could not parse instance-data: %w", err) - } - - instance.ApiUrl, err = url.Parse(data.Api) - if err != nil { - return OvermindInstance{}, fmt.Errorf("invalid api_url value '%v' in instance-data, error: %w", data.Api, err) - } - instance.NatsUrl, err = url.Parse(data.Nats) - if err != nil { - return OvermindInstance{}, fmt.Errorf("invalid nats_url value '%v' in instance-data, error: %w", data.Nats, err) - } - - instance.Audience = data.Aud - instance.CLIClientID = data.CLIClientID - instance.Auth0Domain = data.Auth0Domain - - return instance, nil -} - // rootCmd represents the base command when called without any subcommands var rootCmd = &cobra.Command{ Use: "overmind", @@ -264,7 +182,7 @@ Then enter the code: ` // getChangeUuid returns the UUID of a change, as selected by --uuid or --change, or a state with the specified status and having --ticket-link -func getChangeUuid(ctx context.Context, oi OvermindInstance, expectedStatus sdp.ChangeStatus, ticketLink string, errNotFound bool) (uuid.UUID, error) { +func getChangeUuid(ctx context.Context, oi sdp.OvermindInstance, expectedStatus sdp.ChangeStatus, ticketLink string, errNotFound bool) (uuid.UUID, error) { var changeUuid uuid.UUID var err error @@ -443,10 +361,10 @@ func tracedSettings() map[string]any { return result } -func login(ctx context.Context, cmd *cobra.Command, scopes []string, writer io.Writer) (context.Context, OvermindInstance, *oauth2.Token, error) { +func login(ctx context.Context, cmd *cobra.Command, scopes []string, writer io.Writer) (context.Context, sdp.OvermindInstance, *oauth2.Token, error) { timeout, err := time.ParseDuration(viper.GetString("timeout")) if err != nil { - return ctx, OvermindInstance{}, nil, flagError{usage: fmt.Sprintf("invalid --timeout value '%v'\n\n%v", viper.GetString("timeout"), cmd.UsageString())} + return ctx, sdp.OvermindInstance{}, nil, flagError{usage: fmt.Sprintf("invalid --timeout value '%v'\n\n%v", viper.GetString("timeout"), cmd.UsageString())} } lf := log.Fields{ @@ -463,11 +381,11 @@ func login(ctx context.Context, cmd *cobra.Command, scopes []string, writer io.W connectSpinner, _ := pterm.DefaultSpinner.WithWriter(multi.NewWriter()).Start("Connecting to Overmind") - oi, err := NewOvermindInstance(ctx, viper.GetString("app")) + oi, err := sdp.NewOvermindInstance(ctx, viper.GetString("app")) if err != nil { connectSpinner.Fail("Failed to get instance data from app") _, _ = multi.Stop() - return ctx, OvermindInstance{}, nil, loggedError{ + return ctx, sdp.OvermindInstance{}, nil, loggedError{ err: err, fields: lf, message: "failed to get instance data from app", @@ -480,7 +398,7 @@ func login(ctx context.Context, cmd *cobra.Command, scopes []string, writer io.W ctx, token, err := ensureToken(ctx, oi, scopes) if err != nil { connectSpinner.Fail("Failed to authenticate") - return ctx, OvermindInstance{}, nil, loggedError{ + return ctx, sdp.OvermindInstance{}, nil, loggedError{ err: err, fields: lf, message: "failed to authenticate", @@ -493,7 +411,7 @@ func login(ctx context.Context, cmd *cobra.Command, scopes []string, writer io.W return ctx, oi, token, nil } -func ensureToken(ctx context.Context, oi OvermindInstance, requiredScopes []string) (context.Context, *oauth2.Token, error) { +func ensureToken(ctx context.Context, oi sdp.OvermindInstance, requiredScopes []string) (context.Context, *oauth2.Token, error) { var token *oauth2.Token var err error @@ -528,7 +446,7 @@ func ensureToken(ctx context.Context, oi OvermindInstance, requiredScopes []stri // Gets a token from Oauth with the required scopes. This method will also cache // that token locally for use later, and will use the cached token if possible -func getOauthToken(ctx context.Context, oi OvermindInstance, requiredScopes []string) (*oauth2.Token, error) { +func getOauthToken(ctx context.Context, oi sdp.OvermindInstance, requiredScopes []string) (*oauth2.Token, error) { var localScopes []string // Check for a locally saved token in ~/.overmind @@ -652,7 +570,7 @@ func getOauthToken(ctx context.Context, oi OvermindInstance, requiredScopes []st } // Gets a token using an API key -func getAPIKeyToken(ctx context.Context, oi OvermindInstance, apiKey string, requiredScopes []string) (*oauth2.Token, error) { +func getAPIKeyToken(ctx context.Context, oi sdp.OvermindInstance, apiKey string, requiredScopes []string) (*oauth2.Token, error) { log.WithContext(ctx).Debug("using provided token for authentication") var token *oauth2.Token diff --git a/cmd/terraform_apply.go b/cmd/terraform_apply.go index ff55488a..cd5480cd 100644 --- a/cmd/terraform_apply.go +++ b/cmd/terraform_apply.go @@ -117,7 +117,7 @@ func TerraformApply(cmd *cobra.Command, args []string) error { return TerraformApplyImpl(ctx, cmd, oi, args, planFile) } -func TerraformApplyImpl(ctx context.Context, cmd *cobra.Command, oi OvermindInstance, args []string, planFile string) error { +func TerraformApplyImpl(ctx context.Context, cmd *cobra.Command, oi sdp.OvermindInstance, args []string, planFile string) error { client := AuthenticatedChangesClient(ctx, oi) changeUuid, err := func() (uuid.UUID, error) { diff --git a/cmd/terraform_plan.go b/cmd/terraform_plan.go index 86a7810f..fa522309 100644 --- a/cmd/terraform_plan.go +++ b/cmd/terraform_plan.go @@ -79,7 +79,7 @@ func TerraformPlan(cmd *cobra.Command, args []string) error { return TerraformPlanImpl(ctx, cmd, oi, args, planFile) } -func TerraformPlanImpl(ctx context.Context, cmd *cobra.Command, oi OvermindInstance, args []string, planFile string) error { +func TerraformPlanImpl(ctx context.Context, cmd *cobra.Command, oi sdp.OvermindInstance, args []string, planFile string) error { span := trace.SpanFromContext(ctx) // this printer will be configured once the terraform plan command has From 973ac73d6d43914776b2f852c74bd130fee22429 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Thu, 26 Sep 2024 10:08:22 +0000 Subject: [PATCH 2/9] Bump SDP version --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 3665bd8f..9b73cf53 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/overmindtech/aws-source v0.0.0-20240913010148-901dfa33a89c github.com/overmindtech/discovery v0.27.7 github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297 - github.com/overmindtech/sdp-go v0.93.1 + github.com/overmindtech/sdp-go v0.94.0 github.com/overmindtech/stdlib-source v0.0.0-20240913002017-521b1b54a766 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/sirupsen/logrus v1.9.3 @@ -126,7 +126,7 @@ require ( github.com/miekg/dns v1.1.62 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/nats-io/jwt/v2 v2.6.0 // indirect + github.com/nats-io/jwt/v2 v2.7.0 // indirect github.com/nats-io/nats.go v1.37.0 // indirect github.com/nats-io/nkeys v0.4.7 // indirect github.com/nats-io/nuid v1.0.1 // indirect diff --git a/go.sum b/go.sum index 4817b1cc..8ca16ff9 100644 --- a/go.sum +++ b/go.sum @@ -245,8 +245,8 @@ github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= github.com/muesli/termenv v0.15.3-0.20240912151726-82936c5ea257 h1:RNw/zu+CJemcRlDFPjElZUbY2UlI/MA2B3I6PM3Isiw= github.com/muesli/termenv v0.15.3-0.20240912151726-82936c5ea257/go.mod h1:hxSnBBYLK21Vtq/PHd0S2FYCxBXzBua8ov5s1RobyRQ= -github.com/nats-io/jwt/v2 v2.6.0 h1:yXoBTdEotZw3NujMT+Nnu1UPNlFWdKQ3d0JJF/+pJag= -github.com/nats-io/jwt/v2 v2.6.0/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A= +github.com/nats-io/jwt/v2 v2.7.0 h1:J+ZnaaMGQi3xSB8iOhVM5ipiWCDrQvgEoitTwWFyOYw= +github.com/nats-io/jwt/v2 v2.7.0/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A= github.com/nats-io/nats-server/v2 v2.10.18 h1:tRdZmBuWKVAFYtayqlBB2BuCHNGAQPvoQIXOKwU3WSM= github.com/nats-io/nats-server/v2 v2.10.18/go.mod h1:97Qyg7YydD8blKlR8yBsUlPlWyZKjA7Bp5cl3MUE9K8= github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE= @@ -263,8 +263,8 @@ github.com/overmindtech/discovery v0.27.7 h1:Mz0npcA0poJc676368KzY65qM1i/7Y+yGe/ github.com/overmindtech/discovery v0.27.7/go.mod h1:Zds0U9qKVJKogSsnyUzPrT1Uj9jzssaCWfGyosXLPWc= github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297 h1:ih4bqBMHTCtg3lMwJszNkMGO9n7Uoe0WX5be1/x+s+g= github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297/go.mod h1:bRQZYnvLrW1S5wYT6tbQnun8NpO5X6zP5cY3VKuDc4U= -github.com/overmindtech/sdp-go v0.93.1 h1:EtIJ5SAxuzonOnhxjPufoS7BKsovk4V7tIfBJcHbq6I= -github.com/overmindtech/sdp-go v0.93.1/go.mod h1:yThheAAyOqQwkw8B5dt3YErZBM+/o0499troPpSr/ss= +github.com/overmindtech/sdp-go v0.94.0 h1:yEJtdUJ8+rqW6dsJtZWzblu19864LOope/vSkghgFsI= +github.com/overmindtech/sdp-go v0.94.0/go.mod h1:Yac80f4ua/N2b1WlQU7/IqIJebLN27LMB2EvmV9QKmk= github.com/overmindtech/sdpcache v1.6.4 h1:MJoYBDqDE3s8FrRzZ0RPgFiH39HWI/Mv2ImH1NdLT8k= github.com/overmindtech/sdpcache v1.6.4/go.mod h1:/F9XStVdntRJEQjlZ86BPuB1Y7VPo1PFcsCNiU1IoGE= github.com/overmindtech/stdlib-source v0.0.0-20240913002017-521b1b54a766 h1:23fzUSNNRheeDLFFdYZAV1LaT1T5a7A6HJrJAKzd230= From 50e45c7b9770802f61ec602eb8196f7f81011b8f Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Thu, 26 Sep 2024 10:55:30 +0000 Subject: [PATCH 3/9] Updated disco --- go.mod | 2 +- go.sum | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 9b73cf53..34cf1bbf 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/muesli/reflow v0.3.0 github.com/muesli/termenv v0.15.3-0.20240912151726-82936c5ea257 github.com/overmindtech/aws-source v0.0.0-20240913010148-901dfa33a89c - github.com/overmindtech/discovery v0.27.7 + github.com/overmindtech/discovery v0.28.0 github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297 github.com/overmindtech/sdp-go v0.94.0 github.com/overmindtech/stdlib-source v0.0.0-20240913002017-521b1b54a766 diff --git a/go.sum b/go.sum index 8ca16ff9..0e88b2eb 100644 --- a/go.sum +++ b/go.sum @@ -247,8 +247,8 @@ github.com/muesli/termenv v0.15.3-0.20240912151726-82936c5ea257 h1:RNw/zu+CJemcR github.com/muesli/termenv v0.15.3-0.20240912151726-82936c5ea257/go.mod h1:hxSnBBYLK21Vtq/PHd0S2FYCxBXzBua8ov5s1RobyRQ= github.com/nats-io/jwt/v2 v2.7.0 h1:J+ZnaaMGQi3xSB8iOhVM5ipiWCDrQvgEoitTwWFyOYw= github.com/nats-io/jwt/v2 v2.7.0/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A= -github.com/nats-io/nats-server/v2 v2.10.18 h1:tRdZmBuWKVAFYtayqlBB2BuCHNGAQPvoQIXOKwU3WSM= -github.com/nats-io/nats-server/v2 v2.10.18/go.mod h1:97Qyg7YydD8blKlR8yBsUlPlWyZKjA7Bp5cl3MUE9K8= +github.com/nats-io/nats-server/v2 v2.10.20 h1:CXDTYNHeBiAKBTAIP2gjpgbWap2GhATnTLgP8etyvEI= +github.com/nats-io/nats-server/v2 v2.10.20/go.mod h1:hgcPnoUtMfxz1qVOvLZGurVypQ+Cg6GXVXjG53iHk+M= github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE= github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI= @@ -259,8 +259,8 @@ github.com/openrdap/rdap v0.9.2-0.20240517203139-eb57b3a8dedd h1:UuQycBx6K0lB0/I github.com/openrdap/rdap v0.9.2-0.20240517203139-eb57b3a8dedd/go.mod h1:391Ww1JbjG4FHOlvQqCd6n25CCCPE64JzC5cCYPxhyM= github.com/overmindtech/aws-source v0.0.0-20240913010148-901dfa33a89c h1:pbQlgvTwle/V/AFQpdlS1hoBZ66cRrQCh3wA0bMil/U= github.com/overmindtech/aws-source v0.0.0-20240913010148-901dfa33a89c/go.mod h1:9JTXoPQG8RCRxbWetVzzlEPsOkThOIRTSi6noHvTItU= -github.com/overmindtech/discovery v0.27.7 h1:Mz0npcA0poJc676368KzY65qM1i/7Y+yGe/qq7xK/Ms= -github.com/overmindtech/discovery v0.27.7/go.mod h1:Zds0U9qKVJKogSsnyUzPrT1Uj9jzssaCWfGyosXLPWc= +github.com/overmindtech/discovery v0.28.0 h1:gyOc2hYAEKwOUqQYMk/4pt6CWe8oTA6SjDX/MLvla2s= +github.com/overmindtech/discovery v0.28.0/go.mod h1:z8a5z1ZnwT2+kMFrudhEefQZzVbju65WVdQLR6AsRZI= github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297 h1:ih4bqBMHTCtg3lMwJszNkMGO9n7Uoe0WX5be1/x+s+g= github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297/go.mod h1:bRQZYnvLrW1S5wYT6tbQnun8NpO5X6zP5cY3VKuDc4U= github.com/overmindtech/sdp-go v0.94.0 h1:yEJtdUJ8+rqW6dsJtZWzblu19864LOope/vSkghgFsI= @@ -356,8 +356,8 @@ github.com/zclconf/go-cty v1.15.0 h1:tTCRWxsexYUmtt/wVxgDClUe+uQusuI443uL6e+5sXQ github.com/zclconf/go-cty v1.15.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM= -go.opentelemetry.io/contrib/detectors/aws/ec2 v1.29.0 h1:cvBIkDnRrj5ERkPLTw54m8EJ5YVnjChxRYygT0uowNQ= -go.opentelemetry.io/contrib/detectors/aws/ec2 v1.29.0/go.mod h1:bDy4J1T+f+8mtf3188NW0zidrwSUF7GSxevRPiIquJs= +go.opentelemetry.io/contrib/detectors/aws/ec2 v1.30.0 h1:rxDteGHWDfZ3QEPqyN4ZzaT1wX63iPqnyHh94RcmcGs= +go.opentelemetry.io/contrib/detectors/aws/ec2 v1.30.0/go.mod h1:oRFluXjREVUDMZ8dfwY4LJlJrbSWePeS5QgJ2oauwak= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 h1:ZIg3ZT/aQ7AfKqdwp7ECpOK6vHqquXXuyTjIO8ZdmPs= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0/go.mod h1:DQAwmETtZV00skUwgD6+0U89g80NKsJE3DCKeLLPQMI= go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts= @@ -436,8 +436,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= From 054b9c3e4f0573caa69259d28a2c89320753c459 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 13:13:35 +0000 Subject: [PATCH 4/9] Update Overmind Dependencies --- go.mod | 54 +++++++++++++------------- go.sum | 120 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 87 insertions(+), 87 deletions(-) diff --git a/go.mod b/go.mod index 3665bd8f..089dc1eb 100644 --- a/go.mod +++ b/go.mod @@ -22,11 +22,11 @@ require ( github.com/mitchellh/go-homedir v1.1.0 github.com/muesli/reflow v0.3.0 github.com/muesli/termenv v0.15.3-0.20240912151726-82936c5ea257 - github.com/overmindtech/aws-source v0.0.0-20240913010148-901dfa33a89c - github.com/overmindtech/discovery v0.27.7 + github.com/overmindtech/aws-source v0.0.0-20240926120844-293ba52f072d + github.com/overmindtech/discovery v0.28.0 github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297 - github.com/overmindtech/sdp-go v0.93.1 - github.com/overmindtech/stdlib-source v0.0.0-20240913002017-521b1b54a766 + github.com/overmindtech/sdp-go v0.94.0 + github.com/overmindtech/stdlib-source v0.0.0-20240926105910-da9ff37cfb5d github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/sirupsen/logrus v1.9.3 github.com/sourcegraph/conc v0.3.0 @@ -64,36 +64,36 @@ require ( github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.43.7 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.38.7 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.40.7 // indirect - github.com/aws/aws-sdk-go-v2/service/directconnect v1.27.9 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.9 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.177.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.45.4 // indirect - github.com/aws/aws-sdk-go-v2/service/efs v1.31.6 // indirect - github.com/aws/aws-sdk-go-v2/service/eks v1.48.4 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.26.7 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/iam v1.35.2 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.43.8 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.38.8 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.40.8 // indirect + github.com/aws/aws-sdk-go-v2/service/directconnect v1.27.10 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.10 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.177.4 // indirect + github.com/aws/aws-sdk-go-v2/service/ecs v1.45.5 // indirect + github.com/aws/aws-sdk-go-v2/service/efs v1.31.8 // indirect + github.com/aws/aws-sdk-go-v2/service/eks v1.48.5 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.26.8 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/iam v1.35.3 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.18 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17 // indirect - github.com/aws/aws-sdk-go-v2/service/kms v1.35.7 // indirect - github.com/aws/aws-sdk-go-v2/service/lambda v1.58.3 // indirect - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.41.3 // indirect - github.com/aws/aws-sdk-go-v2/service/networkmanager v1.29.6 // indirect - github.com/aws/aws-sdk-go-v2/service/rds v1.82.5 // indirect - github.com/aws/aws-sdk-go-v2/service/route53 v1.43.2 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.61.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sns v1.31.7 // indirect - github.com/aws/aws-sdk-go-v2/service/sqs v1.34.8 // indirect + github.com/aws/aws-sdk-go-v2/service/kms v1.35.8 // indirect + github.com/aws/aws-sdk-go-v2/service/lambda v1.60.0 // indirect + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.41.4 // indirect + github.com/aws/aws-sdk-go-v2/service/networkmanager v1.29.7 // indirect + github.com/aws/aws-sdk-go-v2/service/rds v1.83.2 // indirect + github.com/aws/aws-sdk-go-v2/service/route53 v1.43.3 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.62.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sns v1.31.8 // indirect + github.com/aws/aws-sdk-go-v2/service/sqs v1.34.9 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.22.8 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.30.8 // indirect - github.com/aws/smithy-go v1.20.4 // indirect + github.com/aws/smithy-go v1.21.0 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/aymerick/douceur v0.2.0 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect @@ -126,7 +126,7 @@ require ( github.com/miekg/dns v1.1.62 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/nats-io/jwt/v2 v2.6.0 // indirect + github.com/nats-io/jwt/v2 v2.7.0 // indirect github.com/nats-io/nats.go v1.37.0 // indirect github.com/nats-io/nkeys v0.4.7 // indirect github.com/nats-io/nuid v1.0.1 // indirect diff --git a/go.sum b/go.sum index 4817b1cc..0ad19935 100644 --- a/go.sum +++ b/go.sum @@ -58,30 +58,30 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvK github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc= github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17 h1:Roo69qTpfu8OlJ2Tb7pAYVuF0CpuUMB0IYWwYP/4DZM= github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17/go.mod h1:NcWPxQzGM1USQggaTVwz6VpqMZPX1CvDJLDh6jnOCa4= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.43.7 h1:F0HcD8t3BCS5qqdLZzep3NBj5mmqpTNbdVws2l4tFfI= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.43.7/go.mod h1:bfjSD4lHRjHgXmqdwOIZ2EW5AisvpOuLhP/ADKIVUP8= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.38.7 h1:XAIxPw6FUxGv2xCB+7GapxB/H1LxfUogdzHbL6Pn3kI= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.38.7/go.mod h1:R7mWBZ2a/EnExUNP+vkBBQGTz7+ZCcT16Mm6a9XZ/0A= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.40.7 h1:G8JC8KCrNiQiyK61CYyzRDixCb+XNktVcaQzlG95yJI= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.40.7/go.mod h1:HeDvLYJALo05N6wCx3Ufa1rHGL1mz9ON312O2yVclIs= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.27.9 h1:orJr+QTCZ0lW08DyjsPfElRu8u2zeSohG133BLz+YJI= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.27.9/go.mod h1:fCz4GqdJcE/zPbT2CuE3kIk/nZcNEJ5L3gEN0eazWE0= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.9 h1:jbqgtdKfAXebx2/l2UhDEe/jmmCIhaCO3HFK71M7VzM= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.9/go.mod h1:N3YdUYxyxhiuAelUgCpSVBuBI1klobJxZrDtL+olu10= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.177.3 h1:dqdCh1M8h+j8OGNUpxTs7eBPFr6lOdLpdlE6IPLLSq4= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.177.3/go.mod h1:TFSALWR7Xs7+KyMM87ZAYxncKFBvzEt2rpK/BJCH2ps= -github.com/aws/aws-sdk-go-v2/service/ecs v1.45.4 h1:X/PuKPsmoa1ol/ZHVnt5Saw/dFbuYD+tn9DFJraFt+A= -github.com/aws/aws-sdk-go-v2/service/ecs v1.45.4/go.mod h1:YF27tGN94jGsy9s7/EvbdZcnvQZo+3pmXQ2xyT90wI0= -github.com/aws/aws-sdk-go-v2/service/efs v1.31.6 h1:XyitYkJyUWkgZ3Ob7yI65MtCgp+TB9Em6Vdqo/TLKWY= -github.com/aws/aws-sdk-go-v2/service/efs v1.31.6/go.mod h1:XGcTOlJ2nuj3KemxjGAGc/fpl2Cb8Z0DE+cTnKHmBGU= -github.com/aws/aws-sdk-go-v2/service/eks v1.48.4 h1:rgYF107dG64XdYhQ1N0ac2G+8L3I+fD4Vsw8zz9wOKA= -github.com/aws/aws-sdk-go-v2/service/eks v1.48.4/go.mod h1:9dn8p15siUL80NCTPVNd+YvEpVTmWO+rboGx6qOMBa0= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.26.7 h1:0tUfOZVLJmVFQiPGEUHkv9fVO4lyuuzD6nLePcyDyOY= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.26.7/go.mod h1:dY3XGX8oXzFkl6PYxcSccHePPb7AbxMzpbjwBvEysfQ= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.37.0 h1:4MrtpNNsYfrWKlGD2qKY+HHtcNd9lm4tfdxRCw5rR8w= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.37.0/go.mod h1:jk+iid9R4MN7UVDwSTK/ZDDO8WNhxnO2WVzfYOMLh+4= -github.com/aws/aws-sdk-go-v2/service/iam v1.35.2 h1:CK5cIZTxza9ki/4eghMeLk32/UeVcPgyDBNiFfbcG0U= -github.com/aws/aws-sdk-go-v2/service/iam v1.35.2/go.mod h1:PpmEOH3ZTQlDAezieBVdFMjPO1jovUMNPA4OpCtnwbY= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.43.8 h1:shE+vQu67H71UdCiCmVN3WNxSC1odR0Q5fVrdlbUD9k= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.43.8/go.mod h1:bfjSD4lHRjHgXmqdwOIZ2EW5AisvpOuLhP/ADKIVUP8= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.38.8 h1:4O76oA4I+juxEKtuUsfmQq7mZj8PkGYVBivLgr69lrg= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.38.8/go.mod h1:R7mWBZ2a/EnExUNP+vkBBQGTz7+ZCcT16Mm6a9XZ/0A= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.40.8 h1:+TC6bH5yzGSJPDQ+NKmbXpy2r346JGJb5QT0Mpe4xLE= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.40.8/go.mod h1:HeDvLYJALo05N6wCx3Ufa1rHGL1mz9ON312O2yVclIs= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.27.10 h1:c8aR/RsenrzC/ILi9VdNFDU6jQWZeRby+8WXgrY9Ltw= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.27.10/go.mod h1:fCz4GqdJcE/zPbT2CuE3kIk/nZcNEJ5L3gEN0eazWE0= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.10 h1:ozHHSE9Hflrf2DZmJEoqIO+bK6E6rAfID8PSCv2rgG8= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.10/go.mod h1:N3YdUYxyxhiuAelUgCpSVBuBI1klobJxZrDtL+olu10= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.177.4 h1:LgQ6qyFVk1fehExC4nMBuwWC38SQai1jhpS9GQPkHTo= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.177.4/go.mod h1:TFSALWR7Xs7+KyMM87ZAYxncKFBvzEt2rpK/BJCH2ps= +github.com/aws/aws-sdk-go-v2/service/ecs v1.45.5 h1:bsOJ/yl4QKZqyMjJPNuj3JIgsz6mML4VjcveupRaebk= +github.com/aws/aws-sdk-go-v2/service/ecs v1.45.5/go.mod h1:YF27tGN94jGsy9s7/EvbdZcnvQZo+3pmXQ2xyT90wI0= +github.com/aws/aws-sdk-go-v2/service/efs v1.31.8 h1:jAfe2YLd59Sr1QdHF42xHdEwaCWTrOe6EU4+BzA8xdo= +github.com/aws/aws-sdk-go-v2/service/efs v1.31.8/go.mod h1:XGcTOlJ2nuj3KemxjGAGc/fpl2Cb8Z0DE+cTnKHmBGU= +github.com/aws/aws-sdk-go-v2/service/eks v1.48.5 h1:vMwwdzKoUBt7vMHNkF16Hh7+8ndVGOAAEgqcrbz17M4= +github.com/aws/aws-sdk-go-v2/service/eks v1.48.5/go.mod h1:9dn8p15siUL80NCTPVNd+YvEpVTmWO+rboGx6qOMBa0= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.26.8 h1:ZzdtO9vtppVzh2/x8JCTZOvdynBrFYP0mGo7I1X7StA= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.26.8/go.mod h1:dY3XGX8oXzFkl6PYxcSccHePPb7AbxMzpbjwBvEysfQ= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.37.1 h1:qQAmLVnqkL8RVhAK30GQuoLOJc+AEE4p7dzBzR/LBws= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.37.1/go.mod h1:jk+iid9R4MN7UVDwSTK/ZDDO8WNhxnO2WVzfYOMLh+4= +github.com/aws/aws-sdk-go-v2/service/iam v1.35.3 h1:bWFkGGea2UoD/m229uuRfT0mu+6pKNB0Kq4U6j/Qz3U= +github.com/aws/aws-sdk-go-v2/service/iam v1.35.3/go.mod h1:PpmEOH3ZTQlDAezieBVdFMjPO1jovUMNPA4OpCtnwbY= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 h1:KypMCbLPPHEmf9DgMGw51jMj77VfGPAN2Kv4cfhlfgI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4/go.mod h1:Vz1JQXliGcQktFTN/LN6uGppAIRoLBR2bMvIMP0gOjc= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19 h1:FLMkfEiRjhgeDTCjjLoc3URo/TBkgeQbocA78lfkzSI= @@ -92,32 +92,32 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 h1:rfprUlsd github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19/go.mod h1:SCWkEdRq8/7EK60NcvvQ6NXKuTcchAD4ROAsC37VEZE= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17 h1:u+EfGmksnJc/x5tq3A+OD7LrMbSSR/5TrKLvkdy/fhY= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17/go.mod h1:VaMx6302JHax2vHJWgRo+5n9zvbacs3bLU/23DNQrTY= -github.com/aws/aws-sdk-go-v2/service/kms v1.35.7 h1:v0D1LeMkA/X+JHAZWERrr+sUGOt8KrCZKnJA6KszkcE= -github.com/aws/aws-sdk-go-v2/service/kms v1.35.7/go.mod h1:K9lwD0Rsx9+NSaJKsdAdlDK4b2G4KKOEve9PzHxPoMI= -github.com/aws/aws-sdk-go-v2/service/lambda v1.58.3 h1:jG5WkOpwHICcDQfR+o3r4YYCFeghnHQBQyp5YRmKN9w= -github.com/aws/aws-sdk-go-v2/service/lambda v1.58.3/go.mod h1:Y8hbqj7E9G7kQU3Y5btZNVXedcBQ1WVfLRkDSFXDzXI= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.41.3 h1:GN0pP32wAvy7u3fxfzW6mJSQJH80Hrb7iJ9AVGPPbQo= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.41.3/go.mod h1:h/bacGCd5VoL19uG10XXQC7olnLCAwZCu4h2H+BpPnE= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.29.6 h1:v/87UJJhI97jn+rn8x95wyghpiPdhmZJMlD5kDnMoTI= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.29.6/go.mod h1:Wgci/tYvO2iAaFk2VaXyYjGfRN75JLyGw9cbEmvtRmY= -github.com/aws/aws-sdk-go-v2/service/rds v1.82.5 h1:MB+bWfwWE/FnTGBO0yxXbdSMvU/753OHVdMbMgQezxI= -github.com/aws/aws-sdk-go-v2/service/rds v1.82.5/go.mod h1:zNFNa99yH2j3zzqZgt3Atu197K1UkE+1sfigpi5+eWo= -github.com/aws/aws-sdk-go-v2/service/route53 v1.43.2 h1:957e1/SwXIfPi/0OUJkH9YnPZRe9G6Kisd/xUhF7AUE= -github.com/aws/aws-sdk-go-v2/service/route53 v1.43.2/go.mod h1:343vcjcyOTuHTBBgUrOxPM36/jE96qLZnGL447ldrB0= -github.com/aws/aws-sdk-go-v2/service/s3 v1.61.2 h1:Kp6PWAlXwP1UvIflkIP6MFZYBNDCa4mFCGtxrpICVOg= -github.com/aws/aws-sdk-go-v2/service/s3 v1.61.2/go.mod h1:5FmD/Dqq57gP+XwaUnd5WFPipAuzrf0HmupX27Gvjvc= -github.com/aws/aws-sdk-go-v2/service/sns v1.31.7 h1:3MWDVQ1pS3e/S4ADKg+mMETqIbOuQDY9FqH7XCb5ISA= -github.com/aws/aws-sdk-go-v2/service/sns v1.31.7/go.mod h1:wjhxA9hlVu75dCL/5Wcx8Cwmszvu6t0i8WEDypcB4+s= -github.com/aws/aws-sdk-go-v2/service/sqs v1.34.8 h1:t3TzmBX0lpDNtLhl7vY97VMvLtxp/KTvjjj2X3s6SUQ= -github.com/aws/aws-sdk-go-v2/service/sqs v1.34.8/go.mod h1:zn0Oy7oNni7XIGoAd6bHBTVtX06OrnpvT1kww8jxyi8= +github.com/aws/aws-sdk-go-v2/service/kms v1.35.8 h1:9AShwR4JYnpCdVmjyJKXi0Fvjqqze5XVyZFQo4NI4lY= +github.com/aws/aws-sdk-go-v2/service/kms v1.35.8/go.mod h1:K9lwD0Rsx9+NSaJKsdAdlDK4b2G4KKOEve9PzHxPoMI= +github.com/aws/aws-sdk-go-v2/service/lambda v1.60.0 h1:s5xuUGDXt7BGAqacvFDsDfPFBgYtO8ZOIHpj5RSj2WM= +github.com/aws/aws-sdk-go-v2/service/lambda v1.60.0/go.mod h1:Y8hbqj7E9G7kQU3Y5btZNVXedcBQ1WVfLRkDSFXDzXI= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.41.4 h1:d0y+W3OuyBtuD0IbToKv/OV8/aV9edioMLeOOhj5T8o= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.41.4/go.mod h1:h/bacGCd5VoL19uG10XXQC7olnLCAwZCu4h2H+BpPnE= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.29.7 h1:+i/nMnTYIJoBdJEJdHfod75FJbvIzdxr/ooJuJVjoBY= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.29.7/go.mod h1:Wgci/tYvO2iAaFk2VaXyYjGfRN75JLyGw9cbEmvtRmY= +github.com/aws/aws-sdk-go-v2/service/rds v1.83.2 h1:BuKR4y0DGimyLoCylfYR8BiDzVBgAn4PQA+rp/8drKc= +github.com/aws/aws-sdk-go-v2/service/rds v1.83.2/go.mod h1:zNFNa99yH2j3zzqZgt3Atu197K1UkE+1sfigpi5+eWo= +github.com/aws/aws-sdk-go-v2/service/route53 v1.43.3 h1:hMnlDw1V8y9dKmWxxw3CqMCwx+BVQASeTE02ws+DBWo= +github.com/aws/aws-sdk-go-v2/service/route53 v1.43.3/go.mod h1:343vcjcyOTuHTBBgUrOxPM36/jE96qLZnGL447ldrB0= +github.com/aws/aws-sdk-go-v2/service/s3 v1.62.0 h1:rd/aA3iDq1q7YsL5sc4dEwChutH7OZF9Ihfst6pXQzI= +github.com/aws/aws-sdk-go-v2/service/s3 v1.62.0/go.mod h1:5FmD/Dqq57gP+XwaUnd5WFPipAuzrf0HmupX27Gvjvc= +github.com/aws/aws-sdk-go-v2/service/sns v1.31.8 h1:vRSk062d1SmaEVbiqFePkvYuhCTnW2JnPkUdt19nqeY= +github.com/aws/aws-sdk-go-v2/service/sns v1.31.8/go.mod h1:wjhxA9hlVu75dCL/5Wcx8Cwmszvu6t0i8WEDypcB4+s= +github.com/aws/aws-sdk-go-v2/service/sqs v1.34.9 h1:soISVWbRSqWplczJaEYxj26UrGULnptybx/eA3aGo90= +github.com/aws/aws-sdk-go-v2/service/sqs v1.34.9/go.mod h1:zn0Oy7oNni7XIGoAd6bHBTVtX06OrnpvT1kww8jxyi8= github.com/aws/aws-sdk-go-v2/service/sso v1.22.8 h1:JRwuL+S1Qe1owZQoxblV7ORgRf2o0SrtzDVIbaVCdQ0= github.com/aws/aws-sdk-go-v2/service/sso v1.22.8/go.mod h1:eEygMHnTKH/3kNp9Jr1n3PdejuSNcgwLe1dWgQtO0VQ= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8 h1:+HpGETD9463PFSj7lX5+eq7aLDs85QUIA+NBkeAsscA= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8/go.mod h1:bCbAxKDqNvkHxRaIMnyVPXPo+OaPRwvmgzMxbz1VKSA= github.com/aws/aws-sdk-go-v2/service/sts v1.30.8 h1:bAi+4p5EKnni+jrfcAhb7iHFQ24bthOAV9t0taf3DCE= github.com/aws/aws-sdk-go-v2/service/sts v1.30.8/go.mod h1:NXi1dIAGteSaRLqYgarlhP/Ij0cFT+qmCwiJqWh/U5o= -github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4= -github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= +github.com/aws/smithy-go v1.21.0 h1:H7L8dtDRk0P1Qm6y0ji7MCYMQObJ5R9CRpyPhRUkLYA= +github.com/aws/smithy-go v1.21.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWpi6yML8= @@ -245,10 +245,10 @@ github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= github.com/muesli/termenv v0.15.3-0.20240912151726-82936c5ea257 h1:RNw/zu+CJemcRlDFPjElZUbY2UlI/MA2B3I6PM3Isiw= github.com/muesli/termenv v0.15.3-0.20240912151726-82936c5ea257/go.mod h1:hxSnBBYLK21Vtq/PHd0S2FYCxBXzBua8ov5s1RobyRQ= -github.com/nats-io/jwt/v2 v2.6.0 h1:yXoBTdEotZw3NujMT+Nnu1UPNlFWdKQ3d0JJF/+pJag= -github.com/nats-io/jwt/v2 v2.6.0/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A= -github.com/nats-io/nats-server/v2 v2.10.18 h1:tRdZmBuWKVAFYtayqlBB2BuCHNGAQPvoQIXOKwU3WSM= -github.com/nats-io/nats-server/v2 v2.10.18/go.mod h1:97Qyg7YydD8blKlR8yBsUlPlWyZKjA7Bp5cl3MUE9K8= +github.com/nats-io/jwt/v2 v2.7.0 h1:J+ZnaaMGQi3xSB8iOhVM5ipiWCDrQvgEoitTwWFyOYw= +github.com/nats-io/jwt/v2 v2.7.0/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A= +github.com/nats-io/nats-server/v2 v2.10.20 h1:CXDTYNHeBiAKBTAIP2gjpgbWap2GhATnTLgP8etyvEI= +github.com/nats-io/nats-server/v2 v2.10.20/go.mod h1:hgcPnoUtMfxz1qVOvLZGurVypQ+Cg6GXVXjG53iHk+M= github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE= github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI= @@ -257,18 +257,18 @@ github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/openrdap/rdap v0.9.2-0.20240517203139-eb57b3a8dedd h1:UuQycBx6K0lB0/IfHePshOYjlrptkF4FoApFP2Y4s3k= github.com/openrdap/rdap v0.9.2-0.20240517203139-eb57b3a8dedd/go.mod h1:391Ww1JbjG4FHOlvQqCd6n25CCCPE64JzC5cCYPxhyM= -github.com/overmindtech/aws-source v0.0.0-20240913010148-901dfa33a89c h1:pbQlgvTwle/V/AFQpdlS1hoBZ66cRrQCh3wA0bMil/U= -github.com/overmindtech/aws-source v0.0.0-20240913010148-901dfa33a89c/go.mod h1:9JTXoPQG8RCRxbWetVzzlEPsOkThOIRTSi6noHvTItU= -github.com/overmindtech/discovery v0.27.7 h1:Mz0npcA0poJc676368KzY65qM1i/7Y+yGe/qq7xK/Ms= -github.com/overmindtech/discovery v0.27.7/go.mod h1:Zds0U9qKVJKogSsnyUzPrT1Uj9jzssaCWfGyosXLPWc= +github.com/overmindtech/aws-source v0.0.0-20240926120844-293ba52f072d h1:QOVs3o0L+GO2TXnFudEL7RB5SEg6rsviighCx+u97TI= +github.com/overmindtech/aws-source v0.0.0-20240926120844-293ba52f072d/go.mod h1:CQX2cmPahYoisATffvOktHv969jpCOlRHMpyvYnTrqw= +github.com/overmindtech/discovery v0.28.0 h1:gyOc2hYAEKwOUqQYMk/4pt6CWe8oTA6SjDX/MLvla2s= +github.com/overmindtech/discovery v0.28.0/go.mod h1:z8a5z1ZnwT2+kMFrudhEefQZzVbju65WVdQLR6AsRZI= github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297 h1:ih4bqBMHTCtg3lMwJszNkMGO9n7Uoe0WX5be1/x+s+g= github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297/go.mod h1:bRQZYnvLrW1S5wYT6tbQnun8NpO5X6zP5cY3VKuDc4U= -github.com/overmindtech/sdp-go v0.93.1 h1:EtIJ5SAxuzonOnhxjPufoS7BKsovk4V7tIfBJcHbq6I= -github.com/overmindtech/sdp-go v0.93.1/go.mod h1:yThheAAyOqQwkw8B5dt3YErZBM+/o0499troPpSr/ss= +github.com/overmindtech/sdp-go v0.94.0 h1:yEJtdUJ8+rqW6dsJtZWzblu19864LOope/vSkghgFsI= +github.com/overmindtech/sdp-go v0.94.0/go.mod h1:Yac80f4ua/N2b1WlQU7/IqIJebLN27LMB2EvmV9QKmk= github.com/overmindtech/sdpcache v1.6.4 h1:MJoYBDqDE3s8FrRzZ0RPgFiH39HWI/Mv2ImH1NdLT8k= github.com/overmindtech/sdpcache v1.6.4/go.mod h1:/F9XStVdntRJEQjlZ86BPuB1Y7VPo1PFcsCNiU1IoGE= -github.com/overmindtech/stdlib-source v0.0.0-20240913002017-521b1b54a766 h1:23fzUSNNRheeDLFFdYZAV1LaT1T5a7A6HJrJAKzd230= -github.com/overmindtech/stdlib-source v0.0.0-20240913002017-521b1b54a766/go.mod h1:I6VArvKdep5egwFy5cSX3lFQWZ4WZBVNta7f2yViVGo= +github.com/overmindtech/stdlib-source v0.0.0-20240926105910-da9ff37cfb5d h1:tGsLe3qKjveSe/Ayu3TRByLRM0vqilDCP8erWjml6pc= +github.com/overmindtech/stdlib-source v0.0.0-20240926105910-da9ff37cfb5d/go.mod h1:n8KUWQYGJuCh4DGXFpur9beKpkOUNaSTAvtynqZmRhU= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= @@ -356,8 +356,8 @@ github.com/zclconf/go-cty v1.15.0 h1:tTCRWxsexYUmtt/wVxgDClUe+uQusuI443uL6e+5sXQ github.com/zclconf/go-cty v1.15.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM= -go.opentelemetry.io/contrib/detectors/aws/ec2 v1.29.0 h1:cvBIkDnRrj5ERkPLTw54m8EJ5YVnjChxRYygT0uowNQ= -go.opentelemetry.io/contrib/detectors/aws/ec2 v1.29.0/go.mod h1:bDy4J1T+f+8mtf3188NW0zidrwSUF7GSxevRPiIquJs= +go.opentelemetry.io/contrib/detectors/aws/ec2 v1.30.0 h1:rxDteGHWDfZ3QEPqyN4ZzaT1wX63iPqnyHh94RcmcGs= +go.opentelemetry.io/contrib/detectors/aws/ec2 v1.30.0/go.mod h1:oRFluXjREVUDMZ8dfwY4LJlJrbSWePeS5QgJ2oauwak= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 h1:ZIg3ZT/aQ7AfKqdwp7ECpOK6vHqquXXuyTjIO8ZdmPs= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0/go.mod h1:DQAwmETtZV00skUwgD6+0U89g80NKsJE3DCKeLLPQMI= go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts= @@ -436,8 +436,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= From 323b2d11773090084d23fe603c66358b6f001e0a Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Thu, 26 Sep 2024 14:44:42 +0000 Subject: [PATCH 5/9] Updated dependencies --- go.mod | 11 ++++++++--- go.sum | 12 ++++++------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 089dc1eb..9f14c9f4 100644 --- a/go.mod +++ b/go.mod @@ -22,11 +22,11 @@ require ( github.com/mitchellh/go-homedir v1.1.0 github.com/muesli/reflow v0.3.0 github.com/muesli/termenv v0.15.3-0.20240912151726-82936c5ea257 - github.com/overmindtech/aws-source v0.0.0-20240926120844-293ba52f072d - github.com/overmindtech/discovery v0.28.0 + github.com/overmindtech/aws-source v0.0.0-20240926144404-f751a73d0bdf + github.com/overmindtech/discovery v0.28.1 github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297 github.com/overmindtech/sdp-go v0.94.0 - github.com/overmindtech/stdlib-source v0.0.0-20240926105910-da9ff37cfb5d + github.com/overmindtech/stdlib-source v0.0.0-20240926134010-3b0fe91d0e18 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/sirupsen/logrus v1.9.3 github.com/sourcegraph/conc v0.3.0 @@ -53,12 +53,15 @@ require ( require ( atomicgo.dev/cursor v0.2.0 // indirect atomicgo.dev/schedule v0.1.0 // indirect + github.com/Masterminds/semver/v3 v3.2.1 // indirect + github.com/MrAlias/otel-schema-utils v0.2.1-alpha // indirect github.com/agext/levenshtein v1.2.2 // indirect github.com/alecthomas/chroma/v2 v2.14.0 // indirect github.com/alecthomas/kingpin/v2 v2.3.2 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/auth0/go-jwt-middleware/v2 v2.2.2 // indirect + github.com/aws/aws-sdk-go v1.55.5 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 // indirect @@ -147,8 +150,10 @@ require ( github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect github.com/yuin/goldmark v1.7.4 // indirect github.com/yuin/goldmark-emoji v1.0.3 // indirect + go.opentelemetry.io/contrib/detectors/aws/ec2 v1.30.0 // indirect go.opentelemetry.io/otel/log v0.3.0 // indirect go.opentelemetry.io/otel/metric v1.30.0 // indirect + go.opentelemetry.io/otel/schema v0.0.7 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.27.0 // indirect diff --git a/go.sum b/go.sum index 0ad19935..b7fc823e 100644 --- a/go.sum +++ b/go.sum @@ -257,18 +257,18 @@ github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/openrdap/rdap v0.9.2-0.20240517203139-eb57b3a8dedd h1:UuQycBx6K0lB0/IfHePshOYjlrptkF4FoApFP2Y4s3k= github.com/openrdap/rdap v0.9.2-0.20240517203139-eb57b3a8dedd/go.mod h1:391Ww1JbjG4FHOlvQqCd6n25CCCPE64JzC5cCYPxhyM= -github.com/overmindtech/aws-source v0.0.0-20240926120844-293ba52f072d h1:QOVs3o0L+GO2TXnFudEL7RB5SEg6rsviighCx+u97TI= -github.com/overmindtech/aws-source v0.0.0-20240926120844-293ba52f072d/go.mod h1:CQX2cmPahYoisATffvOktHv969jpCOlRHMpyvYnTrqw= -github.com/overmindtech/discovery v0.28.0 h1:gyOc2hYAEKwOUqQYMk/4pt6CWe8oTA6SjDX/MLvla2s= -github.com/overmindtech/discovery v0.28.0/go.mod h1:z8a5z1ZnwT2+kMFrudhEefQZzVbju65WVdQLR6AsRZI= +github.com/overmindtech/aws-source v0.0.0-20240926144404-f751a73d0bdf h1:fsv7zkFY+FghGaEtIRd4YNCup9cYy/EGH+hprJrNoSw= +github.com/overmindtech/aws-source v0.0.0-20240926144404-f751a73d0bdf/go.mod h1:fNCoRjQq82KFjdX2mCgEWxNb+l6uZGjRGqrZkmVkpuQ= +github.com/overmindtech/discovery v0.28.1 h1:yCW82atxCRuXvzuXjz5mUkztcyFZGsIgswkLr2SJ5Ho= +github.com/overmindtech/discovery v0.28.1/go.mod h1:z8a5z1ZnwT2+kMFrudhEefQZzVbju65WVdQLR6AsRZI= github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297 h1:ih4bqBMHTCtg3lMwJszNkMGO9n7Uoe0WX5be1/x+s+g= github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297/go.mod h1:bRQZYnvLrW1S5wYT6tbQnun8NpO5X6zP5cY3VKuDc4U= github.com/overmindtech/sdp-go v0.94.0 h1:yEJtdUJ8+rqW6dsJtZWzblu19864LOope/vSkghgFsI= github.com/overmindtech/sdp-go v0.94.0/go.mod h1:Yac80f4ua/N2b1WlQU7/IqIJebLN27LMB2EvmV9QKmk= github.com/overmindtech/sdpcache v1.6.4 h1:MJoYBDqDE3s8FrRzZ0RPgFiH39HWI/Mv2ImH1NdLT8k= github.com/overmindtech/sdpcache v1.6.4/go.mod h1:/F9XStVdntRJEQjlZ86BPuB1Y7VPo1PFcsCNiU1IoGE= -github.com/overmindtech/stdlib-source v0.0.0-20240926105910-da9ff37cfb5d h1:tGsLe3qKjveSe/Ayu3TRByLRM0vqilDCP8erWjml6pc= -github.com/overmindtech/stdlib-source v0.0.0-20240926105910-da9ff37cfb5d/go.mod h1:n8KUWQYGJuCh4DGXFpur9beKpkOUNaSTAvtynqZmRhU= +github.com/overmindtech/stdlib-source v0.0.0-20240926134010-3b0fe91d0e18 h1:mKGMFtxy19ilX6U4ysVdWwxA/zLbcrm0gEbfN7AEURo= +github.com/overmindtech/stdlib-source v0.0.0-20240926134010-3b0fe91d0e18/go.mod h1:J/DE+bAGZZXdeRwmv1xa3qCrXaxDXNwfF57yJ7tR5hg= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= From 2aa6d6ca809a79d8abbd0ff70246b61113b414b9 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Thu, 26 Sep 2024 14:54:34 +0000 Subject: [PATCH 6/9] Generate `commit.txt` for sources too --- .github/actions/go_init/action.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/actions/go_init/action.yml b/.github/actions/go_init/action.yml index f34c5ea6..8f22812e 100644 --- a/.github/actions/go_init/action.yml +++ b/.github/actions/go_init/action.yml @@ -35,6 +35,16 @@ runs: mv -v aws-source .. mv -v k8s-source .. + - name: Go Generate for sources + shell: bash + run: | + cd ../aws-source + go generate ./... + cd - + cd ../k8s-source + go generate ./... + cd - + - name: Go Generate shell: bash run: | From c97fa9a789dbc1ae48b980d5fd26e915a72d0c6c Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Thu, 26 Sep 2024 14:57:23 +0000 Subject: [PATCH 7/9] Added docgen --- .github/actions/go_init/action.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/actions/go_init/action.yml b/.github/actions/go_init/action.yml index 8f22812e..00d27857 100644 --- a/.github/actions/go_init/action.yml +++ b/.github/actions/go_init/action.yml @@ -35,6 +35,9 @@ runs: mv -v aws-source .. mv -v k8s-source .. + - name: Install Docgen + run: go install github.com/overmindtech/docgen@latest + - name: Go Generate for sources shell: bash run: | From 7a0613a29660e9f0740363758807446c2bbf80fa Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Thu, 26 Sep 2024 14:59:42 +0000 Subject: [PATCH 8/9] Adding shell? --- .github/actions/go_init/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/go_init/action.yml b/.github/actions/go_init/action.yml index 00d27857..161da28c 100644 --- a/.github/actions/go_init/action.yml +++ b/.github/actions/go_init/action.yml @@ -36,6 +36,7 @@ runs: mv -v k8s-source .. - name: Install Docgen + shell: bash run: go install github.com/overmindtech/docgen@latest - name: Go Generate for sources From 162778209c834e4def9d3821cc1b7b6e39bd2f9c Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Thu, 26 Sep 2024 15:15:28 +0000 Subject: [PATCH 9/9] Updated version logic --- cmd/explore.go | 2 ++ go.mod | 9 ++------- go.sum | 8 ++++---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/cmd/explore.go b/cmd/explore.go index 69b8010b..4fed6a4b 100644 --- a/cmd/explore.go +++ b/cmd/explore.go @@ -56,6 +56,7 @@ func StartLocalSources(ctx context.Context, oi sdp.OvermindInstance, token *oaut stdlibEngine, err := stdlibsource.InitializeEngine( natsOptions, fmt.Sprintf("stdlib-source-%v", hostname), + fmt.Sprintf("cli-%v", cliVersion), uuid.New(), heartbeatOptions, 2_000, @@ -108,6 +109,7 @@ func StartLocalSources(ctx context.Context, oi sdp.OvermindInstance, token *oaut awsEngine, err := proc.InitializeAwsSourceEngine( ctx, fmt.Sprintf("aws-source-%v", hostname), + fmt.Sprintf("cli-%v", cliVersion), uuid.New(), natsOptions, heartbeatOptions, diff --git a/go.mod b/go.mod index 9f14c9f4..711ecc19 100644 --- a/go.mod +++ b/go.mod @@ -22,11 +22,11 @@ require ( github.com/mitchellh/go-homedir v1.1.0 github.com/muesli/reflow v0.3.0 github.com/muesli/termenv v0.15.3-0.20240912151726-82936c5ea257 - github.com/overmindtech/aws-source v0.0.0-20240926144404-f751a73d0bdf + github.com/overmindtech/aws-source v0.0.0-20240926151408-e4942cf01757 github.com/overmindtech/discovery v0.28.1 github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297 github.com/overmindtech/sdp-go v0.94.0 - github.com/overmindtech/stdlib-source v0.0.0-20240926134010-3b0fe91d0e18 + github.com/overmindtech/stdlib-source v0.0.0-20240926151404-3201148cfa40 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/sirupsen/logrus v1.9.3 github.com/sourcegraph/conc v0.3.0 @@ -53,15 +53,12 @@ require ( require ( atomicgo.dev/cursor v0.2.0 // indirect atomicgo.dev/schedule v0.1.0 // indirect - github.com/Masterminds/semver/v3 v3.2.1 // indirect - github.com/MrAlias/otel-schema-utils v0.2.1-alpha // indirect github.com/agext/levenshtein v1.2.2 // indirect github.com/alecthomas/chroma/v2 v2.14.0 // indirect github.com/alecthomas/kingpin/v2 v2.3.2 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/auth0/go-jwt-middleware/v2 v2.2.2 // indirect - github.com/aws/aws-sdk-go v1.55.5 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 // indirect @@ -150,10 +147,8 @@ require ( github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect github.com/yuin/goldmark v1.7.4 // indirect github.com/yuin/goldmark-emoji v1.0.3 // indirect - go.opentelemetry.io/contrib/detectors/aws/ec2 v1.30.0 // indirect go.opentelemetry.io/otel/log v0.3.0 // indirect go.opentelemetry.io/otel/metric v1.30.0 // indirect - go.opentelemetry.io/otel/schema v0.0.7 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.27.0 // indirect diff --git a/go.sum b/go.sum index b7fc823e..ead05777 100644 --- a/go.sum +++ b/go.sum @@ -257,8 +257,8 @@ github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/openrdap/rdap v0.9.2-0.20240517203139-eb57b3a8dedd h1:UuQycBx6K0lB0/IfHePshOYjlrptkF4FoApFP2Y4s3k= github.com/openrdap/rdap v0.9.2-0.20240517203139-eb57b3a8dedd/go.mod h1:391Ww1JbjG4FHOlvQqCd6n25CCCPE64JzC5cCYPxhyM= -github.com/overmindtech/aws-source v0.0.0-20240926144404-f751a73d0bdf h1:fsv7zkFY+FghGaEtIRd4YNCup9cYy/EGH+hprJrNoSw= -github.com/overmindtech/aws-source v0.0.0-20240926144404-f751a73d0bdf/go.mod h1:fNCoRjQq82KFjdX2mCgEWxNb+l6uZGjRGqrZkmVkpuQ= +github.com/overmindtech/aws-source v0.0.0-20240926151408-e4942cf01757 h1:edUCzmJJfG1WkRQ7ntlbpaHpHxYQHsBXuZq+2V4BmLw= +github.com/overmindtech/aws-source v0.0.0-20240926151408-e4942cf01757/go.mod h1:fNCoRjQq82KFjdX2mCgEWxNb+l6uZGjRGqrZkmVkpuQ= github.com/overmindtech/discovery v0.28.1 h1:yCW82atxCRuXvzuXjz5mUkztcyFZGsIgswkLr2SJ5Ho= github.com/overmindtech/discovery v0.28.1/go.mod h1:z8a5z1ZnwT2+kMFrudhEefQZzVbju65WVdQLR6AsRZI= github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297 h1:ih4bqBMHTCtg3lMwJszNkMGO9n7Uoe0WX5be1/x+s+g= @@ -267,8 +267,8 @@ github.com/overmindtech/sdp-go v0.94.0 h1:yEJtdUJ8+rqW6dsJtZWzblu19864LOope/vSkg github.com/overmindtech/sdp-go v0.94.0/go.mod h1:Yac80f4ua/N2b1WlQU7/IqIJebLN27LMB2EvmV9QKmk= github.com/overmindtech/sdpcache v1.6.4 h1:MJoYBDqDE3s8FrRzZ0RPgFiH39HWI/Mv2ImH1NdLT8k= github.com/overmindtech/sdpcache v1.6.4/go.mod h1:/F9XStVdntRJEQjlZ86BPuB1Y7VPo1PFcsCNiU1IoGE= -github.com/overmindtech/stdlib-source v0.0.0-20240926134010-3b0fe91d0e18 h1:mKGMFtxy19ilX6U4ysVdWwxA/zLbcrm0gEbfN7AEURo= -github.com/overmindtech/stdlib-source v0.0.0-20240926134010-3b0fe91d0e18/go.mod h1:J/DE+bAGZZXdeRwmv1xa3qCrXaxDXNwfF57yJ7tR5hg= +github.com/overmindtech/stdlib-source v0.0.0-20240926151404-3201148cfa40 h1:U0vgNLhbrLErHYV14GB6V3asOpKhmHu137/7bDrmq+M= +github.com/overmindtech/stdlib-source v0.0.0-20240926151404-3201148cfa40/go.mod h1:6p6PA3DY5Oki+mZJCT7f0t9Oe4Di4piRMWiykWhDmas= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=