using aep-lib-go

now that proto generation has been properly upstreamed, we can leverage LROs
from the aep-lib-go instead. This vastly reduces the code in aepc.

Author: toumorokoshi

cmd/root.go

@@ -22,13 +22,12 @@ import (
 
 	"github.com/ghodss/yaml"
 
-	"github.com/aep-dev/aepc/loader"
-	"github.com/aep-dev/aepc/parser"
-	"github.com/aep-dev/aepc/schema"
+	"encoding/json"
+
+	"github.com/aep-dev/aep-lib-go/pkg/api"
+	"github.com/aep-dev/aep-lib-go/pkg/proto"
 	"github.com/aep-dev/aepc/validator"
-	"github.com/aep-dev/aepc/writer/proto"
 	"github.com/spf13/cobra"
-	"google.golang.org/protobuf/encoding/protojson"
 )
 
 func NewCommand() *cobra.Command {
@@ -53,26 +52,22 @@ func NewCommand() *cobra.Command {
 
 func ProcessInput(inputFile, outputFilePrefix string) error {
 	outputDir := filepath.Dir(outputFilePrefix)
-	s := &schema.Service{}
+	var a api.API
 	input, err := ReadFile(inputFile)
 	fmt.Printf("input: %s\n", string(input))
 	if err != nil {
 		return fmt.Errorf("unable to read file: %w", err)
 	}
 	ext := filepath.Ext(inputFile)
-	err = unmarshal(ext, input, s)
+	err = unmarshal(ext, input, &a)
 	if err != nil {
 		return fmt.Errorf("unable to unmarshal file: %w", err)
 	}
-	errors := validator.ValidateService(s)
+	errors := validator.ValidateAPI(&a)
 	if len(errors) > 0 {
 		return fmt.Errorf("error validating service: %v", errors)
 	}
-	api, err := parser.ToAPI(s)
-	if err != nil {
-		return fmt.Errorf("error building api: %w", err)
-	}
-	proto, err := proto.WriteServiceToProto(api, outputDir)
+	proto, err := proto.APIToProtoString(&a, outputDir)
 	if err != nil {
 		return fmt.Errorf("error writing service proto: %w", err)
 	}
@@ -82,7 +77,7 @@ func ProcessInput(inputFile, outputFilePrefix string) error {
 		return fmt.Errorf("error writing file: %w", err)
 	}
 	fmt.Printf("output proto file: %s\n", protoFile)
-	openapi, err := api.ConvertToOpenAPIBytes()
+	openapi, err := a.ConvertToOpenAPIBytes()
 	if err != nil {
 		return fmt.Errorf("error building openapi: %w", err)
 	}
@@ -105,22 +100,18 @@ func ProcessInput(inputFile, outputFilePrefix string) error {
 	return nil
 }
 
-func unmarshal(ext string, b []byte, s *schema.Service) error {
+func unmarshal(ext string, b []byte, a *api.API) error {
 	switch ext {
-	case ".proto":
-		if err := loader.ReadServiceFromProto(b, s); err != nil {
-			return fmt.Errorf("unable to decode proto %q: %w", string(b), err)
-		}
 	case ".yaml":
 		asJson, err := yaml.YAMLToJSON(b)
 		if err != nil {
 			return fmt.Errorf("unable to decode yaml to JSON %q: %w", string(b), err)
 		}
-		if err := protojson.Unmarshal(asJson, s); err != nil {
+		if err := json.Unmarshal(asJson, a); err != nil {
 			log.Fatal(fmt.Errorf("unable to decode proto %q: %w", string(b), err))
 		}
 	case ".json":
-		if err := protojson.Unmarshal(b, s); err != nil {
+		if err := json.Unmarshal(b, a); err != nil {
 			return fmt.Errorf("unable to decode json %q: %w", string(b), err)
 		}
 	default:

example/bookstore/v1/bookstore.yaml

@@ -8,10 +8,12 @@ resources:
   # example of a simple resource
   - kind: "publisher"
     plural: "publishers"
-    properties:
-      description:
-        type: STRING
-        number: 1
+    schema:
+      type: "object"
+      properties:
+        description:
+          type: string
+          x-aep-field-number: 1
     methods:
       create: {}
       read: {}
@@ -28,34 +30,33 @@ resources:
     # kind.
     parents:
       - "publisher"
-    properties:
-      isbn:
-        array_type:
-          type: STRING
-        number: 1
-        required: true
-      price:
-        type: FLOAT
-        number: 2
-        required: true
-      published:
-        type: BOOLEAN
-        number: 3
-        required: true
-      edition:
-        type: INT32
-        number: 4
-        required: false
-      author:
-        array_type:
-          object_type:
+    schema:
+      type: "object"
+      required: ["author", "isbn", "price", "published"]
+      properties:
+        isbn:
+          items:
+            type: string
+          x-aep-field-number: 1
+        price:
+          type: float
+          x-aep-field-number: 2
+        published:
+          type: boolean
+          x-aep-field-number: 3
+        edition:
+          type: integer
+          x-aep-field-number: 4
+        author:
+          x-aep-field-number: 5
+          items:
             properties:
               firstName:
-                type: STRING
-                number: 1
+                type: string
+                x-aep-field-number: 1
               lastName:
-                type: STRING
-                number: 2
+                type: string
+                x-aep-field-number: 2
     methods:
       create: {}
       read: {}
@@ -68,13 +69,14 @@ resources:
         - name: "archive"
           method_type: POST
           request:
-            object_type:
-              properties: {}
+            type: "object"
+            properties: {}
           response:
-            object_type:
-              properties:
-                success:
-                  type: BOOLEAN
+            type: "object"
+            properties:
+              success:
+                type: boolean
+                x-aep-field-number: 1
   # other example resources that might be interesting to add:
   # authors, which could be a reference for book
   # authors could have a reference to publishers too
@@ -86,22 +88,43 @@ resources:
     # kind.
     parents:
       - "book"
-    properties:
-      displayname:
-        type: STRING
-        number: 1
-        required: true
+    schema:
+      required: ["displayname"]
+      type: "object"
+      properties:
+        displayname:
+          x-aep-field-number: 1
+          type: string
     methods:
       create: {}
       read: {}
       list: {}
       delete: {}
   - kind: "isbn"
     plural: "isbns"
-    properties: {}
+    schema:
+      type: "object"
     methods:
       read: {}
       list: {}
       create: {}
       # blocked on https://github.com/aep-dev/api-linter/issues/97
       # non_client_settable_id: true
+  - kind: "operation"
+    plural: "operations"
+    schema:
+      x-aep-proto-message-name: "aep.api.Operation",
+      type: "object"
+      properties:
+        path:
+          type: string
+          x-aep-field-number: 1
+        metadata:
+          type: string
+          x-aep-field-number: 2
+        done:
+          type: boolean
+          x-aep-field-number: 3
+        response:
+          type: object
+          x-aep-field-number: 5

go.mod

@@ -5,9 +5,14 @@ go 1.23.0
 toolchain go1.23.6
 
 require (
+	buf.build/gen/go/aep/api/protocolbuffers/go v1.36.6-20250324194021-2fc44491c629.1
+	cloud.google.com/go/longrunning v0.6.6
+	github.com/aep-dev/aep-lib-go v0.0.0-20250422043410-eb3b92e38647
+	github.com/aep-dev/terraform-provider-aep v0.0.0-20241112052633-f48d45460768
+	github.com/google/cel-go v0.22.1
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0
-	github.com/jhump/protoreflect v1.17.0
+	github.com/mattn/go-sqlite3 v1.14.24
 	github.com/rs/cors v1.11.1
 	github.com/spf13/cobra v1.7.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb
@@ -16,32 +21,20 @@ require (
 )
 
 require (
-	buf.build/gen/go/aep/api/protocolbuffers/go v1.36.6-20250324194021-2fc44491c629.1 // indirect
 	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20240221180331-f05a6f4403ce.1 // indirect
 	cel.dev/expr v0.19.1 // indirect
-	cloud.google.com/go v0.118.3 // indirect
-	cloud.google.com/go/auth v0.15.0 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
-	cloud.google.com/go/compute/metadata v0.6.0 // indirect
-	cloud.google.com/go/longrunning v0.6.6 // indirect
 	github.com/DataDog/datadog-go v2.2.0+incompatible // indirect
 	github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
 	github.com/PuerkitoBio/purell v1.1.0 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/aep-dev/aep-lib-go v0.0.0-20250223051210-bfe8118a440e // indirect
-	github.com/aep-dev/terraform-provider-aep v0.0.0-20241112052633-f48d45460768 // indirect
 	github.com/agext/levenshtein v1.2.2 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
 	github.com/bufbuild/protocompile v0.14.1 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
-	github.com/cockscomb/cel2sql v0.0.0-20211204123659-c803dfd5c44c // indirect
 	github.com/dikhan/http_goclient v0.0.0-20181010015730-b9de9b5ee7b6 // indirect
 	github.com/fatih/color v1.16.0 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/analysis v0.0.0-20171215055114-2bbaa248df98 // indirect
 	github.com/go-openapi/errors v0.0.0-20170426151106-03cfca65330d // indirect
 	github.com/go-openapi/jsonpointer v0.17.0 // indirect
@@ -51,10 +44,6 @@ require (
 	github.com/go-openapi/strfmt v0.0.0-20171222154016-4dd3d302e100 // indirect
 	github.com/go-openapi/swag v0.17.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/cel-go v0.22.1 // indirect
-	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.5 // indirect
-	github.com/googleapis/gax-go/v2 v2.14.1 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -77,11 +66,11 @@ require (
 	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/iancoleman/strcase v0.3.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/jhump/protoreflect v1.17.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-sqlite3 v1.14.24 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
@@ -93,35 +82,26 @@ require (
 	github.com/rogpeppe/go-internal v1.13.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stoewer/go-strcase v1.2.0 // indirect
+	github.com/stretchr/testify v1.10.0 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/zclconf/go-cty v1.15.0 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
-	go.opentelemetry.io/otel v1.34.0 // indirect
-	go.opentelemetry.io/otel/metric v1.34.0 // indirect
-	go.opentelemetry.io/otel/trace v1.34.0 // indirect
 	golang.org/x/crypto v0.36.0 // indirect
 	golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
 	golang.org/x/mod v0.21.0 // indirect
 	golang.org/x/net v0.37.0 // indirect
-	golang.org/x/oauth2 v0.27.0 // indirect
 	golang.org/x/sync v0.12.0 // indirect
-	golang.org/x/time v0.10.0 // indirect
 	golang.org/x/tools v0.26.0 // indirect
-	google.golang.org/api v0.224.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
 	gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
 require (
 	github.com/ghodss/yaml v1.0.0
-	github.com/google/go-cmp v0.7.0
+	github.com/google/go-cmp v0.7.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/text v0.23.0
+	golang.org/x/text v0.23.0 // indirect
 )