Split parse configuration function

README.md

@@ -36,7 +36,7 @@ The application can be configured with the following environment variables:
 - `IAM_ENDPOINT`: Endpoint for IAM role retrieving (Can be blank for AWS)
 - `SSE_TYPE`: Specified server side encrpytion (defaults blank) Valid values can be `SSE`, `KMS`, `SSE-C` all others values don't enable the SSE
 - `SSE_KEY`: The key needed for SSE method (only for `KMS` and `SSE-C`)
-- `TIMEOUT`: The read timout and write timout in second (default to `600` - 10 minute)
+- `TIMEOUT`: The read and write timout in seconds (default to `600` - 10 minutes)
 
 ### Build and Run Locally
 

go.mod

@@ -33,7 +33,7 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
 	golang.org/x/crypto v0.11.0 // indirect
-	golang.org/x/net v0.12.0 // indirect
+	golang.org/x/net v0.13.0 // indirect
 	golang.org/x/sys v0.10.0 // indirect
 	golang.org/x/text v0.11.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect

go.sum

@@ -285,8 +285,8 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
-golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
+golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
+golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=

main.go

@@ -24,7 +24,25 @@ var templateFS embed.FS
 //go:embed web/static
 var staticFS embed.FS
 
-func main() {
+type configuration struct {
+	Endpoint            string
+	UseIam              bool
+	IamEndpoint         string
+	AccessKeyID         string
+	SecretAccessKey     string
+	Region              string
+	AllowDelete         bool
+	ForceDownload       bool
+	UseSSL              bool
+	SkipSSLVerification bool
+	ListRecursive       bool
+	Port                string
+	Timeout             int32
+	SseType             string
+	SseKey              string
+}
+
+func parseConfiguration() configuration {
 	var accessKeyID, secretAccessKey, iamEndpoint string
 
 	viper.AutomaticEnv()
@@ -67,13 +85,38 @@ func main() {
 	viper.SetDefault("PORT", "8080")
 	port := viper.GetString("PORT")
 
+	viper.SetDefault("TIMEOUT", 600)
+	timeout := viper.GetInt32("TIMEOUT")
+
 	viper.SetDefault("SSE_TYPE", "")
+	sseType := viper.GetString("SSE_TYPE")
 	viper.SetDefault("SSE_KEY", "")
+	sseKey := viper.GetString("SSE_KEY")
+
+	return configuration{
+		Endpoint:            endpoint,
+		UseIam:              useIam,
+		IamEndpoint:         iamEndpoint,
+		AccessKeyID:         accessKeyID,
+		SecretAccessKey:     secretAccessKey,
+		Region:              region,
+		AllowDelete:         allowDelete,
+		ForceDownload:       forceDownload,
+		UseSSL:              useSSL,
+		SkipSSLVerification: skipSSLVerification,
+		ListRecursive:       listRecursive,
+		Port:                port,
+		Timeout:             timeout,
+		SseType:             sseType,
+		SseKey:              sseKey,
+	}
+}
 
-	sseType := s3manager.SSEType{Type: viper.GetString("SSE_TYPE"), Key: viper.GetString("SSE_KEY")}
+func main() {
+	configuration := parseConfiguration()
 
-	viper.SetDefault("TIMEOUT", 600)
-	serverTimeout := time.Duration(viper.GetInt32("TIMEOUT")) * time.Second
+	sseType := s3manager.SSEType{Type: configuration.SseType, Key: configuration.SseKey}
+	serverTimeout := time.Duration(configuration.Timeout) * time.Second
 
 	// Set up templates
 	templates, err := fs.Sub(templateFS, "web/template")
@@ -88,21 +131,21 @@ func main() {
 
 	// Set up S3 client
 	opts := &minio.Options{
-		Secure: useSSL,
+		Secure: configuration.UseSSL,
 	}
-	if useIam {
-		opts.Creds = credentials.NewIAM(iamEndpoint)
+	if configuration.UseIam {
+		opts.Creds = credentials.NewIAM(configuration.IamEndpoint)
 	} else {
-		opts.Creds = credentials.NewStaticV4(accessKeyID, secretAccessKey, "")
+		opts.Creds = credentials.NewStaticV4(configuration.AccessKeyID, configuration.SecretAccessKey, "")
 	}
 
-	if region != "" {
-		opts.Region = region
+	if configuration.Region != "" {
+		opts.Region = configuration.Region
 	}
-	if useSSL && skipSSLVerification {
+	if configuration.UseSSL && configuration.SkipSSLVerification {
 		opts.Transport = &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}} //nolint:gosec
 	}
-	s3, err := minio.New(endpoint, opts)
+	s3, err := minio.New(configuration.Endpoint, opts)
 	if err != nil {
 		log.Fatalln(fmt.Errorf("error creating s3 client: %w", err))
 	}
@@ -111,21 +154,21 @@ func main() {
 	r := mux.NewRouter()
 	r.Handle("/", http.RedirectHandler("/buckets", http.StatusPermanentRedirect)).Methods(http.MethodGet)
 	r.PathPrefix("/static/").Handler(http.StripPrefix("/static/", http.FileServer(http.FS(statics)))).Methods(http.MethodGet)
-	r.Handle("/buckets", s3manager.HandleBucketsView(s3, templates, allowDelete)).Methods(http.MethodGet)
-	r.PathPrefix("/buckets/").Handler(s3manager.HandleBucketView(s3, templates, allowDelete, listRecursive)).Methods(http.MethodGet)
+	r.Handle("/buckets", s3manager.HandleBucketsView(s3, templates, configuration.AllowDelete)).Methods(http.MethodGet)
+	r.PathPrefix("/buckets/").Handler(s3manager.HandleBucketView(s3, templates, configuration.AllowDelete, configuration.ListRecursive)).Methods(http.MethodGet)
 	r.Handle("/api/buckets", s3manager.HandleCreateBucket(s3)).Methods(http.MethodPost)
-	if allowDelete {
+	if configuration.AllowDelete {
 		r.Handle("/api/buckets/{bucketName}", s3manager.HandleDeleteBucket(s3)).Methods(http.MethodDelete)
 	}
 	r.Handle("/api/buckets/{bucketName}/objects", s3manager.HandleCreateObject(s3, sseType)).Methods(http.MethodPost)
-	r.Handle("/api/buckets/{bucketName}/objects/{objectName:.*}", s3manager.HandleGetObject(s3, forceDownload)).Methods(http.MethodGet)
-	if allowDelete {
+	r.Handle("/api/buckets/{bucketName}/objects/{objectName:.*}", s3manager.HandleGetObject(s3, configuration.ForceDownload)).Methods(http.MethodGet)
+	if configuration.AllowDelete {
 		r.Handle("/api/buckets/{bucketName}/objects/{objectName:.*}", s3manager.HandleDeleteObject(s3)).Methods(http.MethodDelete)
 	}
 
 	lr := logging.Handler(os.Stdout)(r)
 	srv := &http.Server{
-		Addr:         ":" + port,
+		Addr:         ":" + configuration.Port,
 		Handler:      lr,
 		ReadTimeout:  serverTimeout,
 		WriteTimeout: serverTimeout,