Skip to content

Allow multiple intervening folders between provider name and API version #1081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeskew merged 2 commits into from
Sep 6, 2022
Merged

Allow multiple intervening folders between provider name and API version #1081

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45b075e
Allow multiple intervening folders between provider name and API version
jeskew Sep 2, 2022
7f8120c
Update path regex comment
jeskew Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/generator/src/cmd/generate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ function normalizeJsonPath(jsonPath: string) {
}

async function generateAutorestConfig(logger: ILogger, readmePath: string, bicepReadmePath: string, config: GeneratorConfig) {
// We expect a path format convention of <provider>/(preview|stable)/<yyyy>-<mm>-<dd>(|-preview)/<filename>.json
// We expect a path format convention of <provider>/(any/number/of/intervening/folders)/<yyyy>-<mm>-<dd>(|-preview)/<filename>.json
// This information is used to generate individual tags in the generated autorest configuration
// eslint-disable-next-line no-useless-escape
const pathRegex = /^(\$\(this-folder\)\/|)([^\/]+)\/[^\/]+\/(\d{4}-\d{2}-\d{2}(|-preview))\/.*\.json$/i;
const pathRegex = /^(\$\(this-folder\)\/|)([^\/]+)(?:\/[^\/]+)+\/(\d{4}-\d{2}-\d{2}(|-preview))\/.*\.json$/i;
Copy link
Copy Markdown
Member

@anthony-c-martin anthony-c-martin Sep 6, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Does this change the match group numbers (match[2] & match[3]) used below?
  2. Please could you also update the comment above regarding path format convention?

Were you able to validate this change generates the correct output when the pipeline is executed?

Copy link
Copy Markdown
Contributor Author

@jeskew jeskew Sep 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The match group numbers remain the same ((?:...) is a non-matching group).

The updated pipeline was executed on Friday and produced this PR, which restored all the Microsoft.Compute types and had no other impact.


const readmeContents = await readFile(readmePath, { encoding: 'utf8' });
const readmeMarkdown = markdown.parse(readmeContents);
Expand Down