Comprehensive e2e testing for Component Readiness with abstracted data backends

.gitignore

@@ -7,3 +7,9 @@ report.sh
 .vscode/
 .idea/
 /sippy-ng/build/*
+.env
+*.log
+*.out
+/e2e-coverage/
+/e2e-coverage.out
+/e2e-coverage.html

Dockerfile

@@ -4,11 +4,13 @@ COPY . .
 ENV PATH="/go/bin:${PATH}"
 ENV GOPATH="/go"
 RUN dnf module enable nodejs:18 -y && dnf install -y go make npm && make build
+RUN go build -cover -coverpkg=./cmd/...,./pkg/... -mod=vendor -o ./sippy-cover ./cmd/sippy
 
 FROM registry.access.redhat.com/ubi9/ubi:latest AS base
 RUN mkdir -p /historical-data
 RUN mkdir -p /config
 COPY --from=builder /go/src/sippy/sippy /bin/sippy
+COPY --from=builder /go/src/sippy/sippy-cover /bin/sippy-cover
 COPY --from=builder /go/src/sippy/sippy-daemon /bin/sippy-daemon
 COPY --from=builder /go/src/sippy/scripts/fetchdata.sh /bin/fetchdata.sh
 COPY --from=builder /go/src/sippy/config/*.yaml /config/

cmd/sippy/annotatejobruns.go

@@ -8,7 +8,8 @@ import (
 	"time"
 
 	"github.com/openshift/sippy/pkg/api/componentreadiness"
-	"github.com/openshift/sippy/pkg/apis/api/componentreport/bq"
+	bqprovider "github.com/openshift/sippy/pkg/api/componentreadiness/dataprovider/bigquery"
+	"github.com/openshift/sippy/pkg/apis/api/componentreport/crstatus"
 	"github.com/openshift/sippy/pkg/apis/api/componentreport/crtest"
 	"github.com/openshift/sippy/pkg/apis/cache"
 	bqcachedclient "github.com/openshift/sippy/pkg/bigquery"
@@ -32,7 +33,7 @@ type AnnotateJobRunsFlags struct {
 	ComponentReadinessFlags *flags.ComponentReadinessFlags
 	ConfigFlags             *configflags.ConfigFlags
 	VariantStr              []string
-	Variants                []bq.Variant
+	Variants                []crstatus.Variant
 	Release                 string
 	Label                   string
 	BuildClusters           []string
@@ -104,7 +105,7 @@ func (f *AnnotateJobRunsFlags) Validate(allVariants crtest.JobVariants) error {
 		if !found {
 			return fmt.Errorf("--variant %s has wrong variant value %s", variantStr, vt[1])
 		}
-		f.Variants = append(f.Variants, bq.Variant{Key: vt[0], Value: vt[1]})
+		f.Variants = append(f.Variants, crstatus.Variant{Key: vt[0], Value: vt[1]})
 	}
 	if len(f.Label) == 0 {
 		return fmt.Errorf("--label is required")
@@ -179,9 +180,9 @@ Example run: sippy annotate-job-runs  --google-service-account-credential-file=f
 				return errors.WithMessage(err, "couldn't get DB client")
 			}
 
-			allVariants, errs := componentreadiness.GetJobVariantsFromBigQuery(ctx, bigQueryClient)
+			allVariants, errs := componentreadiness.GetJobVariants(ctx, bqprovider.NewBigQueryProvider(bigQueryClient, nil))
 			if len(errs) > 0 {
-				return fmt.Errorf("failed to get variants from bigquery")
+				return fmt.Errorf("failed to get job variants: %v", errs)
 			}
 			if err = f.Validate(allVariants); err != nil {
 				return errors.WithMessage(err, "error validating options")

cmd/sippy/automatejira.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/openshift/sippy/pkg/api"
 	"github.com/openshift/sippy/pkg/api/componentreadiness"
+	bqprovider "github.com/openshift/sippy/pkg/api/componentreadiness/dataprovider/bigquery"
 	"github.com/openshift/sippy/pkg/apis/api/componentreport/crtest"
 	"github.com/openshift/sippy/pkg/apis/cache"
 	jiratype "github.com/openshift/sippy/pkg/apis/jira/v1"
@@ -169,9 +170,10 @@ func NewAutomateJiraCommand() *cobra.Command {
 				log.WithError(err).Warn("error reading config file")
 			}
 
-			allVariants, errs := componentreadiness.GetJobVariantsFromBigQuery(ctx, bigQueryClient)
+			provider := bqprovider.NewBigQueryProvider(bigQueryClient, config.ComponentReadinessConfig.VariantJunitTableOverrides)
+			allVariants, errs := componentreadiness.GetJobVariants(ctx, provider)
 			if len(errs) > 0 {
-				return fmt.Errorf("failed to get variants from bigquery")
+				return fmt.Errorf("failed to get job variants: %v", errs)
 			}
 			variantToJiraComponents, err := jiraautomator.GetVariantJiraMap(ctx, bigQueryClient)
 			if err != nil {
@@ -186,11 +188,10 @@ func NewAutomateJiraCommand() *cobra.Command {
 				log.WithError(err).Fatal("unable to connect to postgres")
 			}
 			j, err := jiraautomator.NewJiraAutomator(
-				jiraClient, bigQueryClient, dbc, cacheOpts,
+				jiraClient, bigQueryClient, provider, dbc, cacheOpts,
 				views.ComponentReadiness, releases, f.SippyURL, f.JiraAccount,
 				f.IncludeComponents, f.ColumnThresholds,
-				f.DryRun, variantToJiraComponents,
-				config.ComponentReadinessConfig.VariantJunitTableOverrides)
+				f.DryRun, variantToJiraComponents)
 			if err != nil {
 				panic(err)
 			}

cmd/sippy/component_readiness.go

@@ -17,6 +17,7 @@ import (
 	"gopkg.in/yaml.v3"
 
 	resources "github.com/openshift/sippy"
+	bqprovider "github.com/openshift/sippy/pkg/api/componentreadiness/dataprovider/bigquery"
 	"github.com/openshift/sippy/pkg/apis/cache"
 	v1 "github.com/openshift/sippy/pkg/apis/config/v1"
 	"github.com/openshift/sippy/pkg/bigquery"
@@ -186,6 +187,8 @@ func (f *ComponentReadinessFlags) runServerMode() error {
 		log.WithError(err).Warn("unable to initialize Jira client, bug filing will be disabled")
 	}
 
+	crDataProvider := bqprovider.NewBigQueryProvider(bigQueryClient, config.ComponentReadinessConfig.VariantJunitTableOverrides)
+
 	server := sippyserver.NewServer(
 		sippyserver.ModeOpenShift,
 		f.APIFlags.ListenAddr,
@@ -198,6 +201,7 @@ func (f *ComponentReadinessFlags) runServerMode() error {
 		gcsClient,
 		f.GoogleCloudFlags.StorageBucket,
 		bigQueryClient,
+		crDataProvider,
 		nil,
 		cacheClient,
 		f.ComponentReadinessFlags.CRTimeRoundingFactor,
@@ -214,10 +218,10 @@ func (f *ComponentReadinessFlags) runServerMode() error {
 			context.Background(),
 			dbc,
 			bigQueryClient,
+			crDataProvider,
 			time.Time{},
 			cache.NewStandardCROptions(f.ComponentReadinessFlags.CRTimeRoundingFactor),
-			views.ComponentReadiness,
-			config.ComponentReadinessConfig.VariantJunitTableOverrides)
+			views.ComponentReadiness)
 		if err != nil {
 			log.WithError(err).Error("error refreshing metrics")
 		}
@@ -234,10 +238,10 @@ func (f *ComponentReadinessFlags) runServerMode() error {
 						context.Background(),
 						dbc,
 						bigQueryClient,
+						crDataProvider,
 						time.Time{},
 						cache.NewStandardCROptions(f.ComponentReadinessFlags.CRTimeRoundingFactor),
-						views.ComponentReadiness,
-						config.ComponentReadinessConfig.VariantJunitTableOverrides)
+						views.ComponentReadiness)
 					if err != nil {
 						log.WithError(err).Error("error refreshing metrics")
 					}

cmd/sippy/load.go

@@ -11,6 +11,7 @@ import (
 	"cloud.google.com/go/bigquery"
 	"github.com/openshift/sippy/pkg/api"
 	"github.com/openshift/sippy/pkg/api/componentreadiness"
+	bqprovider "github.com/openshift/sippy/pkg/api/componentreadiness/dataprovider/bigquery"
 	"github.com/openshift/sippy/pkg/apis/cache"
 	sippyv1 "github.com/openshift/sippy/pkg/apis/sippy/v1"
 	"github.com/openshift/sippy/pkg/dataloader/crcacheloader"
@@ -318,10 +319,9 @@ func NewLoadCommand() *cobra.Command {
 					}
 
 					regressionTracker := componentreadiness.NewRegressionTracker(
-						bqc, dbc, cacheOpts, releases,
+						bqprovider.NewBigQueryProvider(bqc, config.ComponentReadinessConfig.VariantJunitTableOverrides), dbc, cacheOpts, releases,
 						componentreadiness.NewPostgresRegressionStore(dbc, jiraClient),
 						views.ComponentReadiness,
-						config.ComponentReadinessConfig.VariantJunitTableOverrides,
 						false)
 					loaders = append(loaders, regressionTracker)
 				}