fix(plugins/plugin-ibmcloud): ibmcloud cos initialization bug

Fixes #5968
kubernetes-sigs · Oct 13, 2020 · 9335063 · 9335063
1 parent 3bdcfd3
commit 9335063
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/plugins/plugin-ibmcloud/cos/src/controller/local.ts b/plugins/plugin-ibmcloud/cos/src/controller/local.ts
@@ -17,10 +17,10 @@
 import { REPL } from '@kui-shell/core'
 import { FStat } from '@kui-shell/plugin-bash-like/fs'
 
-import Config, { hasEndpoint, isOnlyMissingEndpoint } from '../model/Config'
+import Config, { hasEndpoint, isGoodConfigIgnoringEndpoint } from '../model/Config'
 
 export function isGoodConfig(config: void | Record<string, any>): config is Config {
-  return isOnlyMissingEndpoint(config) && hasEndpoint(config)
+  return isGoodConfigIgnoringEndpoint(config) && hasEndpoint(config)
 }
 
 export default async function findLocal(repl: REPL): Promise<void | Config> {

diff --git a/plugins/plugin-ibmcloud/cos/src/model/Config.ts b/plugins/plugin-ibmcloud/cos/src/model/Config.ts
@@ -26,11 +26,13 @@ export function hasEndpoint(config: void | Record<string, any>): config is Pick<
   return typeof (config as Config).endpointForKui === 'string'
 }
 
-export function isOnlyMissingEndpoint(config: void | Record<string, any>): config is Omit<Config, 'endpointForKui'> {
+export function isGoodConfigIgnoringEndpoint(config: void | Record<string, any>): config is Config {
   const conf = config as Config
-  return (
-    config && typeof conf.AccessKeyID === 'string' && typeof conf.SecretAccessKey === 'string' && !hasEndpoint(config)
-  )
+  return config && typeof conf.AccessKeyID === 'string' && typeof conf.SecretAccessKey === 'string'
+}
+
+export function isOnlyMissingEndpoint(config: void | Record<string, any>): config is Omit<Config, 'endpointForKui'> {
+  return isGoodConfigIgnoringEndpoint(config) && !hasEndpoint(config)
 }
 
 export default Config