Fix openapi cli

grafana · Oct 3, 2023 · a30ad5d · a30ad5d
1 parent 9007b2f
commit a30ad5d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/cmd/cli/generate/command.go b/cmd/cli/generate/command.go
@@ -36,6 +36,7 @@ func Command() *cobra.Command {
 	cmd.Flags().StringArrayVar(&opts.KindsysComposableEntrypoints, "kindsys-composable", nil, "Kindys composable kinds input schema.") // TODO: better usage text
 	cmd.Flags().StringArrayVar(&opts.KindsysCustomEntrypoints, "kindsys-custom", nil, "Kindys custom kinds input schema.")             // TODO: better usage text
 	cmd.Flags().StringArrayVar(&opts.JSONSchemaEntrypoints, "jsonschema", nil, "Jsonschema input schema.")                             // TODO: better usage text
+	cmd.Flags().StringArrayVar(&opts.OpenApiEntrypoints, "openapi", nil, "Openapi input schema.")                                      // TODO: better usage text
 
 	cmd.Flags().StringArrayVarP(&opts.CueImports, "include-cue-import", "I", nil, "Specify an additional library import directory. Format: [path]:[import]. Example: '../grafana/common-library:github.com/grafana/grafana/packages/grafana-schema/src/common")
 
@@ -44,6 +45,7 @@ func Command() *cobra.Command {
 	_ = cmd.MarkFlagDirname("kindsys-custom")
 	_ = cmd.MarkFlagDirname("jsonschema")
 	_ = cmd.MarkFlagDirname("output")
+	_ = cmd.MarkFlagDirname("openapi")
 
 	return cmd
 }

diff --git a/cmd/cli/inspect/command.go b/cmd/cli/inspect/command.go
@@ -37,6 +37,7 @@ func Command() *cobra.Command {
 	cmd.Flags().StringArrayVar(&opts.LoaderOptions.KindsysComposableEntrypoints, "kindsys-composable", nil, "Kindys composable kinds input schema.") // TODO: better usage text
 	cmd.Flags().StringArrayVar(&opts.LoaderOptions.KindsysCustomEntrypoints, "kindsys-custom", nil, "Kindys custom kinds input schema.")             // TODO: better usage text
 	cmd.Flags().StringArrayVar(&opts.LoaderOptions.JSONSchemaEntrypoints, "jsonschema", nil, "Jsonschema input schema.")                             // TODO: better usage text
+	cmd.Flags().StringArrayVar(&opts.LoaderOptions.OpenApiEntrypoints, "openapi", nil, "Openapi input schema.")                                      // TODO: better usage text
 
 	cmd.Flags().StringArrayVarP(&opts.LoaderOptions.CueImports, "include-cue-import", "I", nil, "Specify an additional library import directory. Format: [path]:[import]. Example: '../grafana/common-library:github.com/grafana/grafana/packages/grafana-schema/src/common")
 

diff --git a/cmd/cli/loaders/openapi.go b/cmd/cli/loaders/openapi.go
@@ -8,8 +8,8 @@ import (
 )
 
 func openapiLoader(opts Options) ([]*ast.File, error) {
-	allSchemas := make([]*ast.File, 0, len(opts.Entrypoints))
-	for _, entrypoint := range opts.Entrypoints {
+	allSchemas := make([]*ast.File, 0, len(opts.OpenApiEntrypoints))
+	for _, entrypoint := range opts.OpenApiEntrypoints {
 		pkg := filepath.Base(filepath.Dir(entrypoint))
 		schemaAst, err := openapi.GenerateAST(entrypoint, openapi.Config{
 			Package: pkg,

diff --git a/cmd/cli/loaders/options.go b/cmd/cli/loaders/options.go
@@ -15,6 +15,7 @@ const (
 	KindsysComposable LoaderRef = "kindsys-composable"
 	KindsysCustom     LoaderRef = "kindsys-custom"
 	JSONSchema        LoaderRef = "jsonschema"
+	OpenAPI           LoaderRef = "openapi"
 )
 
 func loadersMap() map[LoaderRef]Loader {
@@ -24,6 +25,7 @@ func loadersMap() map[LoaderRef]Loader {
 		KindsysComposable: kindsysCompopsableLoader,
 		KindsysCustom:     kindsysCustomLoader,
 		JSONSchema:        jsonschemaLoader,
+		OpenAPI:           openapiLoader,
 	}
 }
 
@@ -40,6 +42,7 @@ type Options struct {
 	KindsysComposableEntrypoints []string
 	KindsysCustomEntrypoints     []string
 	JSONSchemaEntrypoints        []string
+	OpenApiEntrypoints           []string
 
 	// Cue-specific options
 	CueImports []string