Skip to content

Commit 77ce0fc

Browse files
jloleysensjloleysens
authored
[OAS] Removing staging files (#197455)
## Summary Removing staging files for now. We can always revert this if it turns out we need them. ## Reviewers * I might be missing something in removing these, but right now I think they are making commit noise and not really serving a purpose * I moved the `final_merge` step to after the OAS snapshot capture
1 parent 6b63f7f commit 77ce0fc

8 files changed

Lines changed: 6 additions & 112941 deletions

File tree

‎.buildkite/scripts/steps/checks.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,4 @@ fi
1212
.buildkite/scripts/steps/checks/saved_objects_definition_change.sh
1313
.buildkite/scripts/steps/code_generation/elastic_assistant_codegen.sh
1414
.buildkite/scripts/steps/code_generation/security_solution_codegen.sh
15-
.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
1615
.buildkite/scripts/steps/code_generation/osquery_codegen.sh
17-
.buildkite/scripts/steps/openapi_bundling/final_merge.sh

‎.buildkite/scripts/steps/checks/capture_oas_snapshot.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ run_check() {
2323
retry 5 15 run_check
2424

2525
check_for_changed_files "$cmd" true
26+
27+
.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
28+
.buildkite/scripts/steps/openapi_bundling/final_merge.sh

‎.buildkite/scripts/steps/openapi_bundling/final_merge.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ source .buildkite/scripts/common/util.sh
77
echo --- Merge Kibana OpenAPI specs
88

99
(cd oas_docs && make api-docs && make api-docs-lint)
10-
(cd oas_docs && make api-docs-staging && make api-docs-lint)
1110

12-
check_for_changed_files "make api-docs && make api-docs-staging" true
11+
check_for_changed_files "make api-docs" true

‎oas_docs/makefile‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,16 @@ api-docs: ## Generate Serverless and ESS Kibana OpenAPI bundles with kbn-openapi
1818
@node scripts/merge_serverless_oas.js
1919
@node scripts/merge_ess_oas.js
2020

21-
.PHONY: api-docs-staging
22-
api-docs-staging: ## Generate Serverless and ESS Kibana OpenAPI bundles with kbn-openapi-bundler
23-
@node scripts/merge_serverless_oas_staging.js
24-
@node scripts/merge_ess_oas_staging.js
25-
2621
.PHONY: api-docs-stateful
2722
api-docs-stateful: ## Generate only kibana.yaml
2823
@node scripts/merge_ess_oas.js
2924

3025
.PHONY: api-docs-serverless
3126
api-docs-serverless: ## Generate only kibana.serverless.yaml
3227
@node scripts/merge_serverless_oas.js
33-
28+
3429
.PHONY: api-docs-lint
35-
api-docs-lint: ## Run spectral API docs linter
30+
api-docs-lint: ## Run spectral API docs linter
3631
@npx @stoplight/spectral-cli lint "output/*.yaml" --ruleset ".spectral.yaml"
3732

3833
.PHONY: api-docs-lint-errs

0 commit comments

Comments
 (0)