Merge pull request #14 from PowerDNS/gh_actions

Fix GitHub Actions and Refactor deprecated/deleted API calls and parameters
PowerDNS · Oct 18, 2024 · dd45a5c · dd45a5c
2 parents ffab50e + 2231710
commit dd45a5c
Show file tree

Hide file tree

Showing 68 changed files with 263 additions and 1,510 deletions.
diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml
@@ -12,27 +12,27 @@ jobs:
   test_all:
     name: test_all
     env:
-      DOCKER_COMPOSE_VERSION: 1.29.2
-      LUAROCKS: 2.2.2
+      LUAROCKS: 3.11.1
       ES_USERNAME: elastic
-      ES_PASSWORD: changeme
+      ES_PASSWORD: "Changeme12456!"
       ES_TEST_PROTOCOL: http
       ES_TEST_PORT: 9200
       CACERT_PATH: 
       ELASTIC_CREDS:
       PROTOCOL: HTTP
     strategy:
+      fail-fast: false
       matrix:
         # We test on four versions of Lua
-        lua: [lua5.1, lua5.2, lua5.3, luajit2.0]
+        lua: [lua5.1, lua5.2, lua5.3, lua5.4, luajit]
         # We're testing on three versions of Elastic: 7, 8 and the
         # Amazon Fork - OpenSearch 2.0
         elastic: [el7, el8, os2]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v4
         with:
-          fetch-depth: 5
+          fetch-depth: 6
           submodules: recursive
       - name: Set dynamic env vars
         run:  echo "CAFILE=$GITHUB_WORKSPACE/docker/certs/ca/ca.crt" >> $GITHUB_ENV
@@ -41,26 +41,27 @@ jobs:
         run: echo "CACERT_PATH=--cacert $GITHUB_WORKSPACE/docker/certs/ca/ca.crt" >> $GITHUB_ENV
       - name: install dependencies
         run: sudo apt-get -y update && sudo apt-get install wget openssl -y
-      - name: install docker-compose
-        run: curl -L https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-`uname -s`-`uname -m` > docker-compose && chmod +x docker-compose && sudo mv docker-compose /usr/local/bin
       - name: run elasticsearch
-        run: cd docker && docker-compose -f create-certs.yml up && cp docker-compose.yml.${{ matrix.elastic }} docker-compose.yml && docker-compose up -d && cd ..
+        run: cd docker && docker compose -f create-certs.yml up && cp docker-compose.yml.${{ matrix.elastic }} docker-compose.yml && docker compose up -d && cd ..
+      - name: output docker compose logs if the previous step failed
+        if: failure()
+        run: cd docker && docker compose logs && cd ..
       - name: setup test environment
         env:
           LUA: ${{ matrix.lua }}
         run: source tests/gh_actions/setenv_lua.sh
       - name: Add lua things to path
         run: echo "$HOME/.lua:$HOME/.local/bin:$GITHUB_WORKSPACE/install/luarocks/bin" >> $GITHUB_PATH
       - name: install luarocks
-        run: luarocks install lunitx && luarocks install luacov && luarocks install luacov-coveralls && luarocks install luasec 0.7-1
+        run: luarocks install lunitx && luarocks install luacov && luarocks install luacov-coveralls && luarocks install luasec
       - name: make the elasticsearch-lua rockspec
-        run: luarocks make rockspecs/elasticsearch-lua-1.0.11-1.rockspec
+        run: luarocks make rockspecs/elasticsearch-lua-1.0.12-1.rockspec
       - name: run the tests for el8
         if: ${{ matrix.elastic == 'el8' }}
         env:
           ES_TEST_PROTOCOL: https
           ES_TEST_PORT: 19200
-          ELASTIC_CREDS: -u elastic:changeme
+          ELASTIC_CREDS: -u ${{env.ES_USERNAME}}:${{env.ES_PASSWORD}}
           PROTOCOL: https
         run: cd tests && luarocks path >lpath.sh && source lpath.sh && lua run-tests.lua
       - name: run the tests for opensearch2

diff --git a/docker/.env b/docker/.env
@@ -1,2 +1,2 @@
 CERTS_DIR=/usr/share/elasticsearch/config/certificates 
-ELASTIC_PASSWORD=changeme
+ELASTIC_PASSWORD=Changeme12456!
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.2'
-
 services:
   os01:
     image: opensearchproject/opensearch:2.0.0
@@ -34,7 +32,7 @@ services:
 
   es02:
     container_name: es02
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.2.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.2
     environment:
       - node.name=es02
       - ELASTIC_PASSWORD=$ELASTIC_PASSWORD
@@ -62,7 +60,7 @@ services:
       retries: 5
 
   wait_until_ready:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.2.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.2
     command: /usr/bin/true
     depends_on: {"es02": {"condition": "service_healthy"}}
 

diff --git a/docker/docker-compose.yml.el7 b/docker/docker-compose.yml.el7
@@ -1,5 +1,3 @@
-version: '2.2'
-
 services:
   es01:
     container_name: es01

diff --git a/docker/docker-compose.yml.el8 b/docker/docker-compose.yml.el8
@@ -1,9 +1,7 @@
-version: '2.2'
-
 services:
   es02:
     container_name: es02
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.2.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.2
     environment:
       - node.name=es02
       - ELASTIC_PASSWORD=$ELASTIC_PASSWORD

diff --git a/docker/docker-compose.yml.os2 b/docker/docker-compose.yml.os2
@@ -1,11 +1,10 @@
-version: '2.2'
-
 services:
   os01:
-    image: opensearchproject/opensearch:2.0.0
+    image: opensearchproject/opensearch:2
     container_name: os01
     environment:
       - node.name=os01
+      - OPENSEARCH_INITIAL_ADMIN_PASSWORD=$ELASTIC_PASSWORD
       - discovery.type=single-node
       - plugins.security.disabled=true
       - bootstrap.memory_lock=true # along with the memlock settings below, disables swapping

diff --git a/rockspecs/elasticsearch-lua-1.0.12-1.rockspec b/rockspecs/elasticsearch-lua-1.0.12-1.rockspec
@@ -0,0 +1,170 @@
+package = "elasticsearch-lua"
+version = "1.0.12-1"
+source = {
+  url = "git+https://github.com/PowerDNS/elasticsearch-lua",
+  tag = "v1.0.12"
+}
+description = {
+  summary = "Elasticsearch client for the Lua language",
+  detailed = [[
+    This is an elasticsearch client written in Lua. In accordance with other official low level clients, the client accepts associative arrays in the form of lua table as parameters. It is a fork of the origina client written by DhavalKapil
+  ]],
+  homepage = "https://github.com/PowerDNS/elasticsearch-lua",
+  license = "MIT"
+}
+dependencies = {
+  "lua >= 5.1 <= 5.4",
+  "luasocket",
+  "lua-cjson = 2.1.0.10-1",
+  "lunitx",
+  "luasec"
+}
+build = {
+  type = "builtin",
+  modules = {
+    ["elasticsearch"] = "src/elasticsearch.lua",
+    ["elasticsearch.Nodes"] = "src/elasticsearch/Nodes.lua",
+    ["elasticsearch.Transport"] = "src/elasticsearch/Transport.lua",
+    ["elasticsearch.Tasks"] = "src/elasticsearch/Tasks.lua",
+    ["elasticsearch.Cluster"] = "src/elasticsearch/Cluster.lua",
+    ["elasticsearch.Snapshot"] = "src/elasticsearch/Snapshot.lua",
+    ["elasticsearch.Cat"] = "src/elasticsearch/Cat.lua",
+    ["elasticsearch.helpers"] = "src/elasticsearch/helpers.lua",
+    ["elasticsearch.Settings"] = "src/elasticsearch/Settings.lua",
+    ["elasticsearch.Logger"] = "src/elasticsearch/Logger.lua",
+    ["elasticsearch.parser"] = "src/elasticsearch/parser.lua",
+    ["elasticsearch.Indices"] = "src/elasticsearch/Indices.lua",
+    ["elasticsearch.Client"] = "src/elasticsearch/Client.lua",
+
+    ["elasticsearch.connection.Connection"] = "src/elasticsearch/connection/Connection.lua",
+
+    ["elasticsearch.selector.RoundRobinSelector"] = "src/elasticsearch/selector/RoundRobinSelector.lua",
+    ["elasticsearch.selector.Selector"] = "src/elasticsearch/selector/Selector.lua",
+    ["elasticsearch.selector.StickyRoundRobinSelector"] = "src/elasticsearch/selector/StickyRoundRobinSelector.lua",
+    ["elasticsearch.selector.RandomSelector"] = "src/elasticsearch/selector/RandomSelector.lua",
+
+    ["elasticsearch.connectionpool.ConnectionPool"] = "src/elasticsearch/connectionpool/ConnectionPool.lua",
+    ["elasticsearch.connectionpool.StaticConnectionPool"] = "src/elasticsearch/connectionpool/StaticConnectionPool.lua",
+    ["elasticsearch.connectionpool.SniffConnectionPool"] = "src/elasticsearch/connectionpool/SniffConnectionPool.lua",
+
+    ["elasticsearch.endpoints.MSearch"] = "src/elasticsearch/endpoints/MSearch.lua",
+    ["elasticsearch.endpoints.TermVectors"] = "src/elasticsearch/endpoints/TermVectors.lua",
+    ["elasticsearch.endpoints.Suggest"] = "src/elasticsearch/endpoints/Suggest.lua",
+    ["elasticsearch.endpoints.PutTemplate"] = "src/elasticsearch/endpoints/PutTemplate.lua",
+    ["elasticsearch.endpoints.Search"] = "src/elasticsearch/endpoints/Search.lua",
+    ["elasticsearch.endpoints.Bulk"] = "src/elasticsearch/endpoints/Bulk.lua",
+    ["elasticsearch.endpoints.SearchExists"] = "src/elasticsearch/endpoints/SearchExists.lua",
+    ["elasticsearch.endpoints.ReIndex"] = "src/elasticsearch/endpoints/ReIndex.lua",
+    ["elasticsearch.endpoints.Index"] = "src/elasticsearch/endpoints/Index.lua",
+    ["elasticsearch.endpoints.TemplateEndpoint"] = "src/elasticsearch/endpoints/TemplateEndpoint.lua",
+    ["elasticsearch.endpoints.GetTemplate"] = "src/elasticsearch/endpoints/GetTemplate.lua",
+    ["elasticsearch.endpoints.RenderSearchTemplate"] = "src/elasticsearch/endpoints/RenderSearchTemplate.lua",
+    ["elasticsearch.endpoints.Info"] = "src/elasticsearch/endpoints/Info.lua",
+    ["elasticsearch.endpoints.Delete"] = "src/elasticsearch/endpoints/Delete.lua",
+    ["elasticsearch.endpoints.SearchShards"] = "src/elasticsearch/endpoints/SearchShards.lua",
+    ["elasticsearch.endpoints.DeleteTemplate"] = "src/elasticsearch/endpoints/DeleteTemplate.lua",
+    ["elasticsearch.endpoints.Update"] = "src/elasticsearch/endpoints/Update.lua",
+    ["elasticsearch.endpoints.Get"] = "src/elasticsearch/endpoints/Get.lua",
+    ["elasticsearch.endpoints.Scroll"] = "src/elasticsearch/endpoints/Scroll.lua",
+    ["elasticsearch.endpoints.Explain"] = "src/elasticsearch/endpoints/Explain.lua",
+    ["elasticsearch.endpoints.MTermVectors"] = "src/elasticsearch/endpoints/MTermVectors.lua",
+    ["elasticsearch.endpoints.MGet"] = "src/elasticsearch/endpoints/MGet.lua",
+    ["elasticsearch.endpoints.SearchTemplate"] = "src/elasticsearch/endpoints/SearchTemplate.lua",
+    ["elasticsearch.endpoints.Count"] = "src/elasticsearch/endpoints/Count.lua",
+    ["elasticsearch.endpoints.Ping"] = "src/elasticsearch/endpoints/Ping.lua",
+    ["elasticsearch.endpoints.FieldStats"] = "src/elasticsearch/endpoints/FieldStats.lua",
+    ["elasticsearch.endpoints.Endpoint"] = "src/elasticsearch/endpoints/Endpoint.lua",
+    ["elasticsearch.endpoints.UpdateByQuery"] = "src/elasticsearch/endpoints/UpdateByQuery.lua",
+    ["elasticsearch.endpoints.Mlt"] = "src/elasticsearch/endpoints/Mlt.lua",
+    ["elasticsearch.endpoints.DeleteByQuery"] = "src/elasticsearch/endpoints/DeleteByQuery.lua",
+
+    ["elasticsearch.endpoints.Cat.Aliases"] = "src/elasticsearch/endpoints/Cat/Aliases.lua",
+    ["elasticsearch.endpoints.Cat.Health"] = "src/elasticsearch/endpoints/Cat/Health.lua",
+    ["elasticsearch.endpoints.Cat.Nodes"] = "src/elasticsearch/endpoints/Cat/Nodes.lua",
+    ["elasticsearch.endpoints.Cat.NodeAttrs"] = "src/elasticsearch/endpoints/Cat/NodeAttrs.lua",
+    ["elasticsearch.endpoints.Cat.PendingTasks"] = "src/elasticsearch/endpoints/Cat/PendingTasks.lua",
+    ["elasticsearch.endpoints.Cat.Allocation"] = "src/elasticsearch/endpoints/Cat/Allocation.lua",
+    ["elasticsearch.endpoints.Cat.CatEndpoint"] = "src/elasticsearch/endpoints/Cat/CatEndpoint.lua",
+    ["elasticsearch.endpoints.Cat.Recovery"] = "src/elasticsearch/endpoints/Cat/Recovery.lua",
+    ["elasticsearch.endpoints.Cat.FieldData"] = "src/elasticsearch/endpoints/Cat/FieldData.lua",
+    ["elasticsearch.endpoints.Cat.Snapshots"] = "src/elasticsearch/endpoints/Cat/Snapshots.lua",
+    ["elasticsearch.endpoints.Cat.ThreadPool"] = "src/elasticsearch/endpoints/Cat/ThreadPool.lua",
+    ["elasticsearch.endpoints.Cat.Segments"] = "src/elasticsearch/endpoints/Cat/Segments.lua",
+    ["elasticsearch.endpoints.Cat.Repositories"] = "src/elasticsearch/endpoints/Cat/Repositories.lua",
+    ["elasticsearch.endpoints.Cat.Count"] = "src/elasticsearch/endpoints/Cat/Count.lua",
+    ["elasticsearch.endpoints.Cat.Master"] = "src/elasticsearch/endpoints/Cat/Master.lua",
+    ["elasticsearch.endpoints.Cat.Indices"] = "src/elasticsearch/endpoints/Cat/Indices.lua",
+    ["elasticsearch.endpoints.Cat.Shards"] = "src/elasticsearch/endpoints/Cat/Shards.lua",
+    ["elasticsearch.endpoints.Cat.Plugins"] = "src/elasticsearch/endpoints/Cat/Plugins.lua",
+    ["elasticsearch.endpoints.Cat.Help"] = "src/elasticsearch/endpoints/Cat/Help.lua",
+
+    ["elasticsearch.endpoints.Cluster.Health"] = "src/elasticsearch/endpoints/Cluster/Health.lua",
+    ["elasticsearch.endpoints.Cluster.PendingTasks"] = "src/elasticsearch/endpoints/Cluster/PendingTasks.lua",
+    ["elasticsearch.endpoints.Cluster.Stats"] = "src/elasticsearch/endpoints/Cluster/Stats.lua",
+    ["elasticsearch.endpoints.Cluster.Reroute"] = "src/elasticsearch/endpoints/Cluster/Reroute.lua",
+    ["elasticsearch.endpoints.Cluster.State"] = "src/elasticsearch/endpoints/Cluster/State.lua",
+    ["elasticsearch.endpoints.Cluster.GetSettings"] = "src/elasticsearch/endpoints/Cluster/GetSettings.lua",
+    ["elasticsearch.endpoints.Cluster.PutSettings"] = "src/elasticsearch/endpoints/Cluster/PutSettings.lua",
+
+    ["elasticsearch.endpoints.Indices.Open"] = "src/elasticsearch/endpoints/Indices/Open.lua",
+    ["elasticsearch.endpoints.Indices.GetFieldMapping"] = "src/elasticsearch/endpoints/Indices/GetFieldMapping.lua",
+    ["elasticsearch.endpoints.Indices.DeleteAlias"] = "src/elasticsearch/endpoints/Indices/DeleteAlias.lua",
+    ["elasticsearch.endpoints.Indices.Status"] = "src/elasticsearch/endpoints/Indices/Status.lua",
+    ["elasticsearch.endpoints.Indices.GetUpgrade"] = "src/elasticsearch/endpoints/Indices/GetUpgrade.lua",
+    ["elasticsearch.endpoints.Indices.Refresh"] = "src/elasticsearch/endpoints/Indices/Refresh.lua",
+    ["elasticsearch.endpoints.Indices.IndicesEndpoint"] = "src/elasticsearch/endpoints/Indices/IndicesEndpoint.lua",
+    ["elasticsearch.endpoints.Indices.PutTemplate"] = "src/elasticsearch/endpoints/Indices/PutTemplate.lua",
+    ["elasticsearch.endpoints.Indices.Close"] = "src/elasticsearch/endpoints/Indices/Close.lua",
+    ["elasticsearch.endpoints.Indices.ExistsAlias"] = "src/elasticsearch/endpoints/Indices/ExistsAlias.lua",
+    ["elasticsearch.endpoints.Indices.Create"] = "src/elasticsearch/endpoints/Indices/Create.lua",
+    ["elasticsearch.endpoints.Indices.GetMapping"] = "src/elasticsearch/endpoints/Indices/GetMapping.lua",
+    ["elasticsearch.endpoints.Indices.GetTemplate"] = "src/elasticsearch/endpoints/Indices/GetTemplate.lua",
+    ["elasticsearch.endpoints.Indices.Stats"] = "src/elasticsearch/endpoints/Indices/Stats.lua",
+    ["elasticsearch.endpoints.Indices.GetAliases"] = "src/elasticsearch/endpoints/Indices/GetAliases.lua",
+    ["elasticsearch.endpoints.Indices.UpdateAliases"] = "src/elasticsearch/endpoints/Indices/UpdateAliases.lua",
+    ["elasticsearch.endpoints.Indices.Recovery"] = "src/elasticsearch/endpoints/Indices/Recovery.lua",
+    ["elasticsearch.endpoints.Indices.Delete"] = "src/elasticsearch/endpoints/Indices/Delete.lua",
+    ["elasticsearch.endpoints.Indices.ValidateQuery"] = "src/elasticsearch/endpoints/Indices/ValidateQuery.lua",
+    ["elasticsearch.endpoints.Indices.Exists"] = "src/elasticsearch/endpoints/Indices/Exists.lua",
+    ["elasticsearch.endpoints.Indices.ClearCache"] = "src/elasticsearch/endpoints/Indices/ClearCache.lua",
+    ["elasticsearch.endpoints.Indices.PostUpgrade"] = "src/elasticsearch/endpoints/Indices/PostUpgrade.lua",
+    ["elasticsearch.endpoints.Indices.DeleteTemplate"] = "src/elasticsearch/endpoints/Indices/DeleteTemplate.lua",
+    ["elasticsearch.endpoints.Indices.Segments"] = "src/elasticsearch/endpoints/Indices/Segments.lua",
+    ["elasticsearch.endpoints.Indices.Get"] = "src/elasticsearch/endpoints/Indices/Get.lua",
+    ["elasticsearch.endpoints.Indices.GetSettings"] = "src/elasticsearch/endpoints/Indices/GetSettings.lua",
+    ["elasticsearch.endpoints.Indices.PutSettings"] = "src/elasticsearch/endpoints/Indices/PutSettings.lua",
+    ["elasticsearch.endpoints.Indices.ExistsTemplate"] = "src/elasticsearch/endpoints/Indices/ExistsTemplate.lua",
+    ["elasticsearch.endpoints.Indices.DeleteMapping"] = "src/elasticsearch/endpoints/Indices/DeleteMapping.lua",
+    ["elasticsearch.endpoints.Indices.GetAlias"] = "src/elasticsearch/endpoints/Indices/GetAlias.lua",
+    ["elasticsearch.endpoints.Indices.Analyze"] = "src/elasticsearch/endpoints/Indices/Analyze.lua",
+    ["elasticsearch.endpoints.Indices.PutAlias"] = "src/elasticsearch/endpoints/Indices/PutAlias.lua",
+    ["elasticsearch.endpoints.Indices.Optimize"] = "src/elasticsearch/endpoints/Indices/Optimize.lua",
+    ["elasticsearch.endpoints.Indices.ShardStores"] = "src/elasticsearch/endpoints/Indices/ShardStores.lua",
+    ["elasticsearch.endpoints.Indices.PutMapping"] = "src/elasticsearch/endpoints/Indices/PutMapping.lua",
+    ["elasticsearch.endpoints.Indices.ForceMerge"] = "src/elasticsearch/endpoints/Indices/ForceMerge.lua",
+    ["elasticsearch.endpoints.Indices.Flush"] = "src/elasticsearch/endpoints/Indices/Flush.lua",
+    ["elasticsearch.endpoints.Indices.Seal"] = "src/elasticsearch/endpoints/Indices/Seal.lua",
+
+    ["elasticsearch.endpoints.Nodes.Stats"] = "src/elasticsearch/endpoints/Nodes/Stats.lua",
+    ["elasticsearch.endpoints.Nodes.Info"] = "src/elasticsearch/endpoints/Nodes/Info.lua",
+    ["elasticsearch.endpoints.Nodes.HotThreads"] = "src/elasticsearch/endpoints/Nodes/HotThreads.lua",
+    ["elasticsearch.endpoints.Nodes.Shutdown"] = "src/elasticsearch/endpoints/Nodes/Shutdown.lua",
+    ["elasticsearch.endpoints.Nodes.NodesEndpoint"] = "src/elasticsearch/endpoints/Nodes/NodesEndpoint.lua",
+
+    ["elasticsearch.endpoints.Snapshot.Status"] = "src/elasticsearch/endpoints/Snapshot/Status.lua",
+    ["elasticsearch.endpoints.Snapshot.SnapshotEndpoint"] = "src/elasticsearch/endpoints/Snapshot/SnapshotEndpoint.lua",
+    ["elasticsearch.endpoints.Snapshot.Create"] = "src/elasticsearch/endpoints/Snapshot/Create.lua",
+    ["elasticsearch.endpoints.Snapshot.VerifyRepository"] = "src/elasticsearch/endpoints/Snapshot/VerifyRepository.lua",
+    ["elasticsearch.endpoints.Snapshot.Restore"] = "src/elasticsearch/endpoints/Snapshot/Restore.lua",
+    ["elasticsearch.endpoints.Snapshot.Delete"] = "src/elasticsearch/endpoints/Snapshot/Delete.lua",
+    ["elasticsearch.endpoints.Snapshot.Get"] = "src/elasticsearch/endpoints/Snapshot/Get.lua",
+    ["elasticsearch.endpoints.Snapshot.DeleteRepository"] = "src/elasticsearch/endpoints/Snapshot/DeleteRepository.lua",
+    ["elasticsearch.endpoints.Snapshot.GetRepository"] = "src/elasticsearch/endpoints/Snapshot/GetRepository.lua",
+    ["elasticsearch.endpoints.Snapshot.CreateRepository"] = "src/elasticsearch/endpoints/Snapshot/CreateRepository.lua",
+
+    ["elasticsearch.endpoints.Tasks.Cancel"] = "src/elasticsearch/endpoints/Tasks/Cancel.lua",
+    ["elasticsearch.endpoints.Tasks.Get"] = "src/elasticsearch/endpoints/Tasks/Get.lua",
+    ["elasticsearch.endpoints.Tasks.TasksEndpoint"] = "src/elasticsearch/endpoints/Tasks/TasksEndpoint.lua"
+  },
+  copy_directories = {"tests"}
+}