hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Remove unwarranted function configuration

Browse Source 
Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne Savolainen 2022-06-07 13:54:54 +03:00
parent 484aadb920
commit 3468fc33b5
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts
View File

@ -36,7 +36,7 @@ const getActiveHelmRepositoriesInjectable = getInjectable({
const getHelmEnv = di.inject(getHelmEnvInjectable); const getHelmEnv = di.inject(getHelmEnvInjectable);
const logger = di.inject(loggerInjectable); const logger = di.inject(loggerInjectable);
const getRepositoriesFor = getRepositoriesForFor(readYamlFile); const getRepositories = getRepositoriesFor(readYamlFile);
return async (): Promise<AsyncResult<HelmRepo[]>> => { return async (): Promise<AsyncResult<HelmRepo[]>> => {
const envResult = await getHelmEnv(); const envResult = await getHelmEnv();
@ -75,11 +75,6 @@ const getActiveHelmRepositoriesInjectable = getInjectable({
}; };
} }
const getRepositories = getRepositoriesFor(
repositoryConfigFilePath,
helmRepositoryCacheDirPath,
);
const updateResult = await execHelm("repo", "update"); const updateResult = await execHelm("repo", "update");
if (!updateResult.callWasSuccessful) { if (!updateResult.callWasSuccessful) {
@ -89,7 +84,6 @@ const getActiveHelmRepositoriesInjectable = getInjectable({
error: `Error updating Helm repositories: ${updateResult.error}`, error: `Error updating Helm repositories: ${updateResult.error}`,
}; };
} }
const resultOfAddingDefaultRepository = await execHelm("repo", "add", "bitnami", "https://charts.bitnami.com/bitnami"); const resultOfAddingDefaultRepository = await execHelm("repo", "add", "bitnami", "https://charts.bitnami.com/bitnami");
if (!resultOfAddingDefaultRepository.callWasSuccessful) { if (!resultOfAddingDefaultRepository.callWasSuccessful) {
@ -100,32 +94,38 @@ const getActiveHelmRepositoriesInjectable = getInjectable({
} }
} }
return { callWasSuccessful: true, response: await getRepositories() }; return {
callWasSuccessful: true,
response: await getRepositories(
repositoryConfigFilePath,
helmRepositoryCacheDirPath,
),
};
}; };
}, },
}); });
export default getActiveHelmRepositoriesInjectable; export default getActiveHelmRepositoriesInjectable;
const getRepositoriesForFor = const getRepositoriesFor =
(readYamlFile: ReadYamlFile) => (readYamlFile: ReadYamlFile) =>
(repositoryConfigFilePath: string, helmRepositoryCacheDirPath: string) => async (repositoryConfigFilePath: string, helmRepositoryCacheDirPath: string): Promise<HelmRepo[]> => {
async (): Promise<HelmRepo[]> => { const { repositories } = (await readYamlFile(
const { repositories } = (await readYamlFile( repositoryConfigFilePath,
repositoryConfigFilePath, )) as HelmRepositoriesFromYaml;
)) as HelmRepositoriesFromYaml;
return repositories.map((repository) => ({ return repositories.map((repository) => ({
name: repository.name, name: repository.name,
url: repository.url, url: repository.url,
caFile: repository.caFile, caFile: repository.caFile,
certFile: repository.certFile, certFile: repository.certFile,
insecureSkipTlsVerify: repository.insecure_skip_tls_verify, insecureSkipTlsVerify: repository.insecure_skip_tls_verify,
keyFile: repository.keyFile, keyFile: repository.keyFile,
username: repository.username, username: repository.username,
password: repository.password, password: repository.password,
cacheFilePath: `${helmRepositoryCacheDirPath}/${repository.name}-index.yaml`, cacheFilePath: `${helmRepositoryCacheDirPath}/${repository.name}-index.yaml`,
})); }));
}; };
const internalHelmErrorForNoRepositoriesFound = "no repositories found. You must add one before updating"; const internalHelmErrorForNoRepositoriesFound = "no repositories found. You must add one before updating";