build: codegen to call clean on a per pkg basis

Primary Changes --------------- 1. Updated codegen scripts of all affected packages to include a global openapi-generator-ignore file 2. Created script to clean openapi folders generated by codegen for typescript-axios and kotlin Secondary Changes ----------------- 1. Removed duplicated code generated previously when codegen clear wasn't enabled 2. Created openapi-generator-ignore file at project root for global ignore rules 3. Updated package.json of all affected packages, extensions and examples Fixes hyperledger-cacti#2736 Signed-off-by: jagpreetsinghsasan <[email protected]>
jagpreetsinghsasan · Oct 17, 2023 · 64e4089 · 64e4089
1 parent 9e66850
commit 64e4089
Show file tree

Hide file tree

Showing 235 changed files with 126 additions and 4,204 deletions.
diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/package.json b/examples/cactus-example-carbon-accounting-business-logic-plugin/package.json
@@ -46,8 +46,8 @@
     "codegen": "run-p 'codegen:*'",
     "codegen:openapi": "npm run generate-sdk",
     "generate-sdk": "run-p 'generate-sdk:*'",
-    "generate-sdk:kotlin": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g kotlin -o ./src/main/kotlin/generated/openapi/kotlin-client/ --reserved-words-mappings protected=protected",
-    "generate-sdk:typescript-axios": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios --reserved-words-mappings protected=protected",
+    "generate-sdk:kotlin": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g kotlin -o ./src/main/kotlin/generated/openapi/kotlin-client/ --reserved-words-mappings protected=protected --ignore-file-override ../../openapi-generator-ignore",
+    "generate-sdk:typescript-axios": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios --reserved-words-mappings protected=protected --ignore-file-override ../../openapi-generator-ignore",
     "watch": "npm-watch",
     "webpack": "npm-run-all webpack:dev",
     "webpack:dev": "npm-run-all webpack:dev:node webpack:dev:web",

diff --git a/...ss-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator-ignore b/...ss-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator-ignore
@@ -21,6 +21,3 @@
 #docs/*.md
 # Then explicitly reverse the ignore rule for a single file:
 #!docs/README.md
-
-docs/**
-gradle/**
diff --git a/...ess-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES b/...ess-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.openapi-generator-ignore
 README.md
 build.gradle
 gradlew

diff --git a/...lient/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/...lient/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
diff --git a/...c-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator-ignore b/...c-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator-ignore
@@ -21,7 +21,3 @@
 #docs/*.md
 # Then explicitly reverse the ignore rule for a single file:
 #!docs/README.md
-
-.gitignore
-.npmignore
-git_push.sh
diff --git a/...ic-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/FILES b/...ic-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.openapi-generator-ignore
 api.ts
 base.ts
 common.ts

diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/package.json b/examples/cactus-example-supply-chain-business-logic-plugin/package.json
@@ -46,8 +46,8 @@
     "codegen": "run-p 'codegen:*'",
     "codegen:openapi": "npm run generate-sdk",
     "generate-sdk": "run-p 'generate-sdk:*'",
-    "generate-sdk:kotlin": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g kotlin -o ./src/main/kotlin/generated/openapi/kotlin-client/ --reserved-words-mappings protected=protected",
-    "generate-sdk:typescript-axios": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/",
+    "generate-sdk:kotlin": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g kotlin -o ./src/main/kotlin/generated/openapi/kotlin-client/ --reserved-words-mappings protected=protected --ignore-file-override ../../openapi-generator-ignore",
+    "generate-sdk:typescript-axios": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/ --ignore-file-override ../../openapi-generator-ignore",
     "watch": "npm-watch",
     "webpack": "npm-run-all webpack:dev",
     "webpack:dev": "npm-run-all webpack:dev:node webpack:dev:web",

diff --git a/...ss-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator-ignore b/...ss-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator-ignore
@@ -21,6 +21,3 @@
 #docs/*.md
 # Then explicitly reverse the ignore rule for a single file:
 #!docs/README.md
-
-docs/**
-gradle/**
diff --git a/...ess-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES b/...ess-logic-plugin/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.openapi-generator-ignore
 README.md
 build.gradle
 gradlew

diff --git a/...lient/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/...lient/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
diff --git a/...c-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator-ignore b/...c-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator-ignore
@@ -21,7 +21,3 @@
 #docs/*.md
 # Then explicitly reverse the ignore rule for a single file:
 #!docs/README.md
-
-.gitignore
-.npmignore
-git_push.sh
diff --git a/...ic-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/FILES b/...ic-plugin/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.openapi-generator-ignore
 api.ts
 base.ts
 common.ts

diff --git a/extensions/cactus-plugin-htlc-coordinator-besu/package.json b/extensions/cactus-plugin-htlc-coordinator-besu/package.json
@@ -46,7 +46,7 @@
     "codegen": "run-p 'codegen:*'",
     "codegen:openapi": "run-p generate-sdk",
     "generate-sdk": "run-p 'generate-sdk:*'",
-    "generate-sdk:typescript-axios": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/",
+    "generate-sdk:typescript-axios": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios/ --ignore-file-override ../../openapi-generator-ignore",
     "watch": "npm-watch",
     "webpack": "npm-run-all webpack:dev webpack:prod",
     "webpack:dev": "npm-run-all webpack:dev:node webpack:dev:web",

diff --git a/...tor-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator-ignore b/...tor-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator-ignore
@@ -21,7 +21,3 @@
 #docs/*.md
 # Then explicitly reverse the ignore rule for a single file:
 #!docs/README.md
-
-git_push.sh
-.npmignore
-.gitignore
diff --git a/...ator-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/FILES b/...ator-besu/src/main/typescript/generated/openapi/typescript-axios/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.openapi-generator-ignore
 api.ts
 base.ts
 common.ts

diff --git a/extensions/cactus-plugin-object-store-ipfs/package.json b/extensions/cactus-plugin-object-store-ipfs/package.json
@@ -46,8 +46,8 @@
     "codegen": "run-p 'codegen:*'",
     "codegen:openapi": "npm run generate-sdk",
     "generate-sdk": "run-p 'generate-sdk:*'",
-    "generate-sdk:kotlin": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g kotlin -o ./src/main/kotlin/generated/openapi/kotlin-client/ --reserved-words-mappings protected=protected",
-    "generate-sdk:typescript-axios": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios --reserved-words-mappings protected=protected",
+    "generate-sdk:kotlin": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g kotlin -o ./src/main/kotlin/generated/openapi/kotlin-client/ --reserved-words-mappings protected=protected --ignore-file-override ../../openapi-generator-ignore",
+    "generate-sdk:typescript-axios": "openapi-generator-cli generate -i ./src/main/json/openapi.json -g typescript-axios -o ./src/main/typescript/generated/openapi/typescript-axios --reserved-words-mappings protected=protected --ignore-file-override ../../openapi-generator-ignore",
     "watch": "npm-watch",
     "webpack": "npm-run-all webpack:dev",
     "webpack:dev": "npm-run-all webpack:dev:node webpack:dev:web",

diff --git a/...ject-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator-ignore b/...ject-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator-ignore
@@ -21,6 +21,3 @@
 #docs/*.md
 # Then explicitly reverse the ignore rule for a single file:
 #!docs/README.md
-
-docs/**
-gradle/**
diff --git a/...bject-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES b/...bject-store-ipfs/src/main/kotlin/generated/openapi/kotlin-client/.openapi-generator/FILES
@@ -1,3 +1,4 @@
+.openapi-generator-ignore
 README.md
 build.gradle
 gradlew

diff --git a/...lient/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/...lient/src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
diff --git a/...pi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectV1200Response.kt b/...pi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectV1200Response.kt
diff --git a/...penapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectV1Request.kt b/...penapi/kotlin-client/src/main/kotlin/org/openapitools/client/models/GetObjectV1Request.kt
diff --git a/...pi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectV1200Response.kt b/...pi/kotlin-client/src/main/kotlin/org/openapitools/client/models/HasObjectV1200Response.kt