Chore: Remove Result field from datasources (#63048)

* Remove Result field from AddDataSourceCommand
* Remove DatasourcesPermissionFilterQuery Result
* Remove GetDataSourceQuery Result
* Remove GetDataSourcesByTypeQuery Result
* Remove GetDataSourcesQuery Result
* Remove GetDefaultDataSourceQuery Result
* Remove UpdateDataSourceCommand Result

pkg/tests/api/correlations/common_test.go

@@ -149,11 +149,12 @@ func (c TestContext) createUser(cmd user.CreateUserCommand) {
 	require.NoError(c.t, err)
 }
 
-func (c TestContext) createDs(cmd *datasources.AddDataSourceCommand) {
+func (c TestContext) createDs(cmd *datasources.AddDataSourceCommand) *datasources.DataSource {
 	c.t.Helper()
 
-	err := c.env.Server.HTTPServer.DataSourcesService.AddDataSource(context.Background(), cmd)
+	dataSource, err := c.env.Server.HTTPServer.DataSourcesService.AddDataSource(context.Background(), cmd)
 	require.NoError(c.t, err)
+	return dataSource
 }
 
 func (c TestContext) createCorrelation(cmd correlations.CreateCorrelationCommand) correlations.Correlation {

pkg/tests/api/correlations/correlations_create_test.go

@@ -47,16 +47,16 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
 		ReadOnly: true,
 		OrgID:    1,
 	}
-	ctx.createDs(createDsCommand)
-	readOnlyDS := createDsCommand.Result.UID
+	dataSource := ctx.createDs(createDsCommand)
+	readOnlyDS := dataSource.UID
 
 	createDsCommand = &datasources.AddDataSourceCommand{
 		Name:  "writable",
 		Type:  "loki",
 		OrgID: 1,
 	}
-	ctx.createDs(createDsCommand)
-	writableDs := createDsCommand.Result.UID
+	dataSource = ctx.createDs(createDsCommand)
+	writableDs := dataSource.UID
 
 	t.Run("Unauthenticated users shouldn't be able to create correlations", func(t *testing.T) {
 		res := ctx.Post(PostParams{

pkg/tests/api/correlations/correlations_delete_test.go

@@ -47,17 +47,17 @@ func TestIntegrationDeleteCorrelation(t *testing.T) {
 		ReadOnly: true,
 		OrgID:    1,
 	}
-	ctx.createDs(createDsCommand)
-	readOnlyDS := createDsCommand.Result.UID
+	dataSource := ctx.createDs(createDsCommand)
+	readOnlyDS := dataSource.UID
 
 	createDsCommand = &datasources.AddDataSourceCommand{
 		Name:  "writable",
 		Type:  "loki",
 		OrgID: 1,
 	}
-	ctx.createDs(createDsCommand)
-	writableDs := createDsCommand.Result.UID
-	writableDsOrgId := createDsCommand.Result.OrgID
+	dataSource = ctx.createDs(createDsCommand)
+	writableDs := dataSource.UID
+	writableDsOrgId := dataSource.OrgID
 
 	t.Run("Unauthenticated users shouldn't be able to delete correlations", func(t *testing.T) {
 		res := ctx.Delete(DeleteParams{

pkg/tests/api/correlations/correlations_read_test.go

@@ -70,8 +70,7 @@ func TestIntegrationReadCorrelation(t *testing.T) {
 		Type:  "loki",
 		OrgID: 1,
 	}
-	ctx.createDs(createDsCommand)
-	dsWithCorrelations := createDsCommand.Result
+	dsWithCorrelations := ctx.createDs(createDsCommand)
 	correlation := ctx.createCorrelation(correlations.CreateCorrelationCommand{
 		SourceUID: dsWithCorrelations.UID,
 		TargetUID: &dsWithCorrelations.UID,
@@ -88,8 +87,7 @@ func TestIntegrationReadCorrelation(t *testing.T) {
 		Type:  "loki",
 		OrgID: 1,
 	}
-	ctx.createDs(createDsCommand)
-	dsWithoutCorrelations := createDsCommand.Result
+	dsWithoutCorrelations := ctx.createDs(createDsCommand)
 
 	// This creates 2 records in the correlation table that should never be returned by the API.
 	// Given all tests in this file work on the assumption that only a single correlation exists,

pkg/tests/api/correlations/correlations_update_test.go

@@ -47,17 +47,17 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
 		ReadOnly: true,
 		OrgID:    1,
 	}
-	ctx.createDs(createDsCommand)
-	readOnlyDS := createDsCommand.Result.UID
+	dataSource := ctx.createDs(createDsCommand)
+	readOnlyDS := dataSource.UID
 
 	createDsCommand = &datasources.AddDataSourceCommand{
 		Name:  "writable",
 		Type:  "loki",
 		OrgID: 1,
 	}
-	ctx.createDs(createDsCommand)
-	writableDs := createDsCommand.Result.UID
-	writableDsOrgId := createDsCommand.Result.OrgID
+	dataSource = ctx.createDs(createDsCommand)
+	writableDs := dataSource.UID
+	writableDsOrgId := dataSource.OrgID
 
 	t.Run("Unauthenticated users shouldn't be able to update correlations", func(t *testing.T) {
 		res := ctx.Patch(PatchParams{