Merge pull request #1518 from josephschorr/invert-flag

Invert the flag for the new schema watching cache
authzed · Aug 30, 2023 · eb0d8cc · eb0d8cc
2 parents d4b4924 + 9f0d79d
commit eb0d8cc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/pkg/cmd/serve.go b/pkg/cmd/serve.go
@@ -70,7 +70,7 @@ func RegisterServeFlags(cmd *cobra.Command, config *server.Config) error {
 	}
 	server.RegisterCacheFlags(cmd.Flags(), "ns-cache", &config.NamespaceCacheConfig, namespaceCacheDefaults)
 
-	cmd.Flags().BoolVar(&config.DisableWatchableSchemaCache, "disable-watchable-schema-cache", false, "disables the schema cache which makes use of the Watch API for automatic updates")
+	cmd.Flags().BoolVar(&config.EnableExperimentalWatchableSchemaCache, "enable-experimental-watchable-schema-cache", false, "enables the experimental schema cache which makes use of the Watch API for automatic updates")
 
 	// Flags for parsing and validating schemas.
 	cmd.Flags().BoolVar(&config.SchemaPrefixesRequired, "schema-prefixes-required", false, "require prefixes on all object definitions in schemas")

diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go
@@ -75,8 +75,8 @@ type Config struct {
 	MaxRelationshipContextSize int `debugmap:"visible" default:"25_000"`
 
 	// Namespace cache
-	DisableWatchableSchemaCache bool        `debugmap:"visible"`
-	NamespaceCacheConfig        CacheConfig `debugmap:"visible"`
+	EnableExperimentalWatchableSchemaCache bool        `debugmap:"visible"`
+	NamespaceCacheConfig                   CacheConfig `debugmap:"visible"`
 
 	// Schema options
 	SchemaPrefixesRequired bool `debugmap:"visible"`
@@ -218,9 +218,9 @@ func (c *Config) Complete(ctx context.Context) (RunnableServer, error) {
 	}
 	log.Ctx(ctx).Info().EmbedObject(nscc).Msg("configured namespace cache")
 
-	cachingMode := schemacaching.WatchIfSupported
-	if c.DisableWatchableSchemaCache {
-		cachingMode = schemacaching.JustInTimeCaching
+	cachingMode := schemacaching.JustInTimeCaching
+	if c.EnableExperimentalWatchableSchemaCache {
+		cachingMode = schemacaching.WatchIfSupported
 	}
 
 	ds = schemacaching.NewCachingDatastoreProxy(ds, nscc, c.DatastoreConfig.GCWindow, cachingMode)

diff --git a/pkg/cmd/server/zz_generated.options.go b/pkg/cmd/server/zz_generated.options.go