Skip to content

Commit 31898f7

Browse files
committed
check: ES syntax update for newer version
1 parent cf0e6e0 commit 31898f7

File tree

1 file changed

+31
-22
lines changed

1 file changed

+31
-22
lines changed

bin/check.pl

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838

3939
# look up this module in ElasticSearch and see what we have on it
4040
my $results = $es_file->search(
41-
size => 100, # shouldn't get more than this
42-
fields => [
43-
qw< name release author distribution version authorized indexed maturity date >
44-
],
4541
query => {
4642
bool => {
4743
must => [
@@ -51,22 +47,35 @@
5147
],
5248
},
5349
},
50+
size => 100, # shouldn't get more than this
51+
_source => [qw<
52+
name
53+
release
54+
author
55+
distribution
56+
version
57+
authorized
58+
indexed
59+
maturity
60+
date
61+
>],
62+
5463
);
5564
my @files = @{ $results->{hits}{hits} };
5665

5766
# now find the first latest releases for these files
5867
foreach my $file (@files) {
5968
my $release_results = $es_release->search(
60-
size => 1,
61-
fields => [qw< name status authorized version id date >],
6269
query => {
6370
bool => {
6471
must => [
65-
{ term => { name => $file->{fields}{release} } },
72+
{ term => { name => $file->{_source}{release} } },
6673
{ term => { status => 'latest' } },
6774
],
6875
},
6976
},
77+
size => 1,
78+
_source => [qw< name status authorized version id date >],
7079
);
7180

7281
push @releases, $release_results->{hits}{hits}[0]
@@ -78,16 +87,16 @@
7887
if ( !@releases ) {
7988
foreach my $file (@files) {
8089
my $release_results = $es_release->search(
81-
size => 1,
82-
fields =>
83-
[qw< name status authorized version id date >],
8490
query => {
8591
bool => {
8692
must => [
87-
{ term => { name => $file->{fields}{release} } },
93+
{ term => { name => $file->{_source}{release} } },
8894
],
8995
},
9096
},
97+
size => 1,
98+
_source =>
99+
[qw< name status authorized version id date >],
91100
);
92101

93102
push @releases, @{ $release_results->{hits}{hits} };
@@ -97,22 +106,22 @@
97106
# if we found the releases tell them about it
98107
if (@releases) {
99108
if ( @releases == 1
100-
and $releases[0]->{fields}{status} eq 'latest' )
109+
and $releases[0]->{_source}{status} eq 'latest' )
101110
{
102111
log_info {
103-
"Found latest release $releases[0]->{fields}{name} for $pkg"
112+
"Found latest release $releases[0]->{_source}{name} for $pkg"
104113
}
105114
unless $errors_only;
106115
}
107116
else {
108117
log_error {"Could not find latest release for $pkg"};
109118
foreach my $rel (@releases) {
110-
log_warn {" Found release $rel->{fields}{name}"};
111-
log_warn {" STATUS : $rel->{fields}{status}"};
119+
log_warn {" Found release $rel->{_source}{name}"};
120+
log_warn {" STATUS : $rel->{_source}{status}"};
112121
log_warn {
113-
" AUTORIZED : $rel->{fields}{authorized}"
122+
" AUTORIZED : $rel->{_source}{authorized}"
114123
};
115-
log_warn {" DATE : $rel->{fields}{date}"};
124+
log_warn {" DATE : $rel->{_source}{date}"};
116125
}
117126

118127
$error_count++;
@@ -123,13 +132,13 @@
123132
"Module $pkg doesn't have any releases in ElasticSearch!"
124133
};
125134
foreach my $file (@files) {
126-
log_warn {" Found file $file->{fields}{name}"};
127-
log_warn {" RELEASE : $file->{fields}{release}"};
128-
log_warn {" AUTHOR : $file->{fields}{author}"};
135+
log_warn {" Found file $file->{_source}{name}"};
136+
log_warn {" RELEASE : $file->{_source}{release}"};
137+
log_warn {" AUTHOR : $file->{_source}{author}"};
129138
log_warn {
130-
" AUTHORIZED : $file->{fields}{authorized}"
139+
" AUTHORIZED : $file->{_source}{authorized}"
131140
};
132-
log_warn {" DATE : $file->{fields}{date}"};
141+
log_warn {" DATE : $file->{_source}{date}"};
133142
}
134143
$error_count++;
135144
}

0 commit comments

Comments
 (0)