fix: 🐛 add retro compatibility for 8.24.2

Author: ArnaudTA

files/logo.png

@@ -1,7 +1,7 @@
 {
   "name": "@cpn-console/observability-plugin",
   "type": "module",
-  "version": "0.1.3",
+  "version": "0.1.2-patch-1",
   "description": "Loki plugin for DSO console",
   "exports": {
     ".": {

package.json

@@ -84,11 +84,19 @@ export const upsertProject: StepCall<Project> = async (payload) => {
       if (!environment.apis.kubernetes) {
         throw new Error(`no kubernetes apis on environment ${environment.name}`)
       }
-      const gen = isNewNsName(await environment.apis.kubernetes.getNsName()) ? compressedUUID : project.slug
+      const name = isNewNsName(await environment.apis.kubernetes.getNsName()) ? compressedUUID : project.slug
       if (environment.stage === 'prod') {
-        tenantsToCreate[`prod-${gen}`] = tenantRbacProd
+        tenantsToCreate[`prod-${name}`] = {
+          groups: tenantRbacProd,
+          name,
+          type: 'prod',
+        }
       } else {
-        tenantsToCreate[`hprod-${gen}`] = tenantRbacHProd
+        tenantsToCreate[`hprod-${name}`] = {
+          groups: tenantRbacHProd,
+          name,
+          type: 'hprod',
+        }
       }
     }
 

src/function.ts

@@ -8,24 +8,45 @@ const imageData = Buffer.from((readFileSync(join(import.meta.dirname, '../files/
 
 const infos = {
   name: 'observability',
-  to: ({ project }) => [
-    {
-      to: `${getConfig().grafanaUrl}/prod-${compressUUID(project.id)}`,
-      description: 'Production',
-    },
-    {
-      to: `${getConfig().grafanaUrl}/prod-${project.slug}`,
-      description: 'Production ancien',
-    },
-    {
-      to: `${getConfig().grafanaUrl}/hprod-${compressUUID(project.id)}`,
-      description: 'Hors production',
-    },
-    {
-      to: `${getConfig().grafanaUrl}/hprod-${project.slug}`,
-      description: 'Hors production ancien',
-    },
-  ],
+  // @ts-ignore retro compatibility
+  to: ({ project, projectId, organization }) => {
+    let isInfV9 = false
+    const params = {
+      id: '',
+      slug: '',
+    }
+    const grafanaUrl = getConfig().grafanaUrl
+    if (typeof project === 'string' && typeof organization === 'string') {
+      params.id = projectId
+      params.slug = `${organization}-${project}`
+      isInfV9 = true
+    } else {
+      params.id = project.id
+      params.slug = project.slug
+    }
+    return [
+      {
+        to: `${grafanaUrl}/prod-${compressUUID(String(params.id))}`,
+        title: isInfV9 ? 'Production' : undefined,
+        description: 'Production',
+      },
+      {
+        to: `${grafanaUrl}/prod-${params.slug}`,
+        title: isInfV9 ? 'Production ancien' : undefined,
+        description: 'Production ancien',
+      },
+      {
+        to: `${grafanaUrl}/hprod-${compressUUID(String(params.id))}`,
+        title: isInfV9 ? 'Hors production' : undefined,
+        description: 'Hors production',
+      },
+      {
+        to: `${grafanaUrl}/hprod-${params.slug}`,
+        title: isInfV9 ? 'Hors production ancien' : undefined,
+        description: 'Hors production ancien',
+      },
+    ]
+  },
   title: 'Grafana',
   imgSrc: `data:image/png;base64,${imageData}`,
   description: 'Grafana est un outil de métrique et de logs',

src/infos.ts

@@ -62,8 +62,13 @@ export function getCustomK8sApi(): CustomObjectsApi {
 
 export type Stage = 'prod' | 'hprod'
 
+export interface TenantInfo {
+  groups: string[]
+  type: 'prod' | 'hprod'
+  name: string // tenant name, short-uuid or slug
+}
 export interface TenantKeycloakMapper {
-  [x: string]: string[]
+  [x: string]: TenantInfo // fullName, type + (short-uuid or slug)
 }
 
 const re = /[a-z0-9]{25}--[a-z0-9]{25}/

src/utils.ts

@@ -4,7 +4,7 @@ import type {
   Project as GitlabProject,
   Group,
 } from './gitlab.js'
-import type { TenantKeycloakMapper } from './utils.js'
+import type { TenantInfo, TenantKeycloakMapper } from './utils.js'
 // @ts-ignore
 import yaml from 'js-yaml'
 import {
@@ -20,9 +20,11 @@ const valuesPath = 'helm/values.yaml'
 const valuesBranch = 'main'
 
 interface ProjectLoki {
-  name: string
+  project: string // slug
+  name: string // slug ou short-uuid (capture regex)
   groups: string[]
-  uuid: string
+  uuid: string // uuid du projet
+  type: 'prod' | 'hprod'
   // urls: string[]
 }
 
@@ -115,22 +117,36 @@ export async function upsertGitlabConfig(project: Project, gitlabApi: GitlabInte
 
   for (const tenant of yamlFile.global.tenants) {
     if (tenant.uuid !== project.id) continue
-    if (tenant.name in tenants) {
-      if (tenant.groups.toString() !== tenants[tenant.name].toString()) {
+    const fullName = `${tenant.type}-${tenant.name}`
+    const matchingTenant = tenants[fullName] as TenantInfo | undefined
+    if (matchingTenant) {
+      if (tenant.groups.toString() !== tenants[tenant.name].groups.toString()) {
         needUpdates = true
-        tenant.groups = structuredClone(tenants[tenant.name])
+        tenant.groups = structuredClone(tenants[tenant.name].groups)
       }
-      notFoundTenants = notFoundTenants.filter(notFoundTenant => notFoundTenant !== tenant.name)
+      if (tenant.project !== project.slug) {
+        needUpdates = true
+        tenant.project = project.slug
+      }
+      if (tenant.name !== matchingTenant.name) {
+        needUpdates = true
+        tenant.name = matchingTenant.name
+      }
+      if (tenant.type !== matchingTenant.type) {
+        needUpdates = true
+        tenant.type = matchingTenant.type
+      }
+      notFoundTenants = notFoundTenants.filter(notFoundTenant => notFoundTenant !== fullName)
     } else {
       needUpdates = true
       shouldBeRemoved.push(tenant.name)
     }
   }
 
   const newTenants = notFoundTenants.map((notFoundTenant): ProjectLoki => ({
-    groups: structuredClone(tenants[notFoundTenant]),
-    name: notFoundTenant,
+    ...structuredClone(tenants[notFoundTenant]),
     uuid: project.id,
+    project: project.slug,
   }))
 
   yamlFile = {