fix envconfig default (#505)

Signed-off-by: Kenny Leung <kleung@chainguard.dev>
chainguard-dev · Aug 21, 2024 · ef196e0 · ef196e0
1 parent abb622b
commit ef196e0
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/modules/bucket-events/cmd/trampoline/main.go b/modules/bucket-events/cmd/trampoline/main.go
@@ -25,8 +25,8 @@ import (
 )
 
 var env = envconfig.MustProcess(context.Background(), &struct {
-	Port       int    `env:"PORT" default:"8080" required:"true"`
-	IngressURI string `env:"INGRESS_URI" required:"true"`
+	Port       int    `env:"PORT, default=8080"`
+	IngressURI string `env:"INGRESS_URI, required"`
 }{})
 
 var eventTypes = map[string]string{

diff --git a/modules/cloudevent-broker/cmd/ingress/main.go b/modules/cloudevent-broker/cmd/ingress/main.go
@@ -37,8 +37,8 @@ const (
 )
 
 var env = envconfig.MustProcess(context.Background(), &struct {
-	Port  int    `env:"PORT" default:"8080" required:"true"`
-	Topic string `env:"PUBSUB_TOPIC" required:"true"`
+	Port  int    `env:"PORT, default:8080"`
+	Topic string `env:"PUBSUB_TOPIC, required"`
 }{})
 
 func main() {

diff --git a/modules/cloudevent-recorder/cmd/dejavu-bq/main.go b/modules/cloudevent-recorder/cmd/dejavu-bq/main.go
@@ -25,11 +25,11 @@ const (
 )
 
 var env = envconfig.MustProcess(context.Background(), &struct {
-	Host string `env:"HOST" default:"http://0.0.0.0" required:"true"`
-	Port int    `env:"PORT" default:"8080" required:"true"`
+	Host string `env:"HOST, default=http://0.0.0.0"`
+	Port int    `env:"PORT, default=8080"`
 
-	EventType   string `env:"EVENT_TYPE" default:"dev.chainguard.not_specified.not_specified" required:"true"`
-	EventSource string `env:"EVENT_SOURCE" default:"github.com" required:"true"`
+	EventType   string `env:"EVENT_TYPE, default=dev.chainguard.not_specified.not_specified"`
+	EventSource string `env:"EVENT_SOURCE, default=github.com"`
 
 	// Project is the GCP project where the dataset lives
 	Project string `env:"PROJECT" required:"true"`

diff --git a/modules/cloudevent-recorder/cmd/logrotate/main.go b/modules/cloudevent-recorder/cmd/logrotate/main.go
@@ -20,9 +20,9 @@ import (
 )
 
 var env = envconfig.MustProcess(context.Background(), &struct {
-	Bucket        string        `env:"BUCKET" required:"true"`
-	FlushInterval time.Duration `env:"FLUSH_INTERVAL" default:"3m"`
-	LogPath       string        `env:"LOG_PATH" required:"true"`
+	Bucket        string        `env:"BUCKET, required"`
+	FlushInterval time.Duration `env:"FLUSH_INTERVAL, default=3m"`
+	LogPath       string        `env:"LOG_PATH, required"`
 }{})
 
 func main() {

diff --git a/modules/cloudevent-recorder/cmd/recorder/main.go b/modules/cloudevent-recorder/cmd/recorder/main.go
@@ -23,8 +23,8 @@ import (
 )
 
 var env = envconfig.MustProcess(context.Background(), &struct {
-	Port    int    `env:"PORT" default:"8080" required:"true"`
-	LogPath string `env:"LOG_PATH" required:"true"`
+	Port    int    `env:"PORT, default=8080"`
+	LogPath string `env:"LOG_PATH, required"`
 }{})
 
 func main() {

diff --git a/modules/github-bots/sdk/bot.go b/modules/github-bots/sdk/bot.go
@@ -61,7 +61,7 @@ func (b *Bot) RegisterHandler(handler EventHandlerFunc) {
 }
 
 var env = envconfig.MustProcess(context.Background(), &struct {
-	Port int `env:"PORT" default:"8080" required:"true"`
+	Port int `env:"PORT, default=8080"`
 }{})
 
 func Serve(b Bot) {

diff --git a/modules/github-events/cmd/trampoline/main.go b/modules/github-events/cmd/trampoline/main.go
@@ -25,9 +25,9 @@ import (
 )
 
 var env = envconfig.MustProcess(context.Background(), &struct {
-	Port          int    `env:"PORT" default:"8080" required:"true"`
-	IngressURI    string `env:"EVENT_INGRESS_URI" required:"true"`
-	WebhookSecret string `env:"WEBHOOK_SECRET" required:"true"`
+	Port          int    `env:"PORT, default=8080"`
+	IngressURI    string `env:"EVENT_INGRESS_URI, required"`
+	WebhookSecret string `env:"WEBHOOK_SECRET, required"`
 }{})
 
 func main() {

diff --git a/pkg/httpmetrics/metrics.go b/pkg/httpmetrics/metrics.go
@@ -31,11 +31,11 @@ import (
 )
 
 var env = envconfig.MustProcess(context.Background(), &struct {
-	MetricsPort int `env:"METRICS_PORT" default:"2112"`
+	MetricsPort int `env:"METRICS_PORT, default=2112"`
 
 	// https://cloud.google.com/run/docs/container-contract#services-env-vars
-	KnativeServiceName  string `env:"K_SERVICE" default:"unknown"`
-	KnativeRevisionName string `env:"K_REVISION" default:"unknown"`
+	KnativeServiceName  string `env:"K_SERVICE, default=unknown"`
+	KnativeRevisionName string `env:"K_REVISION, default=unknown"`
 }{})
 
 // ServeMetrics serves the metrics endpoint if the METRICS_PORT env var is set.

diff --git a/pkg/profiler/profiler.go b/pkg/profiler/profiler.go
@@ -16,7 +16,7 @@ import (
 )
 
 var env = envconfig.MustProcess(context.Background(), &struct {
-	EnableProfiler bool `env:"ENABLE_PROFILER" default:"false" required:"false"`
+	EnableProfiler bool `env:"ENABLE_PROFILER, default=false"`
 }{})
 
 func SetupProfiler() {