public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: use any rather than interface{} (#74066)

Browse Source
This commit is contained in:
Ryan McKinley
2023-08-30 18:46:47 +03:00
committed by GitHub
parent 3e272d2bda
commit 025b2f3011
525 changed files with 2528 additions and 2528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/pluginsintegration/pluginsettings/models.go
+8 -8
View File
@@ -14,7 +14,7 @@ type DTO struct {
OrgID int64
PluginID string
PluginVersion string
JSONData map[string]interface{}
JSONData map[string]any
SecureJSONData map[string][]byte
Enabled bool
Pinned bool
@@ -32,7 +32,7 @@ type InfoDTO struct {
type UpdateArgs struct {
Enabled bool
Pinned bool
JSONData map[string]interface{}
JSONData map[string]any
SecureJSONData map[string]string
PluginVersion string
PluginID string
@@ -61,7 +61,7 @@ type PluginSetting struct {
OrgId int64
Enabled bool
Pinned bool
JsonData map[string]interface{}
JsonData map[string]any
SecureJsonData map[string][]byte
PluginVersion string
@@ -82,11 +82,11 @@ type PluginSettingInfo struct {
// Also acts as api DTO
type UpdatePluginSettingCmd struct {
Enabled bool `json:"enabled"`
Pinned bool `json:"pinned"`
JsonData map[string]interface{} `json:"jsonData"`
SecureJsonData map[string]string `json:"secureJsonData"`
PluginVersion string `json:"version"`
Enabled bool `json:"enabled"`
Pinned bool `json:"pinned"`
JsonData map[string]any `json:"jsonData"`
SecureJsonData map[string]string `json:"secureJsonData"`
PluginVersion string `json:"version"`
PluginId string `json:"-"`
OrgId int64 `json:"-"`
pkg/services/pluginsintegration/pluginsettings/service/service.go
+1 -1
View File
@@ -136,7 +136,7 @@ func (s *Service) DecryptedValues(ps *pluginsettings.DTO) map[string]string {
func (s *Service) getPluginSettingsInfo(ctx context.Context, orgID int64) ([]*pluginsettings.PluginSettingInfo, error) {
sql := `SELECT org_id, plugin_id, enabled, pinned, plugin_version FROM plugin_setting `
params := make([]interface{}, 0)
params := make([]any, 0)
if orgID != 0 {
sql += "WHERE org_id=?"
pkg/services/pluginsintegration/pluginsettings/service/service_test.go
+5 -5
View File
@@ -30,7 +30,7 @@ func TestService_DecryptedValuesCache(t *testing.T) {
ps := pluginsettings.DTO{
ID: 1,
JSONData: map[string]interface{}{},
JSONData: map[string]any{},
SecureJSONData: encryptedJsonData,
}
@@ -68,7 +68,7 @@ func TestService_DecryptedValuesCache(t *testing.T) {
ps := pluginsettings.DTO{
ID: 1,
JSONData: map[string]interface{}{},
JSONData: map[string]any{},
SecureJSONData: encryptedJsonData,
}
@@ -110,7 +110,7 @@ func TestIntegrationPluginSettings(t *testing.T) {
PluginId: "existing",
Enabled: false,
Pinned: false,
JsonData: map[string]interface{}{
JsonData: map[string]any{
"key": "value",
},
SecureJsonData: secureJsonData,
@@ -177,7 +177,7 @@ func TestIntegrationPluginSettings(t *testing.T) {
PluginID: existing.PluginId,
Enabled: true,
PluginVersion: "1.0.1",
JSONData: map[string]interface{}{
JSONData: map[string]any{
"key2": "value2",
},
SecureJSONData: map[string]string{
@@ -235,7 +235,7 @@ func TestIntegrationPluginSettings(t *testing.T) {
Enabled: true,
OrgID: 1,
PluginVersion: "1.0.0",
JSONData: map[string]interface{}{
JSONData: map[string]any{
"key": "value",
},
SecureJSONData: map[string]string{