Change field

Signed-off-by: Bandini Bhopi <bandinib@amazon.com>

src/plugins/data_source/common/auth_registry/authentication_methods_registry.ts

@@ -16,18 +16,18 @@ export class AuthenticationMethodRegistery {
    * Register a authMethods with function to return credentials inside the registry.
    * Authentication Method can only be registered once. subsequent calls with the same method name will throw an error.
    */
-  public registerAuthenticationMethod(type: string, authMethodValues: AuthMethodValues) {
-    if (this.authMethods.has(type)) {
-      throw new Error(`Authentication method '${type}' is already registered`);
+  public registerAuthenticationMethod(name: string, authMethodValues: AuthMethodValues) {
+    if (this.authMethods.has(name)) {
+      throw new Error(`Authentication method '${name}' is already registered`);
     }
-    this.authMethods.set(type, authMethodValues);
+    this.authMethods.set(name, authMethodValues);
   }
 
   public getAllAuthenticationMethods() {
     return [...this.authMethods.values()];
   }
 
-  public getAuthenticationMethod(authType: string) {
-    return this.authMethods.get(authType);
+  public getAuthenticationMethod(name: string) {
+    return this.authMethods.get(name);
   }
 }

src/plugins/data_source/common/data_sources/types.ts

@@ -13,7 +13,7 @@ export interface DataSourceAttributes extends SavedObjectAttributes {
     credentials: UsernamePasswordTypedContent | SigV4Content | undefined | AuthTypeContent;
   };
   lastUpdatedTime?: string;
-  authMethodType: AuthType | string;
+  name: AuthType | string;
 }
 
 export interface AuthTypeContent {

src/plugins/data_source/server/client/configure_client.ts

@@ -118,21 +118,19 @@ const getQueryClient = async (
   console.log(`I'm inside getQueryClient`);
   let {
     auth: { type },
-    authMethodType = 'token_exchange',
+    name,
   } = dataSourceAttr;
   const { endpoint } = dataSourceAttr;
-  authMethodType = authMethodType ?? type;
+  name = name ?? type;
   const clientOptions = parseClientOptions(config, endpoint);
   const cacheKey = generateCacheKey(dataSourceAttr, dataSourceId);
   let awsCredential;
   if (authRegistryPromise !== undefined) {
     console.log(`authRegistryPromise is defined`);
     await authRegistryPromise.then((auth) => {
       if (auth !== undefined) {
-        console.log(
-          `auth is defined, calling getAuthenticationMethod with param = ${authMethodType}`
-        );
-        const authMethod = auth.getAuthenticationMethod(authMethodType);
+        console.log(`auth is defined, calling getAuthenticationMethod with param = ${name}`);
+        const authMethod = auth.getAuthenticationMethod(name);
         console.log(`authMethod = ${JSON.stringify(authMethod)}`);
         awsCredential = authMethod?.credentialProvider({ dataSourceAttr, request, cryptography });
         type = authMethod?.authType;

src/plugins/data_source/server/plugin.ts

@@ -121,16 +121,16 @@ export class DataSourcePlugin implements Plugin<DataSourcePluginSetup, DataSourc
     const router = core.http.createRouter();
     registerTestConnectionRoute(router, dataSourceService, cryptographyServiceSetup);
 
-    const registerCredentialProvider = (type: string, authMethodValues: AuthMethodValues) => {
+    const registerCredentialProvider = (name: string, authMethodValues: AuthMethodValues) => {
       this.logger.info(
-        `Registered Credential Provider for authType = ${type} and authMethodValues = ${JSON.stringify(
+        `Registered Credential Provider for authType = ${name} and authMethodValues = ${JSON.stringify(
           authMethodValues
         )}`
       );
       if (this.started) {
         throw new Error('cannot call `registerCredentialProvider` after service startup.');
       }
-      this.authMethodsRegistry.registerAuthenticationMethod(type, authMethodValues);
+      this.authMethodsRegistry.registerAuthenticationMethod(name, authMethodValues);
     };
 
     return {

src/plugins/data_source/server/types.ts

@@ -80,7 +80,7 @@ declare module 'src/core/server' {
 export interface DataSourcePluginSetup {
   createDataSourceError: (err: any) => DataSourceError;
 
-  registerCredentialProvider: (type: string, authMethodValues: AuthMethodValues) => void;
+  registerCredentialProvider: (name: string, authMethodValues: AuthMethodValues) => void;
 }
 
 export interface DataSourcePluginStart {