Add OpenQA::VcsProvider::{GitHUb,Gitea}

Author: perlpunk

lib/OpenQA/Schema/Result/ScheduledProducts.pm

@@ -18,7 +18,8 @@ use OpenQA::JobSettings;
 use OpenQA::Jobs::Constants;
 use OpenQA::JobDependencies::Constants;
 use OpenQA::Scheduler::Client;
-use OpenQA::VcsProvider;
+use OpenQA::VcsProvider::GitHub;
+use OpenQA::VcsProvider::Gitea;
 use Mojo::JSON qw(encode_json decode_json);
 use OpenQA::YAML 'load_yaml';
 use Carp;
@@ -935,7 +936,10 @@ 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;
-    my $vcs = OpenQA::VcsProvider->new(app => OpenQA::App->singleton);
+    return undef unless $self->webhook_id;
+    my ($type) = split m/:/, $self->webhook_id;
+    my $class = {gh => 'GitHub', gitea => 'Gitea'}->{$type} or return undef;
+    my $vcs = "OpenQA::VcsProvider::$class"->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;

lib/OpenQA/VcsProvider.pm

@@ -18,28 +18,34 @@ sub read_settings ($self, $settings) {
     return 1;
 }
 
-sub report_status_to_git ($self, $params, $scheduled_product_id, $callback = undef) {
+sub add_params ($self, $params, $scheduled_product_id) {
     $params->{context} //= 'openqa';
     $params->{description} //= 'openQA test run';
     my $base_url = $self->base_url;
     $params->{target_url} //= "$base_url/admin/productlog?id=$scheduled_product_id"
       if $scheduled_product_id && $base_url;
+}
 
-    my $url = Mojo::URL->new($self->statuses_url);
+sub create_request ($self, $params) {
     my $app = $self->app;
     my $ua = $app->ua;
+    my $url = Mojo::URL->new($self->statuses_url);
     my $tx = $ua->build_tx(POST => $url);
     my $req = $tx->req;
-    my $headers = $req->headers;
-    my $github_token = $app->config->{secrets}->{github_token};
     my $json = encode_json($params);
     $req->body($json);
+    my $headers = $req->headers;
     $headers->content_type('application/json');
     $headers->content_length(length $json);
-    $headers->header(Accept => 'application/vnd.github+json');
-    $headers->header(Authorization => "Bearer $github_token");
-    $headers->header('X-GitHub-Api-Version' => '2022-11-28');
-    $ua->start($tx, $callback);
+
+    return $tx;
+}
+
+sub report_status_to_git ($self, $params, $scheduled_product_id, $callback = undef) {
+    $self->add_params($params, $scheduled_product_id);
+
+    my $tx = $self->create_request($params);
+    $self->app->ua->start($tx, $callback);
     return $tx;
 }
 

lib/OpenQA/VcsProvider/GitHub.pm

@@ -0,0 +1,21 @@
+# Copyright SUSE LLC
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+package OpenQA::VcsProvider::GitHub;
+
+use Mojo::Base 'OpenQA::VcsProvider', -signatures;
+use Mojo::URL;
+
+sub create_request ($self, $params) {
+    my $tx = $self->SUPER::create_request($params);
+    my $headers = $tx->req->headers;
+
+    my $github_token = $self->app->config->{secrets}->{github_token};
+    $headers->header(Accept => 'application/vnd.github+json');
+    $headers->header(Authorization => "Bearer $github_token");
+    $headers->header('X-GitHub-Api-Version' => '2022-11-28');
+
+    return $tx;
+}
+
+1;

lib/OpenQA/VcsProvider/Gitea.pm

@@ -0,0 +1,21 @@
+# Copyright SUSE LLC
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+package OpenQA::VcsProvider::Gitea;
+
+use Mojo::Base 'OpenQA::VcsProvider', -signatures;
+use Mojo::URL;
+
+sub create_request ($self, $params) {
+    my $tx = $self->SUPER::create_request($params);
+    my $headers = $tx->req->headers;
+
+#    my $github_token = $self->app->config->{secrets}->{github_token};
+#    $headers->header(Accept => 'application/vnd.github+json');
+#    $headers->header(Authorization => "Bearer $github_token");
+#    $headers->header('X-GitHub-Api-Version' => '2022-11-28');
+
+    return $tx;
+}
+
+1;

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

@@ -10,7 +10,7 @@ use OpenQA::Utils;
 use DBIx::Class::Timestamps 'now';
 use OpenQA::Schema::Result::JobDependencies;
 use OpenQA::Utils 'format_tx_error';
-use OpenQA::VcsProvider;
+use OpenQA::VcsProvider::GitHub;
 use Mojo::Util 'secure_compare';
 
 my %SUPPORTED_PR_ACTIONS = (opened => 'opened', synchronize => 'updated', closed => 'closed');
@@ -144,7 +144,7 @@ sub product ($self) {
 
     # create scheduled product and enqueue minion job with parameter
     my $scheduled_product = $scheduled_products->create_with_event(\%params, $self->current_user, $webhook_id);
-    my $vcs = OpenQA::VcsProvider->new(app => $app);
+    my $vcs = OpenQA::VcsProvider::GitHub->new(app => $app);
     my $cb = sub ($ua, $tx, @) {
         if (my $err = $tx->error) {
             $scheduled_product->delete;

t/16-utils-vcs-provider.t

@@ -8,7 +8,7 @@ use FindBin;
 use lib "$FindBin::Bin/lib", "$FindBin::Bin/../external/os-autoinst-common/lib";
 require OpenQA::Test::Database;
 use OpenQA::Test::TimeLimit '5';
-use OpenQA::VcsProvider;
+use OpenQA::VcsProvider::GitHub;
 use Test::Mojo;
 use Test::Warnings ':report_warnings';
 
@@ -20,7 +20,7 @@ subtest 'reporting status to GitHub' => sub {
     my $app = $t->app;
     $app->config->{secrets}->{github_token} = 'some-token';
 
-    my $git = OpenQA::VcsProvider->new(app => $app);
+    my $git = OpenQA::VcsProvider::GitHub->new(app => $app);
     my $url = 'http://127.0.0.1/repos/some/repo/statuses/some-sha';
     $git->read_settings({GITHUB_STATUSES_URL => $url, CI_TARGET_URL => 'https://openqa.opensuse.org'});
     my $tx = $git->report_status_to_git({state => 'pending'}, '42');

t/api/16-webhooks.t

@@ -90,7 +90,7 @@ subtest 'failure when reporting status to GitHub' => sub {
 };
 
 # mock reporting back to GitHub
-my $vcs_mock = Test::MockModule->new('OpenQA::VcsProvider');
+my $vcs_mock = Test::MockModule->new('OpenQA::VcsProvider::GitHub');
 my $minion_job_id;
 my $status_reports = 0;
 my $expected_sha = '04a3f669ea13a4aa7cbd4569f578a66f7403c43d';