Require project ID when listing data source rules

mindersec · Jan 15, 2025 · df1593b · df1593b
1 parent 10ab63b
commit df1593b
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 16 deletions.
diff --git a/database/mock/store.go b/database/mock/store.go
diff --git a/database/query/datasources.sql b/database/query/datasources.sql
@@ -84,7 +84,7 @@ WHERE data_source_id = $1 AND project_id = $2;
 --
 -- name: ListRuleTypesReferencesByDataSource :many
 SELECT * FROM rule_type_data_sources
-WHERE data_sources_id = $1;
+WHERE data_sources_id = $1 and project_id = $2;
 
 -- AddRuleTypeDataSourceReference adds a link between one rule type
 -- and one data source it uses.

diff --git a/internal/datasources/service/service.go b/internal/datasources/service/service.go
@@ -366,7 +366,10 @@ func (d *dataSourceService) Delete(
 	tx := stx.Q()
 
 	// List rule types referencing the data source
-	ret, err := tx.ListRuleTypesReferencesByDataSource(ctx, id)
+	ret, err := tx.ListRuleTypesReferencesByDataSource(ctx, db.ListRuleTypesReferencesByDataSourceParams{
+		DataSourcesID: id,
+		ProjectID:     project,
+	})
 	if err != nil {
 		return fmt.Errorf("failed to list rule types referencing data source %s: %w", id, err)
 	}

diff --git a/internal/datasources/service/service_test.go b/internal/datasources/service/service_test.go
@@ -921,7 +921,10 @@ func TestDelete(t *testing.T) {
 			setup: func(args args, mockDB *mockdb.MockStore) {
 				// Mock ListRuleTypesReferencesByDataSource to return empty list
 				mockDB.EXPECT().
-					ListRuleTypesReferencesByDataSource(gomock.Any(), args.id).
+					ListRuleTypesReferencesByDataSource(gomock.Any(), db.ListRuleTypesReferencesByDataSourceParams{
+						DataSourcesID: args.id,
+						ProjectID:     args.project,
+					}).
 					Return([]db.RuleTypeDataSource{}, nil)
 
 				mockDB.EXPECT().
@@ -951,7 +954,10 @@ func TestDelete(t *testing.T) {
 			setup: func(args args, mockDB *mockdb.MockStore) {
 				// Mock ListRuleTypesReferencesByDataSource to return empty list
 				mockDB.EXPECT().
-					ListRuleTypesReferencesByDataSource(gomock.Any(), args.id).
+					ListRuleTypesReferencesByDataSource(gomock.Any(), db.ListRuleTypesReferencesByDataSourceParams{
+						DataSourcesID: args.id,
+						ProjectID:     args.project,
+					}).
 					Return([]db.RuleTypeDataSource{}, nil)
 
 				mockDB.EXPECT().
@@ -981,7 +987,10 @@ func TestDelete(t *testing.T) {
 			setup: func(args args, mockDB *mockdb.MockStore) {
 				// Mock ListRuleTypesReferencesByDataSource to return non-empty list
 				mockDB.EXPECT().
-					ListRuleTypesReferencesByDataSource(gomock.Any(), args.id).
+					ListRuleTypesReferencesByDataSource(gomock.Any(), db.ListRuleTypesReferencesByDataSourceParams{
+						DataSourcesID: args.id,
+						ProjectID:     args.project,
+					}).
 					Return([]db.RuleTypeDataSource{
 						{RuleTypeID: uuid.New()},
 					}, nil)
@@ -997,7 +1006,10 @@ func TestDelete(t *testing.T) {
 			},
 			setup: func(args args, mockDB *mockdb.MockStore) {
 				mockDB.EXPECT().
-					ListRuleTypesReferencesByDataSource(gomock.Any(), args.id).
+					ListRuleTypesReferencesByDataSource(gomock.Any(), db.ListRuleTypesReferencesByDataSourceParams{
+						DataSourcesID: args.id,
+						ProjectID:     args.project,
+					}).
 					Return([]db.RuleTypeDataSource{}, nil)
 				mockDB.EXPECT().
 					GetDataSource(gomock.Any(), gomock.Any()).
@@ -1018,7 +1030,10 @@ func TestDelete(t *testing.T) {
 			setup: func(args args, mockDB *mockdb.MockStore) {
 				// Mock ListRuleTypesReferencesByDataSource to return an error
 				mockDB.EXPECT().
-					ListRuleTypesReferencesByDataSource(gomock.Any(), args.id).
+					ListRuleTypesReferencesByDataSource(gomock.Any(), db.ListRuleTypesReferencesByDataSourceParams{
+						DataSourcesID: args.id,
+						ProjectID:     args.project,
+					}).
 					Return(nil, fmt.Errorf("database error"))
 			},
 			wantErr: true,
@@ -1033,7 +1048,10 @@ func TestDelete(t *testing.T) {
 			setup: func(args args, mockDB *mockdb.MockStore) {
 				// Mock ListRuleTypesReferencesByDataSource to return empty list
 				mockDB.EXPECT().
-					ListRuleTypesReferencesByDataSource(gomock.Any(), args.id).
+					ListRuleTypesReferencesByDataSource(gomock.Any(), db.ListRuleTypesReferencesByDataSourceParams{
+						DataSourcesID: args.id,
+						ProjectID:     args.project,
+					}).
 					Return([]db.RuleTypeDataSource{}, nil)
 				mockDB.EXPECT().
 					GetDataSource(gomock.Any(), gomock.Any()).

diff --git a/internal/db/datasources.sql.go b/internal/db/datasources.sql.go
diff --git a/internal/db/querier.go b/internal/db/querier.go