Skip to content

chore(resource): remove the unused resource-config cache #1766

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

Merged
rohilsurana merged 1 commit into from
Jul 17, 2026
Merged

chore(resource): remove the unused resource-config cache #1766

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
14 changes: 4 additions & 10 deletions cmd/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ import (
"github.com/pkg/profile"
)

var ruleCacheRefreshDelay = time.Minute * 2
var GetStripeClientFunc func(logger *slog.Logger, cfg *config.Frontier) *client.API

func StartServer(logger *slog.Logger, cfg *config.Frontier) error {
Expand Down Expand Up @@ -144,13 +143,9 @@ func StartServer(logger *slog.Logger, cfg *config.Frontier) error {
if err != nil {
return err
}
resourceBlobRepository := blob.NewResourcesRepository(logger, resourceBlobFS)
if err := resourceBlobRepository.InitCache(ctx, ruleCacheRefreshDelay); err != nil {
return err
}
defer func() {
logger.Debug("cleaning up resource blob")
if err := resourceBlobRepository.Close(); err != nil {
if err := resourceBlobFS.Close(); err != nil {
logger.Warn("resource blob cleanup failed", "err", err)
}
}()
Expand Down Expand Up @@ -187,7 +182,7 @@ func StartServer(logger *slog.Logger, cfg *config.Frontier) error {
return err
}

deps, err := buildAPIDependencies(logger, cfg, dbClient, spiceDBClient, resourceBlobRepository, billingPlanRepository)
deps, err := buildAPIDependencies(logger, cfg, dbClient, spiceDBClient, resourceBlobFS, billingPlanRepository)
if err != nil {
return err
}
Expand Down Expand Up @@ -366,7 +361,7 @@ func buildAPIDependencies(
cfg *config.Frontier,
dbc *db.Client,
sdb *spicedb.SpiceDB,
resourceBlobRepository *blob.ResourcesRepository,
resourceBlobBucket blob.Bucket,
planBlobRepository *blob.PlanRepository,
) (api.Deps, error) {
// Load additional traits from config file if specified
Expand Down Expand Up @@ -541,7 +536,6 @@ func buildAPIDependencies(
resourcePGRepository := postgres.NewResourceRepository(dbc)
resourceService := resource.NewService(
resourcePGRepository,
resourceBlobRepository,
relationService,
authnService,
projectService,
Expand Down Expand Up @@ -600,7 +594,7 @@ func buildAPIDependencies(

usageService := usage.NewService(creditService)

resourceSchemaRepository := blob.NewSchemaConfigRepository(resourceBlobRepository.Bucket)
resourceSchemaRepository := blob.NewSchemaConfigRepository(resourceBlobBucket)
bootstrapService := bootstrap.NewBootstrapService(
logger,
cfg.App.Admin,
Expand Down
95 changes: 0 additions & 95 deletions core/resource/mocks/config_repository.go
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions core/resource/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ type Repository interface {
Delete(ctx context.Context, id string) error
}

type ConfigRepository interface {
GetAll(ctx context.Context) ([]YAML, error)
}

type Resource struct {
ID string `json:"id"`
URN string `json:"urn"`
Expand All @@ -42,13 +38,6 @@ func (res Resource) CreateURN(projectName string) string {
return fmt.Sprintf("frn:%s:%s:%s", projectName, res.NamespaceID, res.Name)
}

type YAML struct {
Name string `json:"name" yaml:"name"`
Backend string `json:"backend" yaml:"backend"`
ResourceType string `json:"resource_type" yaml:"resource_type"`
Actions map[string][]string `json:"actions" yaml:"actions"`
}

type Check struct {
Object relation.Object
Subject relation.Subject
Expand Down
4 changes: 1 addition & 3 deletions core/resource/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ type PATService interface {

type Service struct {
repository Repository
configRepository ConfigRepository
relationService RelationService
authnService AuthnService
projectService ProjectService
Expand All @@ -58,13 +57,12 @@ type AuditRecordRepository interface {
Create(ctx context.Context, auditRecord auditmodels.AuditRecord) (auditmodels.AuditRecord, error)
}

func NewService(repository Repository, configRepository ConfigRepository,
func NewService(repository Repository,
relationService RelationService, authnService AuthnService,
projectService ProjectService, orgService OrgService,
patService PATService, auditRecordRepository AuditRecordRepository) *Service {
return &Service{
repository: repository,
configRepository: configRepository,
relationService: relationService,
authnService: authnService,
projectService: projectService,
Expand Down
Loading
Loading