Remove pop from Proxy & RDBMS storage getter

.travis.yml

@@ -7,8 +7,8 @@ go:
 env:
   global:
     - PATH=${PATH}:./bin
-    - POP_PATH=$PWD/cmd/proxy
-    - GO_ENV=test_postgres
+    - POP_PATH=$PWD/cmd/olympus
+    - GO_ENV=test
     - MINIO_ACCESS_KEY=minio
     - MINIO_SECRET_KEY=minio123
     - ATHENS_MONGO_CONNECTION_STRING=mongodb://127.0.0.1:27017
@@ -20,8 +20,9 @@ before_script:
   - make setup-dev-env
   - wget "https://dl.minio.io/server/minio/release/linux-amd64/minio"
   - chmod +x minio && nohup ./minio server . &
-  - buffalo db create
-  - buffalo db migrate up
+  - buffalo db create -e $GO_ENV -d -c $POP_PATH/database.yml
+  - buffalo db migrate up -e $GO_ENV -d -c $POP_PATH/database.yml
+
 
 script:
   - make verify test-unit test-e2e

Makefile

@@ -51,7 +51,6 @@ bench:
 
 .PHONY: alldeps
 alldeps:
-	docker-compose -p athensdev up -d mysql
 	docker-compose -p athensdev up -d postgres
 	docker-compose -p athensdev up -d mongo
 	docker-compose -p athensdev up -d redis

cmd/olympus/actions/app.go

@@ -109,11 +109,6 @@ func App(config *AppConfig) (*buffalo.App, error) {
 		// TODO: initialize the azurecdn.Storage struct here
 	}))
 
-	// Wraps each request in a transaction.
-	//  c.Value("tx").(*pop.PopTransaction)
-	// Remove to disable this.
-	// app.Use(middleware.PopTransaction(models.DB))
-
 	// Setup and use translations:
 	if T, err = i18n.New(packr.NewBox("../locales"), "en-US"); err != nil {
 		app.Stop(err)

cmd/olympus/actions/storage.go

@@ -8,7 +8,6 @@ import (
 	"github.com/gomods/athens/pkg/storage/fs"
 	"github.com/gomods/athens/pkg/storage/mem"
 	"github.com/gomods/athens/pkg/storage/mongo"
-	"github.com/gomods/athens/pkg/storage/rdbms"
 	"github.com/spf13/afero"
 )
 
@@ -35,12 +34,6 @@ func GetStorage() (storage.Backend, error) {
 		}
 		certPath := env.MongoCertPath()
 		return mongo.NewStorageWithCert(connectionString, certPath)
-	case "postgres", "sqlite", "cockroach", "mysql":
-		connectionName, err := env.RdbmsName()
-		if err != nil {
-			return nil, err
-		}
-		return rdbms.NewRDBMSStorage(connectionName)
 	default:
 		return nil, fmt.Errorf("storage type %s is unknown", storageType)
 	}

cmd/olympus/database.yml

@@ -1,29 +1,22 @@
 development:
-  dialect: "mysql"
+  dialect: "postgres"
   database: athens
   host: 127.0.0.1
-  port: 3306
-  user: vgp
-  password: vgp
+  port: 5432
+  user: postgres
+  password: postgres
 
-test_postgres:
+test:
   dialect: "postgres"
-  database: athens_development
+  database: athens_test
   user: postgres
-  password: ''
+  password: postgres
+  port: 5432
   host: 127.0.0.1
   pool: 5
 
-test:
-  dialect: "mysql"
-  database: athens
-  host: 127.0.0.1
-  port: 3306
-  user: vgp
-  password: vgp
-
 production:
-  dialect: "mysql"
+  dialect: "postgres"
   database: olympusdb
   host: {{ env "DB_HOST" }}
   port: {{ env "DB_PORT" }}

cmd/olympus/migrations/schema.sql

@@ -1,40 +1,57 @@
--- MySQL dump 10.13  Distrib 5.7.21, for osx10.13 (x86_64)
---
--- Host: 127.0.0.1    Database: athens
--- ------------------------------------------------------
--- Server version	5.7.21
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `schema_migration`
---
-
-DROP TABLE IF EXISTS `schema_migration`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `schema_migration` (
-  `version` varchar(255) NOT NULL,
-  UNIQUE KEY `version_idx` (`version`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2018-06-06 12:42:59
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 9.6.9
+-- Dumped by pg_dump version 10.4
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET client_min_messages = warning;
+SET row_security = off;
+
+--
+-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: 
+--
+
+CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
+
+
+--
+-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: 
+--
+
+COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
+
+
+SET default_tablespace = '';
+
+SET default_with_oids = false;
+
+--
+-- Name: schema_migration; Type: TABLE; Schema: public; Owner: postgres
+--
+
+CREATE TABLE public.schema_migration (
+    version character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.schema_migration OWNER TO postgres;
+
+--
+-- Name: schema_migration_version_idx; Type: INDEX; Schema: public; Owner: postgres
+--
+
+CREATE UNIQUE INDEX schema_migration_version_idx ON public.schema_migration USING btree (version);
+
+
+--
+-- PostgreSQL database dump complete
+--
+

cmd/olympus/models/models.go

@@ -1,22 +1,5 @@
 package models
 
-import (
-	"log"
-
-	"github.com/gobuffalo/pop"
-	"github.com/gomods/athens/pkg/config/env"
-)
-
-// DB is a connection to your database to be used
-// throughout your application.
-var DB *pop.Connection
-
 func init() {
-	var err error
-	env := env.GoEnvironmentWithDefault("development")
-	DB, err = pop.Connect(env)
-	if err != nil {
-		log.Fatal(err)
-	}
-	pop.Debug = env == "development"
+
 }

cmd/olympus/models/models_test.go

@@ -2,15 +2,8 @@ package models_test
 
 import (
 	"testing"
-
-	"github.com/gobuffalo/suite"
 )
 
-type ModelSuite struct {
-	*suite.Model
-}
-
 func Test_ModelSuite(t *testing.T) {
-	as := &ModelSuite{suite.NewModel()}
-	suite.Run(t, as)
+
 }

cmd/proxy/actions/app.go

@@ -119,12 +119,6 @@ func App() (*buffalo.App, error) {
 		csrfMiddleware := csrf.New
 		app.Use(csrfMiddleware)
 	}
-
-	// Wraps each request in a transaction.
-	//  c.Value("tx").(*pop.PopTransaction)
-	// Remove to disable this.
-	// app.Use(middleware.PopTransaction(models.DB))
-
 	// Setup and use translations:
 	if T, err = i18n.New(packr.NewBox("../locales"), "en-US"); err != nil {
 		app.Stop(err)

cmd/proxy/actions/storage.go

@@ -12,7 +12,6 @@ import (
 	"github.com/gomods/athens/pkg/storage/mem"
 	"github.com/gomods/athens/pkg/storage/minio"
 	"github.com/gomods/athens/pkg/storage/mongo"
-	"github.com/gomods/athens/pkg/storage/rdbms"
 	"github.com/spf13/afero"
 )
 
@@ -43,12 +42,6 @@ func GetStorage() (storage.Backend, error) {
 			return nil, fmt.Errorf("could not create new storage from os fs (%s)", err)
 		}
 		return s, nil
-	case "postgres", "sqlite", "cockroach", "mysql":
-		storageRoot, err = env.RdbmsName()
-		if err != nil {
-			return nil, err
-		}
-		return rdbms.NewRDBMSStorage(storageRoot)
 	case "minio":
 		endpoint, err := env.MinioEndpoint()
 		if err != nil {

docker-compose.yml

@@ -9,19 +9,13 @@ services:
     image: mongo:3.7.9-jessie
     ports:
       - 27017:27017
-  mysql:
-    image: bitnami/mysql:5.7.21-r7
-    ports:
-      - "3306:3306"
-    environment:
-      - "ALLOW_EMPTY_PASSWORD=yes"
-      - "MYSQL_USER=vgp"
-      - "MYSQL_PASSWORD=vgp"
-      - "MYSQL_DATABASE=athens"
   postgres:
     image: postgres:9.6.9-alpine
     ports:
       - "5432:5432"
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
   minio:
     image: minio/minio:latest
     command: server /data