Give modeler ability to clear the cache (#626)

* Give modeler ability to clear the cache This is required so that the new values display in the UI * Use the same namespace for caching * Set config in tests
google · Sep 22, 2020 · 005569e · 005569e
1 parent a2770f9
commit 005569e
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 4 deletions.
diff --git a/cmd/adminapi/main.go b/cmd/adminapi/main.go
@@ -87,7 +87,7 @@ func realMain(ctx context.Context) error {
 	// Setup cacher
 	cacher, err := cache.CacherFor(ctx, &config.Cache, cache.MultiKeyFunc(
 		cache.HMACKeyFunc(sha1.New, config.Cache.HMACKey),
-		cache.PrefixKeyFunc("adminapi:cache:"),
+		cache.PrefixKeyFunc("cache:"),
 	))
 	if err != nil {
 		return fmt.Errorf("failed to create cacher: %w", err)

diff --git a/cmd/apiserver/main.go b/cmd/apiserver/main.go
@@ -90,7 +90,7 @@ func realMain(ctx context.Context) error {
 	// Setup cacher
 	cacher, err := cache.CacherFor(ctx, &config.Cache, cache.MultiKeyFunc(
 		cache.HMACKeyFunc(sha1.New, config.Cache.HMACKey),
-		cache.PrefixKeyFunc("apiserver:cache:"),
+		cache.PrefixKeyFunc("cache:"),
 	))
 	if err != nil {
 		return fmt.Errorf("failed to create cacher: %w", err)

diff --git a/cmd/modeler/main.go b/cmd/modeler/main.go
@@ -18,11 +18,13 @@ package main
 
 import (
 	"context"
+	"crypto/sha1"
 	"fmt"
 	"os"
 	"strconv"
 
 	"github.com/google/exposure-notifications-verification-server/pkg/buildinfo"
+	"github.com/google/exposure-notifications-verification-server/pkg/cache"
 	"github.com/google/exposure-notifications-verification-server/pkg/config"
 	"github.com/google/exposure-notifications-verification-server/pkg/controller/modeler"
 	"github.com/google/exposure-notifications-verification-server/pkg/ratelimit"
@@ -76,12 +78,22 @@ func realMain(ctx context.Context) error {
 	defer oe.Close()
 	logger.Infow("observability exporter", "config", oeConfig)
 
+	// Setup cacher
+	cacher, err := cache.CacherFor(ctx, &config.Cache, cache.MultiKeyFunc(
+		cache.HMACKeyFunc(sha1.New, config.Cache.HMACKey),
+		cache.PrefixKeyFunc("cache:"),
+	))
+	if err != nil {
+		return fmt.Errorf("failed to create cacher: %w", err)
+	}
+	defer cacher.Close()
+
 	// Setup database
 	db, err := config.Database.Load(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to load database config: %w", err)
 	}
-	if err := db.Open(ctx); err != nil {
+	if err := db.OpenWithCacher(ctx, cacher); err != nil {
 		return fmt.Errorf("failed to connect to database: %w", err)
 	}
 	defer db.Close()

diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -105,7 +105,7 @@ func realMain(ctx context.Context) error {
 	// Setup cacher
 	cacher, err := cache.CacherFor(ctx, &config.Cache, cache.MultiKeyFunc(
 		cache.HMACKeyFunc(sha1.New, config.Cache.HMACKey),
-		cache.PrefixKeyFunc("server:cache:"),
+		cache.PrefixKeyFunc("cache:"),
 	))
 	if err != nil {
 		return fmt.Errorf("failed to create cacher: %w", err)

diff --git a/pkg/config/modeler.go b/pkg/config/modeler.go
@@ -17,6 +17,7 @@ package config
 import (
 	"context"
 
+	"github.com/google/exposure-notifications-verification-server/pkg/cache"
 	"github.com/google/exposure-notifications-verification-server/pkg/database"
 	"github.com/google/exposure-notifications-verification-server/pkg/ratelimit"
 
@@ -27,6 +28,7 @@ import (
 
 // Modeler is the configuration for the modeler service.
 type Modeler struct {
+	Cache         cache.Config
 	Database      database.Config
 	Observability observability.Config
 	RateLimit     ratelimit.Config

diff --git a/pkg/controller/modeler/modeler_test.go b/pkg/controller/modeler/modeler_test.go
@@ -19,6 +19,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/google/exposure-notifications-verification-server/pkg/cache"
 	"github.com/google/exposure-notifications-verification-server/pkg/config"
 	"github.com/google/exposure-notifications-verification-server/pkg/database"
 	"github.com/google/exposure-notifications-verification-server/pkg/ratelimit"
@@ -38,6 +39,10 @@ func testModeler(tb testing.TB) *Controller {
 			Type:    "IN_MEMORY",
 			HMACKey: []byte(""),
 		},
+		Cache: cache.Config{
+			Type:    "IN_MEMORY",
+			HMACKey: []byte(""),
+		},
 	}
 	if err := envconfig.ProcessWith(ctx, &config, envconfig.MapLookuper(nil)); err != nil {
 		tb.Fatal(err)

diff --git a/terraform/service_modeler.tf b/terraform/service_modeler.tf
@@ -79,6 +79,12 @@ resource "google_secret_manager_secret_iam_member" "modeler-db-verification-code
   member    = "serviceAccount:${google_service_account.modeler.email}"
 }
 
+resource "google_secret_manager_secret_iam_member" "modeler-cache-hmac-key" {
+  secret_id = google_secret_manager_secret.cache-hmac-key.id
+  role      = "roles/secretmanager.secretAccessor"
+  member    = "serviceAccount:${google_service_account.modeler.email}"
+}
+
 resource "google_secret_manager_secret_iam_member" "modeler-ratelimit-hmac-key" {
   secret_id = google_secret_manager_secret.ratelimit-hmac-key.id
   role      = "roles/secretmanager.secretAccessor"
@@ -108,6 +114,7 @@ resource "google_cloud_run_service" "modeler" {
 
         dynamic "env" {
           for_each = merge(
+            local.cache_config,
             local.database_config,
             local.gcp_config,
             local.rate_limit_config,