Fix CI build (#4)

* Fix CI * Fix failing tests
fernride · Sep 10, 2024 · 5908584 · 5908584
1 parent 0baa058
commit 5908584
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/cpanato/github_actions_exporter
+module github.com/fernride/github_actions_exporter
 
 go 1.22
 

diff --git a/internal/server/metrics.go b/internal/server/metrics.go
@@ -96,8 +96,8 @@ type WorkflowObserver interface {
 	CountWorkflowJobStatus(org, repo, status, conclusion, runnerGroup, workflowName, jobName, branch string)
 	CountWorkflowJobDuration(org, repo, status, conclusion, runnerGroup, workflowName, jobName, branch string, seconds float64)
 
-	ObserveWorkflowRunDuration(org, repo, workflow, conclusion, branch string, seconds float64)
-	CountWorkflowRunStatus(org, repo, status, conclusion, workflow, branch string)
+	ObserveWorkflowRunDuration(org, repo, branch, workflow, conclusion string, seconds float64)
+	CountWorkflowRunStatus(org, repo, branch, status, conclusion, workflow string)
 }
 
 var _ WorkflowObserver = (*PrometheusObserver)(nil)

diff --git a/internal/server/server_test.go b/internal/server/server_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/cpanato/github_actions_exporter/internal/server"
+	"github.com/fernride/github_actions_exporter/internal/server"
 	"github.com/go-kit/log"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/internal/server/workflow_metrics_exporter.go b/internal/server/workflow_metrics_exporter.go
@@ -12,7 +12,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/cpanato/github_actions_exporter/model"
+	"github.com/fernride/github_actions_exporter/model"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/google/go-github/v59/github"

diff --git a/internal/server/workflow_metrics_exporter_test.go b/internal/server/workflow_metrics_exporter_test.go
@@ -14,7 +14,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cpanato/github_actions_exporter/internal/server"
+	"github.com/fernride/github_actions_exporter/internal/server"
 	"github.com/go-kit/log"
 	"github.com/google/go-github/v59/github"
 	"github.com/stretchr/testify/assert"
@@ -457,9 +457,9 @@ func Test_GHActionExporter_HandleGHWebHook_WorkflowJobCompletedEvent_WithNoStart
 		org:          org,
 		repo:         repo,
 		branch:       branch,
-		runnerGroup:  runnerGroupName,
 		status:       status,
 		conclusion:   conclusion,
+		runnerGroup:  runnerGroupName,
 		workflowName: workflowName,
 		jobName:      jobName,
 	}, 50*time.Millisecond)
@@ -703,7 +703,7 @@ func NewTestPrometheusObserver(t *testing.T) *TestPrometheusObserver {
 	}
 }
 
-func (o *TestPrometheusObserver) ObserveWorkflowJobDuration(org, repo, branch, state, runnerGroup, workflowName, jobName string, seconds float64) {
+func (o *TestPrometheusObserver) ObserveWorkflowJobDuration(org, repo, state, runnerGroup, workflowName, jobName, branch string, seconds float64) {
 	o.workFlowJobDurationObserved <- workflowJobObservation{
 		org:          org,
 		repo:         repo,
@@ -716,7 +716,7 @@ func (o *TestPrometheusObserver) ObserveWorkflowJobDuration(org, repo, branch, s
 	}
 }
 
-func (o *TestPrometheusObserver) CountWorkflowJobStatus(org, repo, branch, status, conclusion, runnerGroup, workflowName, jobName string) {
+func (o *TestPrometheusObserver) CountWorkflowJobStatus(org, repo, status, conclusion, runnerGroup, workflowName, jobName, branch string) {
 	o.workflowJobStatusCounted <- workflowJobStatusCount{
 		org:          org,
 		repo:         repo,
@@ -729,7 +729,7 @@ func (o *TestPrometheusObserver) CountWorkflowJobStatus(org, repo, branch, statu
 	}
 }
 
-func (o *TestPrometheusObserver) CountWorkflowJobDuration(org, repo, branch, status, conclusion, runnerGroup, workflowName, jobName string, seconds float64) {
+func (o *TestPrometheusObserver) CountWorkflowJobDuration(org, repo, status, conclusion, runnerGroup, workflowName, jobName, branch string, seconds float64) {
 	o.workflowJobDurationCounted <- workflowJobDurationCount{
 		org:          org,
 		repo:         repo,

diff --git a/main.go b/main.go
@@ -9,7 +9,7 @@ import (
 	"syscall"
 
 	"github.com/alecthomas/kingpin/v2"
-	"github.com/cpanato/github_actions_exporter/internal/server"
+	"github.com/fernride/github_actions_exporter/internal/server"
 	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/promlog"