add Apache license to psql docker files

.rat-excludes

@@ -1 +1,41 @@
-./docs/*
+VERSION
+BUILD_NUMBER
+.*.md
+README.*
+.git.*
+.rat-excludes
+.keep
+docs
+vendor
+misc
+profile\..*
+profiles
+.*.json
+.*.cfg
+.*.conf
+.*.js
+jquery.*
+jMenu.*
+traffic_ops/lib/Schema/Results
+.*.jsx
+\.classpath
+\.project
+etc
+.*.prop
+tomcat
+perl5
+.*.css
+.*.crt
+.*.key
+.bowerrc
+traffic_server
+checks
+.*.csv
+.*.svg
+.*.xml.test
+.*.config.dist
+CrStates
+.*.logrotate
+.jshintrc
+testFiles
+.*.txt

infrastructure/docker/traffic_ops/Dockerfile

@@ -16,7 +16,7 @@
 # under the License.
 ############################################################
 # Dockerfile to build Traffic Ops 1.6.0 container images
-# Based on CentOS 6.6
+# Based on CentOS 7.2
 ############################################################
 
 # Example Build and Run:
@@ -27,16 +27,11 @@
 #
 # docker run --name my-traffic-ops --hostname my-traffic-ops --net cdnet --publish 443:443 --env MYSQL_IP=my-traffic-ops-mysql --env MYSQL_PORT=3306 --env MYSQL_ROOT_PASS=secretrootpass --env MYSQL_TRAFFIC_OPS_PASS=supersecretpassword --env ADMIN_USER=superroot --env ADMIN_PASS=supersecreterpassward --env CERT_COUNTRY=US --env CERT_STATE=Colorado --env CERT_CITY=Denver --env CERT_COMPANY=NotComcast --env TRAFFIC_VAULT_PASS=marginallylesssecret --env DOMAIN=cdnet --detach traffic_ops:1.5.1
 
-FROM centos:6.6
+FROM centos:7
 MAINTAINER Dan Kirkwood
 
-RUN yum -y update 
-RUN yum install -y tar gcc-c++ perl perl-core openssl-devel mysql-devel expect curl
-RUN yum clean all
-
-RUN curl -L https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm | perl - App::cpanminus \
-    && cpanm Carton \
-    && rm -rf /root/.cpanm
+RUN yum install -y perl cpanminus perl-Test-CPAN-Meta
+RUN cpanm Carton
 
 # Override RPM arg to use a different one using --build-arg RPM=...  Can be local file or http://...
 ARG RPM=http://traffic-control-cdn.net/downloads/1.7.0/RELEASE-1.7.0/traffic_ops-1.7.0-3908.5b77f60f.x86_64.rpm
@@ -48,13 +43,6 @@ RUN rm /$(basename $RPM)
 
 RUN cd /opt/traffic_ops/app && carton
 
-# TODO: workaround for installing on CentOS 7 -- fix this!
-RUN chmod a+x /opt/traffic_ops/app/bin/* \
-	 /opt/traffic_ops/app/script/* \
-	 /opt/traffic_ops/app/db/*.pl \
-	 /opt/traffic_ops/app/db/*.sh \
-	 /opt/traffic_ops/install/bin/*
-
 RUN export PERL5LIB=/opt/traffic_ops/app/local/lib/perl5/:/opt/traffic_ops/install/lib/ \
 	&& export TERM=xterm \
 	&& export USER=root \

traffic_ops/app/conf/development/database.conf

@@ -1,10 +1,10 @@
 
 {
-	"description": "Local MySQL database on port 3306",
+	"description": "Local PostgreSQL database on port 5432",
 	"dbname": "to_development",
 	"hostname": "localhost",
-	"user": "to_user",
+	"user": "to_development",
 	"password": "twelve",
-	"port": "3306",
-	"type": "mysql"
+	"port": "5432",
+	"type": "Pg"
 }

traffic_ops/app/conf/integration/database.conf

@@ -1,9 +1,9 @@
 {
-   "description": "Local MySQL database on port 3306",
+   "description": "Local PostgreSQL database on port 5432",
    "dbname": "to_integration",
    "hostname": "localhost",
-   "user": "to_user",
+   "user": "to_integration",
    "password": "twelve",
-   "port": "3306",
-   "type": "mysql"
+   "port": "5432",
+   "type": "Pg"
 }

traffic_ops/app/conf/production/database.conf

@@ -1,10 +1,10 @@
 
 {
-	"description": "Local MySQL database on port 3306",
-	"dbname": "traffic_ops_db",
+	"description": "Local PostgreSQL database on port 5432",
+	"dbname": "traffic_ops",
 	"hostname": "localhost",
 	"user": "traffic_ops",
 	"password": "password",
-	"port": "3306",
-	"type": "mysql"
+	"port": "5432",
+	"type": "Pg"
 }

traffic_ops/app/conf/test/database.conf

@@ -1,9 +1,9 @@
 {
-   "description": "Local MySQL database on port 3306",
+   "description": "Local PostgreSQL database on port 5432",
    "dbname": "to_test",
    "hostname": "localhost",
-   "user": "to_user",
+   "user": "to_test",
    "password": "twelve",
-   "port": "3306",
-   "type": "mysql"
+   "port": "5432",
+   "type": "Pg"
 }

traffic_ops/app/cpanfile

@@ -42,8 +42,7 @@ requires 'Config::Properties';
 requires 'Context::Preserve';
 requires 'Data::GUID';
 requires 'DBD::SQLite';
-#requires 'Time::HiRes'; # required by DBD::mysql
-requires 'DBD::mysql', '==4.029';
+requires 'DBD::Pg';
 requires 'DBI';
 requires 'DBIx::Class';
 requires 'DBIx::Class::Core';
@@ -275,3 +274,4 @@ requires 'Net::DNS::SEC::Private';
 requires 'LWP::Protocol::https';
 requires 'Net::CIDR';
 requires 'Data::Validate::IP';
+requires 'YAML';

traffic_ops/app/db/admin.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/env perl 
+#!/usr/bin/env perl
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,6 +24,9 @@
 use Schema;
 use CPAN::Meta;
 use File::Find::Rule;
+
+use YAML;
+use YAML qw(LoadFile);
 use DBIx::Class::Schema::Loader qw/make_schema_at/;
 
 my $usage = "\n"
@@ -32,71 +35,56 @@
 	. "Purpose:  This script is used to manage database. The environments are\n"
 	. "          defined in the dbconf.yml, as well as the database names.\n\n"
 	. "arguments:   \n\n"
-	. "create  - Execute db 'create' the database for the current environment.\n"
+	. "createdb  - Execute db 'createdb' the database for the current environment.\n"
+	. "dropdb  - Execute db 'dropdb' on the database for the current environment.\n"
 	. "down  - Roll back a single migration from the current version.\n"
-	. "drop  - Execute db 'drop' on the database for the current environment.\n"
+	. "createuser  - Execute 'createuser' the user for the current environment.\n"
+	. "dropuser  - Execute 'dropuser' the user for the current environment.\n"
+	. "showusers  - Execute sql to show all of the user for the current environment.\n"
 	. "redo  - Roll back the most recently applied migration, then run it again.\n"
-	. "reset  - Execute db drop, create, load_schema, migrate on the database for the current environment.\n"
+	. "reset  - Execute db 'dropdb', 'createdb', load_schema, migrate on the database for the current environment.\n"
 	. "reverse_schema  - Reverse engineer the lib/Schema/Result files from the environment database.\n"
 	. "seed  - Execute sql from db/seeds.sql for loading static data.\n"
-	. "setup  - Execute db drop, create, load_schema, migrate, seed on the database for the current environment.\n"
+	. "setup  - Execute db dropdb, createdb, load_schema, migrate, seed on the database for the current environment.\n"
 	. "status  - Print the status of all migrations.\n"
 	. "upgrade  - Execute migrate then seed on the database for the current environment.\n";
 
 my $environment = 'development';
-my $db_string   = 'tcp:127.0.0.1:3306*twelve_monkeys/twelve_monkeys/twelve';
 my $db_protocol;
 
 # This is defaulted to 'to_development' so
 # you don't have to specify --env=development for dev workstations
 my $db_name     = 'to_development';
-my $db_username = 'to_user';
+my $db_username = 'to_development';
 my $db_password = '';
 my $host_ip     = '';
 my $host_port   = '';
 GetOptions( "env=s" => \$environment );
 $ENV{'MOJO_MODE'} = $environment;
-my $dbh = Schema->database_handle;
-
-sub database_handle_no_dbname {
-	my $self    = shift;
-	my $db_info = Schema->get_dbinfo();
-	our $user = $db_info->{user};
-	our $pass = $db_info->{password};
-	our $dsn  = get_dsn_no_dbname();
-
-	return DBI->connect( $dsn, $user, $pass, { AutoCommit => 1 } );
-}
-
-sub get_dsn_no_dbname {
-	my $self = shift;
-
-	my $db_info = Schema->get_dbinfo();
-	our $dbname   = $db_info->{dbname};
-	our $hostname = $db_info->{hostname};
-	our $port     = $db_info->{port};
-	our $type     = $db_info->{type};
-	our $dsn      = "DBI:$type:host=$hostname;port=$port";
-}
-
-my $dbh_no_dbname = database_handle_no_dbname;
 
-my $schema = Schema->connect_to_database;
-
-parse_dbconf_yml_mysql_driver();
+parse_dbconf_yml_pg_driver();
 
 STDERR->autoflush(1);
 my $argument = shift(@ARGV);
 if ( defined($argument) ) {
-	if ( $argument eq 'create' ) {
-		create();
+	if ( $argument eq 'createdb' ) {
+		createdb();
+	}
+	elsif ( $argument eq 'dropdb' ) {
+		dropdb();
 	}
-	elsif ( $argument eq 'drop' ) {
-		drop();
+	elsif ( $argument eq 'createuser' ) {
+		createuser();
+	}
+	elsif ( $argument eq 'dropuser' ) {
+		dropuser();
+	}
+	elsif ( $argument eq 'showusers' ) {
+		showusers();
 	}
 	elsif ( $argument eq 'reset' ) {
-		drop();
-		create();
+		dropdb();
+		createdb();
 		load_schema();
 		migrate('up');
 	}
@@ -105,8 +93,8 @@ sub get_dsn_no_dbname {
 		seed();
 	}
 	elsif ( $argument eq 'setup' ) {
-		drop();
-		create();
+		dropdb();
+		createdb();
 		load_schema();
 		migrate('up');
 		seed();
@@ -135,70 +123,72 @@ sub get_dsn_no_dbname {
 	elsif ( $argument eq 'reverse_schema' ) {
 		reverse_schema();
 	}
+	else {
+		print $usage;
+	}
 }
 else {
 	print $usage;
 }
 
 exit(0);
 
-sub parse_dbconf_yml_mysql_driver {
-	my ($db_conf) = @_;
-
-	my @files = File::Find::Rule->file()->name('dbconf.yml')->in('.');
-	my $meta  = Parse::CPAN::Meta->load_file( $files[0] );
-
-	# Mysql connection string parsing, if db changes added switch here
-	# based on the driver: in dbconf.xml
-	my $db_connection_string = $meta->{$environment}->{open};
-
-	my @options = split( ':', $db_connection_string );
-	$db_protocol = $options[0];
-
-	$host_ip         = $options[1];
-	my @port_options = split( '\*', $options[2] );
-	$host_port       = $port_options[0];
-
-	my $rest_of_options = $port_options[1];
-	my @db_options = split( '/', $rest_of_options );
-	$db_name     = $db_options[0];
-	$db_username = $db_options[1];
-	$db_password = $db_options[2];
+sub parse_dbconf_yml_pg_driver {
+	my $db_conf       = LoadFile('db/dbconf.yml');
+	my $db_connection = $db_conf->{$environment};
+	$db_protocol = $db_connection->{driver};
+	my $open = $db_connection->{open};
+
+	# Goose requires the 'open' line in the dbconf file to be a scalar.
+	# example:
+	#		open: host=127.0.0.1 port=5432 user=to_user password=twelve dbname=to_development sslmode=disable
+	# We need access to these values for db connections so I am manipulating the 'open'
+	# line so that it can be loaded into a hash.
+	$open = join "\n", map { s/=/ : /; $_ } split " ", $open;
+	my $hash = Load $open;
+
+	$host_ip     = $hash->{host};
+	$host_port   = $hash->{port};
+	$db_name     = $hash->{dbname};
+	$db_username = $hash->{user};
+	$db_password = $hash->{password};
 }
 
 sub migrate {
 	my ($command) = @_;
+
 	print "Migrating database...\n";
 	system( 'goose --env=' . $environment . ' ' . $command );
 }
 
 sub seed {
-	print "Seeding database...\n";
-	system("mysql -h $host_ip -P $host_port $db_name -u$db_username -p$db_password < db/seeds.sql");
+	print "Seeding database.\n";
+	system("psql -h $host_ip -p $host_port -d $db_name -U $db_username -e < db/seeds.sql");
 }
 
 sub load_schema {
-	print "Creating database tables...\n";
-	system("mysql -h $host_ip -P $host_port $db_name -u$db_username -p$db_password < db/create_tables.sql");
+	print "Creating database tables.\n";
+	system("psql -h $host_ip -p $host_port -d $db_name -U $db_username -e < db/create_tables.sql");
 }
 
-sub drop {
-	my $q = "drop database " . $db_name;
-	print "Executing '" . $q . "'\n";
-	if ( defined($dbh) ) {
-		my $stmt = $dbh_no_dbname->prepare($q);
-		$stmt->execute();
-	}
-	else {
-		print "No database to drop\n";
-	}
+sub dropdb {
+	system("dropdb -h $host_ip -p $host_port -U $db_username -e --if-exists $db_name;");
+}
+
+sub createdb {
+	system("createdb -h $host_ip -p $host_port -U $db_username -e $db_name;");
+}
+
+sub createuser {
+	system("createuser -h $host_ip -p $host_port -P -e --superuser $db_username;");
+}
+
+sub dropuser {
+	system("dropuser -h $host_ip -p $host_port -i -e $db_username;");
 }
 
-sub create {
-	my $q = "create database " . $db_name;
-	print "Executing '" . $q . "'\n";
-	my $stmt = $dbh_no_dbname->prepare($q);
-	$stmt->execute();
+sub showusers {
+	system("psql postgres -c '\\du';");
 }
 
 sub reverse_schema {