using aep-lib-go's generation logic

Author: toumorokoshi

cmd/root.go

@@ -22,8 +22,6 @@ import (
 
 	"github.com/ghodss/yaml"
 
-	"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"
@@ -52,22 +50,21 @@ func NewCommand() *cobra.Command {
 
 func ProcessInput(inputFile, outputFilePrefix string) error {
 	outputDir := filepath.Dir(outputFilePrefix)
-	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, &a)
+	a, err := deserializeAPI(ext, input)
 	if err != nil {
 		return fmt.Errorf("unable to unmarshal file: %w", err)
 	}
-	errors := validator.ValidateAPI(&a)
+	errors := validator.ValidateAPI(a)
 	if len(errors) > 0 {
 		return fmt.Errorf("error validating service: %v", errors)
 	}
-	proto, err := proto.APIToProtoString(&a, outputDir)
+	proto, err := proto.APIToProtoString(a, outputDir)
 	if err != nil {
 		return fmt.Errorf("error writing service proto: %w", err)
 	}
@@ -100,24 +97,27 @@ func ProcessInput(inputFile, outputFilePrefix string) error {
 	return nil
 }
 
-func unmarshal(ext string, b []byte, a *api.API) error {
+func deserializeAPI(ext string, b []byte) (*api.API, error) {
 	switch ext {
 	case ".yaml":
 		asJson, err := yaml.YAMLToJSON(b)
 		if err != nil {
-			return fmt.Errorf("unable to decode yaml to JSON %q: %w", string(b), err)
+			return nil, fmt.Errorf("unable to decode yaml to JSON %q: %w", string(b), err)
 		}
-		if err := json.Unmarshal(asJson, a); err != nil {
-			log.Fatal(fmt.Errorf("unable to decode proto %q: %w", string(b), err))
+		api, err := api.LoadAPIFromJson(asJson)
+		if err != nil {
+			log.Fatal(fmt.Errorf("unable to unmarshal json %q: %w", string(b), err))
 		}
+		return api, nil
 	case ".json":
-		if err := json.Unmarshal(b, a); err != nil {
-			return fmt.Errorf("unable to decode json %q: %w", string(b), err)
+		api, err := api.LoadAPIFromJson(b)
+		if err != nil {
+			log.Fatal(fmt.Errorf("unable to unmarshal json %q: %w", string(b), err))
 		}
+		return api, nil
 	default:
-		return fmt.Errorf("extension %v is unsupported", ext)
+		return nil, fmt.Errorf("extension %v is unsupported", ext)
 	}
-	return nil
 }
 
 func ReadFile(fileName string) ([]byte, error) {

example/bookstore/v1/bookstore.pb.go

@@ -69,8 +69,10 @@ service Bookstore {
     };
   }
 
-  // archive abook.
-  rpc archiveBook ( ArchiveBookRequest ) returns ( aep.api.Operation ) {
+  // archive a book.
+  rpc ArchiveBook ( ArchiveBookRequest ) returns ( aep.api.Operation ) {
+    option (aep.api.operation_info) = { response_type: "example.bookstore.v1.ArchiveBookResponse" };
+
     option (google.api.http) = {
       post: "/{path=publishers/*/books/*}:archive",
       body: "*"
@@ -179,7 +181,7 @@ service Bookstore {
 message Book {
   option (google.api.resource) = {
     type: "bookstore.example.com/book",
-    pattern: [ "publishers/{publisher}/books/{book}" ],
+    pattern: [ "" ],
     plural: "books",
     singular: "book"
   };
@@ -193,20 +195,20 @@ message Book {
     string lastName = 2;
   }
 
-  // Field for author.
-  repeated Author author = 5;
-
   // Field for isbn.
   repeated string isbn = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Field for price.
-  float price = 2 [(google.api.field_behavior) = REQUIRED];
+  int32 price = 2 [(google.api.field_behavior) = REQUIRED];
 
   // Field for published.
   bool published = 3 [(google.api.field_behavior) = REQUIRED];
 
   // Field for edition.
-  int32 edition = 4;
+  int32 edition = 4 [(google.api.field_behavior) = REQUIRED];
+
+  // Field for author.
+  repeated Author author = 5 [(google.api.field_behavior) = REQUIRED];
 
   // Field for path.
   string path = 10018;
@@ -216,9 +218,7 @@ message Book {
 message BookEdition {
   option (google.api.resource) = {
     type: "bookstore.example.com/book-edition",
-    pattern: [
-      "publishers/{publisher}/books/{book}/editions/{book-edition}"
-    ],
+    pattern: [ "" ],
     plural: "book-editions",
     singular: "book-edition"
   };
@@ -234,20 +234,17 @@ message BookEdition {
 message Isbn {
   option (google.api.resource) = {
     type: "bookstore.example.com/isbn",
-    pattern: [ "isbns/{isbn}" ],
+    pattern: [ "" ],
     plural: "isbns",
     singular: "isbn"
   };
-
-  // Field for path.
-  string path = 10018;
 }
 
 // A Publisher.
 message Publisher {
   option (google.api.resource) = {
     type: "bookstore.example.com/publisher",
-    pattern: [ "publishers/{publisher}" ],
+    pattern: [ "" ],
     plural: "publishers",
     singular: "publisher"
   };
@@ -305,9 +302,6 @@ message DeleteBookRequest {
     (google.api.field_behavior) = REQUIRED,
     (google.api.resource_reference) = { type: "bookstore.example.com/book" }
   ];
-
-  // If true, the resource will be deleted, even if children still exist.
-  bool force = 10020 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // Request message for the Listbook method
@@ -360,8 +354,6 @@ message ArchiveBookRequest {
 
 // Response message for the archive method
 message ArchiveBookResponse {
-  // Field for success.
-  bool success = 1;
 }
 
 // A Create request for a  book-edition resource.
@@ -372,9 +364,6 @@ message CreateBookEditionRequest {
     (google.api.resource_reference) = { }
   ];
 
-  // An id that uniquely identifies the resource within the collection
-  string id = 10014;
-
   // The resource to perform the operation on.
   BookEdition book_edition = 10015 [(google.api.field_behavior) = REQUIRED];
 }
@@ -429,9 +418,6 @@ message CreateIsbnRequest {
     (google.api.resource_reference) = { }
   ];
 
-  // An id that uniquely identifies the resource within the collection
-  string id = 10014;
-
   // The resource to perform the operation on.
   Isbn isbn = 10015 [(google.api.field_behavior) = REQUIRED];
 }
@@ -515,9 +501,6 @@ message DeletePublisherRequest {
     (google.api.field_behavior) = REQUIRED,
     (google.api.resource_reference) = { type: "bookstore.example.com/publisher" }
   ];
-
-  // If true, the resource will be deleted, even if children still exist.
-  bool force = 10020 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // Request message for the Listpublisher method