From b6aa35028fbb2591883b2c1056a1e45f71ff444e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Gomez?= Date: Fri, 6 Oct 2023 00:11:34 +0200 Subject: [PATCH] Update OpenAPI-related files --- cmd/cli/loaders/openapi.go | 4 ++-- internal/openapi/generator.go | 8 ++++---- internal/openapi/generator_test.go | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/cli/loaders/openapi.go b/cmd/cli/loaders/openapi.go index 2860d8dd1..64ab39037 100644 --- a/cmd/cli/loaders/openapi.go +++ b/cmd/cli/loaders/openapi.go @@ -7,8 +7,8 @@ import ( "github.com/grafana/cog/internal/openapi" ) -func openapiLoader(opts Options) ([]*ast.File, error) { - allSchemas := make([]*ast.File, 0, len(opts.OpenAPIEntrypoints)) +func openapiLoader(opts Options) ([]*ast.Schema, error) { + allSchemas := make([]*ast.Schema, 0, len(opts.OpenAPIEntrypoints)) for _, entrypoint := range opts.OpenAPIEntrypoints { pkg := filepath.Base(filepath.Dir(entrypoint)) schemaAst, err := openapi.GenerateAST(entrypoint, openapi.Config{ diff --git a/internal/openapi/generator.go b/internal/openapi/generator.go index eeef145ea..07ee69cff 100644 --- a/internal/openapi/generator.go +++ b/internal/openapi/generator.go @@ -27,10 +27,10 @@ type Config struct { } type generator struct { - file *ast.File + file *ast.Schema } -func GenerateAST(filePath string, cfg Config) (*ast.File, error) { +func GenerateAST(filePath string, cfg Config) (*ast.Schema, error) { loader := openapi3.NewLoader() oapi, err := loader.LoadFromFile(filePath) if err != nil { @@ -42,7 +42,7 @@ func GenerateAST(filePath string, cfg Config) (*ast.File, error) { } g := &generator{ - file: &ast.File{Package: cfg.Package}, + file: &ast.Schema{Package: cfg.Package}, } if oapi.Components == nil { @@ -63,7 +63,7 @@ func (g *generator) declareDefinition(schemas openapi3.Schemas) error { return err } - g.file.Definitions = append(g.file.Definitions, ast.Object{ + g.file.Objects = append(g.file.Objects, ast.Object{ Name: name, Comments: schemaComments(schemaRef.Value), Type: def, diff --git a/internal/openapi/generator_test.go b/internal/openapi/generator_test.go index d420e09bf..904965708 100644 --- a/internal/openapi/generator_test.go +++ b/internal/openapi/generator_test.go @@ -14,9 +14,9 @@ func TestDataTypes(t *testing.T) { f, err := GenerateAST(testFolder+"datatypes.json", Config{Package: "datatypes"}) require.NoError(t, err) - require.Len(t, f.Definitions, 1) + require.Len(t, f.Objects, 1) - def := f.Definitions[0] + def := f.Objects[0] assert.Equal(t, def.Name, "DataTypes") assert.Equal(t, def.Type.Kind, ast.KindStruct) @@ -74,9 +74,9 @@ func TestEnums(t *testing.T) { f, err := GenerateAST(testFolder+"enums.json", Config{Package: "enums"}) require.NoError(t, err) - require.Len(t, f.Definitions, 1) + require.Len(t, f.Objects, 1) - def := f.Definitions[0] + def := f.Objects[0] assert.Equal(t, def.Name, "Enums") assert.Equal(t, def.Type.Kind, ast.KindStruct) @@ -145,7 +145,7 @@ func TestArrays(t *testing.T) { f, err := GenerateAST(testFolder+"arrays.json", Config{Package: "arrays"}) require.NoError(t, err) - require.Len(t, f.Definitions, 2) + require.Len(t, f.Objects, 2) def := f.LocateDefinition("Arrays") assert.Equal(t, def.Type.Kind, ast.KindStruct) @@ -183,7 +183,7 @@ func TestRefs(t *testing.T) { f, err := GenerateAST(testFolder+"refs.json", Config{Package: "refs"}) require.NoError(t, err) - require.Len(t, f.Definitions, 2) + require.Len(t, f.Objects, 2) def := f.LocateDefinition("Refs") assert.Equal(t, def.Type.Kind, ast.KindStruct)