Skip to content

Commit

Permalink
[cascading] from release/10.3.0-rc to main (#1791)
Browse files Browse the repository at this point in the history
<!--
{"currentBranch":"release/10.3.0-rc","targetBranch":"main","bypassReviewers":false,"isConflicting":false}
-->

## Cascading from release/10.3.0-rc to main

---

:heavy_exclamation_mark: The pull request is conflicting with the target
branch.
You can fix the issue locally with the following commands:

<details open>
  <summary>Using <b>gh CLI</b></summary>

  ```shell
  gh pr checkout 1791
  git pull --ff origin main
  ```

  and update this Pull Request with

  ```shell
  gh pr push 1791
  ```
</details>

<details>
  <summary>Using <b>git</b> only</summary>

  ```shell
  git fetch origin
  git checkout origin/cascading/10.3.0-rc-main
  git pull --ff origin main
  ```

  and update this Pull Request with

  ```shell
  git push origin HEAD:cascading/10.3.0-rc-main
  ```
</details>

---

<small>This Pull Request has been generated with :heart: by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
  • Loading branch information
mrednic-1A committed May 16, 2024
2 parents 5fbacc5 + 5f01fb7 commit 71d1e62
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions packages/@ama-sdk/schematics/schematics/typescript/core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,13 @@ function ngGenerateTypescriptSDKFn(options: NgGenerateTypescriptSDKCoreSchematic
const openApiToolsPath = path.posix.join(targetPath, 'openapitools.json');
if (tree.exists(openApiToolsPath)) {
const openApiTools = tree.readJson(openApiToolsPath) as JsonObject & OpenApiToolsConfiguration;
Object.keys(openApiTools['generator-cli']?.generators)
.filter((key) => !openApiTools['generator-cli'].generators[key].inputSpec)
.forEach((key) => openApiTools['generator-cli'].generators[key].inputSpec = `./${defaultFileName}`);
tree.overwrite(openApiToolsPath, JSON.stringify(openApiTools, null, 2));
const generators = openApiTools['generator-cli']?.generators;
if (generators) {
Object.keys(generators)
.filter((key) => !openApiTools['generator-cli'].generators[key].inputSpec)
.forEach((key) => openApiTools['generator-cli'].generators[key].inputSpec = `./${defaultFileName}`);
tree.overwrite(openApiToolsPath, JSON.stringify(openApiTools, null, 2));
}
}
return tree;
};
Expand Down

0 comments on commit 71d1e62

Please sign in to comment.