Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

- Dev environment: Camel proxy [PR #1441](https://github.com/3scale/APIcast/pull/1441)

- Bump penlight to 1.31.1 [PR #1447](https://github.com/3scale/APIcast/pull/1447)

## [3.14.0] 2023-07-25

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/man
RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/manifests/3scale/lua-resty-env-0.4.0-1.src.rock
RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/manifests/3scale/liquid-0.2.0-2.src.rock
RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/manifests/tieske/date-2.2-2.src.rock
RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/manifests/tieske/penlight-1.7.0-1.src.rock
RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/manifests/tieske/penlight-1.13.1-1.src.rock
RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/manifests/mpeterv/argparse-0.6.0-1.src.rock
RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/manifests/3scale/lua-resty-execvp-0.1.1-1.src.rock
RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/manifests/3scale/luafilesystem-ffi-0.2.0-1.src.rock
Expand Down
3 changes: 1 addition & 2 deletions gateway/src/apicast/cli/command/generate.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
local setmetatable = setmetatable

local filesystem = require('apicast.cli.filesystem')
local pl = require'pl.import_into'()
local Template = require('apicast.cli.template')

Expand Down Expand Up @@ -30,7 +29,7 @@ function _M.copy(source, destination, env, force)

local template = Template:new(env, source, true)

for filename in filesystem(source) do
for filename in pl.dir.dirtree(source) do
local path = template:interpret(pl.path.relpath(filename, source))

local fullpath = pl.path.join(destination, path)
Expand Down
75 changes: 0 additions & 75 deletions gateway/src/apicast/cli/filesystem.lua

This file was deleted.

3 changes: 1 addition & 2 deletions gateway/src/apicast/cli/template.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ local ipairs = ipairs
local sub = string.sub
local len = string.len
local pack = table.pack
local fs = require('apicast.cli.filesystem')
local pl = { dir = require('pl.dir'), path = require('pl.path'), file = require('pl.file') }
local Liquid = require 'liquid'
local resty_env = require('resty.env')
Expand Down Expand Up @@ -84,7 +83,7 @@ local function dirtree(dir, cache)
return pairs(cached)
else
cache[dir] = {}
return fs(dir)
return pl.dir.dirtree(dir)
end
end

Expand Down