fix: remove unneeded config values

Author: rickbassham

.gitignore

@@ -1 +1,2 @@
-build/
+build/
+.DS_Store

env/env.go

@@ -1,19 +1,11 @@
 package env
 
 import (
-	"time"
-
 	"github.com/caarlos0/env"
 )
 
 // Config represents the common environment variables needed for all apps.
 type Config struct {
-	AppName      string    `env:"APP_NAME,required"`
-	TeamName     string    `env:"TEAM_NAME,required"`
-	Environment  string    `env:"APP_ENV,required"`
-	BuildDate    time.Time `env:"BUILD_DATE"`
-	BuildGitHash string    `env:"BUILD_GIT_HASH,required"`
-	BuildGitTag  string    `env:"BUILD_GIT_TAG,required"`
 }
 
 // Load will bind the environment variables to the given config.

logging/log.go

@@ -24,12 +24,6 @@ func Initialize(c env.Config) *zap.Logger {
 	))
 
 	log = log.With(
-		zap.String("app_name", c.AppName),
-		zap.String("environment", c.Environment),
-		zap.String("build_git_hash", c.BuildGitHash),
-		zap.String("build_git_tag", c.BuildGitTag),
-		zap.Time("build_date", c.BuildDate),
-		zap.String("team", c.TeamName),
 		zap.String("run_id", uuid.New().String()),
 		zap.Time("start_time", time.Now()),
 	)

main.go

@@ -22,7 +22,6 @@ type config struct {
 	env.Config
 	ListenIPAddress string `env:"LISTEN_IP,required"`
 	ListenPort      int    `env:"LISTEN_PORT,required"`
-	CORSOrigin      string `env:"CORS_ORIGIN,required"`
 	WeeWxURL        string `env:"WEEWX_URL,required"`
 }
 
@@ -53,7 +52,7 @@ func main() {
 
 	h := handler.New(weewx.NewClient(c.WeeWxURL, log))
 
-	r := router.NewRouter(h, log, c.BuildGitTag, c.CORSOrigin)
+	r := router.NewRouter(h, log)
 
 	err = startHTTPServer(r, log, fmt.Sprintf("%s:%d", c.ListenIPAddress, c.ListenPort))
 	if err != nil {

router/router.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi"
-	"github.com/go-chi/cors"
 	"go.uber.org/zap"
 
 	"github.com/darkdragonsastro/weewx-json-alpaca/middleware"
@@ -52,21 +51,11 @@ type Handler interface {
 
 // NewRouter creates a new CORS enabled router for our API. All requests will be logged and
 // instrumented with New Relic.
-func NewRouter(h Handler, log *zap.Logger, version, corsOrigin string) http.Handler {
+func NewRouter(h Handler, log *zap.Logger) http.Handler {
 	r := chi.NewRouter()
 
-	cors := cors.New(cors.Options{
-		AllowedOrigins:   []string{corsOrigin},
-		AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
-		AllowedHeaders:   []string{"*"},
-		AllowCredentials: true,
-		MaxAge:           300,
-	})
-
-	r.Use(middleware.Version(version))
 	r.Use(middleware.TraceID)
 	r.Use(middleware.Logger(log))
-	r.Use(cors.Handler)
 	r.Use(middleware.Alpaca)
 	r.NotFound(h.NotFound)