use our own ES type using Type::Tiny

metacpan · Jan 29, 2025 · d593825 · d593825
1 parent 087d367
commit d593825
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 30 deletions.
diff --git a/lib/Catalyst/Plugin/Session/Store/ElasticSearch.pm b/lib/Catalyst/Plugin/Session/Store/ElasticSearch.pm
@@ -4,7 +4,7 @@ package Catalyst::Plugin::Session::Store::ElasticSearch;
 
 use Moose;
 extends 'Catalyst::Plugin::Session::Store';
-use MooseX::Types::ElasticSearch qw( ES );
+use MetaCPAN::Types::TypeTiny qw( ES );
 
 use MetaCPAN::ESConfig       qw( es_doc_path );
 use MetaCPAN::Server::Config ();

diff --git a/lib/MetaCPAN/API.pm b/lib/MetaCPAN/API.pm
@@ -19,13 +19,13 @@ To run the api web server, run the following on one of the servers:
 
 use Mojo::Base 'Mojolicious';
 
-use File::Temp                   ();
-use List::Util                   qw( any );
-use MetaCPAN::Script::Runner     ();
-use Search::Elasticsearch        ();
-use Try::Tiny                    qw( catch try );
-use MetaCPAN::Server::Config     ();
-use MooseX::Types::ElasticSearch qw(ES);
+use File::Temp                ();
+use List::Util                qw( any );
+use MetaCPAN::Script::Runner  ();
+use Search::Elasticsearch     ();
+use Try::Tiny                 qw( catch try );
+use MetaCPAN::Server::Config  ();
+use MetaCPAN::Types::TypeTiny qw( ES );
 
 has es => sub {
     ES->assert_coerce(

diff --git a/lib/MetaCPAN/Query.pm b/lib/MetaCPAN/Query.pm
@@ -1,9 +1,9 @@
 package MetaCPAN::Query;
 use Moose;
 
-use Module::Runtime              qw( require_module );
-use Module::Pluggable::Object    ();
-use MooseX::Types::ElasticSearch qw( ES );
+use Module::Runtime           qw( require_module );
+use Module::Pluggable::Object ();
+use MetaCPAN::Types::TypeTiny qw( ES );
 
 has es => (
     is       => 'ro',

diff --git a/lib/MetaCPAN/Query/Role/Common.pm b/lib/MetaCPAN/Query/Role/Common.pm
@@ -1,7 +1,7 @@
 package MetaCPAN::Query::Role::Common;
 use Moose::Role;
 
-use MooseX::Types::ElasticSearch qw( ES );
+use MetaCPAN::Types::TypeTiny qw( ES );
 
 has es => (
     is       => 'ro',

diff --git a/lib/MetaCPAN/Role/Script.pm b/lib/MetaCPAN/Role/Script.pm
@@ -2,18 +2,17 @@ package MetaCPAN::Role::Script;
 
 use Moose::Role;
 
-use Carp                         ();
-use MooseX::Types::ElasticSearch qw( ES );
-use IO::Prompt::Tiny             qw( prompt );
-use Log::Contextual              qw( :log :dlog );
-use MetaCPAN::Model              ();
-use MetaCPAN::Types::TypeTiny    qw( AbsPath Bool HashRef Int Path Str );
-use MetaCPAN::Util               qw( root_dir );
-use Mojo::Server                 ();
-use Term::ANSIColor              qw( colored );
+use Carp                      ();
+use IO::Prompt::Tiny          qw( prompt );
+use Log::Contextual           qw( :log :dlog );
+use MetaCPAN::Model           ();
+use MetaCPAN::Types::TypeTiny qw( AbsPath Bool ES HashRef Int Path Str );
+use MetaCPAN::Util            qw( root_dir );
+use Mojo::Server              ();
+use Term::ANSIColor           qw( colored );
 
 use MooseX::Getopt::OptionTypeMap ();
-for my $type ( Path, AbsPath ) {
+for my $type ( Path, AbsPath, ES ) {
     MooseX::Getopt::OptionTypeMap->add_option_type_to_map( $type, '=s' );
 }
 

diff --git a/lib/MetaCPAN/Server/Model/ES.pm b/lib/MetaCPAN/Server/Model/ES.pm
@@ -2,8 +2,8 @@ package MetaCPAN::Server::Model::ES;
 
 use Moose;
 
-use MetaCPAN::Server::Config     ();
-use MooseX::Types::ElasticSearch qw( ES );
+use MetaCPAN::Server::Config  ();
+use MetaCPAN::Types::TypeTiny qw( ES );
 
 extends 'Catalyst::Model';
 

diff --git a/lib/MetaCPAN/Types/TypeTiny.pm b/lib/MetaCPAN/Types/TypeTiny.pm
@@ -20,6 +20,8 @@ use Type::Library -base, -declare => ( qw(
     HashRefCPANMeta
 
     CommaSepOption
+
+    ES
 ) );
 use Type::Utils qw( as coerce declare extends from via );
 
@@ -129,4 +131,30 @@ coerce CommaSepOption, from Str, via {
     return [ map split(/\s*,\s*/), $_ ];
 };
 
+declare ES, as Object;
+coerce ES, from Str, via {
+    my $server = $_;
+    $server = "127.0.0.1$server" if ( $server =~ /^:/ );
+    return Search::Elasticsearch->new(
+        nodes => $server,
+        cxn   => 'HTTPTiny',
+    );
+};
+
+coerce ES, from HashRef, via {
+    return Search::Elasticsearch->new( {
+        cxn => 'HTTPTiny',
+        %$_,
+    } );
+};
+
+coerce ES, from ArrayRef, via {
+    my @servers = @$_;
+    @servers = map { /^:/ ? "127.0.0.1$_" : $_ } @servers;
+    return Search::Elasticsearch->new(
+        nodes => \@servers,
+        cxn   => 'HTTPTiny',
+    );
+};
+
 1;
diff --git a/t/lib/MetaCPAN/Server/Test.pm b/t/lib/MetaCPAN/Server/Test.pm
@@ -4,12 +4,12 @@ use strict;
 use warnings;
 use feature qw(state);
 
-use HTTP::Request::Common        qw( DELETE GET POST );    ## no perlimports
-use MetaCPAN::Model              ();
-use MetaCPAN::Server             ();
-use MetaCPAN::Server::Config     ();
-use MooseX::Types::ElasticSearch qw( ES );
-use Plack::Test;                                           ## no perlimports
+use HTTP::Request::Common     qw( DELETE GET POST );    ## no perlimports
+use MetaCPAN::Model           ();
+use MetaCPAN::Server          ();
+use MetaCPAN::Server::Config  ();
+use MetaCPAN::Types::TypeTiny qw( ES );
+use Plack::Test;                                        ## no perlimports
 
 use base 'Exporter';
 our @EXPORT_OK = qw(