rename: declarative_config.validate -> declarative_config.validate_sc…

…hema
Kong · Jan 14, 2025 · c1a26c0 · c1a26c0
1 parent 459301a
commit c1a26c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/kong/clustering/services/sync/validate.lua b/kong/clustering/services/sync/validate.lua
@@ -4,7 +4,7 @@ local declarative_config = require("kong.db.schema.others.declarative_config")
 
 local null = ngx.null
 local tb_insert = table.insert
-local validate = declarative_config.validate
+local validate_schema = declarative_config.validate_schema
 local pk_string = declarative_config.pk_string
 local validate_references_sync = declarative_config.validate_references_sync
 local pretty_print_error = declarative.pretty_print_error
@@ -38,10 +38,10 @@ local function validate_deltas(deltas, is_full_sync)
     end
   end
 
-  -- validate schema
+  -- validate schema (same logic as the sync v1 full-sync schema validation)
   local dc_schema = db.declarative_config.schema
 
-  local ok, err_t = validate(dc_schema, dc_table)
+  local ok, err_t = validate_schema(dc_schema, dc_table)
   if not ok then
     return nil, pretty_print_error(err_t)
   end

diff --git a/kong/db/schema/others/declarative_config.lua b/kong/db/schema/others/declarative_config.lua
@@ -849,7 +849,7 @@ local function get_unique_key(schema, entity, field, value)
 end
 
 
-function DeclarativeConfig.validate(self, input)
+function DeclarativeConfig.validate_schema(self, input)
   local ok, err = self:validate(input)
   if not ok then
     yield()
@@ -885,7 +885,7 @@ local function flatten(self, input)
     input._transform = true
   end
 
-  local ok, err = DeclarativeConfig.validate(self, input)
+  local ok, err = DeclarativeConfig.validate_schema(self, input)
   if not ok then
     return nil, err
   end