fix(kconfig): remove kong version and edition from kconfig.js (#12045)

(cherry picked from commit aed8c05)
Kong · Dec 25, 2023 · 73111e7 · 73111e7
1 parent e0232d3
commit 73111e7
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 9 deletions.
diff --git a/kong/admin_gui/init.lua b/kong/admin_gui/init.lua
@@ -1,4 +1,3 @@
-local meta = require "kong.meta"
 local utils = require "kong.admin_gui.utils"
 
 local _M = {}
@@ -15,8 +14,6 @@ function _M.generate_kconfig(kong_config)
     ADMIN_API_URL = utils.prepare_variable(kong_config.admin_gui_api_url),
     ADMIN_API_PORT = utils.prepare_variable(api_port),
     ADMIN_API_SSL_PORT = utils.prepare_variable(api_ssl_port),
-    KONG_VERSION = utils.prepare_variable(meta.version),
-    KONG_EDITION = meta._VERSION:match("enterprise") and "enterprise" or "community",
     ANONYMOUS_REPORTS = utils.prepare_variable(kong_config.anonymous_reports),
   }
 

diff --git a/spec/01-unit/29-admin_gui/02-admin_gui_template_spec.lua b/spec/01-unit/29-admin_gui/02-admin_gui_template_spec.lua
@@ -68,7 +68,6 @@ describe("admin_gui template", function()
       assert.matches("'ADMIN_API_URL': 'https://admin-reference.kong-cloud.com'", kconfig_content, nil, true)
       assert.matches("'ADMIN_API_PORT': '8001'", kconfig_content, nil, true)
       assert.matches("'ADMIN_API_SSL_PORT': '8444'", kconfig_content, nil, true)
-      assert.matches("'KONG_EDITION': 'community'", kconfig_content, nil, true)
     end)
 
     it("should regenerates the appropriate kconfig from another call", function()
@@ -88,7 +87,6 @@ describe("admin_gui template", function()
       assert.matches("'ADMIN_API_URL': 'http://localhost:8001'", new_content, nil, true)
       assert.matches("'ADMIN_API_PORT': '8001'", new_content, nil, true)
       assert.matches("'ADMIN_API_SSL_PORT': '8444'", new_content, nil, true)
-      assert.matches("'KONG_EDITION': 'community'", new_content, nil, true)
     end)
   end)
 
@@ -151,7 +149,6 @@ describe("admin_gui template", function()
       assert.matches("'ADMIN_API_PORT': '8001'", kconfig_content, nil, true)
       assert.matches("'ADMIN_API_SSL_PORT': '8444'", kconfig_content, nil, true)
       assert.matches("'ANONYMOUS_REPORTS': 'false'", kconfig_content, nil, true)
-      assert.matches("'KONG_EDITION': 'community'", kconfig_content, nil, true)
     end)
 
     it("should regenerates the appropriate kconfig from another call", function()
@@ -170,7 +167,6 @@ describe("admin_gui template", function()
       assert.matches("'ADMIN_API_PORT': '8001'", new_content, nil, true)
       assert.matches("'ADMIN_API_SSL_PORT': '8444'", new_content, nil, true)
       assert.matches("'ANONYMOUS_REPORTS': 'true'", new_content, nil, true)
-      assert.matches("'KONG_EDITION': 'community'", new_content, nil, true)
     end)
   end)
 

diff --git a/spec/02-integration/17-admin_gui/01-admin-gui-path_spec.lua b/spec/02-integration/17-admin_gui/01-admin-gui-path_spec.lua
@@ -49,7 +49,6 @@ describe("Admin GUI - admin_gui_path", function()
       path = "/kconfig.js",
     })
     res = assert.res_status(200, res)
-    assert.matches("'KONG_VERSION': '", res)
     assert.matches("'ADMIN_GUI_PATH': '/'", res, nil, true)
   end)
 
@@ -116,7 +115,6 @@ describe("Admin GUI - admin_gui_path", function()
       path = "/manager/kconfig.js",
     })
     res = assert.res_status(200, res)
-    assert.matches("'KONG_VERSION': '", res)
     assert.matches("'ADMIN_GUI_PATH': '/manager'", res, nil, true)
   end)
 end)