fix: python connection patching
diff --git a/backend/helpers/srvhelper/any_model_service_helper.go b/backend/helpers/srvhelper/any_model_service_helper.go
index 8f09d6d..5a816f5 100644
--- a/backend/helpers/srvhelper/any_model_service_helper.go
+++ b/backend/helpers/srvhelper/any_model_service_helper.go
@@ -117,7 +117,7 @@
}
return err
}
- return srv.db.Update(model)
+ return srv.db.Update(model, dal.From(srv.ModelInfo.TableName()))
}
// CreateOrUpdate validates given model and insert or update it into database if validation passed
@@ -153,7 +153,7 @@
// GetAll returns all models from database
func (srv *AnyModelSrvHelper) QueryAllAny() (any, errors.Error) {
array := srv.NewSlice()
- return array, srv.db.All(&array)
+ return array, srv.db.All(&array, dal.From(srv.ModelInfo.TableName()))
}
func (srv *AnyModelSrvHelper) QueryPageAny(pagination *Pagination, query ...dal.Clause) (any, int64, errors.Error) {
diff --git a/backend/server/services/remote/plugin/plugin_impl.go b/backend/server/services/remote/plugin/plugin_impl.go
index 77e1327..dd6cd65 100644
--- a/backend/server/services/remote/plugin/plugin_impl.go
+++ b/backend/server/services/remote/plugin/plugin_impl.go
@@ -18,6 +18,7 @@
package plugin
import (
+ "encoding/json"
"fmt"
"reflect"
@@ -128,7 +129,12 @@
p.Name(),
[]string{"name"},
func(c any) any {
- reflect.ValueOf(c).Elem().FieldByName("token").SetString("")
+ b := errors.Must1(json.Marshal(c))
+ fmt.Printf("%s\n", b)
+ tokenField := reflect.ValueOf(c).Elem().FieldByName("Token")
+ if tokenField.IsValid() {
+ tokenField.SetString("")
+ }
return c
},
p.connectionModelInfo,
diff --git a/backend/server/services/remote/plugin/scope_db_helper.go.bak b/backend/server/services/remote/plugin/scope_db_helper.go.bak
deleted file mode 100644
index 5e19f08..0000000
--- a/backend/server/services/remote/plugin/scope_db_helper.go.bak
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package plugin
-
-import (
- "fmt"
- "time"
-
- "github.com/apache/incubator-devlake/core/context"
- "github.com/apache/incubator-devlake/core/dal"
- "github.com/apache/incubator-devlake/core/errors"
- "github.com/apache/incubator-devlake/core/plugin"
- "github.com/apache/incubator-devlake/helpers/pluginhelper/api"
- "github.com/apache/incubator-devlake/server/services/remote/models"
-)
-
-type ScopeDatabaseHelperImpl struct {
- api.ScopeDatabaseHelper[models.RemoteConnection, models.DynamicScopeModel, models.RemoteScopeConfig]
- pa *pluginAPI
- db dal.Dal
- params *api.ReflectionParameters
- connHelper *api.ConnectionApiHelper
-}
-
-func NewScopeDatabaseHelperImpl(pa *pluginAPI, basicRes context.BasicRes, params *api.ReflectionParameters) *ScopeDatabaseHelperImpl {
- return &ScopeDatabaseHelperImpl{
- pa: pa,
- db: basicRes.GetDal(),
- params: params,
- connHelper: pa.connhelper,
- }
-}
-
-func (s *ScopeDatabaseHelperImpl) VerifyConnection(connectionId uint64) errors.Error {
- conn := s.pa.connType.New()
- err := s.connHelper.FirstById(conn, connectionId)
- if err != nil {
- if s.db.IsErrorNotFound(err) {
- return errors.BadInput.New("Invalid Connection Id")
- }
- return err
- }
- return nil
-}
-
-func (s *ScopeDatabaseHelperImpl) SaveScope(scopes []*models.DynamicScopeModel) errors.Error {
- now := time.Now()
- return s.save(scopes, &now, &now)
-}
-
-func (s *ScopeDatabaseHelperImpl) UpdateScope(scope *models.DynamicScopeModel) errors.Error {
- // Update API on Gorm doesn't work with dynamic models. Need to do delete + create instead, unfortunately.
- if err := s.DeleteScope(scope); err != nil {
- if !s.db.IsErrorNotFound(err) {
- return err
- }
- }
- now := time.Now()
- return s.save([]*models.DynamicScopeModel{scope}, nil, &now)
-}
-
-func (s *ScopeDatabaseHelperImpl) GetScope(connectionId uint64, scopeId string) (*models.DynamicScopeModel, errors.Error) {
- query := dal.Where(fmt.Sprintf("connection_id = ? AND %s = ?", s.params.ScopeIdColumnName), connectionId, scopeId)
- scope := models.NewDynamicScopeModel(s.pa.scopeType)
- err := api.CallDB(s.db.First, scope, query)
- if err != nil {
- return nil, errors.Default.Wrap(err, "could not get scope")
- }
- return scope, nil
-}
-
-func (s *ScopeDatabaseHelperImpl) ListScopes(input *plugin.ApiResourceInput, connectionId uint64) ([]*models.DynamicScopeModel, int64, errors.Error) {
- count, err := s.db.Count(dal.From(s.pa.scopeType.TableName()), dal.Where("connection_id = ?", connectionId))
- if err != nil {
- return nil, 0, err
- }
- limit, offset := api.GetLimitOffset(input.Query, "pageSize", "page")
- scopes := models.NewDynamicScopeModel(s.pa.scopeType).NewSlice()
- err = api.CallDB(s.db.All, scopes, dal.Where("connection_id = ?", connectionId), dal.Limit(limit), dal.Offset(offset))
- if err != nil {
- return nil, 0, err
- }
- var result []*models.DynamicScopeModel
- for _, scopeRaw := range scopes.UnwrapSlice() {
- scope := models.NewDynamicScopeModel(s.pa.scopeType)
- _ = scope.From(scopeRaw)
- result = append(result, scope)
- }
- return result, count, nil
-}
-
-func (s *ScopeDatabaseHelperImpl) DeleteScope(scope *models.DynamicScopeModel) errors.Error {
- return api.CallDB(s.db.Delete, scope)
-}
-
-func (s *ScopeDatabaseHelperImpl) GetScopeConfig(configId uint64) (*models.RemoteScopeConfig, errors.Error) {
- config := s.pa.scopeConfigType.New()
- err := api.CallDB(s.db.First, config, dal.Where("id = ?", configId))
- if err != nil {
- return nil, err
- }
- unwrapped := config.Unwrap().(models.RemoteScopeConfig)
- return &unwrapped, nil
-}
-
-func (s *ScopeDatabaseHelperImpl) ListScopeConfigs(configIds []uint64) ([]*models.RemoteScopeConfig, errors.Error) {
- configs := s.pa.scopeConfigType.NewSlice()
- err := api.CallDB(s.db.All, configs, dal.Where("id IN (?)", configIds))
- if err != nil {
- return nil, err
- }
- var result []*models.RemoteScopeConfig
- for _, config := range configs.UnwrapSlice() {
- config := config.(models.RemoteScopeConfig)
- result = append(result, &config)
- }
- return result, nil
-}
-
-func (s *ScopeDatabaseHelperImpl) save(scopes []*models.DynamicScopeModel, createdAt *time.Time, updatedAt *time.Time) errors.Error {
- var targets []map[string]any
- for _, scope := range scopes {
- ifc := scope.UnwrapPtr()
- m, err := models.ToDatabaseMap(s.pa.scopeType.TableName(), ifc, createdAt, updatedAt)
- if err != nil {
- return err
- }
- targets = append(targets, m)
- }
- err := api.CallDB(s.db.Create, &targets, dal.From(s.pa.scopeType.TableName()))
- if err != nil {
- return errors.Default.Wrap(err, "could not save scope")
- }
- return nil
-}
-
-var _ api.ScopeDatabaseHelper[models.RemoteConnection, models.DynamicScopeModel, models.RemoteScopeConfig] = &ScopeDatabaseHelperImpl{}
