updates for eli 0.35.0

Author: cryi

build/build.lua

@@ -29,7 +29,7 @@ local function minify(filePath)
 		net.download_file("https://github.com/cryi/luasrcdiet/archive/refs/tags/1.1.1.zip", "../build/luasrcdiet.zip",
 			{ followRedirects = true })
 		fs.mkdirp("../build/luasrcdiet")
-		zip.extract("../build/luasrcdiet.zip", "../build/luasrcdiet", { flattenRootDir = true })
+		zip.extract("../build/luasrcdiet.zip", "../build/luasrcdiet", { flatten_root_dir = true })
 	end
 
 	local _cwd = os.cwd() or ""
@@ -84,13 +84,13 @@ local amiAsctlEntrypoint = "ami-plugin/asctl.lua"
 local amiAsctlOutput = "../bin/ami/asctl.lua"
 amalg("-o", amiAsctlOutput, "-s", amiAsctlEntrypoint, table.unpack(collect_requires(amiAsctlEntrypoint)))
 local fileName = string.interpolate("${pluginName}-${version}.zip", { pluginName = "asctl", version = require"version-info".VERSION })
-zip.compress("../bin/ami", path.combine("../bin", fileName), { recurse = true, contentOnly = true, overwrite = true })
+zip.compress("../bin/ami", path.combine("../bin", fileName), { recurse = true, content_only = true, overwrite = true })
 
 -- minify
 -- if not fs.exists("../build/luasrcdiet") then
 -- 	net.download_file("https://github.com/cryi/luasrcdiet/archive/refs/tags/1.1.1.zip", "../build/luasrcdiet.zip", { followRedirects = true })
 -- 	fs.mkdirp("../build/luasrcdiet")
--- 	zip.extract("../build/luasrcdiet.zip", "../build/luasrcdiet", { flattenRootDir = true })
+-- 	zip.extract("../build/luasrcdiet.zip", "../build/luasrcdiet", { flatten_root_dir = true })
 -- end
 
 -- local _cwd = os.cwd() or ""

src/ascend/internals/env.lua

@@ -268,7 +268,7 @@ local function normalize_service_definition(name, definition)
 			log_rotate = module.log_rotate or normalized.log_rotate,
 			log_max_size = module.log_max_size or normalized.log_max_size,
 			log_max_files = module.log_max_files or normalized.log_max_files
-		}, { overwrite = true, arrayMergeStrategy = "prefer-t1" })
+		}, { overwrite = true, array_merge_strategy = "prefer-t1" })
 
 		module = util.merge_tables(module, serviceDefinitionDefaults)
 		if type(module.healthcheck) == "table" then
@@ -278,7 +278,6 @@ local function normalize_service_definition(name, definition)
 		normalized.modules[id] = module
 	end
 
-
 	return {
 		modules = normalized.modules
 	}

tests/common/test-env.lua

@@ -99,7 +99,7 @@ local function update_env(obj, options)
 
         local definition = util.merge_tables(base, serviceDefinition.definition, {
             overwrite = true,
-            arrayMergeStrategy = "prefer-t2",
+            array_merge_strategy = "prefer-t2",
         })
         local encodedDefinition = hjson.encode(patch_definition(definition, obj.path))
         encodedDefinition = string.interpolate(encodedDefinition, obj.vars)

tests/healtchecks.lua

@@ -132,7 +132,7 @@ test["health checks - timeout"] = function()
             if line and line:match("healthcheck for date:default timed out") then
                 break
             end
-            if os.time() > startTime + 10 then
+            if os.time() > startTime + 20 then
                 return false, "Service did not timeout in time: " .. tostring(os.time() - startTime) .. "s"
             end
         end