From 14f1b93d38f4cb883a886366343a1cfc3cbe2d6a Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Wed, 12 Oct 2022 13:03:42 -0800
Subject: [PATCH] chore: remove yaml config option

---
 backend/app/api/main.go         |  7 +------
 backend/go.mod                  |  1 -
 backend/go.sum                  |  4 ----
 backend/internal/config/conf.go | 18 +++---------------
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/backend/app/api/main.go b/backend/app/api/main.go
index 350c2f4..a1275d5 100644
--- a/backend/app/api/main.go
+++ b/backend/app/api/main.go
@@ -36,12 +36,7 @@ var (
 // @name                        Authorization
 // @description                 "Type 'Bearer TOKEN' to correctly set the API Key"
 func main() {
-	path := ""
-	if len(os.Args) > 1 {
-		path = os.Args[1]
-	}
-
-	cfg, err := config.NewConfig(path)
+	cfg, err := config.New()
 	if err != nil {
 		panic(err)
 	}
diff --git a/backend/go.mod b/backend/go.mod
index 24ee290..bd50721 100644
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -42,6 +42,5 @@ require (
 	golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/tools v0.1.13-0.20220804200503-81c7dc4e4efa // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/backend/go.sum b/backend/go.sum
index 7ce209a..62767e2 100644
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -61,13 +61,11 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
 github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
 github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -77,8 +75,6 @@ github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY=
 github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
-github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
diff --git a/backend/internal/config/conf.go b/backend/internal/config/conf.go
index 56488d9..a648bcc 100644
--- a/backend/internal/config/conf.go
+++ b/backend/internal/config/conf.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 
 	"github.com/ardanlabs/conf/v2"
-	"github.com/ardanlabs/conf/v2/yaml"
 
 	"os"
 )
@@ -37,24 +36,13 @@ type WebConfig struct {
 	MaxUploadSize int64  `yaml:"max_file_upload" conf:"default:10"`
 }
 
-// NewConfig parses the CLI/Config file and returns a Config struct. If the file argument is an empty string, the
+// New parses the CLI/Config file and returns a Config struct. If the file argument is an empty string, the
 // file is not read. If the file is not empty, the file is read and the Config struct is returned.
-func NewConfig(file string) (*Config, error) {
+func New() (*Config, error) {
 	var cfg Config
-
 	const prefix = "HBOX"
 
-	help, err := func() (string, error) {
-		if _, err := os.Stat(file); errors.Is(err, os.ErrNotExist) {
-			return conf.Parse(prefix, &cfg)
-		} else {
-			yamlData, err := os.ReadFile(file)
-			if err != nil {
-				return "", err
-			}
-			return conf.Parse(prefix, &cfg, yaml.WithData(yamlData))
-		}
-	}()
+	help, err := conf.Parse(prefix, &cfg)
 
 	if err != nil {
 		if errors.Is(err, conf.ErrHelpWanted) {