Add settable id for nats context options (#205)

nats-io · Jun 13, 2024 · 66c18d6 · 66c18d6
1 parent 91df8f4
commit 66c18d6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/surveyor/conn_pool.go b/surveyor/conn_pool.go
@@ -28,7 +28,8 @@ type natsContext struct {
 	TLSKey      string `json:"tls_key"`
 
 	// only passed programmatically
-	NatsOpts []nats.Option `json:"-"`
+	NatsOptsID string        `json:"nats_opts_id"`
+	NatsOpts   []nats.Option `json:"-"`
 }
 
 func (c *natsContext) copy() *natsContext {

diff --git a/surveyor/jetstream_advisories.go b/surveyor/jetstream_advisories.go
@@ -252,6 +252,8 @@ type JSAdvisoryConfig struct {
 	// optional configuration for importing JS metrics and advisories from other accounts
 	ExternalAccountConfig *JSAdvisoriesExternalAccountConfig `json:"-"`
 
+	// unique identifier for set of NATS options, to permit reload on change
+	NatsOptsID string `json:"nats_opts_id"`
 	// nats options appended to base surveyor options
 	NatsOpts []nats.Option `json:"-"`
 }
@@ -391,6 +393,7 @@ func (o *jsAdvisoryListener) natsContext() *natsContext {
 		TLSCA:       o.config.TLSCA,
 		TLSCert:     o.config.TLSCert,
 		TLSKey:      o.config.TLSKey,
+		NatsOptsID:  o.config.NatsOptsID,
 		NatsOpts:    o.config.NatsOpts,
 	}
 

diff --git a/surveyor/observation.go b/surveyor/observation.go
@@ -142,6 +142,8 @@ type ServiceObsConfig struct {
 	// optional configuration for importing observations from other accounts
 	ExternalAccountConfig *ServiceObservationExternalAccountConfig `json:"-"`
 
+	// unique identifier for set of NATS options, to permit reload on change
+	NatsOptsID string `json:"nats_opts_id"`
 	// nats options appended to base surveyor options
 	NatsOpts []nats.Option `json:"-"`
 }
@@ -266,6 +268,7 @@ func (o *serviceObsListener) natsContext() *natsContext {
 		TLSCA:       o.config.TLSCA,
 		TLSCert:     o.config.TLSCert,
 		TLSKey:      o.config.TLSKey,
+		NatsOptsID:  o.config.NatsOptsID,
 		NatsOpts:    o.config.NatsOpts,
 	}