refactor(datasource): refactoring datasource secure json fields handling, #6697, #6692

2016-12-14 21:06:10 +01:00
parent b38e9b0cac
commit 330c1b945e
5 changed files with 15 additions and 34 deletions
@@ -81,15 +81,7 @@ type DataSource struct {
 	WithCredentials   bool             `json:"withCredentials"`
 	IsDefault         bool             `json:"isDefault"`
 	JsonData          *simplejson.Json `json:"jsonData,omitempty"`
-	TLSAuth           TLSAuth          `json:"tlsAuth,omitempty"`
-	EncryptedFields   []string         `json:"encryptedFields"`
-}
-
-// TLSAuth is used to show if TLS certs have been uploaded already
-type TLSAuth struct {
-	CACertSet     bool `json:"tlsCACertSet"`
-	ClientCertSet bool `json:"tlsClientCertSet"`
-	ClientKeySet  bool `json:"tlsClientKeySet"`
+	SecureJsonFields  map[string]bool  `json:"secureJsonFields"`
 }

 type DataSourceList []DataSource