Require "base_url:" to be set and non-empty (#5)

cirruslabs · Jul 3, 2024 · 814fa61 · 814fa61
1 parent 86453d5
commit 814fa61
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/internal/command/run/run.go b/internal/command/run/run.go
@@ -47,6 +47,10 @@ func run(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
+	if config.BaseURL == nil {
+		return fmt.Errorf("base URL needs to be specified")
+	}
+
 	maxBytes, err := humanize.ParseBytes(config.Disk.Limit)
 	if err != nil {
 		return err
@@ -62,7 +66,7 @@ func run(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
-	server, err := serverpkg.New(addr, (*url.URL)(&config.BaseURL), config.OIDCProviders, localCache, remoteCache)
+	server, err := serverpkg.New(addr, (*url.URL)(config.BaseURL), config.OIDCProviders, localCache, remoteCache)
 	if err != nil {
 		return err
 	}

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"fmt"
 	"gopkg.in/yaml.v3"
 	"io"
 	"net/url"
@@ -9,6 +10,10 @@ import (
 type BaseURL url.URL
 
 func (baseURL *BaseURL) UnmarshalYAML(value *yaml.Node) error {
+	if value.Value == "" {
+		return fmt.Errorf("base URL cannot be empty")
+	}
+
 	parsedURL, err := url.Parse(value.Value)
 	if err != nil {
 		return err
@@ -20,7 +25,7 @@ func (baseURL *BaseURL) UnmarshalYAML(value *yaml.Node) error {
 }
 
 type Config struct {
-	BaseURL       BaseURL        `yaml:"base_url"`
+	BaseURL       *BaseURL       `yaml:"base_url"`
 	OIDCProviders []OIDCProvider `yaml:"oidc_providers"`
 	Disk          Disk           `yaml:"disk"`
 	S3            S3             `yaml:"s3"`

diff --git a/internal/config/config_test.go b/internal/config/config_test.go
@@ -15,7 +15,7 @@ func TestParse(t *testing.T) {
 	actualConfig, err := config.Parse(configFile)
 	require.NoError(t, err)
 	require.Equal(t, &config.Config{
-		BaseURL: config.BaseURL{
+		BaseURL: &config.BaseURL{
 			Scheme: "https",
 			Host:   "example.com",
 		},