Skip to content

dev env updates #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2024
Merged

dev env updates #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions bin/snapshot.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,48 @@
use warnings;
use v5.36;

use Cpanel::JSON::XS qw< decode_json encode_json >;
use Cpanel::JSON::XS qw< decode_json encode_json >;
use DateTime ();
use DateTime::Format::ISO8601 ();
use HTTP::Tiny ();
use Getopt::Long;
use Sys::Hostname qw< hostname >;
use Try::Tiny;

use MetaCPAN::Logger qw< :log :dlog >;

use MetaCPAN::ES;
use MetaCPAN::Ingest qw< are_you_sure >;
use MetaCPAN::Ingest qw<
are_you_sure
config
is_dev
>;

# setup
my $hostname = hostname();
my $mode = $hostname =~ /dev/ ? 'testing' : 'production';
my $config = config();
my $mode = is_dev() ? 'testing' : 'production';
my $bucket = "mc-${mode}-backups"; # So we don't break production
my $repository_name = 'our_backups';

#my $es = MetaCPAN::ES->new( type => "distribution" );
#my $bulk = $es->bulk();
my $aws_key = $config->{es_aws_s3_access_key};
die "es_aws_s3_access_key not in config" unless $aws_key;

my $aws_secret = $config->{es_aws_s3_secret};
die "es_aws_s3_secret not in config" unless $aws_secret;

my $http_client = HTTP::Tiny->new(
default_headers => { 'Accept' => 'application/json' },
timeout => 120, # list can be slow
);

# args
my (
$date_format, $indices, $list, $purge_old, $restore,
$setup, $snap, $snap_name, $snap_stub
);
my $host = MetaCPAN::Server::Config::config()->{elasticsearch_servers};

my $host = $config->{es_node};

GetOptions(
"list" => \$list,
"date_format=s" => \$date_format,
Expand All @@ -45,20 +60,7 @@
# Note: can take wild cards https://www.elastic.co/guide/en/elasticsearch/reference/2.4/multi-index.html
$indices //= '*';

my $config = {}; ## TODO ( use MetaCPAN::Server::Config (); ??? )

my $aws_key = $config->{es_aws_s3_access_key};
my $aws_secret = $config->{es_aws_s3_secret};

my $http_client = HTTP::Tiny->new(
default_headers => { 'Accept' => 'application/json' },
timeout => 120, # list can be slow
);

# run
die "es_aws_s3_access_key not in config" unless $aws_key;
die "es_aws_s3_secret not in config" unless $aws_secret;

run_list_snaps() if $list;
run_setup() if $setup;
run_snapshot() if $snap;
Expand Down Expand Up @@ -205,7 +207,7 @@ ( $method, $path, $data )
Dlog_error {"Error response: $_"} $resp_json;
}
catch {
log_error { 'Error msg: ' . $response->{content} }
log_error { 'Error msg: ' . $response->{content} };
}
return 0;
}
Expand Down
3 changes: 2 additions & 1 deletion cpanfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ requires 'CPAN::DistnameInfo', '0.12';
requires 'Cpanel::JSON::XS';
requires 'Data::Printer';
requires 'DateTime';
requires 'DateTime::Format::ISO8601';
requires 'Data::Printer';
requires 'DBI';
requires 'Digest::SHA';
Expand Down Expand Up @@ -37,7 +38,7 @@ requires 'XML::Simple';

requires 'MetaCPAN::Common',
git => 'https://github.com/metacpan/MetaCPAN-Common',
ref => '48274b9cb890d7f76a8ba6e2fce78348ca1165ca';
ref => '0e5c2852178a47e98db291f613da2b96aca85f64';

on test => sub {
requires 'Code::TidyAll', '>= 0.74';
Expand Down
8 changes: 7 additions & 1 deletion lib/MetaCPAN/Ingest.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use Sub::Exporter -setup => {
fix_version
handle_error
home
is_dev
minion
numify_version
read_00whois
Expand All @@ -55,7 +56,7 @@ my $config //= do {
};
$config->init_logger;

sub config () {$config}
sub config () { $config->config(); }

sub are_you_sure ( $msg, $force=0 ) {
return 1 if $force;
Expand Down Expand Up @@ -187,6 +188,11 @@ sub home () {
return $stdout;
}

# TODO: there must be a better way
sub is_dev () {
return $ENV{PLACK_ENV} =~ /dev/;
}

sub minion () {
require 'Mojo::Server';
return Mojo::Server->new->build_app('MetaCPAN::API')->minion;
Expand Down