Move Spaces FromEnv into blob; Upload takes Object; drop logSpaces.

cmd/server/main.go

@@ -25,9 +25,7 @@ func main() {
 	st := openStore()
 	defer st.Close()
 
-	uploader := spacesUploader()
-	logSpaces(uploader)
-
+	uploader := blob.FromEnv()
 	handler := newHandler(st, uploader)
 	run(&http.Server{Addr: listenAddr(), Handler: handler})
 }
@@ -45,14 +43,6 @@ func openStore() *store.Store {
 	return st
 }
 
-func logSpaces(uploader blob.Uploader) {
-	if uploader.Enabled() {
-		log.Printf("avatars: digitalocean spaces")
-		return
-	}
-	log.Printf("avatars: uploads disabled (set SPACES_* to enable)")
-}
-
 func newHandler(st *store.Store, uploader blob.Uploader) http.Handler {
 	srv, err := web.New(st, st.SessionStore(), plumber.TemplateFS, plumber.StaticFS, web.Config{
 		AdminUsername: os.Getenv("ADMIN_USERNAME"),
@@ -93,17 +83,6 @@ func run(httpSrv *http.Server) {
 	}
 }
 
-func spacesUploader() blob.Uploader {
-	return blob.NewSpaces(blob.SpacesConfig{
-		Key:      os.Getenv("SPACES_KEY"),
-		Secret:   os.Getenv("SPACES_SECRET"),
-		Region:   os.Getenv("SPACES_REGION"),
-		Bucket:   os.Getenv("SPACES_BUCKET"),
-		Endpoint: os.Getenv("SPACES_ENDPOINT"),
-		CDNBase:  os.Getenv("SPACES_CDN_BASE"),
-	})
-}
-
 // listenAddr prefers PORT (App Platform / PaaS), then LISTEN, then :8080.
 func listenAddr() string {
 	if p := strings.TrimSpace(os.Getenv("PORT")); p != "" {