mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-30 11:02:16 +00:00
## Todos for release - [x] Configure Env in docs project on vercel - [x] Configure Root Path in the docs project on vercel - [ ] Remove old CSP https://github.com/zitadel/website/pull/1592 ## What we did This pull request migrates the project documentation from the old `docs/` directory to the new `apps/docs/` directory, introduces a new documentation system built with Next.js and Fumadocs, and updates all relevant references, configuration files, and documentation to reflect this change. It also adds new configuration and ignore files for the new documentation app, updates CI and linting to exclude the new docs from certain checks, and revises the contributing guidelines accordingly. **Documentation System Migration and New Docs App** * Migrated all documentation from `docs/` to `apps/docs/`, and updated all references in `README.md`, `CONTRIBUTING.md`, and other files to point to the new location. [[1]](diffhunk://#diff-eca12c0a30e25b4b46522ebf89465a03ba72a03f540796c979137931d8f92055L585-L640) [[2]](diffhunk://#diff-eca12c0a30e25b4b46522ebf89465a03ba72a03f540796c979137931d8f92055L660-R607) [[3]](diffhunk://#diff-eca12c0a30e25b4b46522ebf89465a03ba72a03f540796c979137931d8f92055L740-R687) [[4]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L2-R3) [[5]](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L30-R30) * Added a new Next.js/Fumadocs-based documentation app under `apps/docs/`, including core app files, layouts, routing, search API, and a comprehensive `README.md` with development and contribution instructions. [[1]](diffhunk://#diff-5a1b07344a2c1b4d3f37b23ff1388b62cd9f57dea3c1cd23d8a0412b7602b132R1-R74) [[2]](diffhunk://#diff-462b9ad1eabbb7d1c29bb9c36e4931eb180fd7190900e6d2babf8f4d66ad1c28R1-R39) [[3]](diffhunk://#diff-e16ae25660ded787b10ac35dea96d5ecaacf895dae0afc8a9bd4382dc79a8c87R1-R7) [apps/docs/app/[[...slug]]/layout.tsxR1-R81](diffhunk://#diff-59e08acde4e805b7aeccef1dcf98f1d71dfc550777e6b9402085cee0e9fa4e0aR1-R81), [apps/docs/app/[[...slug]]/page.tsxR1-R79](diffhunk://#diff-e5df3f80d0fa01e12d63d81f29c57a9d14e846c78fd3beabb2ef768e38fd9580R1-R79), [[4]](diffhunk://#diff-389b34918e040cacaa87cd7201ffa462cc2b0b716736f537e3d3c660ac69353bR1-R7) [[5]](diffhunk://#diff-d3b03416d1c457b19f1c27b26f2db741412df841b875c26ccadc36e4522247f4R1-R29) [[6]](diffhunk://#diff-c8fb8339570a5305809be7c618e14705fd86390dc278e6ce8ba224a7bc8b0c3cR1-R25) **Configuration and Tooling Updates** * Updated `.github/workflows/codeql.yml`, `.golangci.yaml`, and `.github/dependabot.yml` to properly handle the new docs app: excluded `apps/docs` from certain checks, added npm dependency updates for the docs app, and excluded generated content. [[1]](diffhunk://#diff-12783128521e452af0cfac94b99b8d250413c516ec71fe6d97dbea666ff7ba27L8-R14) [[2]](diffhunk://#diff-9917ddc9f1c3304218f7269265b746d997c5c0615478177b5fceecd33ef47cb5R5-R6) [[3]](diffhunk://#diff-9917ddc9f1c3304218f7269265b746d997c5c0615478177b5fceecd33ef47cb5R126-R129) [[4]](diffhunk://#diff-dd4fbda47e51f1e35defb9275a9cd9c212ecde0b870cba89ddaaae65c5f3cd28R89-R106) * Updated `.devcontainer/devcontainer.json` to use the latest Go 1.25.3 version for consistency. **Licensing and Miscellaneous** * Added `apps/docs/` to the list of licensed directories in `LICENSING.md`. These changes ensure the documentation is now maintained in a modern, scalable system and all project tooling is updated to support the new structure. --------- Co-authored-by: Federico Coppede <[email protected]>
237 lines
6.3 KiB
Go
237 lines
6.3 KiB
Go
package main
|
|
|
|
import (
|
|
"flag"
|
|
"io"
|
|
"os"
|
|
"text/template"
|
|
|
|
"github.com/zitadel/logging"
|
|
|
|
"github.com/zitadel/zitadel/internal/config"
|
|
)
|
|
|
|
var (
|
|
directory = flag.String("directory", "./", "working directory: asset.yaml must be in this directory, files will be generated into parent directory")
|
|
assetsDocs = flag.String("assets", "../../../../apps/docs/content/apis/assets/assets.mdx", "path where the assets.mdx will be generated")
|
|
assetPrefix = flag.String("handler-prefix", "/assets/v1", "prefix of the handler paths")
|
|
)
|
|
|
|
func main() {
|
|
flag.Parse()
|
|
configFile := *directory + "asset.yaml"
|
|
authz, err := os.OpenFile(*directory+"../authz.go", os.O_TRUNC|os.O_WRONLY|os.O_CREATE, 0755)
|
|
logging.OnError(err).Fatal("cannot open authz file")
|
|
router, err := os.OpenFile(*directory+"../router.go", os.O_TRUNC|os.O_WRONLY|os.O_CREATE, 0755)
|
|
logging.OnError(err).Fatal("cannot open router file")
|
|
docs, err := os.OpenFile(*assetsDocs, os.O_TRUNC|os.O_WRONLY|os.O_CREATE, 0755)
|
|
logging.OnError(err).Fatal("cannot open docs file")
|
|
GenerateAssetHandler(configFile, *assetPrefix, authz, router, docs)
|
|
}
|
|
|
|
type Method struct {
|
|
Path string
|
|
HasDarkMode bool
|
|
Handlers []Handler
|
|
}
|
|
|
|
type Handler struct {
|
|
Name string
|
|
Comment string
|
|
Type HandlerType
|
|
Permission string
|
|
}
|
|
|
|
func (a Handler) Method() string {
|
|
if a.Type == MethodTypeUpload {
|
|
return "POST"
|
|
}
|
|
return "GET"
|
|
}
|
|
|
|
func (a Handler) PathSuffix() string {
|
|
if a.Type == MethodTypePreview {
|
|
return "/_preview"
|
|
}
|
|
return ""
|
|
}
|
|
|
|
func (a Handler) MethodReturn() string {
|
|
if a.Type == MethodTypeUpload {
|
|
return "Uploader"
|
|
}
|
|
if a.Type == MethodTypeDownload {
|
|
return "Downloader"
|
|
}
|
|
if a.Type == MethodTypePreview {
|
|
return "Downloader"
|
|
}
|
|
return ""
|
|
}
|
|
|
|
func (a Handler) HandlerType() string {
|
|
if a.Type == MethodTypeUpload {
|
|
return "UploadHandleFunc"
|
|
}
|
|
if a.Type == MethodTypeDownload {
|
|
return "DownloadHandleFunc"
|
|
}
|
|
if a.Type == MethodTypePreview {
|
|
return "DownloadHandleFunc"
|
|
}
|
|
return ""
|
|
}
|
|
|
|
type HandlerType string
|
|
|
|
const (
|
|
MethodTypeUpload = "upload"
|
|
MethodTypeDownload = "download"
|
|
MethodTypePreview = "preview"
|
|
)
|
|
|
|
type Services map[string]Service
|
|
|
|
type Service struct {
|
|
Prefix string
|
|
Methods map[string]Method
|
|
}
|
|
|
|
func GenerateAssetHandler(configFilePath, handlerPrefix string, authz, router, docs io.Writer) {
|
|
conf := new(struct {
|
|
Services Services
|
|
})
|
|
err := config.Read(conf, configFilePath)
|
|
logging.Log("ASSETS-Dgbn4").OnError(err).Fatal("cannot read config")
|
|
tmplAuthz, err := template.New("").Parse(authzTmpl)
|
|
logging.Log("ASSETS-BGbbg").OnError(err).Fatal("cannot parse authz template")
|
|
tmplRouter, err := template.New("").Parse(routerTmpl)
|
|
logging.Log("ASSETS-gh4rq").OnError(err).Fatal("cannot parse router template")
|
|
tmplDocs, err := template.New("").Parse(docsTmpl)
|
|
logging.Log("ASSETS-FGdgs").OnError(err).Fatal("cannot parse docs template")
|
|
data := &struct {
|
|
GoPkgName string
|
|
Name string
|
|
Prefix string
|
|
Services Services
|
|
}{
|
|
GoPkgName: "assets",
|
|
Name: "AssetsService",
|
|
Prefix: handlerPrefix,
|
|
Services: conf.Services,
|
|
}
|
|
err = tmplAuthz.Execute(authz, data)
|
|
logging.Log("ASSETS-BHngj").OnError(err).Fatal("cannot generate authz")
|
|
err = tmplRouter.Execute(router, data)
|
|
logging.Log("ASSETS-Bfd41").OnError(err).Fatal("cannot generate router")
|
|
err = tmplDocs.Execute(docs, data)
|
|
logging.Log("ASSETS-Bfd41").OnError(err).Fatal("cannot generate docs")
|
|
}
|
|
|
|
const authzTmpl = `// Code generated by assets generator. DO NOT EDIT.
|
|
|
|
package {{.GoPkgName}}
|
|
|
|
import (
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
)
|
|
|
|
/**
|
|
* {{.Name}}
|
|
*/
|
|
|
|
{{ $prefix := .Prefix }}
|
|
var {{.Name}}_AuthMethods = authz.MethodMapping {
|
|
{{ range $service := .Services}}
|
|
{{ range $method := .Methods}}
|
|
{{ range $handler := .Handlers}}
|
|
{{ if $handler.Permission }}
|
|
"{{$handler.Method}}:{{$prefix}}{{$service.Prefix}}{{$method.Path}}{{$handler.PathSuffix}}": authz.Option{
|
|
Permission: "{{$handler.Permission}}",
|
|
},
|
|
{{ if $method.HasDarkMode }}
|
|
"{{$handler.Method}}:{{$prefix}}{{$service.Prefix}}{{$method.Path}}/dark{{$handler.PathSuffix}}": authz.Option{
|
|
Permission: "{{$handler.Permission}}",
|
|
},
|
|
{{end}}
|
|
{{end}}
|
|
{{end}}
|
|
{{end}}
|
|
{{end}}
|
|
}
|
|
`
|
|
|
|
const routerTmpl = `// Code generated by assets generator. DO NOT EDIT.
|
|
|
|
package {{.GoPkgName}}
|
|
|
|
import (
|
|
"github.com/gorilla/mux"
|
|
|
|
http_mw "github.com/zitadel/zitadel/internal/api/http/middleware"
|
|
"github.com/zitadel/zitadel/internal/command"
|
|
"github.com/zitadel/zitadel/internal/static"
|
|
)
|
|
|
|
type {{.Name}} interface {
|
|
AuthInterceptor() *http_mw.AuthInterceptor
|
|
Commands() *command.Commands
|
|
ErrorHandler() ErrorHandler
|
|
Storage() static.Storage
|
|
|
|
{{ range $service := .Services}}
|
|
{{ range $methodName, $method := .Methods}}
|
|
{{ range $handler := .Handlers}}
|
|
{{$handler.Name}}{{$methodName}}() {{if $handler.MethodReturn}}{{$handler.MethodReturn}}{{end}}
|
|
{{ if $method.HasDarkMode }}
|
|
{{$handler.Name}}{{$methodName}}Dark() {{if $handler.MethodReturn}}{{$handler.MethodReturn}}{{end}}
|
|
{{ end }}
|
|
{{ end }}
|
|
{{ end }}
|
|
{{ end }}
|
|
}
|
|
|
|
func RegisterRoutes(router *mux.Router, s {{.Name}}) {
|
|
|
|
router.Use(s.AuthInterceptor().Handler)
|
|
|
|
{{ range $service := .Services}}
|
|
{{ range $methodName, $method := .Methods}}
|
|
{{ range $handler := .Handlers}}
|
|
router.Path("{{$service.Prefix}}{{$method.Path}}{{$handler.PathSuffix}}").Methods("{{$handler.Method}}").HandlerFunc({{if $handler.HandlerType}}{{$handler.HandlerType}}(s, {{end}}s.{{$handler.Name}}{{$methodName}}(){{if $handler.HandlerType}}){{end}})
|
|
{{ if $method.HasDarkMode }}
|
|
router.Path("{{$service.Prefix}}{{$method.Path}}/dark{{$handler.PathSuffix}}").Methods("{{$handler.Method}}").HandlerFunc({{if $handler.HandlerType}}{{$handler.HandlerType}}(s, {{end}}s.{{$handler.Name}}{{$methodName}}Dark(){{if $handler.HandlerType}}){{end}})
|
|
{{ end }}
|
|
{{ end }}
|
|
{{ end }}
|
|
{{ end }}
|
|
}
|
|
`
|
|
|
|
const docsTmpl = `---
|
|
title: zitadel/assets
|
|
---
|
|
|
|
## {{.Name}}
|
|
|
|
{{ range $service := .Services}}
|
|
{{ range $methodName, $method := .Methods}}
|
|
{{ range $handler := .Handlers}}
|
|
|
|
### {{$handler.Name}}{{$methodName}}()
|
|
|
|
> {{$handler.Name}}{{$methodName}}()
|
|
|
|
{{$handler.Method}}: {{$service.Prefix}}{{$method.Path}}{{$handler.PathSuffix}}
|
|
{{ if $method.HasDarkMode }}
|
|
### {{$handler.Name}}{{$methodName}}()
|
|
|
|
> {{$handler.Name}}{{$methodName}}Dark()
|
|
|
|
{{$handler.Method}}: {{$service.Prefix}}{{$method.Path}}/dark{{$handler.PathSuffix}}
|
|
{{ end }}
|
|
{{ end }}
|
|
{{ end }}
|
|
{{ end }}
|
|
`
|