fix: get correct versions in the session

Author: ferruhcihan

src/otomi-stack.test.ts

@@ -753,6 +753,97 @@ describe('Users tests', () => {
   })
 })
 
+describe('getVersions', () => {
+  let otomiStack: OtomiStack
+
+  beforeEach(async () => {
+    otomiStack = new OtomiStack()
+    await otomiStack.init()
+  })
+
+  afterEach(() => {
+    jest.restoreAllMocks()
+  })
+
+  test('should return versions with otomi version from settings', () => {
+    const mockSettings = { otomi: { version: '1.2.3' } }
+    jest.spyOn(otomiStack, 'getSettings').mockReturnValue(mockSettings)
+
+    const result = (otomiStack as any).getVersions('abc123')
+
+    expect(result).toHaveProperty('core', '1.2.3')
+    expect(result).toHaveProperty('api')
+    expect(result).toHaveProperty('console')
+    expect(result).toHaveProperty('values', 'abc123')
+    expect(otomiStack.getSettings).toHaveBeenCalledWith(['otomi'])
+  })
+
+  test('should fallback to env.VERSIONS.core when otomi.version is not available', () => {
+    const mockSettings = { otomi: undefined }
+    jest.spyOn(otomiStack, 'getSettings').mockReturnValue(mockSettings)
+
+    const result = (otomiStack as any).getVersions('def456')
+
+    expect(result).toHaveProperty('core')
+    expect(result).toHaveProperty('api')
+    expect(result).toHaveProperty('console')
+    expect(result).toHaveProperty('values', 'def456')
+  })
+
+  test('should fallback to process.env.npm_package_version when env.VERSIONS.api is not available', () => {
+    const originalNpmVersion = process.env.npm_package_version
+    process.env.npm_package_version = '5.0.0'
+
+    const mockSettings = { otomi: { version: '1.2.3' } }
+    jest.spyOn(otomiStack, 'getSettings').mockReturnValue(mockSettings)
+
+    const result = (otomiStack as any).getVersions('ghi789')
+
+    expect(result).toHaveProperty('core', '1.2.3')
+    expect(result).toHaveProperty('api')
+    expect(result).toHaveProperty('console')
+    expect(result).toHaveProperty('values', 'ghi789')
+
+    process.env.npm_package_version = originalNpmVersion
+  })
+
+  test('should handle undefined otomi settings gracefully', () => {
+    const mockSettings = {}
+    jest.spyOn(otomiStack, 'getSettings').mockReturnValue(mockSettings)
+
+    const result = (otomiStack as any).getVersions('xyz123')
+
+    expect(result).toHaveProperty('core')
+    expect(result).toHaveProperty('api')
+    expect(result).toHaveProperty('console')
+    expect(result).toHaveProperty('values', 'xyz123')
+  })
+
+  test('should pass through currentSha as values field', () => {
+    const mockSettings = { otomi: { version: '1.0.0' } }
+    jest.spyOn(otomiStack, 'getSettings').mockReturnValue(mockSettings)
+
+    const testSha = 'unique-commit-sha-123'
+    const result = (otomiStack as any).getVersions(testSha)
+
+    expect(result.values).toBe(testSha)
+    expect(typeof result.values).toBe('string')
+  })
+
+  test('should return all required version fields', () => {
+    const mockSettings = { otomi: { version: '1.0.0' } }
+    jest.spyOn(otomiStack, 'getSettings').mockReturnValue(mockSettings)
+
+    const result = (otomiStack as any).getVersions('test-sha')
+
+    expect(Object.keys(result).sort()).toEqual(['api', 'console', 'core', 'values'])
+    expect(typeof result.core).toBe('string')
+    expect(typeof result.api).toBe('string')
+    expect(typeof result.console).toBe('string')
+    expect(typeof result.values).toBe('string')
+  })
+})
+
 describe('PodService', () => {
   let otomiStack: OtomiStack
   let clientMock: {

src/otomi-stack.ts

@@ -530,10 +530,6 @@ export default class OtomiStack {
         }, {})
         updatedSettingsData.otomi.nodeSelector = nodeSelectorObject
       }
-      // Update environment VERSIONS.core when otomi version changes
-      if (updatedSettingsData.otomi?.version && updatedSettingsData.otomi?.version !== env.VERSIONS.core) {
-        env.VERSIONS.core = updatedSettingsData.otomi.version
-      }
     }
 
     settings[settingId] = removeBlankAttributes(updatedSettingsData[settingId] as Record<string, any>)
@@ -2442,6 +2438,16 @@ export default class OtomiStack {
     }
   }
 
+  private getVersions(currentSha: string): Record<string, string> {
+    const { otomi } = this.getSettings(['otomi'])
+    return {
+      core: otomi?.version ?? env.VERSIONS.core,
+      api: env.VERSIONS.api ?? process.env.npm_package_version,
+      console: env.VERSIONS.console,
+      values: currentSha,
+    }
+  }
+
   async getSession(user: k8sUser): Promise<Session> {
     const rootStack = await getSessionStack()
     const valuesSchema = await getValuesSchema()
@@ -2472,12 +2478,7 @@ export default class OtomiStack {
         objStorageApps: env.OBJ_STORAGE_APPS,
         objStorageRegions,
       },
-      versions: {
-        core: env.VERSIONS.core,
-        api: env.VERSIONS.api ?? process.env.npm_package_version,
-        console: env.VERSIONS.console,
-        values: currentSha,
-      },
+      versions: this.getVersions(currentSha),
       valuesSchema,
     }
     return data