SALTO-5293 hide types by default, avoid requiring client config (#5758)

salto-io · Apr 11, 2024 · ba87306 · ba87306
1 parent 5ddd829
commit ba87306
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 8 deletions.
diff --git a/packages/adapter-components/src/definitions/user/user_config.ts b/packages/adapter-components/src/definitions/user/user_config.ts
@@ -32,7 +32,7 @@ export type UserConfig<
   }>,
   TDeploy extends UserDeployConfig = UserDeployConfig,
 > = {
-  client: TClient
+  client?: TClient
   fetch: TFetch
   deploy?: TDeploy
 }
@@ -104,7 +104,7 @@ export const adapterConfigFromConfig = <
 ): Co & UserConfig<TCustomNameMappingOptions> => {
   // TODO extend validations SALTO-5584
   validateClientConfig('client', config?.value?.client)
-  const client = mergeWithDefaultConfig(defaultConfig.client, config?.value?.client)
+  const client = mergeWithDefaultConfig(defaultConfig.client ?? {}, config?.value?.client)
 
   const fetch = _.defaults({}, config?.value?.fetch, defaultConfig.fetch)
 

diff --git a/packages/adapter-components/test/adapter-wrapper/adapter.test.ts b/packages/adapter-components/test/adapter-wrapper/adapter.test.ts
@@ -81,7 +81,6 @@ const getMockFunction = (method: HTTPMethod, mockAxiosAdapter: MockAdapter): Moc
 }
 
 const DEFAULT_CONFIG: UserConfig = {
-  client: {},
   fetch: {
     ...INCLUDE_ALL_CONFIG,
   },

diff --git a/packages/adapter-components/test/filters/common_filters.test.ts b/packages/adapter-components/test/filters/common_filters.test.ts
@@ -41,7 +41,6 @@ describe('common filters', () => {
       const filters = createCommonFilters({
         referenceRules: [],
         config: {
-          client: {},
           fetch: {
             ...INCLUDE_ALL_CONFIG,
           },

diff --git a/packages/confluence-adapter/src/config.ts b/packages/confluence-adapter/src/config.ts
@@ -28,8 +28,8 @@ export type UserConfig = definitions.UserConfig<
 >
 
 export const DEFAULT_CONFIG: UserConfig = {
-  client: {},
   fetch: {
     ...elements.query.INCLUDE_ALL_CONFIG,
+    hideTypes: true,
   },
 }
diff --git a/packages/google-workspace-adapter/src/config.ts b/packages/google-workspace-adapter/src/config.ts
@@ -28,8 +28,8 @@ export type UserConfig = definitions.UserConfig<
 >
 
 export const DEFAULT_CONFIG: UserConfig = {
-  client: {},
   fetch: {
     ...elements.query.INCLUDE_ALL_CONFIG,
+    hideTypes: true,
   },
 }
diff --git a/packages/intercom-adapter/src/config.ts b/packages/intercom-adapter/src/config.ts
@@ -28,9 +28,9 @@ export type UserConfig = definitions.UserConfig<
 >
 
 export const DEFAULT_CONFIG: UserConfig = {
-  client: {},
   fetch: {
     include: [{ type: elements.query.ALL_TYPES }],
     exclude: [{ type: 'company' }],
+    hideTypes: true,
   },
 }
diff --git a/packages/serviceplaceholder-adapter/src/config.ts b/packages/serviceplaceholder-adapter/src/config.ts
@@ -31,8 +31,9 @@ export type UserConfig = definitions.UserConfig<
 >
 
 export const DEFAULT_CONFIG: UserConfig = {
-  client: {},
   fetch: {
     ...elements.query.INCLUDE_ALL_CONFIG,
+    // TODO hideTypes should be true when the adapter is ready. for development, it helps to set to false
+    hideTypes: true,
   },
 }