Skip to content

Commit 5f10c4d

Browse files
api-clients-generation-pipeline[bot]therveci.datadog-api-spec
authored
Use openapi-generator-cli for generation (#784)
* Use openapi-generator-cli instead of docker-compose * Move stuff to .generator * Add files directive * Regenerate client from commit 1ae19d0 of spec repo Co-authored-by: Thomas Hervé <[email protected]> Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com> Co-authored-by: ci.datadog-api-spec <[email protected]>
1 parent 64f55eb commit 5f10c4d

File tree

6 files changed

+46
-53
lines changed

6 files changed

+46
-53
lines changed

.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.5.1.dev2",
7-
"regenerated": "2022-01-13 11:49:31.009960",
8-
"spec_repo_commit": "bb2c57f"
7+
"regenerated": "2022-01-13 12:57:47.272988",
8+
"spec_repo_commit": "1ae19d0"
99
},
1010
"v2": {
1111
"apigentools_version": "1.5.1.dev2",
12-
"regenerated": "2022-01-13 11:49:31.463214",
13-
"spec_repo_commit": "bb2c57f"
12+
"regenerated": "2022-01-13 12:57:47.732164",
13+
"spec_repo_commit": "1ae19d0"
1414
}
1515
}
1616
}

.generator/openapitools.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
3+
"spaces": 2,
4+
"generator-cli": {
5+
"version": "5.3.1",
6+
"storageDir": "lib",
7+
"repository": {
8+
"downloadUrl": "https://github.com/DataDog/openapi-generator/releases/download/5.3.0-60b29e1f8e2/openapi-generator-cli.jar"
9+
},
10+
"generators": {
11+
"v1": {
12+
"generatorName": "python",
13+
"config": "config/v1.json",
14+
"inputSpec": "schemas/v1/openapi.yaml",
15+
"output": "../v1",
16+
"additionalProperties": "disallowAdditionalPropertiesIfNotPresent=true",
17+
"globalProperty": "skipFormModel=false",
18+
"templateDir": "templates"
19+
},
20+
"v2": {
21+
"generatorName": "python",
22+
"config": "config/v2.json",
23+
"inputSpec": "schemas/v2/openapi.yaml",
24+
"output": "../v2",
25+
"additionalProperties": "disallowAdditionalPropertiesIfNotPresent=true",
26+
"globalProperty": "skipFormModel=false",
27+
"templateDir": "templates"
28+
}
29+
}
30+
}
31+
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.env
22
examples/
33
src/datadog_api_client/version.py
4+
.generator/lib
45

56
# VSCode
67
.vscode

.pre-commit-config.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ repos:
2626
# When updating the version of prettier, make sure to check the pre-commit file
2727
# And keep the `entry` here up to date https://github.com/pre-commit/mirrors-prettier/blob/master/.pre-commit-hooks.yaml
2828
29+
- id: openapi-generator
30+
name: OpenAPI-generator
31+
language: node
32+
entry: bash -c "cd .generator && openapi-generator-cli generate"
33+
files: "^.generator/.*"
34+
stages: [manual]
35+
pass_filenames: false
36+
additional_dependencies:
37+
- "@openapitools/openapi-generator-cli"
2938
- repo: https://github.com/psf/black
3039
rev: 21.12b0
3140
hooks:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY: all
22
all: .generator .env
3-
@docker-compose -f docker-compose.generator.yaml up
3+
@pre-commit run --all-files --hook-stage=manual openapi-generator || true
44
@mkdir -p docs/v1 docs/v2
55
@cp -r v1/datadog_api_client ./src/
66
@cp -r v2/datadog_api_client ./src/

docker-compose.generator.yaml

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)