Add statuses_url attribute

Author: perlpunk

lib/OpenQA/Schema/Result/ScheduledProducts.pm

@@ -935,13 +935,13 @@ sub _format_check_description ($verb, $count, $total) {
 sub report_status_to_git ($self, $callback = undef) {
     my $id = $self->id;
     my $settings = $self->{_settings} // $self->settings;
-    return undef unless my $github_statuses_url = $settings->{GITHUB_STATUSES_URL};
+    my $vcs = OpenQA::VcsProvider->new(app => OpenQA::App->singleton);
+    $vcs->read_settings($settings) or return undef;
     my ($state, $verb, $count, $total) = $self->state_for_ci_status;
     return undef unless $state;
-    my $vcs = OpenQA::VcsProvider->new(app => OpenQA::App->singleton);
     my $base_url = $settings->{CI_TARGET_URL};
     my %params = (state => $state, description => _format_check_description($verb, $count, $total));
-    $vcs->report_status_to_git($github_statuses_url, \%params, $id, $base_url, $callback);
+    $vcs->report_status_to_git(\%params, $id, $base_url, $callback);
 }
 
 sub cancel ($self, $reason = undef) {

lib/OpenQA/VcsProvider.pm

@@ -8,14 +8,21 @@ use Mojo::JSON qw(encode_json);
 use Mojo::URL;
 
 has 'app';
+has 'statuses_url';
 
-sub report_status_to_git ($self, $statuses_url, $params, $scheduled_product_id, $base_url, $callback = undef) {
+sub read_settings ($self, $settings) {
+    $self->statuses_url($settings->{GITHUB_STATUSES_URL});
+    return undef unless $self->statuses_url;
+    return 1;
+}
+
+sub report_status_to_git ($self, $params, $scheduled_product_id, $base_url, $callback = undef) {
     $params->{context} //= 'openqa';
     $params->{description} //= 'openQA test run';
     $params->{target_url} //= "$base_url/admin/productlog?id=$scheduled_product_id"
       if $scheduled_product_id && $base_url;
 
-    my $url = Mojo::URL->new($statuses_url);
+    my $url = Mojo::URL->new($self->statuses_url);
     my $app = $self->app;
     my $ua = $app->ua;
     my $tx = $ua->build_tx(POST => $url);

lib/OpenQA/WebAPI/Controller/API/V1/Webhook.pm

@@ -153,7 +153,9 @@ sub product ($self) {
         return $self->render(json => $scheduled_product->enqueue_minion_job(\%params));
     };
     $scheduled_product->discard_changes;    # load value of columns that have a default value
-    my $tx = $vcs->report_status_to_git($statuses_url, {state => 'pending'}, $scheduled_product->id, $base_url, $cb);
+    $vcs->statuses_url($statuses_url);
+#    $vcs->read_settings($settings) or return undef;
+    my $tx = $vcs->report_status_to_git({state => 'pending'}, $scheduled_product->id, $base_url, $cb);
 }
 
 1;

t/16-utils-vcs-provider.t

@@ -22,7 +22,8 @@ subtest 'reporting status to GitHub' => sub {
 
     my $git = OpenQA::VcsProvider->new(app => $app);
     my $url = 'http://127.0.0.1/repos/some/repo/statuses/some-sha';
-    my $tx = $git->report_status_to_git($url, {state => 'pending'}, '42', 'https://openqa.opensuse.org');
+    $git->read_settings({GITHUB_STATUSES_URL => $url});
+    my $tx = $git->report_status_to_git({state => 'pending'}, '42', 'https://openqa.opensuse.org');
     my $req = $tx->req;
     is $req->method, 'POST', 'method';
     is $req->url, $url, 'URL';

t/api/16-webhooks.t

@@ -101,9 +101,9 @@ my $expected_ci_check_state = 'pending';
 my $expected_ci_check_desc = undef;
 $vcs_mock->redefine(
     report_status_to_git =>
-      sub ($self, $statuses_url, $params, $scheduled_product_id, $base_url_from_req, $callback) {
+      sub ($self, $params, $scheduled_product_id, $base_url_from_req, $callback) {
         my $tx = $ua->build_tx(POST => 'http://dummy');
-        is $statuses_url, $expected_statuses_url, 'URL from webhook payload used for reporting back';
+        is $self->statuses_url, $expected_statuses_url, 'URL from webhook payload used for reporting back';
         is $params->{state}, $expected_ci_check_state, "check reported to be $expected_ci_check_state";
         is $params->{description}, $expected_ci_check_desc, 'check description';
         ++$status_reports;