Skip to content

Commit

Permalink
[8.x] [OAS] Removing staging files (elastic#197455) (elastic#197782)
Browse files Browse the repository at this point in the history
# Backport

This will backport the following commits from `main` to `8.x`:
- [[OAS] Removing staging files
(elastic#197455)](elastic#197455)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Jean-Louis
Leysens","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-24T14:52:13Z","message":"[OAS]
Removing staging files (elastic#197455)\n\n## Summary\r\n\r\nRemoving staging
files for now. We can always revert this if it turns\r\nout we need
them.\r\n\r\n## Reviewers\r\n\r\n* I might be missing something in
removing these, but right now I think\r\nthey are making commit noise
and not really serving a purpose\r\n* I moved the `final_merge` step to
after the OAS snapshot
capture","sha":"77ce0fcbcf18805d2ae1ac2d21a449c03deec022","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Core","release_note:skip","v9.0.0","Feature:OAS","backport:version","v8.17.0"],"number":197455,"url":"https://github.com/elastic/kibana/pull/197455","mergeCommit":{"message":"[OAS]
Removing staging files (elastic#197455)\n\n## Summary\r\n\r\nRemoving staging
files for now. We can always revert this if it turns\r\nout we need
them.\r\n\r\n## Reviewers\r\n\r\n* I might be missing something in
removing these, but right now I think\r\nthey are making commit noise
and not really serving a purpose\r\n* I moved the `final_merge` step to
after the OAS snapshot
capture","sha":"77ce0fcbcf18805d2ae1ac2d21a449c03deec022"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/197455","number":197455,"mergeCommit":{"message":"[OAS]
Removing staging files (elastic#197455)\n\n## Summary\r\n\r\nRemoving staging
files for now. We can always revert this if it turns\r\nout we need
them.\r\n\r\n## Reviewers\r\n\r\n* I might be missing something in
removing these, but right now I think\r\nthey are making commit noise
and not really serving a purpose\r\n* I moved the `final_merge` step to
after the OAS snapshot
capture","sha":"77ce0fcbcf18805d2ae1ac2d21a449c03deec022"}},{"branch":"8.x","label":"v8.17.0","labelRegex":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
  • Loading branch information
jloleysens authored Oct 28, 2024
1 parent 9299aa5 commit 12d8388
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 76,483 deletions.
2 changes: 0 additions & 2 deletions .buildkite/scripts/steps/checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ fi
.buildkite/scripts/steps/checks/saved_objects_definition_change.sh
.buildkite/scripts/steps/code_generation/elastic_assistant_codegen.sh
.buildkite/scripts/steps/code_generation/security_solution_codegen.sh
.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
.buildkite/scripts/steps/code_generation/osquery_codegen.sh
.buildkite/scripts/steps/openapi_bundling/final_merge.sh
3 changes: 3 additions & 0 deletions .buildkite/scripts/steps/checks/capture_oas_snapshot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ run_check() {
retry 5 15 run_check

check_for_changed_files "$cmd" true

.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
.buildkite/scripts/steps/openapi_bundling/final_merge.sh
3 changes: 1 addition & 2 deletions .buildkite/scripts/steps/openapi_bundling/final_merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ source .buildkite/scripts/common/util.sh
echo --- Merge Kibana OpenAPI specs

(cd oas_docs && make api-docs && make api-docs-lint)
(cd oas_docs && make api-docs-staging && make api-docs-lint)

check_for_changed_files "make api-docs && make api-docs-staging" true
check_for_changed_files "make api-docs" true
9 changes: 2 additions & 7 deletions oas_docs/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,16 @@ api-docs: ## Generate Serverless and ESS Kibana OpenAPI bundles with kbn-openapi
@node scripts/merge_serverless_oas.js
@node scripts/merge_ess_oas.js

.PHONY: api-docs-staging
api-docs-staging: ## Generate Serverless and ESS Kibana OpenAPI bundles with kbn-openapi-bundler
@node scripts/merge_serverless_oas_staging.js
@node scripts/merge_ess_oas_staging.js

.PHONY: api-docs-stateful
api-docs-stateful: ## Generate only kibana.yaml
@node scripts/merge_ess_oas.js

.PHONY: api-docs-serverless
api-docs-serverless: ## Generate only kibana.serverless.yaml
@node scripts/merge_serverless_oas.js

.PHONY: api-docs-lint
api-docs-lint: ## Run spectral API docs linter
api-docs-lint: ## Run spectral API docs linter
@npx @stoplight/spectral-cli lint "output/*.yaml" --ruleset ".spectral.yaml"

.PHONY: api-docs-lint-errs
Expand Down
Loading

0 comments on commit 12d8388

Please sign in to comment.