generated from amazon-archives/__template_Apache-2.0
-
Notifications
You must be signed in to change notification settings - Fork 623
[Jekyll] Spec Insert Plugin #8692
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.
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
Naarcha-AWS
merged 14 commits into
opensearch-project:main
from
nhtruong:spec_insert_phase_1
Nov 11, 2024
Merged
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
869d2ae
Spec Insert
nhtruong 9024ca1
# Sentence casing
nhtruong 5005901
# vale:reviewdog
nhtruong edb734e
# vale:reviewdog
nhtruong 61b0c2d
# vale:reviewdog
nhtruong 29f2ffc
# Correction on cron job run time.
nhtruong cc17f1e
Apply suggestions from code review
nhtruong 683ae62
# More clarity in method documentation
nhtruong b247183
Merge branch 'main' into spec_insert_phase_1
nhtruong 810f73a
Update DEVELOPER_GUIDE.md
Naarcha-AWS 5d1e2d5
Apply suggestions from code review
Naarcha-AWS 8364b61
Apply suggestions from code review
Naarcha-AWS 9b968b1
Merge branch 'main' into spec_insert_phase_1
Naarcha-AWS 352b240
Apply suggestions from code review
Naarcha-AWS File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| name: Lint and Test Jekyll Spec Insert | ||
| on: | ||
| push: | ||
| paths: | ||
| - 'spec-insert/**' | ||
| pull_request: | ||
| paths: | ||
| - 'spec-insert/**' | ||
| jobs: | ||
| lint-and-test: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: ruby/setup-ruby@v1 | ||
| with: { ruby-version: 3.3.0 } | ||
| - run: bundle install | ||
| - working-directory: spec-insert | ||
| run: | | ||
| bundle exec rubocop | ||
| bundle exec rspec |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| name: Update API Components | ||
| on: | ||
| workflow_dispatch: | ||
| schedule: | ||
| - cron: "0 0 * * 0" # Every Sunday at midnight GMT | ||
| jobs: | ||
| update-api-components: | ||
| if: ${{ github.repository == 'opensearch-project/documentation-website' }} | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: write | ||
| pull-requests: write | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: recursive | ||
| fetch-depth: 0 | ||
|
|
||
| - run: git config --global pull.rebase true | ||
|
|
||
| - uses: ruby/setup-ruby@v1 | ||
| with: { ruby-version: 3.3.0 } | ||
|
|
||
| - run: bundle install | ||
|
|
||
| - name: Download spec and insert into documentation | ||
| run: bundle exec jekyll spec-insert | ||
|
|
||
| - name: Get current date | ||
| id: date | ||
| run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_ENV | ||
|
|
||
| - name: GitHub App token | ||
| id: github_app_token | ||
| uses: tibdex/[email protected] | ||
| with: | ||
| app_id: ${{ secrets.APP_ID }} | ||
| private_key: ${{ secrets.APP_PRIVATE_KEY }} | ||
|
|
||
| - name: Create pull request | ||
| uses: peter-evans/create-pull-request@v6 | ||
| with: | ||
| token: ${{ steps.github_app_token.outputs.token }} | ||
| commit-message: "Updated API components to reflect the latest OpenSearch API spec (${{ env.date }})" | ||
| title: "[AUTOCUT] Update API components to reflect the latest OpenSearch API spec (${{ env.date }})" | ||
| body: | | ||
| Update API components to reflect the latest [OpenSearch API spec](https://github.com/opensearch-project/opensearch-api-specification/releases/download/main-latest/opensearch-openapi.yaml). | ||
| Date: ${{ env.date }} | ||
| branch: update-api-components-${{ env.date }} | ||
| base: main | ||
| signoff: true | ||
| labels: autocut |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| # Developer guide | ||
| - [Introduction](#introduction) | ||
| - [Starting the Jekyll server locally](#starting-the-jekyll-server-locally) | ||
| - [Using spec-insert Jekyll plugin](#using-spec-insert-jekyll-plugin) | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| - [Insert Query Parameters](#insert-query-parameters) | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| - [Insert Path Parameters](#insert-path-parameters) | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| - [Insert Paths and HTTP Methods](#insert-paths-and-http-methods) | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| - [Ignored files and folders](#ignored-files-and-folders) | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| - [CI/CD](#cicd) | ||
|
|
||
| ## Introduction | ||
|
|
||
| The `.md` documents in this repository are rendered into HTML pages using [Jekyll](https://jekyllrb.com/). These HTML pages are hosted on [opensearch.org](https://opensearch.org/docs/latest/). | ||
|
|
||
| ## Starting the Jekyll server locally | ||
| You can run the Jekyll server locally to view the rendered HTML pages using the following steps: | ||
|
|
||
| 1. Install [Ruby](https://www.ruby-lang.org/en/documentation/installation/) 3.1.0 or later for your operating system. | ||
| 2. Install the required gems by running `bundle install`. | ||
| 3. Run `bundle exec jekyll serve` to start the Jekyll server locally. (This can take several minutes to be ready.) | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| 4. Open your browser and navigate to `http://localhost:4000` to view the rendered HTML pages. | ||
|
|
||
| ## Using the `spec-insert` Jekyll plugin | ||
| The `spec-insert` Jekyll plugin is used to insert API components into the markdown files. The plugin downloads the [latest OpenSearch Specification](https://github.com/opensearch-project/opensearch-api-specification) and renders the API components from the spec. This aims to reduce the manual effort required to keep the documentation up-to-date. | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| To use this plugin, make sure that you have installed Ruby 3.1.0 or later and the required gems by running `bundle install`. | ||
|
|
||
| Edit your markdown file and insert the following snippet where you want an API component to be rendered: | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| ```markdown | ||
| <!-- spec_insert_start | ||
| api: <API_NAME> | ||
| component: <COMPONENT_NAME> | ||
| other_param: <OTHER_PARAM> | ||
| --> | ||
|
|
||
| This is where the API component will be inserted. | ||
| Everything between the `spec_insert_start` and `spec_insert_end` tags will be overwritten. | ||
|
|
||
| <!-- spec_insert_end --> | ||
| ``` | ||
|
|
||
| Then run the follow Jekyll command to render the API components: | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ```shell | ||
| bundle exec jekyll spec-insert | ||
| ``` | ||
|
|
||
| If you are working on multiple markdown files and do not want to keep running the `jekyll spec-insert` command, you can add the `--watch` (or `-W`) flag to the command to watch for changes in the markdown files and automatically render the API components: | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| ```shell | ||
| bundle exec jekyll spec-insert --watch | ||
| ``` | ||
|
|
||
| Depending on the text editor you are using to edit the markdown, you may need to manually reload the file from disk to see the changes applied by the plugin if the editor does not automatically reload the file periodically. | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| The plugin will pull the newest OpenSearch API spec from its [repository](https://github.com/opensearch-project/opensearch-api-specification) if the spec file does not exist locally or if it is older than 24 hours. To tell the plugin to always pull the newest spec, you can add the `--refresh-spec` (or `-R`) flag to the command: | ||
|
|
||
| ```shell | ||
| bundle exec jekyll spec-insert --refresh-spec | ||
| ``` | ||
|
|
||
| ### Inserting query parameters | ||
|
|
||
| To insert query parameters table of the, use the following snippet: | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Above: "To insert the API query parameters table"? |
||
| ```markdown | ||
| <!-- spec_insert_start | ||
| api: cat.indices | ||
| component: query_parameters | ||
| --> | ||
| <!-- spec_insert_end --> | ||
| ``` | ||
|
|
||
| This will insert the query parameters of the `cat.indices` API into the `.md` file with three default columns: `Parameter`, `Type`, and `Description`. There are 5 columns that can be inserted: `Parameter`, `Type`, `Description`, `Required`, and `Default`. When `Required`/`Default` is not chosen, the info will be written in the `Description` column. | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| You can customize the query parameters table with the following columns: | ||
|
|
||
| - `Parameter` | ||
| - `Type` | ||
| - `Description` | ||
| - `Required` | ||
| - `Default` | ||
|
|
||
| You can also customize this component with the following settings: | ||
|
|
||
| - `include_global` (Boolean; default is `false`): Includes global query parameters in the table. | ||
| - `include_deprecated` (Boolean; default is `true`): Includes deprecated parameters in the table. | ||
| - `pretty` (Boolean; default is `false`): Renders the table in the pretty format instead of the compact format. | ||
|
|
||
| You can customize the query parameters table with the following columns: | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| ```markdown | ||
| <!-- spec_insert_start | ||
| api: cat.indices | ||
| component: query_parameters | ||
| include_global: true | ||
| include_deprecated: false | ||
| pretty: true | ||
| --> | ||
| <!-- spec_insert_end --> | ||
| ``` | ||
|
|
||
| ### Inserting path parameters | ||
|
|
||
| To insert path parameters table of the `indices.create` API, use the following snippet: | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| ```markdown | ||
| <!-- spec_insert_start | ||
| api: indices.create | ||
| component: path_parameters | ||
| --> | ||
| <!-- spec_insert_end --> | ||
| ``` | ||
|
|
||
| This table behaves the same as the query parameters table except that it does not accept the `include_global` argument. | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| ### Inserting paths and HTTP methods | ||
|
|
||
| To insert paths and HTTP methods of the `search` API, use the following snippet: | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| ```markdown | ||
| <!-- spec_insert_start | ||
| api: search | ||
| component: paths_and_http_methods | ||
| --> | ||
| <!-- spec_insert_end --> | ||
| ``` | ||
|
|
||
| ### Ignoring files and folders | ||
|
|
||
| The `spec-insert` plugin ignores all files and folders listed in the [./_config.yml#exclude](./_config.yml) list, which is also the list of files and folders that Jekyll ignores. | ||
|
|
||
| ### CI/CD | ||
|
|
||
Naarcha-AWS marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| The `spec-insert` plugin is run as part of the CI/CD pipeline to ensure that the API components are up-to-date in the documentation. This is done through the [update-api-components.yml](.github/workflows/update-api-components.yml) GitHub Action workflow that creates a pull request with the updated API components every Sunday. | ||
Naarcha-AWS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| opensearch-openapi.yaml | ||
| rspec_examples.txt |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| --require spec_helper |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| require: rubocop-rake | ||
| AllCops: | ||
| Include: | ||
| - 'lib/**/*.rb' | ||
| - 'Rakefile' | ||
| NewCops: enable | ||
|
|
||
| Metrics/CyclomaticComplexity: | ||
| Enabled: false | ||
| Metrics/MethodLength: | ||
| Enabled: false | ||
| Metrics/ParameterLists: | ||
| Enabled: false | ||
| Metrics/AbcSize: | ||
| Enabled: false | ||
| Metrics/PerceivedComplexity: | ||
| Enabled: false | ||
|
|
||
| Layout/EmptyLineAfterGuardClause: | ||
| Enabled: false | ||
|
|
||
| Style/MultilineBlockChain: | ||
| Enabled: false | ||
| Style/SingleLineMethods: | ||
| Enabled: false | ||
|
|
||
| Naming/FileName: | ||
| Exclude: | ||
| - 'lib/jekyll-spec-insert.rb' # For Jekyll to recognize the plugin |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| Gem::Specification.new do |spec| | ||
| spec.name = 'jekyll-spec-insert' | ||
| spec.version = '0.1.0' | ||
| spec.authors = ['Theo Truong'] | ||
| spec.email = ['[email protected]'] | ||
|
|
||
| spec.summary = 'A Jekyll plugin for inserting OpenSearch OpenAPI specifications into Jekyll sites.' | ||
|
|
||
| spec.files = Dir['lib/**/*.rb'] | ||
| spec.require_paths = ['lib'] | ||
|
|
||
| spec.metadata['rubygems_mfa_required'] = 'true' | ||
| spec.required_ruby_version = '>= 3.1.0' | ||
| end |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also please correct links where necessary.