[gold] Use firestore for ignores
Change-Id: I0920fe83a9b86a395bc0ed25ed448900a1de4499
Bug: skia:9778
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/265400
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
diff --git a/golden/cmd/skiacorrectness/main.go b/golden/cmd/skiacorrectness/main.go
index 42bfc38..9d6ffa3 100644
--- a/golden/cmd/skiacorrectness/main.go
+++ b/golden/cmd/skiacorrectness/main.go
@@ -15,7 +15,6 @@
"strings"
"time"
- "cloud.google.com/go/datastore"
"github.com/flynn/json5"
"github.com/gorilla/mux"
"golang.org/x/oauth2"
@@ -26,7 +25,6 @@
"go.skia.org/infra/go/auth"
"go.skia.org/infra/go/bt"
"go.skia.org/infra/go/common"
- "go.skia.org/infra/go/ds"
"go.skia.org/infra/go/eventbus"
"go.skia.org/infra/go/firestore"
"go.skia.org/infra/go/gerrit"
@@ -54,7 +52,7 @@
"go.skia.org/infra/golden/go/diffstore"
"go.skia.org/infra/golden/go/expstorage/fs_expstore"
"go.skia.org/infra/golden/go/ignore"
- "go.skia.org/infra/golden/go/ignore/ds_ignorestore"
+ "go.skia.org/infra/golden/go/ignore/fs_ignorestore"
"go.skia.org/infra/golden/go/indexer"
"go.skia.org/infra/golden/go/search"
"go.skia.org/infra/golden/go/shared"
@@ -100,8 +98,6 @@
defaultMatchFields = flag.String("match_fields", "name", "A comma separated list of fields that need to match when finding closest images.")
diffServerGRPCAddr = flag.String("diff_server_grpc", "", "The grpc port of the diff server. 'diff_server_http also needs to be set.")
diffServerImageAddr = flag.String("diff_server_http", "", "The images serving address of the diff server. 'diff_server_grpc has to be set as well.")
- dsNamespace = flag.String("ds_namespace", "", "Cloud datastore namespace to be used by this instance.")
- dsProjectID = flag.String("ds_project_id", "", "Project id that houses the datastore instance.")
eventTopic = flag.String("event_topic", "", "The pubsub topic to use for distributed events.")
forceLogin = flag.Bool("force_login", true, "Force the user to be authenticated for all requests.")
fsNamespace = flag.String("fs_namespace", "", "Typically the instance id. e.g. 'flutter', 'skia', etc")
@@ -203,8 +199,8 @@
}
// Get the token source for the service account with access to the services
- // we need to operate
- tokenSource, err := auth.NewDefaultTokenSource(*local, auth.SCOPE_USERINFO_EMAIL, datastore.ScopeDatastore, gstorage.CloudPlatformScope, auth.SCOPE_GERRIT)
+ // we need to operate.
+ tokenSource, err := auth.NewDefaultTokenSource(*local, auth.SCOPE_USERINFO_EMAIL, gstorage.CloudPlatformScope, auth.SCOPE_GERRIT)
if err != nil {
sklog.Fatalf("Failed to authenticate service account: %s", err)
}
@@ -317,10 +313,6 @@
sklog.Fatalf("Unable to create GCSClient: %s", err)
}
- if err := ds.InitWithOpt(*dsProjectID, *dsNamespace, option.WithTokenSource(tokenSource)); err != nil {
- sklog.Fatalf("Unable to configure cloud datastore: %s", err)
- }
-
if *fsNamespace == "" {
sklog.Fatalf("--fs_namespace must be set")
}
@@ -358,12 +350,9 @@
// openSite indicates whether this can expose all end-points. The user still has to be authenticated.
openSite := (*pubWhiteList == everythingPublic) || *forceLogin
- ignoreStore, err := ds_ignorestore.New(ds.DS)
- if err != nil {
- sklog.Fatalf("Unable to create ignorestore: %s", err)
- }
+ ignoreStore := fs_ignorestore.New(ctx, fsClient)
- if err := ignore.StartMetrics(context.Background(), ignoreStore, *tileFreshness); err != nil {
+ if err := ignore.StartMetrics(ctx, ignoreStore, *tileFreshness); err != nil {
sklog.Fatalf("Failed to start monitoring for expired ignore rules: %s", err)
}
diff --git a/golden/k8s-config-templates/gold-skiacorrectness-template.yaml b/golden/k8s-config-templates/gold-skiacorrectness-template.yaml
index d01da58..4c78771 100644
--- a/golden/k8s-config-templates/gold-skiacorrectness-template.yaml
+++ b/golden/k8s-config-templates/gold-skiacorrectness-template.yaml
@@ -53,8 +53,6 @@
- "--default_corpus={{.SKCORR_DEFAULT_CORPUS}}"
- "--diff_server_grpc={{.SKCORR_DIFF_SERVER}}:8000"
- "--diff_server_http={{.SKCORR_DIFF_SERVER}}:8001"
- - "--ds_namespace={{.DATASTORE_NAMESPACE}}"
- - "--ds_project_id={{.DATASTORE_PROJECT}}"
- "--event_topic=gold-{{.INSTANCE_ID}}-eventbus"
- "--force_login={{.FORCE_LOGIN}}"
- "--fs_namespace={{.FIRESTORE_NAMESPACE}}"
