fix tilt and address comments

Signed-off-by: pxp928 <[email protected]>
guacsec · Jan 27, 2024 · f653527 · f653527
1 parent 3e48108
commit f653527
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/cmd/guaccollect/cmd/files.go b/cmd/guaccollect/cmd/files.go
@@ -116,7 +116,7 @@ func getCollectorPublish(ctx context.Context, blobStore *blob.BlobStore, pubsub
 func initializeNATsandCollector(ctx context.Context, pubsubAddr string, blobAddr string) {
 	logger := logging.FromContext(ctx)
 
-	if strings.Contains(pubsubAddr, "nats://") {
+	if strings.HasPrefix(pubsubAddr, "nats://") {
 		// initialize jetstream
 		// TODO: pass in credentials file for NATS secure login
 		jetStream := emitter.NewJetStream(pubsubAddr, "", "")

diff --git a/cmd/guacingest/cmd/ingest.go b/cmd/guacingest/cmd/ingest.go
@@ -62,7 +62,7 @@ func ingest(cmd *cobra.Command, args []string) {
 	ctx, cf := context.WithCancel(logging.WithLogger(context.Background()))
 	logger := logging.FromContext(ctx)
 
-	if strings.Contains(opts.pubsubAddr, "nats://") {
+	if strings.HasPrefix(opts.pubsubAddr, "nats://") {
 		// initialize jetstream
 		// TODO: pass in credentials file for NATS secure login
 		jetStream := emitter.NewJetStream(opts.pubsubAddr, "", "")

diff --git a/internal/testing/cmd/pubsub_test/cmd/files.go b/internal/testing/cmd/pubsub_test/cmd/files.go
@@ -116,7 +116,7 @@ func getCollectorPublish(ctx context.Context, blobStore *blob.BlobStore, pubsub
 func initializeNATsandCollector(ctx context.Context, pubsubAddr string, blobAddr string) {
 	logger := logging.FromContext(ctx)
 
-	if strings.Contains(pubsubAddr, "nats://") {
+	if strings.HasPrefix(pubsubAddr, "nats://") {
 		// initialize jetstream
 		// TODO: pass in credentials file for NATS secure login
 		jetStream := emitter.NewJetStream(pubsubAddr, "", "")

diff --git a/k8s/k8s.yaml b/k8s/k8s.yaml
@@ -113,7 +113,7 @@ spec:
           command: ["/opt/guac/guacingest"]
           workingDir: /tmp
           env:
-            - name: GUAC_NATS_ADDR
+            - name: GUAC_PUBSUB_ADDR
               value: nats://nats:4222
 ---
 apiVersion: apps/v1
@@ -136,7 +136,7 @@ spec:
           command: ["/opt/guac/guaccollect", "image"]
           workingDir: /tmp
           env:
-            - name: GUAC_NATS_ADDR
+            - name: GUAC_PUBSUB_ADDR
               value: nats://nats:4222
             - name: GUAC_CSUB_ADDR
               value: guac-collectsub:2782
@@ -161,7 +161,7 @@ spec:
           command: ["/opt/guac/guaccollect", "deps_dev"]
           workingDir: /tmp
           env:
-            - name: GUAC_NATS_ADDR
+            - name: GUAC_PUBSUB_ADDR
               value: nats://nats:4222
             - name: GUAC_CSUB_ADDR
               value: guac-collectsub:2782
diff --git a/pkg/cli/store.go b/pkg/cli/store.go
@@ -35,7 +35,7 @@ func init() {
 
 	// Set of all flags used across GUAC clis and subcommands. Use consistent
 	// names for config file.
-	set.String("pubsub-addr", "nats://127.0.0.1:4222", "address to connect to a pubsub (default is NATS)")
+	set.String("pubsub-addr", "nats://127.0.0.1:4222", "gocloud connection string for pubsub configured via https://gocloud.dev/howto/pubsub/ (default is nats://127.0.0.1:4222)")
 	set.String("csub-addr", "localhost:2782", "address to connect to collect-sub service")
 	set.Bool("csub-tls", false, "enable tls connection to the server")
 	set.Bool("csub-tls-skip-verify", false, "skip verifying server certificate (for self-signed certificates for example)")
@@ -58,7 +58,7 @@ func init() {
 	set.String("neo4j-realm", "neo4j", "realm to connect to graph db")
 
 	// blob store address
-	set.String("blob-addr", "file:///path/to/dir", "address to the blob store configured via https://gocloud.dev/howto/blob/")
+	set.String("blob-addr", "file:///path/to/dir", "gocloud connection string for blob store configured via https://gocloud.dev/howto/blob/")
 
 	set.String("neptune-endpoint", "localhost", "address to neptune db")
 	set.Int("neptune-port", 8182, "port used for neptune db connection")

diff --git a/pkg/emitter/emitter.go b/pkg/emitter/emitter.go
@@ -63,7 +63,7 @@ func NewEmitterPubSub(_ context.Context, serviceURL string) *EmitterPubSub {
 // buildTopicURL constructs the full URL for a topic.
 // If using NATS, additional parameters are needed for jetstream
 func buildTopicURL(serviceURL string) string {
-	if strings.Contains(serviceURL, "nats://") {
+	if strings.HasPrefix(serviceURL, "nats://") {
 		return fmt.Sprintf("%s?subject=%s", serviceURL, subjectNameDocCollected)
 	} else {
 		return serviceURL
@@ -73,7 +73,7 @@ func buildTopicURL(serviceURL string) string {
 // buildSubscriptionURL constructs the full URL for subscription.
 // If using NATS, additional parameters are needed for jetstream
 func buildSubscriptionURL(serviceURL string) string {
-	if strings.Contains(serviceURL, "nats://") {
+	if strings.HasPrefix(serviceURL, "nats://") {
 		return fmt.Sprintf("%s?%s&subject=%s&consumer_durable=%s&stream_name=%s&stream_subjects=%s", serviceURL, "jetstream", subjectNameDocCollected, durableProcessor, streamName, streamSubjects)
 	} else {
 		return serviceURL