resolve conflicts (#50184)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

pkg/services/provisioning/datasources/testdata/all-properties/all-properties.yaml

@@ -6,12 +6,10 @@ datasources:
     access: proxy
     orgId: 2
     url: url
-    password: password
     user: user
     database: database
     basicAuth: true
     basicAuthUser: basic_auth_user
-    basicAuthPassword: basic_auth_password
     withCredentials: true
     isDefault: true
     jsonData:

pkg/services/provisioning/datasources/testdata/all-properties/sample.yaml

@@ -9,12 +9,10 @@ apiVersion: 1
 #    access: proxy
 #    orgId: 2
 #    url: url
-#    password: password
 #    user: user
 #    database: database
 #    basicAuth: true
 #    basicAuthUser: basic_auth_user
-#    basicAuthPassword: basic_auth_password
 #    withCredentials: true
 #    jsonData:
 #      graphiteVersion: "1.1"

pkg/services/provisioning/datasources/testdata/broken-yaml/commented.yaml

@@ -16,8 +16,6 @@
 #   org_id: 1
 #   # <string> url
 #   url: http://localhost:8080
-#   # <string> database password, if used
-#   password:
 #   # <string> database user, if used
 #   user:
 #   # <string> database name, if used
@@ -26,8 +24,6 @@
 #   basic_auth:
 #   # <string> basic auth username
 #   basic_auth_user:
-#   # <string> basic auth password
-#   basic_auth_password:
 #   # <bool> enable/disable with credentials headers
 #   with_credentials:
 #   # <bool> mark as default datasource. Max one per org

pkg/services/provisioning/datasources/testdata/version-0/version-0.yaml

@@ -4,12 +4,10 @@ datasources:
     access: proxy
     org_id: 2
     url: url
-    password: password
     user: user
     database: database
     basic_auth: true
     basic_auth_user: basic_auth_user
-    basic_auth_password: basic_auth_password
     with_credentials: true
     is_default: true
     json_data: