Skip to content

Commit d8d44b4

Browse files
committed
chore: update env var
Signed-off-by: Brad McCoy <[email protected]>
1 parent 1674d7f commit d8d44b4

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

charts/cdevents-controller/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
2-
version: 0.0.4
3-
appVersion: 0.0.4
2+
version: 0.0.5
3+
appVersion: 0.0.5
44
name: cdevents-controller
55
engine: gotpl
66
description: CDEvents Github Contoller Helm Chart

charts/cdevents-controller/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ spec:
8888
- --h2c
8989
{{- end }}
9090
env:
91-
- name: cdevents-controller_MONGODB_URL
91+
- name: MONGODB_URL
9292
valueFrom:
9393
secretKeyRef:
9494
name: mongodb

cmd/cdevents-controller/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func main() {
7676
viper.RegisterAlias("backendUrl", "backend-url")
7777
hostname, _ := os.Hostname()
7878
viper.SetDefault("jwt-secret", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9")
79-
viper.SetDefault("mongodb-url", "mongodb://mongodb-headless:27017")
79+
viper.SetDefault("mongodb-url", "mongodb://mongodb-headless:27017") //localhost
8080
viper.SetDefault("ui-logo", "https://raw.githubusercontent.com/bradmccoydev/cdevents-controller/gh-pages/cuddle_clap.gif")
8181
viper.Set("hostname", hostname)
8282
viper.Set("version", version.VERSION)

pkg/api/cdevent.go

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package api
22

33
import (
44
"context"
5-
"fmt"
65
"io"
76
"log"
87
"net/http"
8+
"os"
99
"time"
1010

1111
"github.com/gorilla/mux"
@@ -28,33 +28,38 @@ func (s *Server) cdEventHandler(w http.ResponseWriter, r *http.Request) {
2828

2929
key := mux.Vars(r)["key"]
3030
body, err := io.ReadAll(r.Body)
31-
fmt.Printf("key: %s, body: %s", key, body)
31+
log.Printf("key: %s, body: %s", key, body)
3232
if err != nil {
3333
s.ErrorResponse(w, r, span, "reading the request body failed", http.StatusBadRequest)
3434
return
3535
}
3636

3737
var cdevent CDEvent
3838
if err := yaml.Unmarshal(body, &cdevent); err != nil {
39-
log.Fatal(err)
39+
log.Printf("Error Unmarshalling CDEvent: %s", err)
4040
}
4141

42-
client, err := mongo.NewClient(options.Client().ApplyURI(s.config.MongodbURL))
42+
mongoURL := os.Getenv("MONGODB_URL")
43+
log.Printf("Mongo URL is: %s", mongoURL)
44+
45+
//client, err := mongo.NewClient(options.Client().ApplyURI(s.config.MongodbURL))
46+
client, err := mongo.NewClient(options.Client().ApplyURI(mongoURL))
47+
4348
if err != nil {
44-
log.Fatal(err)
49+
log.Printf("Error Getting MongoDB Client: %s", err)
4550
}
4651

4752
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
4853
defer cancel()
4954

5055
err = client.Connect(ctx)
5156
if err != nil {
52-
log.Fatal(err)
57+
log.Printf("Error Connecting to Mongo: %s\n", err)
5358
}
5459

5560
defer func() {
5661
if err = client.Disconnect(ctx); err != nil {
57-
log.Fatal(err)
62+
log.Printf("Error Disconnecting from Mongo: %s\n", err)
5863
}
5964
}()
6065

@@ -63,10 +68,10 @@ func (s *Server) cdEventHandler(w http.ResponseWriter, r *http.Request) {
6368

6469
result, err := collection.InsertOne(ctx, cdevent)
6570
if err != nil {
66-
fmt.Printf("Error With Mongo: %s\n", err)
71+
log.Printf("Error With Mongo: %s\n", err)
6772
}
6873

69-
fmt.Printf("Inserted document with _id: %v\n", result.InsertedID)
74+
log.Printf("Inserted document with _id: %v\n", result.InsertedID)
7075

7176
s.JSONResponse(w, r, body)
7277
}

0 commit comments

Comments
 (0)