Skip to content

feat(api): recover dropped services (scpm, orchestrator, asset-graph, infrastructure) and fix command-name collisions #150

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
tim-thacker-nullify merged 4 commits into from
May 26, 2026
Merged

feat(api): recover dropped services (scpm, orchestrator, asset-graph, infrastructure) and fix command-name collisions #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4acb4b4
feat(api): recover dropped services (scpm, orchestrator, asset-graph,…
tim-thacker-nullify May 26, 2026
32c0ac2
build(generate): vendor the OpenAPI bundle from a pinned monorepo commit
tim-thacker-nullify May 26, 2026
54edc06
build(generate): explicitly exclude /auth/ instead of silently droppi…
tim-thacker-nullify May 26, 2026
5e67ebd
build(generate): drop dead /internal/ excludePrefix
tim-thacker-nullify May 26, 2026
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
21 changes: 19 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: build clean lint lint-go lint-docker
.PHONY: build clean lint lint-go lint-docker fetch-spec generate-api unit cov

# set the version as the latest commit sha if it's not already defined
ifndef VERSION
Expand Down Expand Up @@ -34,8 +34,25 @@ lint-docker:
docker build --quiet --target hadolint -t hadolint:latest .
docker run --rm -v $(shell pwd):/app -w /app hadolint hadolint Dockerfile demo_server/Dockerfile

# OpenAPI bundle sourcing. The spec is published in the (private) nullify
# monorepo; we pin a commit and vendor the bundle into spec/ so generation is
# reproducible and offline. To update: bump SPEC_REF, run `make fetch-spec`,
# then `make generate-api`, and commit both spec/ and the regenerated code.
SPEC_REF ?= 7b34970bbbeeabf665cd71fa0eb0e07eaac534a3
SPEC_REPO ?= nullify-platform/nullify
SPEC_PATH_IN_REPO ?= public-docs/.gitbook/assets/api/nullify-openapi-bundle.yaml
SPEC_LOCAL ?= spec/nullify-openapi-bundle.yaml

# fetch-spec downloads the pinned OpenAPI bundle from the monorepo. Requires
# GitHub auth (`gh auth login`) with access to the private monorepo.
fetch-spec:
@mkdir -p $(dir $(SPEC_LOCAL))
gh api "repos/$(SPEC_REPO)/contents/$(SPEC_PATH_IN_REPO)?ref=$(SPEC_REF)" \
-H "Accept: application/vnd.github.raw" > $(SPEC_LOCAL)
@echo "fetched $(SPEC_LOCAL) from $(SPEC_REPO)@$(SPEC_REF)"

generate-api:
go run ./scripts/generate/main.go --spec ../public-docs/specs/merged-openapi.yml --output internal/api --cmd-output internal/commands
go run ./scripts/generate/main.go --spec $(SPEC_LOCAL) --output internal/api --cmd-output internal/commands

unit:
go test -v -skip TestIntegration ./...
Expand Down
4 changes: 4 additions & 0 deletions cmd/cli/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ func init() {
commands.RegisterSastCommands(apiCmd, getAPIClient)
commands.RegisterScaCommands(apiCmd, getAPIClient)
commands.RegisterSecretsCommands(apiCmd, getAPIClient)
commands.RegisterScpmCommands(apiCmd, getAPIClient)
commands.RegisterOrchestratorCommands(apiCmd, getAPIClient)
commands.RegisterAssetGraphCommands(apiCmd, getAPIClient)
commands.RegisterInfrastructureCommands(apiCmd, getAPIClient)
}

func setupLogger(ctx context.Context) context.Context {
Expand Down
Loading