Skip to content

Commit 12c5408

Browse files
Update generated files and dependencies for fru_tracker API
- Regenerated OpenAPI and route files with updated project name and version. - Updated Go module dependencies to latest versions, including Fabrica and Cobra. - Refactored client code to support JWT bearer token for authorization. - Updated copyright year to 2026 across all generated files. - Removed unimplemented event bus types from event bus middleware. - Enhanced comments and documentation for clarity and consistency. Signed-off-by: Alex Lovell-Troy <alex@lovelltroy.org>
1 parent 3634766 commit 12c5408

23 files changed

Lines changed: 239 additions & 158 deletions

Makefile

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# SPDX-License-Identifier: MIT
55

6-
.PHONY: help build test test-integration lint clean install run docker-build docker-run release-test check-no-pkg-resources-imports generate generate-check dev
6+
.PHONY: help build test test-integration lint clean install run docker-build docker-run release-test check-no-pkg-resources-imports generate generate-check dev reuse-annotate-generated
77

88
# Variables
99
BINARY_NAME=fru-tracker-server
@@ -43,6 +43,22 @@ ifneq ($(strip $(LOCAL_FABRICA)),)
4343
fi
4444
endif
4545
$(FABRICA_ENV) $(FABRICA_CMD) generate $(FABRICA_SOURCE_ARG)
46+
$(GO) mod tidy
47+
@$(MAKE) reuse-annotate-generated
48+
49+
reuse-annotate-generated: ## Add SPDX headers to generated Go files when REUSE is installed
50+
@if command -v reuse >/dev/null 2>&1; then \
51+
files=$$({ \
52+
find internal/storage/ent -type f -name '*.go' -print; \
53+
find cmd internal pkg -type f -name '*_generated.go' -print; \
54+
printf '%s\n' cmd/server/export.go cmd/server/import.go cmd/client/main.go; \
55+
} | while IFS= read -r file; do [ -f "$$file" ] && echo "$$file"; done | sort -u); \
56+
if [ -n "$$files" ]; then \
57+
reuse annotate --copyright="OpenCHAMI Contributors" --license="MIT" --year="$(shell date +%Y)" --skip-existing $$files; \
58+
fi; \
59+
else \
60+
echo "reuse not installed; skipping generated file annotation"; \
61+
fi
4662

4763
generate-check: ## Fail if generated files are out of sync (requires clean git tree)
4864
@if ! git diff --quiet || ! git diff --cached --quiet; then \

cmd/client/main.go

Lines changed: 16 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/server/device_handlers_generated.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/server/discoverysnapshot_handlers_generated.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/server/models_generated.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/server/openapi_extensions.go

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// Copyright © 2026 OpenCHAMI a Series of LF Projects, LLC
2+
//
3+
// SPDX-License-Identifier: MIT
4+
//
5+
// This file contains the user-editable OpenAPI extension hook.
6+
//
7+
// ✅ This file is safe to edit: it will NOT be overwritten by regeneration.
8+
//
9+
// Add any routes that are not Fabrica-generated (legacy APIs, custom endpoints,
10+
// WireGuard, cloud-init, etc.) to registerCustomOpenAPIPaths so they appear in
11+
// the served OpenAPI spec and Swagger UI at /openapi.json and /docs.
12+
//
13+
// Example:
14+
//
15+
// func registerCustomOpenAPIPaths(spec *openapi3.T) {
16+
// metaDataOp := openapi3.NewOperation()
17+
// metaDataOp.OperationID = "getMetaData"
18+
// metaDataOp.Summary = "Cloud-init meta-data endpoint"
19+
// metaDataOp.Tags = []string{"cloud-init"}
20+
// metaDataOp.Responses = openapi3.NewResponses()
21+
// metaDataOp.Responses.Set("200", &openapi3.ResponseRef{
22+
// Value: openapi3.NewResponse().WithDescription("YAML metadata for the requesting node"),
23+
// })
24+
// spec.Paths.Set("/meta-data", &openapi3.PathItem{Get: metaDataOp})
25+
// }
26+
package main
27+
28+
import "github.com/getkin/kin-openapi/openapi3"
29+
30+
// registerCustomOpenAPIPaths is called by GenerateOpenAPISpec after all
31+
// Fabrica-generated resource paths have been registered.
32+
// Add your custom / non-generated route definitions here.
33+
func registerCustomOpenAPIPaths(spec *openapi3.T) {
34+
// Add custom route definitions here.
35+
// Example (uncomment and extend as needed):
36+
//
37+
// op := openapi3.NewOperation()
38+
// op.OperationID = "myCustomEndpoint"
39+
// op.Summary = "My custom endpoint"
40+
// op.Tags = []string{"Custom"}
41+
// op.Responses = openapi3.NewResponses()
42+
// op.Responses.Set("200", &openapi3.ResponseRef{
43+
// Value: openapi3.NewResponse().WithDescription("OK"),
44+
// })
45+
// spec.Paths.Set("/my-endpoint", &openapi3.PathItem{Get: op})
46+
_ = spec
47+
}

cmd/server/openapi_generated.go

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/server/routes_generated.go

Lines changed: 38 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)