fix: 🐛 remove useless required env variables

cloud-pi-native · Jan 22, 2025 · e6d6d5b · e6d6d5b
1 parent 718611f
commit e6d6d5b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "@cpn-console/loki-plugin",
+  "name": "@cpn-console/observability-plugin",
   "type": "module",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Loki plugin for DSO console",
   "exports": {
     ".": {

diff --git a/src/infos.ts b/src/infos.ts
@@ -5,11 +5,11 @@ const infos: ServiceInfos = {
   name: 'observability',
   to: ({ project, organization }) => [
     {
-      to: `https://${getConfig().grafanaHost}/hprod-${organization}-${project}`,
+      to: `${getConfig().grafanaUrl}/hprod-${organization}-${project}`,
       title: 'Hors production',
     },
     {
-      to: `https:///${getConfig().grafanaHost}/prod-${organization}-${project}`,
+      to: `${getConfig().grafanaUrl}/prod-${organization}-${project}`,
       title: 'Production',
     },
   ],

diff --git a/src/utils.ts b/src/utils.ts
@@ -2,7 +2,7 @@ import { requiredEnv } from '@cpn-console/shared'
 import { CoreV1Api, CustomObjectsApi, KubeConfig } from '@kubernetes/client-node'
 
 const config: {
-  grafanaHost?: string
+  grafanaUrl?: string
   kubeconfigPath?: string
   kubeconfigCtx?: string
   keycloakProtocol?: string
@@ -11,7 +11,7 @@ const config: {
   keycloakToken?: string
   keycloakUser?: string
 } = {
-  grafanaHost: undefined,
+  grafanaUrl: undefined,
   kubeconfigPath: undefined,
   kubeconfigCtx: undefined,
   keycloakProtocol: undefined,
@@ -22,9 +22,7 @@ const config: {
 }
 
 export function getConfig(): Required<typeof config> {
-  config.grafanaHost = config.grafanaHost ?? requiredEnv('GRAFANA_HOST')
-  config.kubeconfigPath = config.kubeconfigPath ?? requiredEnv('KUBECONFIG_PATH')
-  config.kubeconfigCtx = config.kubeconfigCtx ?? requiredEnv('KUBECONFIG_CTX')
+  config.grafanaUrl = config.grafanaUrl ?? requiredEnv('GRAFANA_URL')
   config.keycloakProtocol = config.keycloakProtocol ?? requiredEnv('KEYCLOAK_PROTOCOL')
   config.keycloakDomain = config.keycloakDomain ?? requiredEnv('KEYCLOAK_DOMAIN')
   config.keycloakRealm = config.keycloakRealm ?? requiredEnv('KEYCLOAK_REALM')
@@ -35,8 +33,8 @@ export function getConfig(): Required<typeof config> {
 }
 
 function getClient() {
-  const kubeconfigCtx = getConfig().kubeconfigCtx
-  const kubeconfigPath = getConfig().kubeconfigPath
+  const kubeconfigCtx = process.env.KUBECONFIG_CTX
+  const kubeconfigPath = process.env.KUBECONFIG_PATH
   const kc = new KubeConfig()
   if (kubeconfigPath) {
     kc.loadFromFile(kubeconfigPath)