adapt Mapping script to use ESConfig module

ESConfig knows how to find mapping data. Use it to find the mapping data
as well as index configuration.

The mapping data should be able to be moved into json files rather than
json wrapped in a module. This can happen in the future.

Author: haarg

lib/MetaCPAN/Script/Mapping.pm

@@ -2,25 +2,11 @@ package MetaCPAN::Script::Mapping;
 
 use Moose;
 
-use Cpanel::JSON::XS                              qw( decode_json );
-use DateTime                                      ();
-use Log::Contextual                               qw( :log );
-use MetaCPAN::Script::Mapping::Contributor        ();
-use MetaCPAN::Script::Mapping::Cover              ();
-use MetaCPAN::Script::Mapping::CPAN::Author       ();
-use MetaCPAN::Script::Mapping::CPAN::Distribution ();
-use MetaCPAN::Script::Mapping::CPAN::Favorite     ();
-use MetaCPAN::Script::Mapping::CPAN::File         ();
-use MetaCPAN::Script::Mapping::CPAN::Mirror       ();
-use MetaCPAN::Script::Mapping::CPAN::Package      ();
-use MetaCPAN::Script::Mapping::CPAN::Permission   ();
-use MetaCPAN::Script::Mapping::CPAN::Release      ();
-use MetaCPAN::Script::Mapping::CVE                ();
-use MetaCPAN::Script::Mapping::DeployStatement    ();
-use MetaCPAN::Script::Mapping::User::Account      ();
-use MetaCPAN::Script::Mapping::User::Identity     ();
-use MetaCPAN::Script::Mapping::User::Session      ();
-use MetaCPAN::Types::TypeTiny                     qw( Bool Str );
+use Cpanel::JSON::XS          qw( decode_json );
+use DateTime                  ();
+use Log::Contextual           qw( :log );
+use MetaCPAN::ESConfig        qw( es_config );
+use MetaCPAN::Types::TypeTiny qw( Bool Str );
 
 use constant {
     EXPECTED     => 1,
@@ -29,13 +15,6 @@ use constant {
 
 with 'MetaCPAN::Role::Script', 'MooseX::Getopt';
 
-has cpan_index => (
-    is            => 'ro',
-    isa           => Str,
-    default       => 'cpan_v1_01',
-    documentation => 'real name for the cpan index',
-);
-
 has arg_deploy_mapping => (
     init_arg      => 'delete',
     is            => 'ro',
@@ -285,11 +264,9 @@ sub update_index {
     die "update_index requires patch_mapping\n"
         unless $self->patch_mapping;
 
-    my $patch_mapping    = decode_json $self->patch_mapping;
-    my @patch_types      = sort keys %{$patch_mapping};
-    my $dep              = $self->index->deployment_statement;
-    my $existing_mapping = delete $dep->{mappings};
-    my $mapping = +{ map { $_ => $patch_mapping->{$_} } @patch_types };
+    my $patch_mapping = decode_json $self->patch_mapping;
+    my @patch_types   = sort keys %{$patch_mapping};
+    my $mapping       = +{ map { $_ => $patch_mapping->{$_} } @patch_types };
 
     log_info {"Updating mapping for index: $name"};
 
@@ -311,15 +288,14 @@ sub create_index {
     my $dst_idx = $self->arg_create_index;
     $self->_check_index_exists( $dst_idx, NOT_EXPECTED );
 
-    my $patch_mapping = decode_json $self->patch_mapping;
-    my @patch_types   = sort keys %{$patch_mapping};
-    my $dep           = $self->index->deployment_statement;
-    delete $dep->{mappings};
-    my $mapping = +{};
+    my $patch_mapping  = decode_json $self->patch_mapping;
+    my @patch_types    = sort keys %{$patch_mapping};
+    my $index_settings = es_config->index_settings($dst_idx);
+    my $mapping        = +{};
 
     # create the new index with the copied settings
     log_info {"Creating index: $dst_idx"};
-    $self->es->indices->create( index => $dst_idx, body => $dep );
+    $self->es->indices->create( index => $dst_idx, body => $index_settings );
 
     # override with new type mapping
     if ( $self->patch_mapping ) {
@@ -489,51 +465,25 @@ sub show_info {
 }
 
 sub _build_mapping {
-    my $self = $_[0];
-    return {
-        $self->cpan_index => {
-            author =>
-                decode_json(MetaCPAN::Script::Mapping::CPAN::Author::mapping),
-            distribution => decode_json(
-                MetaCPAN::Script::Mapping::CPAN::Distribution::mapping),
-            favorite => decode_json(
-                MetaCPAN::Script::Mapping::CPAN::Favorite::mapping),
-            file =>
-                decode_json(MetaCPAN::Script::Mapping::CPAN::File::mapping),
-            mirror =>
-                decode_json(MetaCPAN::Script::Mapping::CPAN::Mirror::mapping),
-            permission => decode_json(
-                MetaCPAN::Script::Mapping::CPAN::Permission::mapping),
-            package => decode_json(
-                MetaCPAN::Script::Mapping::CPAN::Package::mapping),
-            release => decode_json(
-                MetaCPAN::Script::Mapping::CPAN::Release::mapping),
-        },
+    my $self     = $_[0];
+    my $docs     = es_config->documents;
+    my $mappings = {};
+    for my $name ( sort keys %$docs ) {
+        my $doc   = $docs->{$name};
+        my $index = $doc->{index}
+            or die "no index defined for $name documents";
+        my $type = $doc->{type}
+            or die "no type defined for $name documents";
+        my $mapping = es_config->mapping($name);
+        $mappings->{$index}{$type} = $mapping;
+    }
 
-        user => {
-            account => decode_json(
-                MetaCPAN::Script::Mapping::User::Account::mapping),
-            identity => decode_json(
-                MetaCPAN::Script::Mapping::User::Identity::mapping),
-            session => decode_json(
-                MetaCPAN::Script::Mapping::User::Session::mapping),
-        },
-        contributor => {
-            contributor =>
-                decode_json(MetaCPAN::Script::Mapping::Contributor::mapping),
-        },
-        cover => {
-            cover => decode_json(MetaCPAN::Script::Mapping::Cover::mapping),
-        },
-        cve => {
-            cve => decode_json(MetaCPAN::Script::Mapping::CVE::mapping),
-        },
-    };
+    return $mappings;
 }
 
 sub _build_aliases {
     my $self = $_[0];
-    return { 'cpan' => $self->cpan_index };
+    es_config->aliases;
 }
 
 sub deploy_mapping {
@@ -546,18 +496,16 @@ sub deploy_mapping {
     # Deserialize the Index Mapping Structure
     my $rmappings = $self->_build_mapping;
 
-    my $deploy_statement
-        = decode_json(MetaCPAN::Script::Mapping::DeployStatement::mapping);
-
     my $es = $self->es;
 
     # recreate the indices and apply the mapping
 
     for my $idx ( sort keys %$rmappings ) {
         $self->_delete_index($idx) if $es->indices->exists( index => $idx );
+        my $index_settings = es_config->index_settings($idx);
 
         log_info {"Creating index: $idx"};
-        $es->indices->create( index => $idx, body => $deploy_statement );
+        $es->indices->create( index => $idx, body => $index_settings );
 
         for my $type ( sort keys %{ $rmappings->{$idx} } ) {
             log_info {"Adding mapping: $idx/$type"};