Add support for subscriptions to data sources #5271
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JAORMX
approved these changes
Jan 9, 2025
| @@ -36,7 +36,7 @@ func (s *Server) CreateDataSource(ctx context.Context, | |||
| } | |||
|
|
|||
| // Process the request | |||
| ret, err := s.dataSourcesService.Create(ctx, dsReq, nil) | |||
| ret, err := s.dataSourcesService.Create(ctx, uuid.Nil, dsReq, nil) | |||
There was a problem hiding this comment.
Should we leave a TODO about verifying the subscription before doing an update?
There was a problem hiding this comment.
I think we already do that in the service, I've tagged you in a comment below to verify
eleftherias
commented
Jan 9, 2025
Comment on lines
+253
to
+262
| // Validate the subscription ID if present | ||
| existingDS, err := getDataSourceFromDb(ctx, projectID, ReadBuilder().WithTransaction(tx), tx, | ||
| func(ctx context.Context, tx db.ExtendQuerier, projs []uuid.UUID) (db.DataSource, error) { | ||
| return getByNameQuery(ctx, tx, projs, ds.GetName()) | ||
| }) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to get existing data source: %w", err) | ||
| return nil, fmt.Errorf("failed to get existing data source from DB: %w", err) | ||
| } | ||
| if err = namespaces.DoesSubscriptionIDMatch(subscriptionID, existingDS.SubscriptionID); err != nil { | ||
| return nil, fmt.Errorf("failed to update data source: %w", err) |
There was a problem hiding this comment.
@JAORMX Is this what you mean?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This is the first PR for adding subscriptions to data sources, allowing them to be part of a bundle.
This PR focuses on the database operations and service layer.
A followup PR will add the functions to import data sources from the bundle, and additional validation.
Change Type
Mark the type of change your PR introduces:
Testing
Outline how the changes were tested, including steps to reproduce and any relevant configurations.
Attach screenshots if helpful.
Review Checklist: