Merge pull request #1296 from metacpan/haarg/esconfig

ESConfig: configurable Elasticsearch document types to allow splitting index

Author: haarg

.perlcriticrc

@@ -16,6 +16,9 @@ theme = core
 [-ValuesAndExpressions::ProhibitNoisyQuotes]
 [-Variables::ProhibitPunctuationVars]
 
+# doesn't understand signatures
+[-Subroutines::ProhibitSubroutinePrototypes]
+
 [CodeLayout::RequireTrailingCommas]
 severity = 4
 

lib/Catalyst/Plugin/Session/Store/ElasticSearch.pm

@@ -6,6 +6,7 @@ use Moose;
 extends 'Catalyst::Plugin::Session::Store';
 use MooseX::Types::ElasticSearch qw( ES );
 
+use MetaCPAN::ESConfig       qw( es_doc_path );
 use MetaCPAN::Server::Config ();
 use MetaCPAN::Util           qw( true false );
 
@@ -17,26 +18,12 @@ has _session_es => (
     default =>
         sub { MetaCPAN::Server::Config::config()->{elasticsearch_servers} },
 );
-has _session_es_index => (
-    required => 1,
-    is       => 'ro',
-    default  => sub { shift->_session_plugin_config->{index} || 'user' }
-);
-has _session_es_type => (
-    required => 1,
-    is       => 'ro',
-    default  => sub { shift->_session_plugin_config->{type} || 'session' }
-);
 
 sub get_session_data {
     my ( $self, $key ) = @_;
     if ( my ($sid) = $key =~ /^\w+:(.*)/ ) {
         my $data = eval {
-            $self->_session_es->get(
-                index => $self->_session_es_index,
-                type  => $self->_session_es_type,
-                id    => $sid,
-            );
+            $self->_session_es->get( es_doc_path('session'), id => $sid, );
         } || return undef;
         if ( $key =~ /^expires:/ ) {
             return $data->{_source}->{_expires};
@@ -52,8 +39,7 @@ sub store_session_data {
     if ( my ($sid) = $key =~ /^session:(.*)/ ) {
         $session->{_expires} = $self->session_expires;
         $self->_session_es->index(
-            index   => $self->_session_es_index,
-            type    => $self->_session_es_type,
+            es_doc_path('session'),
             id      => $sid,
             body    => $session,
             refresh => true,
@@ -66,8 +52,7 @@ sub delete_session_data {
     if ( my ($sid) = $key =~ /^session:(.*)/ ) {
         eval {
             $self->_session_es->delete(
-                index   => $self->_session_es_index,
-                type    => $self->_session_es_type,
+                es_doc_path('session'),
                 id      => $sid,
                 refresh => true,
             );
@@ -93,8 +78,6 @@ sub delete_expired_sessions { }
  MyApp->config(
      'Plugin::Session' => {
          servers => ':9200',
-         index   => 'user',
-         type    => 'session',
      } );
 
 =head1 DESCRIPTION

lib/MetaCPAN/API/Model/Cover.pm

@@ -1,5 +1,6 @@
 package MetaCPAN::API::Model::Cover;
 
+use MetaCPAN::ESConfig qw( es_doc_path );
 use MetaCPAN::Moose;
 
 use MetaCPAN::Util qw(hit_total);
@@ -12,9 +13,8 @@ sub find_release_coverage {
     my $query = +{ term => { release => $release } };
 
     my $res = $self->_run_query(
-        index => 'cover',
-        type  => 'cover',
-        body  => {
+        es_doc_path('cover'),
+        body => {
             query => $query,
             size  => 999,
         }

lib/MetaCPAN/API/Model/User.pm

@@ -1,5 +1,6 @@
 package MetaCPAN::API::Model::User;
 
+use MetaCPAN::ESConfig qw( es_doc_path );
 use MetaCPAN::Moose;
 
 with 'MetaCPAN::API::Model::Role::ES';
@@ -17,8 +18,7 @@ sub lookup {
     };
 
     my $res = $self->_run_query(
-        index       => 'user',
-        type        => 'account',
+        es_doc_path('account'),
         body        => { query => $query },
         search_type => 'dfs_query_then_fetch',
     );

lib/MetaCPAN/API/Plugin/Model.pm

@@ -21,10 +21,7 @@ has download => sub {
 
 has search => sub {
     my $self = shift;
-    return MetaCPAN::Query::Search->new(
-        es         => $self->app->es,
-        index_name => 'cpan',
-    );
+    return MetaCPAN::Query::Search->new( es => $self->app->es, );
 };
 
 has user => sub {

lib/MetaCPAN/Document/Author.pm

@@ -7,9 +7,10 @@ use ElasticSearchX::Model::Document::Types qw( Location );
 use ElasticSearchX::Model::Document;
 
 # load order not important
-use Gravatar::URL             ();
-use MetaCPAN::Types           qw( ESBool Profile );
-use MetaCPAN::Types::TypeTiny qw(
+use Gravatar::URL                       ();
+use MetaCPAN::Document::Author::Profile ();
+use MetaCPAN::Types                     qw( ESBool Profile );
+use MetaCPAN::Types::TypeTiny           qw(
     ArrayRef
     ArrayRefPromote
     Blog

lib/MetaCPAN/Document/Author/Set.pm

@@ -16,10 +16,7 @@ has query_author => (
 
 sub _build_query_author {
     my $self = shift;
-    return MetaCPAN::Query::Author->new(
-        es         => $self->es,
-        index_name => $self->index->name,
-    );
+    return MetaCPAN::Query::Author->new( es => $self->es );
 }
 
 __PACKAGE__->meta->make_immutable;

lib/MetaCPAN/Document/CVE/Set.pm

@@ -20,10 +20,7 @@ has query_cve => (
 
 sub _build_query_cve {
     my $self = shift;
-    return MetaCPAN::Query::CVE->new(
-        es         => $self->es,
-        index_name => 'cve',
-    );
+    return MetaCPAN::Query::CVE->new( es => $self->es );
 }
 
 __PACKAGE__->meta->make_immutable;

lib/MetaCPAN/Document/Contributor/Set.pm

@@ -16,10 +16,7 @@ has query_contributor => (
 
 sub _build_query_contributor {
     my $self = shift;
-    return MetaCPAN::Query::Contributor->new(
-        es         => $self->es,
-        index_name => 'contributor',
-    );
+    return MetaCPAN::Query::Contributor->new( es => $self->es );
 }
 
 __PACKAGE__->meta->make_immutable;

lib/MetaCPAN/Document/Cover/Set.pm

@@ -16,10 +16,7 @@ has query_cover => (
 
 sub _build_query_cover {
     my $self = shift;
-    return MetaCPAN::Query::Cover->new(
-        es         => $self->es,
-        index_name => 'cover',
-    );
+    return MetaCPAN::Query::Cover->new( es => $self->es );
 }
 
 __PACKAGE__->meta->make_immutable;