Consolidate config creation into MetaCPAN::Server::Config

oalders · oalders · commit dc055b926fdb · 2024-09-08T21:04:29.000-04:00
diff --git a/etc/metacpan_testing.pl b/etc/metacpan_testing.pl
diff --git a/lib/Catalyst/Plugin/Session/Store/ElasticSearch.pm b/lib/Catalyst/Plugin/Session/Store/ElasticSearch.pm
@@ -6,14 +6,15 @@ use Moose;
 extends 'Catalyst::Plugin::Session::Store';
 use MooseX::Types::ElasticSearch qw( ES );
 
-use MetaCPAN::Config ();
+use MetaCPAN::Server::Config ();
 
 has _session_es => (
     required => 1,
     is       => 'ro',
     coerce   => 1,
     isa      => ES,
-    default  => sub { MetaCPAN::Config::config()->{elasticsearch_servers} },
+    default  =>
+        sub { MetaCPAN::Server::Config::config()->{elasticsearch_servers} },
 );
 has _session_es_index => (
     required => 1,
diff --git a/lib/MetaCPAN/Role/HasConfig.pm b/lib/MetaCPAN/Role/HasConfig.pm
@@ -2,7 +2,7 @@ package MetaCPAN::Role::HasConfig;
 
 use Moose::Role;
 
-use MetaCPAN::Config          ();
+use MetaCPAN::Server::Config  ();
 use MetaCPAN::Types::TypeTiny qw( HashRef );
 use MetaCPAN::Util            qw( checkout_root );
 
@@ -20,7 +20,7 @@ has _config => (
 
 sub _build_config {
     my $self = shift;
-    return MetaCPAN::Config::config();
+    return MetaCPAN::Server::Config::config();
 }
 
 1;
diff --git a/lib/MetaCPAN/Role/Logger.pm b/lib/MetaCPAN/Role/Logger.pm
@@ -2,10 +2,11 @@ package MetaCPAN::Role::Logger;
 
 use v5.10;
 use Moose::Role;
-use Log::Contextual qw( set_logger );
+
+use Log::Contextual           qw( set_logger );
 use Log::Log4perl ':easy';
 use MetaCPAN::Types::TypeTiny qw( Logger Str );
-use Path::Tiny                qw( path );
+use Path::Tiny qw( path );
 
 has level => (
     is            => 'ro',
@@ -45,8 +46,6 @@ sub set_logger_once {
     return;
 }
 
-# XXX NOT A MOOSE BUILDER
-# XXX This doesn't belong here.
 sub _build_logger {
     my ($config) = @_;
     my $log = Log::Log4perl->get_logger( $ARGV[0]
diff --git a/lib/MetaCPAN/Role/Script.pm b/lib/MetaCPAN/Role/Script.pm
@@ -5,16 +5,14 @@ use Moose::Role;
 use Carp                                   ();
 use ElasticSearchX::Model::Document::Types qw( ES );
 use File::Path                             ();
-use IO::Prompt                             ();
+use IO::Prompt::Tiny                       qw( prompt );
 use Log::Contextual                        qw( :log :dlog );
 use MetaCPAN::Model                        ();
 use MetaCPAN::Types::TypeTiny              qw( Bool HashRef Int Path Str );
 use MetaCPAN::Util                         qw( checkout_root );
 use Mojo::Server                           ();
 use Term::ANSIColor                        qw( colored );
 
-use IO::Prompt::Tiny qw( prompt );
-
 with( 'MetaCPAN::Role::HasConfig', 'MetaCPAN::Role::Fastly',
     'MetaCPAN::Role::Logger' );
 
diff --git a/lib/MetaCPAN/Script/Mapping.pm b/lib/MetaCPAN/Script/Mapping.pm
@@ -254,8 +254,6 @@ sub delete_all {
         || $runtime_environment eq 'testing';
 
     if ($is_development) {
-        $self->are_you_sure("ALL Indices will be deleted !!!");
-
         foreach my $name ( keys %{ $self->indices_info } ) {
             $self->_delete_index($name);
         }
diff --git a/lib/MetaCPAN/Script/Runner.pm b/lib/MetaCPAN/Script/Runner.pm
@@ -3,9 +3,10 @@ package MetaCPAN::Script::Runner;
 use strict;
 use warnings;
 
-use Config::ZOMG        ();
-use File::Path          ();
-use Hash::Merge::Simple qw( merge );
+use File::Path               ();
+use MetaCPAN::Server::Config ();
+use Module::Pluggable        qw( plugins );
+use Module::Pluggable        qw( plugins );
 use Module::Pluggable search_path => ['MetaCPAN::Script'];
 use Module::Runtime ();
 use Term::ANSIColor qw( colored );
@@ -21,7 +22,8 @@ sub run {
     die "Usage: metacpan [command] [args]" unless ($class);
     Module::Runtime::require_module( $plugins{$class} );
 
-    my $config = build_config();
+    my $config = MetaCPAN::Server::Config::config();
+    $config->{es} = $config->{elasticsearch_servers};
 
     foreach my $logger ( @{ $config->{logger} || [] } ) {
         my $path = $logger->{filename} or next;
@@ -75,21 +77,6 @@ sub run {
     return ( $EXIT_CODE == 0 );
 }
 
-sub build_config {
-    my $config = Config::ZOMG->new(
-        name => 'metacpan',
-        path => 'etc'
-    )->load;
-    if ( $ENV{HARNESS_ACTIVE} ) {
-        my $tconf = Config::ZOMG->new(
-            name => 'metacpan',
-            file => 'etc/metacpan_testing.pl'
-        )->load;
-        $config = merge $config, $tconf;
-    }
-    return $config;
-}
-
 # AnyEvent::Run calls the main method
 *main = \&run;
 
diff --git a/lib/MetaCPAN/Script/Snapshot.pm b/lib/MetaCPAN/Script/Snapshot.pm
@@ -8,7 +8,7 @@ use DateTime                  ();
 use DateTime::Format::ISO8601 ();
 use HTTP::Tiny                ();
 use Log::Contextual           qw( :log );
-use MetaCPAN::Config          ();
+use MetaCPAN::Server::Config  ();
 use MetaCPAN::Types::TypeTiny qw( ArrayRef Bool Str );
 use Moose;
 use Sys::Hostname qw( hostname );
@@ -82,7 +82,8 @@ has snap_name => (
 has host => (
     is      => 'ro',
     isa     => Str,
-    default => sub { MetaCPAN::Config::config()->{elasticsearch_servers} },
+    default =>
+        sub { MetaCPAN::Server::Config::config()->{elasticsearch_servers} },
     documentation => 'ES host, defaults to: http://localhost:9200',
 );
 
diff --git a/lib/MetaCPAN/Server/Config.pm b/lib/MetaCPAN/Server/Config.pm
@@ -1,10 +1,10 @@
-package MetaCPAN::Config;
+package MetaCPAN::Server::Config;
 
 use warnings;
 use strict;
 
-use FindBin         ();
 use Config::ZOMG    ();
+use FindBin         ();
 use Module::Runtime qw( require_module );
 
 sub config {
@@ -14,10 +14,16 @@ sub config {
     require_module('Git::Helpers');
     $config = _zomg( Git::Helpers::checkout_root() );
 
-    return $config if $config;
+    if ( !$config ) {
+        die "Couldn't find config file in $FindBin::RealBin/.. or "
+            . Git::Helpers::checkout_root();
+    }
+
+    if ( defined $config->{logger} && ref $config->{logger} ne 'ARRAY' ) {
+        $config->{logger} = [ $config->{logger} ];
+    }
 
-    die "Couldn't find config file in $FindBin::RealBin/.. or "
-        . Git::Helpers::checkout_root();
+    return $config;
 }
 
 sub _zomg {
diff --git a/lib/MetaCPAN/Server/Model/CPAN.pm b/lib/MetaCPAN/Server/Model/CPAN.pm
@@ -2,8 +2,8 @@ package MetaCPAN::Server::Model::CPAN;
 
 use Moose;
 
-use MetaCPAN::Config ();
-use MetaCPAN::Model  ();
+use MetaCPAN::Model          ();
+use MetaCPAN::Server::Config ();
 
 extends 'Catalyst::Model';
 
@@ -22,7 +22,7 @@ has index => (
 has servers => (
     is      => 'ro',
     default => sub {
-        return MetaCPAN::Config::config()->{elasticsearch_servers};
+        return MetaCPAN::Server::Config::config()->{elasticsearch_servers};
     },
 );
 
diff --git a/metacpan_server.conf b/metacpan_server.conf
@@ -1,8 +1,15 @@
 git /usr/bin/git
 
+level info
 elasticsearch_servers = :9200
 minion_dsn = postgresql:///minion_queue
 
+<logger>
+    class Log::Log4perl::Appender::File
+    filename ../var/log/metacpan.log
+    syswrite 1
+</logger>
+
 <controller User::Turing>
     # required for server startup -- override this in metacpan_server_local.conf
     private_key 59125ffc09413eed3f2a2c07a37c7a44b95633e2
diff --git a/metacpan_server_testing.conf b/metacpan_server_testing.conf
@@ -1,7 +1,14 @@
 cpan var/t/tmp/fakecpan
+die_on_error 1
+level warn
 source_base var/t/tmp/source
 
-elasticsearch_servers = http://elasticsearch_test:9200
+elasticsearch_servers = elasticsearch_test:9200
+
+<logger>
+    class Log::Log4perl::Appender::Screen
+    name testing
+</logger>
 
 <model CPAN>
     servers __ENV(ES)__
diff --git a/t/config.t b/t/config.t
@@ -3,10 +3,10 @@
 use strict;
 use warnings;
 
-use MetaCPAN::Config ();
+use MetaCPAN::Server::Config ();
 use Test::More import => [qw( done_testing ok )];
 
-my $config = MetaCPAN::Config::config();
+my $config = MetaCPAN::Server::Config::config();
 ok($config);
 
 done_testing();
diff --git a/t/lib/MetaCPAN/Server/Test.pm b/t/lib/MetaCPAN/Server/Test.pm
@@ -3,10 +3,10 @@ package MetaCPAN::Server::Test;
 use strict;
 use warnings;
 
-use HTTP::Request::Common qw( DELETE GET POST ); ## no perlimports
-use MetaCPAN::Config      ();
-use MetaCPAN::Server      ();
-use Plack::Test           qw( test_psgi );          ## no perlimports
+use HTTP::Request::Common    qw( DELETE GET POST );    ## no perlimports
+use MetaCPAN::Server         ();
+use MetaCPAN::Server::Config ();
+use Plack::Test              qw( test_psgi );          ## no perlimports
 use Test::More;
 
 use base 'Exporter';
@@ -43,7 +43,9 @@ use MetaCPAN::Model ();
 sub model {
     MetaCPAN::Model->new(
         es => (
-            nodes => [ MetaCPAN::Config::config()->{elasticsearch_servers} ]
+            nodes => [
+                MetaCPAN::Server::Config::config()->{elasticsearch_servers}
+            ]
         )
     );
 }
diff --git a/t/lib/MetaCPAN/TestHelpers.pm b/t/lib/MetaCPAN/TestHelpers.pm
@@ -1,3 +1,5 @@
+package MetaCPAN::TestHelpers;
+
 use strict;
 use warnings;
 
@@ -7,10 +9,10 @@ package    # no_index
 use Cpanel::JSON::XS         qw( decode_json encode_json );
 use File::Copy               qw( copy );
 use File::pushd              qw( pushd );
-use FindBin                  ();
-use MetaCPAN::Script::Runner ();
+use MetaCPAN::Server::Config ();
 use MetaCPAN::Util           qw( checkout_root );
 use Path::Tiny               qw( path );
+use Test::More import => [qw( diag is ok )];
 use Test::More;
 use Test::Routine::Util qw( run_tests );
 use Try::Tiny           qw( catch finally try );
@@ -98,13 +100,7 @@ sub test_release {
 }
 
 sub get_config {
-    my $config = do {
-
-        # build_config expects test to be t/*.t
-        local $FindBin::RealBin = path( checkout_root(), 't' );
-        MetaCPAN::Script::Runner->build_config;
-    };
-    return $config;
+    return MetaCPAN::Server::Config::config();
 }
 
 sub tmp_dir {
diff --git a/t/lib/MetaCPAN/TestServer.pm b/t/lib/MetaCPAN/TestServer.pm
diff --git a/t/script/cover.t b/t/script/cover.t

Original file line number	Diff line number	Diff line change
`@@ -254,8 +254,6 @@ sub delete_all {`
`254`	`254`	`\|\| $runtime_environment eq 'testing';`
`255`	`255`
`256`	`256`	`if ($is_development) {`
`257`		`- $self->are_you_sure("ALL Indices will be deleted !!!");`
`258`		`-`
`259`	`257`	`foreach my $name ( keys %{ $self->indices_info } ) {`
`260`	`258`	`$self->_delete_index($name);`
`261`	`259`	`}`