Fix config test

Author: haohanyang

.github/workflows/ci.yml

@@ -196,7 +196,7 @@ jobs:
 
       - name: Run Playwright tests
         id: run-tests
-        run: npm run e2e
+        run: bash scripts/cert-gen.sh mongo-tls-auth && npm run e2e
 
       - name: Docker logs
         if: ${{ always() && steps.run-tests.outcome == 'failure' }}

provisioning/datasources/test/mongo-default.yml

@@ -0,0 +1,12 @@
+apiVersion: 1
+
+datasources:
+  - name: 'MongoDB Datasource test'
+    type: 'haohanyang-mongodb-datasource'
+    access: proxy
+    isDefault: false
+    orgId: 1
+    version: 1
+    editable: true
+    jsonData:
+    secureJsonData:

provisioning/datasources/test/mongo-no-auth.yml

@@ -17,7 +17,7 @@ import {
   ConnectionStringScheme,
 } from '../types';
 
-interface Props extends DataSourcePluginOptionsEditorProps<MongoDataSourceOptions, MongoDataSourceSecureJsonData> {}
+interface Props extends DataSourcePluginOptionsEditorProps<MongoDataSourceOptions, MongoDataSourceSecureJsonData> { }
 
 const mongoDBAuthMethods: SelectableValue[] = [
   { label: 'None', value: MongoDBAuthMethod.NONE },
@@ -219,6 +219,7 @@ export function ConfigEditor(props: Props) {
             <Input
               required
               id="config-editor-tls-ca"
+              placeholder='/path/to/ca.pem'
               value={jsonData.caCertPath}
               onChange={(event: ChangeEvent<HTMLInputElement>) =>
                 onOptionsChange({
@@ -235,6 +236,7 @@ export function ConfigEditor(props: Props) {
             <Input
               required
               id="config-editor-tls-cc"
+              placeholder='/path/to/mongodb.crt'
               value={jsonData.clientCertPath}
               onChange={(event: ChangeEvent<HTMLInputElement>) =>
                 onOptionsChange({
@@ -249,8 +251,8 @@ export function ConfigEditor(props: Props) {
           </Field>
           <Field label="Client Key" description="Path to private client key (.pem)">
             <Input
-              required
               id="config-editor-tls-ck"
+              placeholder='/path/to/mongodb.pem'
               value={jsonData.clientKeyPath}
               onChange={(event: ChangeEvent<HTMLInputElement>) =>
                 onOptionsChange({

provisioning/datasources/test/mongo-tls-auth.yml

@@ -2,47 +2,43 @@ import { test, expect } from '@grafana/plugin-e2e';
 
 test('"Save & test" should be successful when mongo without auth config is valid', async ({
   createDataSourceConfigPage,
-  readProvisionedDataSource,
   page,
 }) => {
-  const ds = await readProvisionedDataSource({ fileName: 'test/mongo-no-auth.yml' });
-  const configPage = await createDataSourceConfigPage({ type: ds.type });
-  await page.getByLabel('Host').fill(ds.jsonData.host ?? '');
-  await page.getByLabel('Port').fill(ds.jsonData.port?.toString() ?? '');
-  await page.getByLabel('Database').fill(ds.jsonData.database ?? '');
+  const configPage = await createDataSourceConfigPage({ type: 'haohanyang-mongodb-datasource' });
+  await page.getByLabel('Host').fill('mongo-no-auth');
+  await page.getByLabel('Port').fill('27017');
+  await page.getByLabel('Database').fill('test');
   await page.getByRole('radio', { name: 'None' }).check();
   await expect(configPage.saveAndTest()).toBeOK();
 });
 
 test('"Save & test" should be successful when mongo username-password auth config is valid', async ({
   createDataSourceConfigPage,
-  readProvisionedDataSource,
   page,
 }) => {
-  const ds = await readProvisionedDataSource({ fileName: 'test/mongo-username-password-auth.yml' });
-  const configPage = await createDataSourceConfigPage({ type: ds.type });
-  await page.getByLabel('Host').fill(ds.jsonData.host ?? '');
-  await page.getByLabel('Port').fill(ds.jsonData.port?.toString() ?? '');
-  await page.getByLabel('Database').fill(ds.jsonData.database ?? '');
+  const configPage = await createDataSourceConfigPage({ type: 'haohanyang-mongodb-datasource' });
+  await page.getByLabel('Host').fill('mongo-username-password-auth');
+  await page.getByLabel('Port').fill('27017');
+  await page.getByLabel('Database').fill('test');
   await page.getByRole('radio', { name: 'Username/Password', exact: true }).check();
-  await page.getByLabel('Username', { exact: true }).fill(ds.jsonData.username ?? '');
-  await page.getByLabel('Password', { exact: true }).fill(ds.secureJsonData?.password ?? '');
+  await page.getByLabel('Username', { exact: true }).fill('username');
+  await page.getByLabel('Password', { exact: true }).fill('password');
   await expect(configPage.saveAndTest()).toBeOK();
 });
 
 test('"Save & test" should be successful when mongo tls auth config is valid', async ({
   createDataSourceConfigPage,
-  readProvisionedDataSource,
   page,
 }) => {
-  const ds = await readProvisionedDataSource({ fileName: 'test/mongo-tls-auth.yml' });
-  const configPage = await createDataSourceConfigPage({ type: ds.type });
-  await page.getByLabel('Host').fill(ds.jsonData.host ?? '');
-  await page.getByLabel('Port').fill(ds.jsonData.port?.toString() ?? '');
-  await page.getByLabel('Database').fill(ds.jsonData.database ?? '');
+  const configPage = await createDataSourceConfigPage({ type: 'haohanyang-mongodb-datasource' });
+  await page.getByLabel('Host').fill('mongo-tls-auth');
+  await page.getByLabel('Port').fill('27017');
+  await page.getByLabel('Database').fill('test');
   await page.getByRole('radio', { name: 'TLS/SSL', exact: true }).check();
-  await page.getByLabel('Certificate Authority', { exact: true }).fill(ds.jsonData.caCertPath ?? '');
-  await page.getByLabel('Client Certificate', { exact: true }).fill(ds.jsonData.clientCertPath ?? '');
-  await page.getByLabel('Client Key', { exact: true }).fill(ds.jsonData.clientKeyPath ?? '');
+  await page.screenshot({ path: 'mongo-tls-auth1.png' });
+
+  await page.getByLabel('Certificate Authority').fill('/certs/ca.pem');
+  await page.getByLabel('Client Certificate').fill('/certs/mongodb.crt');
+  await page.getByPlaceholder('/path/to/mongodb.pem').fill('/certs/mongodb.pem');
   await expect(configPage.saveAndTest()).toBeOK();
 });