chore: split apply-overlay tool (#3742)

Author: fmenezes

.github/workflows/autoupdate-spec.yaml

@@ -21,7 +21,7 @@ jobs:
         id: verify-changed-files
         with:
           files: |
-             ./tools/cmd/api-generator/spec.yaml
+             ./tools/internal/specs/spec.yaml
       - run:  make gen-api-commands
         if: steps.verify-changed-files.outputs.files_changed == 'true'
       - run:  make gen-docs

Makefile

@@ -105,11 +105,20 @@ addcopy: ## Add missing license to files
 .PHONY: generate
 generate: gen-docs gen-mocks gen-api-commands ## Generate docs, mocks, code, api commands, all auto generated assets
 
+.PHONY: apply-overlay
+apply-overlay: ## Apply overlay on openapi spec
+	@echo "==> Applying overlay"
+	go run ./tools/cmd/apply-overlay --spec ./tools/internal/specs/spec.yaml --overlay ./tools/internal/specs/overlays/\*.yaml > ./tools/internal/specs/spec-with-overlays.yaml
+
 .PHONY: gen-api-commands
-gen-api-commands: ## Generate api commands
+gen-api-commands: apply-overlay ## Generate api commands
 	@echo "==> Generating api commands"
-	go run ./tools/cmd/api-generator --spec ./tools/cmd/api-generator/spec.yaml --overlay ./tools/cmd/api-generator/overlays --output-type commands > ./internal/api/commands.go
-	go run ./tools/cmd/api-generator --spec ./tools/cmd/api-generator/spec.yaml --overlay ./tools/cmd/api-generator/overlays --output-type metadata > ./tools/cmd/docs/metadata.go
+	go run ./tools/cmd/api-generator --spec ./tools/internal/specs/spec-with-overlays.yaml --output-type commands > ./internal/api/commands.go
+
+.PHONY: gen-docs-metadata
+gen-docs-metadata: apply-overlay ## Generate docs metadata
+	@echo "==> Generating docs metadata"
+	go run ./tools/cmd/api-generator --spec ./tools/internal/specs/spec-with-overlays.yaml --output-type metadata > ./tools/cmd/docs/metadata.go
 
 .PHONY: otel
 otel: ## Generate code
@@ -122,7 +131,7 @@ gen-mocks: ## Generate mocks
 	go generate ./internal...
 
 .PHONY: gen-docs
-gen-docs: ## Generate docs for atlascli commands
+gen-docs: gen-docs-metadata ## Generate docs for atlascli commands
 	@echo "==> Generating docs"
 	go run -ldflags "$(LINKER_FLAGS)" ./tools/cmd/docs
 

scripts/update-openapi-spec.sh

@@ -20,4 +20,4 @@ set -euo pipefail
 SCRIPT_DIR="${BASH_SOURCE%/*}"
 
 # Download the file using curl
-curl -L "https://github.com/mongodb/openapi/raw/refs/heads/main/openapi/v2.yaml" -o "${SCRIPT_DIR}/../tools/cmd/api-generator/spec.yaml"
+curl -L "https://github.com/mongodb/openapi/raw/refs/heads/main/openapi/v2.yaml" -o "${SCRIPT_DIR}/../tools/internal/specs/spec.yaml"