From 1feb0fc559f538a31931e0173e00c1b6aa260286 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Thu, 25 Apr 2024 21:21:52 +0700 Subject: [PATCH 01/44] chore!: rename npm goals - npm run gen-js-example => npm run example:js - npm run gen-ts-example => npm run example:ts - npm run gen-go-example => npm run example:go - npm run gen-py-example => npm run example:py --- .github/workflows/generate-go-app.yml | 2 +- .github/workflows/generate-js-app.yml | 2 +- .github/workflows/generate-python-app.yml | 2 +- .github/workflows/generate-ts-app.yml | 2 +- package.json | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/generate-go-app.yml b/.github/workflows/generate-go-app.yml index e88527c..91f6b72 100644 --- a/.github/workflows/generate-go-app.yml +++ b/.github/workflows/generate-go-app.yml @@ -39,7 +39,7 @@ jobs: run: npm ci --no-audit --no-fund # https://docs.npmjs.com/cli/v8/commands/npm-ci - name: Generate Golang + Chi application - run: npm run gen-go-example + run: npm run example:go - name: Check whether all modified files have been committed run: >- diff --git a/.github/workflows/generate-js-app.yml b/.github/workflows/generate-js-app.yml index 78ca035..cecf723 100644 --- a/.github/workflows/generate-js-app.yml +++ b/.github/workflows/generate-js-app.yml @@ -39,7 +39,7 @@ jobs: run: npm ci --no-audit --no-fund # https://docs.npmjs.com/cli/v8/commands/npm-ci - name: Generate JavaScript + Express application - run: npm run gen-js-example + run: npm run example:js - name: Check whether all modified files have been committed run: >- diff --git a/.github/workflows/generate-python-app.yml b/.github/workflows/generate-python-app.yml index 70d86e9..6b26e0a 100644 --- a/.github/workflows/generate-python-app.yml +++ b/.github/workflows/generate-python-app.yml @@ -39,7 +39,7 @@ jobs: run: npm ci --no-audit --no-fund # https://docs.npmjs.com/cli/v8/commands/npm-ci - name: Generate Python + FastAPI application - run: npm run gen-py-example + run: npm run example:py - name: Check whether all modified files have been committed run: >- diff --git a/.github/workflows/generate-ts-app.yml b/.github/workflows/generate-ts-app.yml index 19cb1a3..83242f7 100644 --- a/.github/workflows/generate-ts-app.yml +++ b/.github/workflows/generate-ts-app.yml @@ -39,7 +39,7 @@ jobs: run: npm ci --no-audit --no-fund # https://docs.npmjs.com/cli/v8/commands/npm-ci - name: Generate TypeScript + Express application - run: npm run gen-ts-example + run: npm run example:ts - name: Check whether all modified files have been committed run: >- diff --git a/package.json b/package.json index 5994ce7..161e96a 100644 --- a/package.json +++ b/package.json @@ -26,10 +26,10 @@ "src/**" ], "scripts": { - "gen-js-example": "cd examples/js/express/mysql; ../../../../src/cli.js --lang js", - "gen-ts-example": "cd examples/ts/express/mysql; ../../../../src/cli.js --lang ts", - "gen-go-example": "cd examples/go/chi/mysql; ../../../../src/cli.js --lang go", - "gen-py-example": "cd examples/python/fastapi/postgres; ../../../../src/cli.js --lang python" + "example:js": "cd examples/js/express/mysql; ../../../../src/cli.js --lang js", + "example:ts": "cd examples/ts/express/mysql; ../../../../src/cli.js --lang ts", + "example:go": "cd examples/go/chi/mysql; ../../../../src/cli.js --lang go", + "example:py": "cd examples/python/fastapi/postgres; ../../../../src/cli.js --lang python" }, "dependencies": { "ejs": "~3.1.9", From e6b64587cec15b6c91b71e0891c350bfaf998ab2 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Thu, 25 Apr 2024 21:24:15 +0700 Subject: [PATCH 02/44] chore: add "example:all" npm goal to generate all examples --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 161e96a..a7b6a91 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "src/**" ], "scripts": { + "example:all": "npm run example:js && npm run example:ts && npm run example:go && npm run example:py", "example:js": "cd examples/js/express/mysql; ../../../../src/cli.js --lang js", "example:ts": "cd examples/ts/express/mysql; ../../../../src/cli.js --lang ts", "example:go": "cd examples/go/chi/mysql; ../../../../src/cli.js --lang go", From 5c4a3256bc3a48016aed4f783ae692aeb301d893 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Thu, 25 Apr 2024 21:28:06 +0700 Subject: [PATCH 03/44] refactor(python): transform db.py to a template Part of #53 --- src/cli.js | 6 +++++- src/templates/{db.py => db.py.ejs} | 0 2 files changed, 5 insertions(+), 1 deletion(-) rename src/templates/{db.py => db.py.ejs} (100%) diff --git a/src/cli.js b/src/cli.js index 7439712..d445c92 100755 --- a/src/cli.js +++ b/src/cli.js @@ -120,7 +120,11 @@ const createDb = async (destDir, { lang }) => { console.log('Generate', fileName) const resultFile = path.join(destDir, fileName) - return fsPromises.copyFile(`${__dirname}/templates/${fileName}`, resultFile) + const resultedCode = await ejs.renderFile( + `${__dirname}/templates/${fileName}.ejs` + ) + + return fsPromises.writeFile(resultFile, resultedCode) } // "-- comment\nSELECT * FROM foo" => "SELECT * FROM foo" diff --git a/src/templates/db.py b/src/templates/db.py.ejs similarity index 100% rename from src/templates/db.py rename to src/templates/db.py.ejs From fbcc711ca643e1954f4c6ceb048467b5c2879283 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 23:47:29 +0000 Subject: [PATCH 04/44] ci: bump actions/checkout from 4.1.3 to 4.1.4 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.3 to 4.1.4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.3...v4.1.4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/generate-go-app.yml | 2 +- .github/workflows/generate-js-app.yml | 2 +- .github/workflows/generate-python-app.yml | 2 +- .github/workflows/generate-ts-app.yml | 2 +- .github/workflows/integration-tests.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/generate-go-app.yml b/.github/workflows/generate-go-app.yml index 91f6b72..ff5e461 100644 --- a/.github/workflows/generate-go-app.yml +++ b/.github/workflows/generate-go-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.3 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.4 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-js-app.yml b/.github/workflows/generate-js-app.yml index cecf723..bcac058 100644 --- a/.github/workflows/generate-js-app.yml +++ b/.github/workflows/generate-js-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.3 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.4 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-python-app.yml b/.github/workflows/generate-python-app.yml index 6b26e0a..2889bda 100644 --- a/.github/workflows/generate-python-app.yml +++ b/.github/workflows/generate-python-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.3 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.4 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-ts-app.yml b/.github/workflows/generate-ts-app.yml index 83242f7..0937089 100644 --- a/.github/workflows/generate-ts-app.yml +++ b/.github/workflows/generate-ts-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.3 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.4 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index b0489e0..3d8ff05 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -56,7 +56,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.3 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.4 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false From 2b2f64310eff2c51e4039307f615bc4fe8570357 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 28 Apr 2024 07:44:08 +0700 Subject: [PATCH 05/44] refactor: extract hurl version to a variable --- .github/workflows/integration-tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 3d8ff05..6efa4ad 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -84,8 +84,9 @@ jobs: - name: Install Hurl run: | - DEB=hurl_4.2.0_amd64.deb - curl --location --no-progress-meter --remote-name https://github.com/Orange-OpenSource/hurl/releases/download/4.2.0/$DEB + VER=4.2.0 + DEB=hurl_${VER}_amd64.deb + curl --location --no-progress-meter --remote-name https://github.com/Orange-OpenSource/hurl/releases/download/$VER/$DEB sudo dpkg --install $DEB - name: Show Hurl version From 41f254bd07bc1ecc4d6c433a828332e88ba882f3 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 28 Apr 2024 07:44:37 +0700 Subject: [PATCH 06/44] ci: update hurl to 4.3.0 --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 6efa4ad..6078ca9 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -84,7 +84,7 @@ jobs: - name: Install Hurl run: | - VER=4.2.0 + VER=4.3.0 DEB=hurl_${VER}_amd64.deb curl --location --no-progress-meter --remote-name https://github.com/Orange-OpenSource/hurl/releases/download/$VER/$DEB sudo dpkg --install $DEB From a74adb5479de3dc7b937fa121da17dff230dd633 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 30 Apr 2024 07:33:04 +0700 Subject: [PATCH 07/44] chore(python): add --port option to the instruction Should be in 2fc11145a4ecebd115f9a91d87eae602b6606052 commit. Relate to #16 --- src/generator/PyGenerator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/generator/PyGenerator.js b/src/generator/PyGenerator.js index 1d871e0..14f5b6f 100644 --- a/src/generator/PyGenerator.js +++ b/src/generator/PyGenerator.js @@ -5,7 +5,7 @@ module.exports = class PyGenerator { pip install -r requirements.txt to install its dependencies and export DB_NAME=db DB_USER=user DB_PASSWORD=secret - uvicorn app:app + uvicorn app:app --port 3000 afteward to run` } From 940643f1eb898dad3176d7d8d3c11a5d61f64ef1 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 30 Apr 2024 07:36:31 +0700 Subject: [PATCH 08/44] refactor: use CURRENT_TIMESTAMP instead of NOW() in order to make it work on SQLite Part of #53 --- examples/go/chi/mysql/routes.go | 6 +++--- examples/js/express/mysql/endpoints.yaml | 6 +++--- examples/js/express/mysql/routes.js | 6 +++--- examples/python/fastapi/postgres/routes.py | 6 +++--- examples/ts/express/mysql/routes.ts | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/go/chi/mysql/routes.go b/examples/go/chi/mysql/routes.go index 4bf7012..d468a64 100644 --- a/examples/go/chi/mysql/routes.go +++ b/examples/go/chi/mysql/routes.go @@ -137,9 +137,9 @@ func registerRoutes(r chi.Router, db *sqlx.DB) { , :name_ru , :slug , :hidden - , NOW() + , CURRENT_TIMESTAMP , :user_id - , NOW() + , CURRENT_TIMESTAMP , :user_id )`, args, @@ -235,7 +235,7 @@ func registerRoutes(r chi.Router, db *sqlx.DB) { , name_ru = :name_ru , slug = :slug , hidden = :hidden - , updated_at = NOW() + , updated_at = CURRENT_TIMESTAMP , updated_by = :user_id WHERE id = :categoryId`, args, diff --git a/examples/js/express/mysql/endpoints.yaml b/examples/js/express/mysql/endpoints.yaml index 7afd1f5..eb59f3c 100644 --- a/examples/js/express/mysql/endpoints.yaml +++ b/examples/js/express/mysql/endpoints.yaml @@ -64,9 +64,9 @@ , :b.name_ru , :b.slug , :b.hidden - , NOW() + , CURRENT_TIMESTAMP , :b.user_id - , NOW() + , CURRENT_TIMESTAMP , :b.user_id ) dto: @@ -122,7 +122,7 @@ , name_ru = :b.name_ru , slug = :b.slug , hidden = :b.hidden - , updated_at = NOW() + , updated_at = CURRENT_TIMESTAMP , updated_by = :b.user_id WHERE id = :p.categoryId dto: diff --git a/examples/js/express/mysql/routes.js b/examples/js/express/mysql/routes.js index b5362d6..5e345f4 100644 --- a/examples/js/express/mysql/routes.js +++ b/examples/js/express/mysql/routes.js @@ -78,9 +78,9 @@ const register = (app, pool) => { , :name_ru , :slug , :hidden - , NOW() + , CURRENT_TIMESTAMP , :user_id - , NOW() + , CURRENT_TIMESTAMP , :user_id )`, { @@ -152,7 +152,7 @@ const register = (app, pool) => { , name_ru = :name_ru , slug = :slug , hidden = :hidden - , updated_at = NOW() + , updated_at = CURRENT_TIMESTAMP , updated_by = :user_id WHERE id = :categoryId`, { diff --git a/examples/python/fastapi/postgres/routes.py b/examples/python/fastapi/postgres/routes.py index 0cbdbc3..e86f7cd 100644 --- a/examples/python/fastapi/postgres/routes.py +++ b/examples/python/fastapi/postgres/routes.py @@ -117,9 +117,9 @@ def post_v1_categories(body: CreateCategoryDto, conn=Depends(db_connection)): , %(name_ru)s , %(slug)s , %(hidden)s - , NOW() + , CURRENT_TIMESTAMP , %(user_id)s - , NOW() + , CURRENT_TIMESTAMP , %(user_id)s ) """, { @@ -192,7 +192,7 @@ def put_v1_categories_category_id(body: CreateCategoryDto, categoryId, conn=Depe , name_ru = %(name_ru)s , slug = %(slug)s , hidden = %(hidden)s - , updated_at = NOW() + , updated_at = CURRENT_TIMESTAMP , updated_by = %(user_id)s WHERE id = %(categoryId)s """, { diff --git a/examples/ts/express/mysql/routes.ts b/examples/ts/express/mysql/routes.ts index 36c6470..57a28a1 100644 --- a/examples/ts/express/mysql/routes.ts +++ b/examples/ts/express/mysql/routes.ts @@ -81,9 +81,9 @@ const register = (app: Express, pool: Pool) => { , :name_ru , :slug , :hidden - , NOW() + , CURRENT_TIMESTAMP , :user_id - , NOW() + , CURRENT_TIMESTAMP , :user_id )`, { @@ -155,7 +155,7 @@ const register = (app: Express, pool: Pool) => { , name_ru = :name_ru , slug = :slug , hidden = :hidden - , updated_at = NOW() + , updated_at = CURRENT_TIMESTAMP , updated_by = :user_id WHERE id = :categoryId`, { From ccb5c76bc9126e849318904cbfde9e5d7bd45252 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 30 Apr 2024 09:25:01 +0700 Subject: [PATCH 09/44] feat(python): specify variable type for query parameters Part of #53 --- examples/python/fastapi/postgres/routes.py | 2 +- src/templates/routes.py.ejs | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/examples/python/fastapi/postgres/routes.py b/examples/python/fastapi/postgres/routes.py index e86f7cd..7499161 100644 --- a/examples/python/fastapi/postgres/routes.py +++ b/examples/python/fastapi/postgres/routes.py @@ -134,7 +134,7 @@ def post_v1_categories(body: CreateCategoryDto, conn=Depends(db_connection)): @router.get('/v1/categories/search') -def get_list_v1_categories_search(hidden, conn=Depends(db_connection)): +def get_list_v1_categories_search(hidden: bool, conn=Depends(db_connection)): try: with conn: with conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cur: diff --git a/src/templates/routes.py.ejs b/src/templates/routes.py.ejs index 2f23cdd..fe5c12d 100644 --- a/src/templates/routes.py.ejs +++ b/src/templates/routes.py.ejs @@ -85,6 +85,18 @@ function findOutType(fieldsInfo, fieldName) { return 'str' } +// "q.title" => "q.title: str" +// "q.active" => "q.active: bool" +// "q.age" => "q.age: int" +// "p.id" => "p.id" +// "b.name" => "b.name" +function appendVariableTypeToQueryParam(paramsInfo, varName) { + if (varName.startsWith('q.')) { + return `${varName}: ${findOutType(paramsInfo, stipOurPrefixes(varName))}` + } + return varName +} + // LATER: reduce duplication with routes.go.ejs function addTypes(props, fieldsInfo) { return props.map(prop => { @@ -187,7 +199,8 @@ endpoints.forEach(function(endpoint) { const pythonMethodName = generate_method_name(method.name, path) // LATER: add support for aggregated_queries (#17) - const argsFromQuery = method.query ? extractParamsFromQuery(method.query).map(stipOurPrefixes) : [] + const queryParamsInfo = method.params && method.params.query ? method.params.query : {} + const argsFromQuery = method.query ? extractParamsFromQuery(method.query).map(param => appendVariableTypeToQueryParam(queryParamsInfo, param)).map(stipOurPrefixes) : [] // define before "if", to make them available later let methodArgs From ea65af96dcaef5843c7e732a0219cc488029a146 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sat, 4 May 2024 09:45:57 +0700 Subject: [PATCH 10/44] docs: highlight notes and warnings See https://github.com/orgs/community/discussions/16925 [skip ci] --- README.md | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index f238ed8..f051c07 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # Query To App Generates the endpoints (or a whole app) from a mapping (SQL query -> URL) ->:warning: This is a proof of concept at this moment. Until it reaches a stable version, it might (and will) break a compatibility. +> [!WARNING] +> This is a proof of concept at this moment. Until it reaches a stable version, it might (and will) break a compatibility. # How to use @@ -67,20 +68,14 @@ Generates the endpoints (or a whole app) from a mapping (SQL query -> URL) | Golang | 
$ export DB_NAME=my-db DB_USER=my-user DB_PASSWORD=my-password
$ go run *.go
or
$ go build -o app
$ ./app
| | Python | 
$ pip install -r requirements.txt
$ export DB_NAME=my-db DB_USER=my-user DB_PASSWORD=my-password
$ uvicorn app:app --port 3000
| - --- - :bulb: **NOTE** + > [!TIP] + > While the example used `export` for setting up the environment variables, we don't recommend export variables that way! This was provided as an example to illustrate that an application follows [The Twelve Factors](https://12factor.net/config) and can be configured by passing environment variables. In real life, you will use docker, docker-compose, Kubernetes or other ways to run an app with required environment variables. - While the example used `export` for setting up the environment variables, we don't recommend export variables that way! This was provided as an example to illustrate that an application follows [The Twelve Factors](https://12factor.net/config) and can be configured by passing environment variables. In real life, you will use docker, docker-compose, Kubernetes or other ways to run an app with required environment variables. - - --- - :bulb: **NOTE** - - An app also supports other environment variables: - - * `PORT`: a port to listen (defaults to `3000`) - * `DB_HOST` a database host (defaults to `localhost`) - - --- + > [!NOTE] + > An app also supports other environment variables: + > + > * `PORT`: a port to listen (defaults to `3000`) + > * `DB_HOST` a database host (defaults to `localhost`) 1. Test that it works From 62339718da3934ad5b632ec33ec406555020cd67 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sat, 4 May 2024 09:53:40 +0700 Subject: [PATCH 11/44] chore: partially revert previous changes as notes doesn't work inside
Correction for ea65af96dcaef5843c7e732a0219cc488029a146 commit. [skip ci] --- README.md | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f051c07..9e0f2d0 100644 --- a/README.md +++ b/README.md @@ -68,14 +68,20 @@ Generates the endpoints (or a whole app) from a mapping (SQL query -> URL) | Golang | 
$ export DB_NAME=my-db DB_USER=my-user DB_PASSWORD=my-password
$ go run *.go
or
$ go build -o app
$ ./app
| | Python | 
$ pip install -r requirements.txt
$ export DB_NAME=my-db DB_USER=my-user DB_PASSWORD=my-password
$ uvicorn app:app --port 3000
| - > [!TIP] - > While the example used `export` for setting up the environment variables, we don't recommend export variables that way! This was provided as an example to illustrate that an application follows [The Twelve Factors](https://12factor.net/config) and can be configured by passing environment variables. In real life, you will use docker, docker-compose, Kubernetes or other ways to run an app with required environment variables. + --- + :bulb: **NOTE** - > [!NOTE] - > An app also supports other environment variables: - > - > * `PORT`: a port to listen (defaults to `3000`) - > * `DB_HOST` a database host (defaults to `localhost`) + While the example used `export` for setting up the environment variables, we don't recommend export variables that way! This was provided as an example to illustrate that an application follows [The Twelve Factors](https://12factor.net/config) and can be configured by passing environment variables. In real life, you will use docker, docker-compose, Kubernetes or other ways to run an app with required environment variables. + + --- + :bulb: **NOTE** + + An app also supports other environment variables: + + * `PORT`: a port to listen (defaults to `3000`) + * `DB_HOST` a database host (defaults to `localhost`) + + ---
1. Test that it works From 2c043c607bb874e4d15cfaa9ad8fdd0e9f77630b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 23:26:35 +0000 Subject: [PATCH 12/44] ci: bump actions/checkout from 4.1.4 to 4.1.6 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.4...v4.1.6) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/generate-go-app.yml | 2 +- .github/workflows/generate-js-app.yml | 2 +- .github/workflows/generate-python-app.yml | 2 +- .github/workflows/generate-ts-app.yml | 2 +- .github/workflows/integration-tests.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/generate-go-app.yml b/.github/workflows/generate-go-app.yml index ff5e461..7fe9634 100644 --- a/.github/workflows/generate-go-app.yml +++ b/.github/workflows/generate-go-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.4 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.6 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-js-app.yml b/.github/workflows/generate-js-app.yml index bcac058..707f8a0 100644 --- a/.github/workflows/generate-js-app.yml +++ b/.github/workflows/generate-js-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.4 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.6 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-python-app.yml b/.github/workflows/generate-python-app.yml index 2889bda..75aadc2 100644 --- a/.github/workflows/generate-python-app.yml +++ b/.github/workflows/generate-python-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.4 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.6 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-ts-app.yml b/.github/workflows/generate-ts-app.yml index 0937089..18e5a67 100644 --- a/.github/workflows/generate-ts-app.yml +++ b/.github/workflows/generate-ts-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.4 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.6 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 6078ca9..a9612a8 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -56,7 +56,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.4 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.6 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false From 5f622b0ed1ad0cbb767bf11dddb615783f14c561 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Thu, 23 May 2024 21:21:15 +0700 Subject: [PATCH 13/44] ci: configure dependabot to monitor updates for NPM Part of #38 [skip ci] --- .github/dependabot.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a9aab58..9e41b33 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -24,3 +24,23 @@ updates: labels: [ "kind/dependency-update", "area/ci" ] # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#open-pull-requests-limit open-pull-requests-limit: 1 + + - package-ecosystem: "npm" + directory: "/" + # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#scheduleinterval + schedule: + interval: "daily" + time: "06:00" + timezone: "Asia/Novosibirsk" + # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#commit-message + commit-message: + prefix: "build" + # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#versioning-strategy + versioning-strategy: "increase" + assignees: [ "php-coder" ] + reviewers: [ "php-coder" ] + labels: [ "kind/dependency-update" ] + # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#rebase-strategy + rebase-strategy: "disabled" + # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#open-pull-requests-limit + open-pull-requests-limit: 1 From 7416c2a13f522edf20c7b657caf9d092b01300cc Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Thu, 23 May 2024 21:22:11 +0700 Subject: [PATCH 14/44] chore: allow dependabot to update all actions rather than manually specified Relate to #38 [skip ci] --- .github/dependabot.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9e41b33..e6f2ec2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,11 +6,6 @@ updates: - package-ecosystem: "github-actions" directory: "/" - # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#allow - allow: - - dependency-name: "actions/checkout" - - dependency-name: "actions/setup-node" - - dependency-name: "actions/upload-artifact" # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#scheduleinterval schedule: interval: "daily" From a352f702c09dcf153210d5cb902e7376af443885 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Thu, 23 May 2024 21:23:47 +0700 Subject: [PATCH 15/44] chore: disable auto rebase for update of GitHub Actions Relate to #38 [skip ci] --- .github/dependabot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e6f2ec2..95a8d66 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,6 +17,8 @@ updates: assignees: [ "php-coder" ] reviewers: [ "php-coder" ] labels: [ "kind/dependency-update", "area/ci" ] + # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#rebase-strategy + rebase-strategy: "disabled" # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#open-pull-requests-limit open-pull-requests-limit: 1 From 9b2cbd23dadd7b6f29608331959bf18b889a55b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 14:25:47 +0000 Subject: [PATCH 16/44] chore(deps): bump ejs from 3.1.9 to 3.1.10 Bumps [ejs](https://github.com/mde/ejs) from 3.1.9 to 3.1.10. - [Release notes](https://github.com/mde/ejs/releases) - [Commits](https://github.com/mde/ejs/compare/v3.1.9...v3.1.10) --- updated-dependencies: - dependency-name: ejs dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9ea4c5e..e231f22 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,10 +6,10 @@ "packages": { "": { "name": "query2app", - "version": "0.0.2", + "version": "0.0.3", "license": "GPL-2.0", "dependencies": { - "ejs": "~3.1.9", + "ejs": "~3.1.10", "js-yaml": "~3.14.0", "minimist": "~1.2.8", "node-sql-parser": "~3.0.4" @@ -104,9 +104,9 @@ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "node_modules/ejs": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", - "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", "dependencies": { "jake": "^10.8.5" }, @@ -309,9 +309,9 @@ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "ejs": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", - "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", "requires": { "jake": "^10.8.5" } diff --git a/package.json b/package.json index a7b6a91..6382885 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "example:py": "cd examples/python/fastapi/postgres; ../../../../src/cli.js --lang python" }, "dependencies": { - "ejs": "~3.1.9", + "ejs": "~3.1.10", "js-yaml": "~3.14.0", "minimist": "~1.2.8", "node-sql-parser": "~3.0.4" From 8d04249398af3abbfcfb0f4ab7bd1a6b8328396e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 23:27:53 +0000 Subject: [PATCH 17/44] ci: bump actions/checkout from 4.1.6 to 4.1.7 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.6 to 4.1.7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.6...v4.1.7) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/generate-go-app.yml | 2 +- .github/workflows/generate-js-app.yml | 2 +- .github/workflows/generate-python-app.yml | 2 +- .github/workflows/generate-ts-app.yml | 2 +- .github/workflows/integration-tests.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/generate-go-app.yml b/.github/workflows/generate-go-app.yml index 7fe9634..1103b0c 100644 --- a/.github/workflows/generate-go-app.yml +++ b/.github/workflows/generate-go-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.6 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.7 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-js-app.yml b/.github/workflows/generate-js-app.yml index 707f8a0..30097c2 100644 --- a/.github/workflows/generate-js-app.yml +++ b/.github/workflows/generate-js-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.6 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.7 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-python-app.yml b/.github/workflows/generate-python-app.yml index 75aadc2..e7e881e 100644 --- a/.github/workflows/generate-python-app.yml +++ b/.github/workflows/generate-python-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.6 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.7 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-ts-app.yml b/.github/workflows/generate-ts-app.yml index 18e5a67..e3e410f 100644 --- a/.github/workflows/generate-ts-app.yml +++ b/.github/workflows/generate-ts-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.6 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.7 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index a9612a8..cfcf580 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -56,7 +56,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.6 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.7 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false From bf25a7337fb6a3c7e19c2b4a1eeeaffbdb52201f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 23:20:46 +0000 Subject: [PATCH 18/44] ci: bump actions/setup-node from 4.0.2 to 4.0.3 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.2 to 4.0.3. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v4.0.2...v4.0.3) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/generate-go-app.yml | 2 +- .github/workflows/generate-js-app.yml | 2 +- .github/workflows/generate-python-app.yml | 2 +- .github/workflows/generate-ts-app.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/generate-go-app.yml b/.github/workflows/generate-go-app.yml index 1103b0c..0637c99 100644 --- a/.github/workflows/generate-go-app.yml +++ b/.github/workflows/generate-go-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.0.2 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.0.3 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-js-app.yml b/.github/workflows/generate-js-app.yml index 30097c2..370f4a2 100644 --- a/.github/workflows/generate-js-app.yml +++ b/.github/workflows/generate-js-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.0.2 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.0.3 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-python-app.yml b/.github/workflows/generate-python-app.yml index e7e881e..4f06fc4 100644 --- a/.github/workflows/generate-python-app.yml +++ b/.github/workflows/generate-python-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.0.2 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.0.3 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-ts-app.yml b/.github/workflows/generate-ts-app.yml index e3e410f..f9f6e23 100644 --- a/.github/workflows/generate-ts-app.yml +++ b/.github/workflows/generate-ts-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.0.2 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.0.3 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' From f54ce64ba1b81d104f9a1b6544a4b0dd45c6ee0d Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 30 Aug 2024 21:03:45 +0700 Subject: [PATCH 19/44] ci: update hurl to 5.0.1 --- .github/workflows/integration-tests.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index cfcf580..3b0503d 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -84,7 +84,7 @@ jobs: - name: Install Hurl run: | - VER=4.3.0 + VER=5.0.1 DEB=hurl_${VER}_amd64.deb curl --location --no-progress-meter --remote-name https://github.com/Orange-OpenSource/hurl/releases/download/$VER/$DEB sudo dpkg --install $DEB @@ -98,9 +98,7 @@ jobs: --error-format long \ --variable SERVER_URL=http://127.0.0.1:${{ matrix.application-port }} \ --variable skip_500_error_testing=${{ matrix.skip_500_error_testing }} \ - --test \ - tests/crud.hurl \ - tests/misc.hurl + --test tests/ - name: Show application logs if: failure() From 61a6b9f83f8a79623ec2c7c57e9105cfc0db0f81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 23:45:35 +0000 Subject: [PATCH 20/44] ci: bump actions/setup-node from 4.0.3 to 4.0.4 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.3 to 4.0.4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v4.0.3...v4.0.4) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/generate-go-app.yml | 2 +- .github/workflows/generate-js-app.yml | 2 +- .github/workflows/generate-python-app.yml | 2 +- .github/workflows/generate-ts-app.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/generate-go-app.yml b/.github/workflows/generate-go-app.yml index 0637c99..3eafc95 100644 --- a/.github/workflows/generate-go-app.yml +++ b/.github/workflows/generate-go-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.0.3 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.0.4 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-js-app.yml b/.github/workflows/generate-js-app.yml index 370f4a2..9905f96 100644 --- a/.github/workflows/generate-js-app.yml +++ b/.github/workflows/generate-js-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.0.3 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.0.4 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-python-app.yml b/.github/workflows/generate-python-app.yml index 4f06fc4..89e9fda 100644 --- a/.github/workflows/generate-python-app.yml +++ b/.github/workflows/generate-python-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.0.3 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.0.4 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-ts-app.yml b/.github/workflows/generate-ts-app.yml index f9f6e23..0e47a56 100644 --- a/.github/workflows/generate-ts-app.yml +++ b/.github/workflows/generate-ts-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.0.3 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.0.4 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' From 358afa796a43380b03f4a859b384212b38fd9ee8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 29 Sep 2024 23:03:18 +0000 Subject: [PATCH 21/44] ci: bump actions/checkout from 4.1.7 to 4.2.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.7...v4.2.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/generate-go-app.yml | 2 +- .github/workflows/generate-js-app.yml | 2 +- .github/workflows/generate-python-app.yml | 2 +- .github/workflows/generate-ts-app.yml | 2 +- .github/workflows/integration-tests.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/generate-go-app.yml b/.github/workflows/generate-go-app.yml index 3eafc95..2997680 100644 --- a/.github/workflows/generate-go-app.yml +++ b/.github/workflows/generate-go-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.7 # https://github.com/actions/checkout + uses: actions/checkout@v4.2.0 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-js-app.yml b/.github/workflows/generate-js-app.yml index 9905f96..31adc9a 100644 --- a/.github/workflows/generate-js-app.yml +++ b/.github/workflows/generate-js-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.7 # https://github.com/actions/checkout + uses: actions/checkout@v4.2.0 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-python-app.yml b/.github/workflows/generate-python-app.yml index 89e9fda..403af98 100644 --- a/.github/workflows/generate-python-app.yml +++ b/.github/workflows/generate-python-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.7 # https://github.com/actions/checkout + uses: actions/checkout@v4.2.0 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-ts-app.yml b/.github/workflows/generate-ts-app.yml index 0e47a56..9fdd556 100644 --- a/.github/workflows/generate-ts-app.yml +++ b/.github/workflows/generate-ts-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.7 # https://github.com/actions/checkout + uses: actions/checkout@v4.2.0 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 3b0503d..41e9f54 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -56,7 +56,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.7 # https://github.com/actions/checkout + uses: actions/checkout@v4.2.0 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false From 6936cfb4fbc512062337431d51438091448e6acd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:13:13 +0000 Subject: [PATCH 22/44] ci: bump actions/checkout from 4.2.0 to 4.2.1 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.2.0...v4.2.1) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/generate-go-app.yml | 2 +- .github/workflows/generate-js-app.yml | 2 +- .github/workflows/generate-python-app.yml | 2 +- .github/workflows/generate-ts-app.yml | 2 +- .github/workflows/integration-tests.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/generate-go-app.yml b/.github/workflows/generate-go-app.yml index 2997680..b8a4e8f 100644 --- a/.github/workflows/generate-go-app.yml +++ b/.github/workflows/generate-go-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.2.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.2.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-js-app.yml b/.github/workflows/generate-js-app.yml index 31adc9a..28a2fa9 100644 --- a/.github/workflows/generate-js-app.yml +++ b/.github/workflows/generate-js-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.2.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.2.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-python-app.yml b/.github/workflows/generate-python-app.yml index 403af98..649d8ff 100644 --- a/.github/workflows/generate-python-app.yml +++ b/.github/workflows/generate-python-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.2.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.2.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-ts-app.yml b/.github/workflows/generate-ts-app.yml index 9fdd556..5363eb8 100644 --- a/.github/workflows/generate-ts-app.yml +++ b/.github/workflows/generate-ts-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.2.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.2.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 41e9f54..5d1957c 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -56,7 +56,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.2.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.2.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false From 2f345661031cc0bcec3da26f742982e3a9ef1a34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 23:28:11 +0000 Subject: [PATCH 23/44] ci: bump actions/checkout from 4.2.1 to 4.2.2 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.2.1...v4.2.2) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/generate-go-app.yml | 2 +- .github/workflows/generate-js-app.yml | 2 +- .github/workflows/generate-python-app.yml | 2 +- .github/workflows/generate-ts-app.yml | 2 +- .github/workflows/integration-tests.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/generate-go-app.yml b/.github/workflows/generate-go-app.yml index b8a4e8f..d53bb21 100644 --- a/.github/workflows/generate-go-app.yml +++ b/.github/workflows/generate-go-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.2.1 # https://github.com/actions/checkout + uses: actions/checkout@v4.2.2 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-js-app.yml b/.github/workflows/generate-js-app.yml index 28a2fa9..09ba90c 100644 --- a/.github/workflows/generate-js-app.yml +++ b/.github/workflows/generate-js-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.2.1 # https://github.com/actions/checkout + uses: actions/checkout@v4.2.2 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-python-app.yml b/.github/workflows/generate-python-app.yml index 649d8ff..0b1fd6c 100644 --- a/.github/workflows/generate-python-app.yml +++ b/.github/workflows/generate-python-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.2.1 # https://github.com/actions/checkout + uses: actions/checkout@v4.2.2 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/generate-ts-app.yml b/.github/workflows/generate-ts-app.yml index 5363eb8..6f9aeb7 100644 --- a/.github/workflows/generate-ts-app.yml +++ b/.github/workflows/generate-ts-app.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.2.1 # https://github.com/actions/checkout + uses: actions/checkout@v4.2.2 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 5d1957c..7f01a21 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -56,7 +56,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.2.1 # https://github.com/actions/checkout + uses: actions/checkout@v4.2.2 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false From 1eeedc0165f15d3563718e1c82af6d911bf1a543 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Oct 2024 23:05:35 +0000 Subject: [PATCH 24/44] ci: bump actions/setup-node from 4.0.4 to 4.1.0 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.4 to 4.1.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v4.0.4...v4.1.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/generate-go-app.yml | 2 +- .github/workflows/generate-js-app.yml | 2 +- .github/workflows/generate-python-app.yml | 2 +- .github/workflows/generate-ts-app.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/generate-go-app.yml b/.github/workflows/generate-go-app.yml index d53bb21..25dd22a 100644 --- a/.github/workflows/generate-go-app.yml +++ b/.github/workflows/generate-go-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.0.4 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.1.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-js-app.yml b/.github/workflows/generate-js-app.yml index 09ba90c..0cc1675 100644 --- a/.github/workflows/generate-js-app.yml +++ b/.github/workflows/generate-js-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.0.4 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.1.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-python-app.yml b/.github/workflows/generate-python-app.yml index 0b1fd6c..2bb0fcb 100644 --- a/.github/workflows/generate-python-app.yml +++ b/.github/workflows/generate-python-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.0.4 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.1.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-ts-app.yml b/.github/workflows/generate-ts-app.yml index 6f9aeb7..cddd6c4 100644 --- a/.github/workflows/generate-ts-app.yml +++ b/.github/workflows/generate-ts-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.0.4 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.1.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' From 49a6a27b30fe9ea9e7241a02c7798500d040c31d Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 10 Dec 2024 07:54:09 +0700 Subject: [PATCH 25/44] ci: update Hurl to 6.0.0 --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 7f01a21..7692ad2 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -84,7 +84,7 @@ jobs: - name: Install Hurl run: | - VER=5.0.1 + VER=6.0.0 DEB=hurl_${VER}_amd64.deb curl --location --no-progress-meter --remote-name https://github.com/Orange-OpenSource/hurl/releases/download/$VER/$DEB sudo dpkg --install $DEB From d948b8a7e17be0d487c5e136a83cc6bad407179c Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 10 Dec 2024 08:00:00 +0700 Subject: [PATCH 26/44] chore: remove obsoleted "version" parameter time="2024-12-10T00:56:09Z" level=warning msg="docker/docker-compose.yaml: `version` is obsolete" --- docker/docker-compose.local.yaml | 1 - docker/docker-compose.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/docker/docker-compose.local.yaml b/docker/docker-compose.local.yaml index 3bedabb..9d72791 100644 --- a/docker/docker-compose.local.yaml +++ b/docker/docker-compose.local.yaml @@ -7,7 +7,6 @@ # # docker compose -f docker-compose.yaml -f docker-compose.local.yaml up -d # -version: '3' services: mysql: diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 80a9ad0..44d2420 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -4,7 +4,6 @@ # docker compose exec mysql mysql -u test -ptest test -e 'SELECT * FROM categories' # docker compose exec postgres psql -U test -c 'SELECT * FROM categories' # -version: '3' services: mysql: From f54d7c78e56366bedcbcdd8a1063c0c752f6fd09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jan 2025 23:55:24 +0000 Subject: [PATCH 27/44] ci: bump actions/setup-node from 4.1.0 to 4.2.0 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v4.1.0...v4.2.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/generate-go-app.yml | 2 +- .github/workflows/generate-js-app.yml | 2 +- .github/workflows/generate-python-app.yml | 2 +- .github/workflows/generate-ts-app.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/generate-go-app.yml b/.github/workflows/generate-go-app.yml index 25dd22a..2fd9eb2 100644 --- a/.github/workflows/generate-go-app.yml +++ b/.github/workflows/generate-go-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.1.0 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.2.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-js-app.yml b/.github/workflows/generate-js-app.yml index 0cc1675..53ce343 100644 --- a/.github/workflows/generate-js-app.yml +++ b/.github/workflows/generate-js-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.1.0 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.2.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-python-app.yml b/.github/workflows/generate-python-app.yml index 2bb0fcb..e7ab7de 100644 --- a/.github/workflows/generate-python-app.yml +++ b/.github/workflows/generate-python-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.1.0 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.2.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-ts-app.yml b/.github/workflows/generate-ts-app.yml index cddd6c4..9054aee 100644 --- a/.github/workflows/generate-ts-app.yml +++ b/.github/workflows/generate-ts-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.1.0 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.2.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' From 8b7e266bba8f20c035de1c722e3aaa6bca82daab Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Wed, 12 Mar 2025 13:00:57 +0700 Subject: [PATCH 28/44] build: use mise for managing required tools [skip ci] --- mise.toml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mise.toml diff --git a/mise.toml b/mise.toml new file mode 100644 index 0000000..4641a9c --- /dev/null +++ b/mise.toml @@ -0,0 +1,5 @@ +[tools] +go = "1.14.15" +hurl = "6.0.0" +node = "18.12.0" +python = "3.7.17" From 813418a5b18d8dacfd2b57b39babf839c8a1a76a Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Thu, 13 Mar 2025 12:58:55 +0700 Subject: [PATCH 29/44] chore: require hurl from tests folder [skip ci] --- mise.toml | 1 - tests/mise.toml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 tests/mise.toml diff --git a/mise.toml b/mise.toml index 4641a9c..560d20e 100644 --- a/mise.toml +++ b/mise.toml @@ -1,5 +1,4 @@ [tools] go = "1.14.15" -hurl = "6.0.0" node = "18.12.0" python = "3.7.17" diff --git a/tests/mise.toml b/tests/mise.toml new file mode 100644 index 0000000..1c63298 --- /dev/null +++ b/tests/mise.toml @@ -0,0 +1,2 @@ +[tools] +hurl = "6.0.0" From 8202bc68a2e078f6ae7fc78a3ea0f588c76ef558 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Mar 2025 23:30:11 +0000 Subject: [PATCH 30/44] ci: bump actions/setup-node from 4.2.0 to 4.3.0 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.2.0 to 4.3.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v4.2.0...v4.3.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/generate-go-app.yml | 2 +- .github/workflows/generate-js-app.yml | 2 +- .github/workflows/generate-python-app.yml | 2 +- .github/workflows/generate-ts-app.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/generate-go-app.yml b/.github/workflows/generate-go-app.yml index 2fd9eb2..7088de9 100644 --- a/.github/workflows/generate-go-app.yml +++ b/.github/workflows/generate-go-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.2.0 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.3.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-js-app.yml b/.github/workflows/generate-js-app.yml index 53ce343..0f2da22 100644 --- a/.github/workflows/generate-js-app.yml +++ b/.github/workflows/generate-js-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.2.0 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.3.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-python-app.yml b/.github/workflows/generate-python-app.yml index e7ab7de..83b8854 100644 --- a/.github/workflows/generate-python-app.yml +++ b/.github/workflows/generate-python-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.2.0 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.3.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-ts-app.yml b/.github/workflows/generate-ts-app.yml index 9054aee..5fb5fb5 100644 --- a/.github/workflows/generate-ts-app.yml +++ b/.github/workflows/generate-ts-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.2.0 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.3.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' From 05e6649a6b12cd0d24a5b2858f070a08655a33c7 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Mon, 14 Apr 2025 11:11:48 +0700 Subject: [PATCH 31/44] ci: update Hurl to 6.1.1 --- .github/workflows/integration-tests.yml | 2 +- tests/mise.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 7692ad2..ab7590d 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -84,7 +84,7 @@ jobs: - name: Install Hurl run: | - VER=6.0.0 + VER=6.1.1 DEB=hurl_${VER}_amd64.deb curl --location --no-progress-meter --remote-name https://github.com/Orange-OpenSource/hurl/releases/download/$VER/$DEB sudo dpkg --install $DEB diff --git a/tests/mise.toml b/tests/mise.toml index 1c63298..89c7edf 100644 --- a/tests/mise.toml +++ b/tests/mise.toml @@ -1,2 +1,2 @@ [tools] -hurl = "6.0.0" +hurl = "6.1.1" From 1db016b361f939bee94e4c66008f8032affd0e34 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Mon, 14 Apr 2025 11:48:02 +0700 Subject: [PATCH 32/44] ci: use mise to install Hurl on CI --- .github/workflows/integration-tests.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index ab7590d..d06b6ac 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -82,12 +82,19 @@ jobs: working-directory: docker run: docker compose ps - - name: Install Hurl - run: | - VER=6.1.1 - DEB=hurl_${VER}_amd64.deb - curl --location --no-progress-meter --remote-name https://github.com/Orange-OpenSource/hurl/releases/download/$VER/$DEB - sudo dpkg --install $DEB + - name: Install mise to install Hurl + uses: jdx/mise-action@v2.1.11 # https://github.com/jdx/mise-action + with: + version: 2025.4.2 # [default: latest] mise version to install + install: true # [default: true] run `mise install` + cache: true # [default: true] cache mise using GitHub's cache + log_level: info # [default: info] log level + working_directory: tests # [default: .] directory to run mise in + env: + # Workaround: don't install some dependencies that we don't use (go, node, python) + # See: https://github.com/jdx/mise-action/issues/183 + # https://mise.jdx.dev/configuration/settings.html#disable_tools + MISE_DISABLE_TOOLS: go,node,python - name: Show Hurl version run: hurl --version From 283c0801827fa6545c05a6ac754b88414b23ad3f Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Mon, 14 Apr 2025 11:54:16 +0700 Subject: [PATCH 33/44] chore: invoke hurl within tests/ directory in order to use version installed by mise Correction for 1db016b361f939bee94e4c66008f8032affd0e34 commit. --- .github/workflows/integration-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index d06b6ac..b6b1696 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -97,15 +97,17 @@ jobs: MISE_DISABLE_TOOLS: go,node,python - name: Show Hurl version + working-directory: tests run: hurl --version - name: Run integration tests + working-directory: tests run: >- hurl \ --error-format long \ --variable SERVER_URL=http://127.0.0.1:${{ matrix.application-port }} \ --variable skip_500_error_testing=${{ matrix.skip_500_error_testing }} \ - --test tests/ + --test - name: Show application logs if: failure() From f3aa2ad81701f32baec1050b57977d2c78bd3730 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Mon, 14 Apr 2025 12:05:37 +0700 Subject: [PATCH 34/44] chore: run integration tests under Ubuntu 22.04 in order to have Glibc >= 2.32.0 The error was: /home/runner/.local/share/mise/installs/hurl/6.1.1/hurl-6.1.1-x86_64-unknown-linux-gnu/bin/hurl: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.32' not found (required by /home/runner/.local/share/mise/installs/hurl/6.1.1/hurl-6.1.1-x86_64-unknown-linux-gnu/bin/hurl) Correction for 1db016b361f939bee94e4c66008f8032affd0e34 commit. --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index b6b1696..e39d696 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -20,7 +20,7 @@ jobs: run-integration-tests: name: Integration Tests # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs strategy: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#handling-failures From 6b2dbfcea6a01a2fd1ba636e59b4a5fa038a7436 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 23:34:17 +0000 Subject: [PATCH 35/44] ci: bump actions/setup-node from 4.3.0 to 4.4.0 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.3.0 to 4.4.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v4.3.0...v4.4.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-version: 4.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/generate-go-app.yml | 2 +- .github/workflows/generate-js-app.yml | 2 +- .github/workflows/generate-python-app.yml | 2 +- .github/workflows/generate-ts-app.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/generate-go-app.yml b/.github/workflows/generate-go-app.yml index 7088de9..deb9f99 100644 --- a/.github/workflows/generate-go-app.yml +++ b/.github/workflows/generate-go-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.3.0 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.4.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-js-app.yml b/.github/workflows/generate-js-app.yml index 0f2da22..e34dc0f 100644 --- a/.github/workflows/generate-js-app.yml +++ b/.github/workflows/generate-js-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.3.0 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.4.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-python-app.yml b/.github/workflows/generate-python-app.yml index 83b8854..e4ca844 100644 --- a/.github/workflows/generate-python-app.yml +++ b/.github/workflows/generate-python-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.3.0 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.4.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' diff --git a/.github/workflows/generate-ts-app.yml b/.github/workflows/generate-ts-app.yml index 5fb5fb5..b199d6a 100644 --- a/.github/workflows/generate-ts-app.yml +++ b/.github/workflows/generate-ts-app.yml @@ -30,7 +30,7 @@ jobs: persist-credentials: false - name: Setup NodeJS - uses: actions/setup-node@v4.3.0 # https://github.com/actions/setup-node + uses: actions/setup-node@v4.4.0 # https://github.com/actions/setup-node with: node-version: 18 cache: 'npm' From 9cceef12bfa16f01ee0ee484fadfc83de1c072ad Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Wed, 16 Apr 2025 12:11:31 +0700 Subject: [PATCH 36/44] ci: update mise to 2025.4.4 Changelogs: - https://github.com/jdx/mise/releases/tag/v2025.4.3 - https://github.com/jdx/mise/releases/tag/v2025.4.4 --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index e39d696..6981b49 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -85,7 +85,7 @@ jobs: - name: Install mise to install Hurl uses: jdx/mise-action@v2.1.11 # https://github.com/jdx/mise-action with: - version: 2025.4.2 # [default: latest] mise version to install + version: 2025.4.4 # [default: latest] mise version to install install: true # [default: true] run `mise install` cache: true # [default: true] cache mise using GitHub's cache log_level: info # [default: info] log level From 715f00cc509035c06c41ab38698c4bf47b768ad2 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Thu, 17 Apr 2025 10:59:08 +0700 Subject: [PATCH 37/44] ci: run workflows on Ubuntu 22.04 as 20.04 has been retired --- .github/workflows/generate-go-app.yml | 2 +- .github/workflows/generate-js-app.yml | 2 +- .github/workflows/generate-python-app.yml | 2 +- .github/workflows/generate-ts-app.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/generate-go-app.yml b/.github/workflows/generate-go-app.yml index deb9f99..b74fc9e 100644 --- a/.github/workflows/generate-go-app.yml +++ b/.github/workflows/generate-go-app.yml @@ -20,7 +20,7 @@ jobs: generate-app: name: Generate app # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Clone source code diff --git a/.github/workflows/generate-js-app.yml b/.github/workflows/generate-js-app.yml index e34dc0f..46f3369 100644 --- a/.github/workflows/generate-js-app.yml +++ b/.github/workflows/generate-js-app.yml @@ -20,7 +20,7 @@ jobs: generate-app: name: Generate app # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Clone source code diff --git a/.github/workflows/generate-python-app.yml b/.github/workflows/generate-python-app.yml index e4ca844..cbe2bfd 100644 --- a/.github/workflows/generate-python-app.yml +++ b/.github/workflows/generate-python-app.yml @@ -20,7 +20,7 @@ jobs: generate-app: name: Generate app # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Clone source code diff --git a/.github/workflows/generate-ts-app.yml b/.github/workflows/generate-ts-app.yml index b199d6a..a312862 100644 --- a/.github/workflows/generate-ts-app.yml +++ b/.github/workflows/generate-ts-app.yml @@ -20,7 +20,7 @@ jobs: generate-app: name: Generate app # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Clone source code From eb2fd24e0670b960aff58de2ee88888d99ea258d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Apr 2025 23:58:37 +0000 Subject: [PATCH 38/44] ci: bump jdx/mise-action from 2.1.11 to 2.2.1 Bumps [jdx/mise-action](https://github.com/jdx/mise-action) from 2.1.11 to 2.2.1. - [Release notes](https://github.com/jdx/mise-action/releases) - [Changelog](https://github.com/jdx/mise-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/jdx/mise-action/compare/v2.1.11...v2.2.1) --- updated-dependencies: - dependency-name: jdx/mise-action dependency-version: 2.2.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 6981b49..e2a2308 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -83,7 +83,7 @@ jobs: run: docker compose ps - name: Install mise to install Hurl - uses: jdx/mise-action@v2.1.11 # https://github.com/jdx/mise-action + uses: jdx/mise-action@v2.2.1 # https://github.com/jdx/mise-action with: version: 2025.4.4 # [default: latest] mise version to install install: true # [default: true] run `mise install` From ec01b4166f90409b94d9f1aa0d83d016d1b7c3fa Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Thu, 24 Apr 2025 12:07:55 +0700 Subject: [PATCH 39/44] ci: update mise to 2025.4.8 Changelogs: - https://github.com/jdx/mise/releases/tag/v2025.4.5 - https://github.com/jdx/mise/releases/tag/v2025.4.6 - https://github.com/jdx/mise/releases/tag/v2025.4.7 - https://github.com/jdx/mise/releases/tag/v2025.4.8 --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index e2a2308..2fb7088 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -85,7 +85,7 @@ jobs: - name: Install mise to install Hurl uses: jdx/mise-action@v2.2.1 # https://github.com/jdx/mise-action with: - version: 2025.4.4 # [default: latest] mise version to install + version: 2025.4.8 # [default: latest] mise version to install install: true # [default: true] run `mise install` cache: true # [default: true] cache mise using GitHub's cache log_level: info # [default: info] log level From 4bb567b1c5bca010ecd06c1f1105fb8cd7f0d102 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 11 May 2025 12:35:50 +0700 Subject: [PATCH 40/44] ci: update mise to 2025.5.3 Changelogs: - https://github.com/jdx/mise/releases/tag/v2025.4.9 - https://github.com/jdx/mise/releases/tag/v2025.4.10 - https://github.com/jdx/mise/releases/tag/v2025.4.11 - https://github.com/jdx/mise/releases/tag/v2025.4.12 - https://github.com/jdx/mise/releases/tag/v2025.5.0 - https://github.com/jdx/mise/releases/tag/v2025.5.1 - https://github.com/jdx/mise/releases/tag/v2025.5.2 - https://github.com/jdx/mise/releases/tag/v2025.5.3 --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 2fb7088..332e3b7 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -85,7 +85,7 @@ jobs: - name: Install mise to install Hurl uses: jdx/mise-action@v2.2.1 # https://github.com/jdx/mise-action with: - version: 2025.4.8 # [default: latest] mise version to install + version: 2025.5.3 # [default: latest] mise version to install install: true # [default: true] run `mise install` cache: true # [default: true] cache mise using GitHub's cache log_level: info # [default: info] log level From a6384ab4d00a92d5278fa0512dad6c33b44be06a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 May 2025 23:20:22 +0000 Subject: [PATCH 41/44] ci: bump jdx/mise-action from 2.2.1 to 2.2.2 Bumps [jdx/mise-action](https://github.com/jdx/mise-action) from 2.2.1 to 2.2.2. - [Release notes](https://github.com/jdx/mise-action/releases) - [Changelog](https://github.com/jdx/mise-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/jdx/mise-action/compare/v2.2.1...v2.2.2) --- updated-dependencies: - dependency-name: jdx/mise-action dependency-version: 2.2.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 332e3b7..10b222b 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -83,7 +83,7 @@ jobs: run: docker compose ps - name: Install mise to install Hurl - uses: jdx/mise-action@v2.2.1 # https://github.com/jdx/mise-action + uses: jdx/mise-action@v2.2.2 # https://github.com/jdx/mise-action with: version: 2025.5.3 # [default: latest] mise version to install install: true # [default: true] run `mise install` From af24fed361d77a3b904d3d64c67c159b79b25f54 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Wed, 14 May 2025 09:57:37 +0700 Subject: [PATCH 42/44] chore: remove deprecated reviewers parameter from dependabot configuration As per dependabot's comment: % The reviewers field in the dependabot.yml file will be removed soon. Please use the code owners file to specify reviewers for Dependabot PRs. % --- .github/dependabot.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 95a8d66..aac594e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,7 +15,6 @@ updates: commit-message: prefix: "ci" assignees: [ "php-coder" ] - reviewers: [ "php-coder" ] labels: [ "kind/dependency-update", "area/ci" ] # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#rebase-strategy rebase-strategy: "disabled" @@ -35,7 +34,6 @@ updates: # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#versioning-strategy versioning-strategy: "increase" assignees: [ "php-coder" ] - reviewers: [ "php-coder" ] labels: [ "kind/dependency-update" ] # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#rebase-strategy rebase-strategy: "disabled" From 99823cfbbff383d9a833d3c158eb9073afefebc9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 May 2025 23:43:53 +0000 Subject: [PATCH 43/44] ci: bump jdx/mise-action from 2.2.2 to 2.2.3 Bumps [jdx/mise-action](https://github.com/jdx/mise-action) from 2.2.2 to 2.2.3. - [Release notes](https://github.com/jdx/mise-action/releases) - [Changelog](https://github.com/jdx/mise-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/jdx/mise-action/compare/v2.2.2...v2.2.3) --- updated-dependencies: - dependency-name: jdx/mise-action dependency-version: 2.2.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 10b222b..637e227 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -83,7 +83,7 @@ jobs: run: docker compose ps - name: Install mise to install Hurl - uses: jdx/mise-action@v2.2.2 # https://github.com/jdx/mise-action + uses: jdx/mise-action@v2.2.3 # https://github.com/jdx/mise-action with: version: 2025.5.3 # [default: latest] mise version to install install: true # [default: true] run `mise install` From 2cbf3649717231867f263a23e5877fd3dd569565 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Wed, 28 May 2025 10:32:59 +0700 Subject: [PATCH 44/44] ci: update mise to 2025.5.14 Changelogs: - https://github.com/jdx/mise/releases/tag/v2025.5.4 - https://github.com/jdx/mise/releases/tag/v2025.5.5 - https://github.com/jdx/mise/releases/tag/v2025.5.6 - https://github.com/jdx/mise/releases/tag/v2025.5.7 - https://github.com/jdx/mise/releases/tag/v2025.5.8 - https://github.com/jdx/mise/releases/tag/v2025.5.9 - https://github.com/jdx/mise/releases/tag/v2025.5.10 - https://github.com/jdx/mise/releases/tag/v2025.5.11 - https://github.com/jdx/mise/releases/tag/v2025.5.12 - https://github.com/jdx/mise/releases/tag/v2025.5.13 - https://github.com/jdx/mise/releases/tag/v2025.5.14 --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 637e227..c8206a9 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -85,7 +85,7 @@ jobs: - name: Install mise to install Hurl uses: jdx/mise-action@v2.2.3 # https://github.com/jdx/mise-action with: - version: 2025.5.3 # [default: latest] mise version to install + version: 2025.5.14 # [default: latest] mise version to install install: true # [default: true] run `mise install` cache: true # [default: true] cache mise using GitHub's cache log_level: info # [default: info] log level