Skip to content

Commit d98c374

Browse files
kartikaysaxenakartikaysaxena
committed
fix: test
Signed-off-by: Kartikay <kartikay_2101ce32@iitp.ac.in>
1 parent 4b34197 commit d98c374

8 files changed

Lines changed: 436 additions & 1380 deletions

File tree

‎internal/services/v1/relationships.go‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -129,27 +129,25 @@ func NewPermissionsServer(
129129
config PermissionsServerConfig,
130130
) v1.PermissionsServiceServer {
131131
configWithDefaults := PermissionsServerConfig{
132-
MaxPreconditionsCount: defaultIfZero(config.MaxPreconditionsCount, 1000),
133-
MaxUpdatesPerWrite: defaultIfZero(config.MaxUpdatesPerWrite, 1000),
134-
MaximumAPIDepth: defaultIfZero(config.MaximumAPIDepth, 50),
135-
StreamingAPITimeout: defaultIfZero(config.StreamingAPITimeout, 30*time.Second),
136-
MaxCaveatContextSize: defaultIfZero(config.MaxCaveatContextSize, 4096),
137-
MaxRelationshipContextSize: defaultIfZero(config.MaxRelationshipContextSize, 25_000),
138-
MaxDatastoreReadPageSize: defaultIfZero(config.MaxDatastoreReadPageSize, 1_000),
139-
MaxReadRelationshipsLimit: defaultIfZero(config.MaxReadRelationshipsLimit, 1_000),
140-
MaxDeleteRelationshipsLimit: defaultIfZero(config.MaxDeleteRelationshipsLimit, 1_000),
141-
MaxLookupResourcesLimit: defaultIfZero(config.MaxLookupResourcesLimit, 1_000),
142-
MaxBulkExportRelationshipsLimit: defaultIfZero(config.MaxBulkExportRelationshipsLimit, 100_000),
143-
DispatchChunkSize: defaultIfZero(config.DispatchChunkSize, 100),
144-
MaxCheckBulkConcurrency: defaultIfZero(config.MaxCheckBulkConcurrency, 50),
145-
CaveatTypeSet: caveattypes.TypeSetOrDefault(config.CaveatTypeSet),
146-
ExpiringRelationshipsEnabled: config.ExpiringRelationshipsEnabled,
147-
PerformanceInsightMetricsEnabled: config.PerformanceInsightMetricsEnabled,
148-
EnableExperimentalLookupResources3: config.EnableExperimentalLookupResources3,
149-
ExperimentalQueryPlan: config.ExperimentalQueryPlan,
150-
DeprecatedRelationshipsAndObjectsEnabled: config.DeprecatedRelationshipsAndObjectsEnabled,
132+
MaxPreconditionsCount: defaultIfZero(config.MaxPreconditionsCount, 1000),
133+
MaxUpdatesPerWrite: defaultIfZero(config.MaxUpdatesPerWrite, 1000),
134+
MaximumAPIDepth: defaultIfZero(config.MaximumAPIDepth, 50),
135+
StreamingAPITimeout: defaultIfZero(config.StreamingAPITimeout, 30*time.Second),
136+
MaxCaveatContextSize: defaultIfZero(config.MaxCaveatContextSize, 4096),
137+
MaxRelationshipContextSize: defaultIfZero(config.MaxRelationshipContextSize, 25_000),
138+
MaxDatastoreReadPageSize: defaultIfZero(config.MaxDatastoreReadPageSize, 1_000),
139+
MaxReadRelationshipsLimit: defaultIfZero(config.MaxReadRelationshipsLimit, 1_000),
140+
MaxDeleteRelationshipsLimit: defaultIfZero(config.MaxDeleteRelationshipsLimit, 1_000),
141+
MaxLookupResourcesLimit: defaultIfZero(config.MaxLookupResourcesLimit, 1_000),
142+
MaxBulkExportRelationshipsLimit: defaultIfZero(config.MaxBulkExportRelationshipsLimit, 100_000),
143+
DispatchChunkSize: defaultIfZero(config.DispatchChunkSize, 100),
144+
MaxCheckBulkConcurrency: defaultIfZero(config.MaxCheckBulkConcurrency, 50),
145+
CaveatTypeSet: caveattypes.TypeSetOrDefault(config.CaveatTypeSet),
146+
ExpiringRelationshipsEnabled: config.ExpiringRelationshipsEnabled,
151147
PerformanceInsightMetricsEnabled: config.PerformanceInsightMetricsEnabled,
152148
EnableExperimentalLookupResources3: config.EnableExperimentalLookupResources3,
149+
ExperimentalQueryPlan: config.ExperimentalQueryPlan,
150+
DeprecatedRelationshipsAndObjectsEnabled: config.DeprecatedRelationshipsAndObjectsEnabled,
153151
}
154152

155153
return &permissionServer{

‎pkg/cmd/server/server.go‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -115,24 +115,24 @@ type Config struct {
115115
LR3ResourceChunkCacheConfig CacheConfig `debugmap:"visible"`
116116

117117
// API Behavior
118-
DisableV1SchemaAPI bool `debugmap:"visible"`
119-
V1SchemaAdditiveOnly bool `debugmap:"visible"`
120-
MaximumUpdatesPerWrite uint16 `debugmap:"visible"`
121-
MaximumPreconditionCount uint16 `debugmap:"visible"`
122-
MaxDatastoreReadPageSize uint64 `debugmap:"visible"`
123-
StreamingAPITimeout time.Duration `debugmap:"visible"`
124-
WatchHeartbeat time.Duration `debugmap:"visible"`
125-
MaxReadRelationshipsLimit uint32 `debugmap:"visible"`
126-
MaxDeleteRelationshipsLimit uint32 `debugmap:"visible"`
127-
MaxLookupResourcesLimit uint32 `debugmap:"visible"`
128-
MaxBulkExportRelationshipsLimit uint32 `debugmap:"visible"`
129-
EnableExperimentalLookupResources bool `debugmap:"visible"`
130-
ExperimentalLookupResourcesVersion string `debugmap:"visible"`
131-
ExperimentalQueryPlan string `debugmap:"visible"`
132-
EnableRelationshipExpiration bool `debugmap:"visible" default:"true"`
133-
EnableRevisionHeartbeat bool `debugmap:"visible"`
134-
EnablePerformanceInsightMetrics bool `debugmap:"visible"`
135-
MismatchZedTokenBehavior string `debugmap:"visible"`
118+
DisableV1SchemaAPI bool `debugmap:"visible"`
119+
V1SchemaAdditiveOnly bool `debugmap:"visible"`
120+
MaximumUpdatesPerWrite uint16 `debugmap:"visible"`
121+
MaximumPreconditionCount uint16 `debugmap:"visible"`
122+
MaxDatastoreReadPageSize uint64 `debugmap:"visible"`
123+
StreamingAPITimeout time.Duration `debugmap:"visible"`
124+
WatchHeartbeat time.Duration `debugmap:"visible"`
125+
MaxReadRelationshipsLimit uint32 `debugmap:"visible"`
126+
MaxDeleteRelationshipsLimit uint32 `debugmap:"visible"`
127+
MaxLookupResourcesLimit uint32 `debugmap:"visible"`
128+
MaxBulkExportRelationshipsLimit uint32 `debugmap:"visible"`
129+
EnableExperimentalLookupResources bool `debugmap:"visible"`
130+
ExperimentalLookupResourcesVersion string `debugmap:"visible"`
131+
ExperimentalQueryPlan string `debugmap:"visible"`
132+
EnableRelationshipExpiration bool `debugmap:"visible" default:"true"`
133+
EnableRevisionHeartbeat bool `debugmap:"visible"`
134+
EnablePerformanceInsightMetrics bool `debugmap:"visible"`
135+
MismatchZedTokenBehavior string `debugmap:"visible"`
136136
EnableExperimentalRelationshipDeprecation bool `debugmap:"visible"`
137137

138138
// Additional Services
@@ -484,23 +484,23 @@ func (c *Config) Complete(ctx context.Context) (RunnableServer, error) {
484484
}
485485

486486
permSysConfig := v1svc.PermissionsServerConfig{
487-
MaxPreconditionsCount: maxPreconditionCount,
488-
MaxUpdatesPerWrite: c.MaximumUpdatesPerWrite,
489-
MaximumAPIDepth: c.DispatchMaxDepth,
490-
MaxCaveatContextSize: c.MaxCaveatContextSize,
491-
MaxRelationshipContextSize: c.MaxRelationshipContextSize,
492-
MaxDatastoreReadPageSize: c.MaxDatastoreReadPageSize,
493-
StreamingAPITimeout: c.StreamingAPITimeout,
494-
MaxReadRelationshipsLimit: c.MaxReadRelationshipsLimit,
495-
MaxDeleteRelationshipsLimit: c.MaxDeleteRelationshipsLimit,
496-
MaxLookupResourcesLimit: c.MaxLookupResourcesLimit,
497-
MaxBulkExportRelationshipsLimit: c.MaxBulkExportRelationshipsLimit,
498-
DispatchChunkSize: c.DispatchChunkSize,
499-
ExpiringRelationshipsEnabled: c.EnableRelationshipExpiration,
500-
CaveatTypeSet: c.DatastoreConfig.CaveatTypeSet,
501-
PerformanceInsightMetricsEnabled: c.EnablePerformanceInsightMetrics,
502-
EnableExperimentalLookupResources3: c.ExperimentalLookupResourcesVersion == "lr3",
503-
ExperimentalQueryPlan: c.ExperimentalQueryPlan == "check",
487+
MaxPreconditionsCount: maxPreconditionCount,
488+
MaxUpdatesPerWrite: c.MaximumUpdatesPerWrite,
489+
MaximumAPIDepth: c.DispatchMaxDepth,
490+
MaxCaveatContextSize: c.MaxCaveatContextSize,
491+
MaxRelationshipContextSize: c.MaxRelationshipContextSize,
492+
MaxDatastoreReadPageSize: c.MaxDatastoreReadPageSize,
493+
StreamingAPITimeout: c.StreamingAPITimeout,
494+
MaxReadRelationshipsLimit: c.MaxReadRelationshipsLimit,
495+
MaxDeleteRelationshipsLimit: c.MaxDeleteRelationshipsLimit,
496+
MaxLookupResourcesLimit: c.MaxLookupResourcesLimit,
497+
MaxBulkExportRelationshipsLimit: c.MaxBulkExportRelationshipsLimit,
498+
DispatchChunkSize: c.DispatchChunkSize,
499+
ExpiringRelationshipsEnabled: c.EnableRelationshipExpiration,
500+
CaveatTypeSet: c.DatastoreConfig.CaveatTypeSet,
501+
PerformanceInsightMetricsEnabled: c.EnablePerformanceInsightMetrics,
502+
EnableExperimentalLookupResources3: c.ExperimentalLookupResourcesVersion == "lr3",
503+
ExperimentalQueryPlan: c.ExperimentalQueryPlan == "check",
504504
DeprecatedRelationshipsAndObjectsEnabled: c.EnableExperimentalRelationshipDeprecation,
505505
}
506506

‎pkg/cmd/server/zz_generated.options.go‎

Lines changed: 17 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)