Skip to content

Make BigQuery optional for local development #801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JoelSpeed wants to merge 1 commit into
base: main
Choose a base branch
from
+45 −18
Open

Make BigQuery optional for local development #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions pkg/cmd/release-payload-controller/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package release_payload_controller

import (
"context"
"errors"
"flag"
"fmt"
"os"
Expand Down Expand Up @@ -83,12 +82,6 @@ func (o *Options) AddFlags(fs *pflag.FlagSet) {
}

func (o *Options) Validate(_ context.Context) error {
if len(o.GoogleProjectID) == 0 {
return errors.New("--google-project-id flag must be set")
}
if len(o.GoogleServiceAccountCredentialFile) == 0 {
return errors.New("--google-service-account-credential-file flag must be set")
}
if err := o.jira.Validate(false); err != nil {
return fmt.Errorf("invalid jira options: %w", err)
}
Expand Down Expand Up @@ -151,17 +144,22 @@ func (o *Options) Run(ctx context.Context) error {
}
}

// BigQuery Client
bqc, err := bigquery.NewBigQueryClient(o.GoogleProjectID, o.GoogleServiceAccountCredentialFile)
if err != nil {
klog.Fatalf("Unable to configure bigquery client: %v", err)
}
defer bqc.Close()

var bqClient bigquery.ClientInterface = bqc
if o.BigQueryCacheTTL > 0 {
bqClient = bigquery.NewCachedClient(bqc, o.BigQueryCacheTTL)
klog.Infof("BigQuery caching enabled with TTL: %s", o.BigQueryCacheTTL)
// BigQuery Client (optional)
var bqClient bigquery.ClientInterface
if o.GoogleProjectID != "" && o.GoogleServiceAccountCredentialFile != "" {
bqc, err := bigquery.NewBigQueryClient(o.GoogleProjectID, o.GoogleServiceAccountCredentialFile)
if err != nil {
klog.Infof("BigQuery client not configured, job history lookups will be unavailable: %v", err)
} else {
defer bqc.Close()
bqClient = bqc
if o.BigQueryCacheTTL > 0 {
bqClient = bigquery.NewCachedClient(bqc, o.BigQueryCacheTTL)
klog.Infof("BigQuery caching enabled with TTL: %s", o.BigQueryCacheTTL)
}
}
} else {
klog.Infof("BigQuery client not configured, job history lookups will be unavailable")
}

// Jira Client (optional)
Expand Down
29 changes: 29 additions & 0 deletions pkg/cmd/release-payload-controller/jira_escalations_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,35 @@ func TestNewJiraEscalationsController(t *testing.T) {
}
}

func TestNewJiraEscalationsControllerWithNilBigQueryClient(t *testing.T) {
t.Parallel()

objs := []runtime.Object{}
client := releasepayloadclient.NewSimpleClientset(objs...)
informerFactory := releasepayloadinformers.NewSharedInformerFactory(client, 0)
releasePayloadInformer := informerFactory.Release().V1alpha1().ReleasePayloads()

eventRecorder := events.NewInMemoryRecorder("test", clock.RealClock{})
configAccessor := &mockConfigAccessor{}

controller, err := NewJiraEscalationsController(
releasePayloadInformer,
client.ReleaseV1alpha1(),
eventRecorder,
configAccessor,
nil,
nil,
)

if err != nil {
t.Fatalf("Failed to create controller: %v", err)
}

if controller == nil {
t.Fatal("Expected non-nil controller")
}
}

func TestGetWindowSize(t *testing.T) {
t.Parallel()

Expand Down