summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--golang/README.md10
-rw-r--r--golang/cmd/fatcatd/main.go (renamed from golang/cmd/fatcat-server/main.go)15
2 files changed, 16 insertions, 9 deletions
diff --git a/golang/README.md b/golang/README.md
index c0e3da5e..729cfd5d 100644
--- a/golang/README.md
+++ b/golang/README.md
@@ -24,6 +24,10 @@ On debian/ubuntu:
createdb -O `whoami` fatcat
psql fatcat -f fatcat-schema.sql
+Build with:
+
+ go build ./cmd/*/
+
## Simplifications
In early development, we'll make at least the following simplifications:
@@ -43,4 +47,10 @@ Install the go-swagger tool:
go get -u github.com/go-swagger/go-swagger/cmd/swagger
+"Simple" server:
+
swagger generate server -A Fatcat -f fatcat-openapi2.yml
+
+"Custom" server:
+
+ swagger generate server -A fatcat -f ./fatcat-openapi2.yml --exclude-main
diff --git a/golang/cmd/fatcat-server/main.go b/golang/cmd/fatcatd/main.go
index 181581c1..94455bf8 100644
--- a/golang/cmd/fatcat-server/main.go
+++ b/golang/cmd/fatcatd/main.go
@@ -1,4 +1,3 @@
-// Code generated by go-swagger; DO NOT EDIT.
package main
@@ -13,16 +12,15 @@ import (
"git.archive.org/bnewbold/fatcat/golang/restapi/operations"
)
-// This file was generated by the swagger tool.
-// Make sure not to overwrite this file after you generated it because all your edits would be lost!
-
func main() {
- swaggerSpec, err := loads.Embedded(restapi.SwaggerJSON, restapi.FlatSwaggerJSON)
- if err != nil {
- log.Fatalln(err)
- }
+ // load embedded swagger file
+ swaggerSpec, err := loads.Analyzed(restapi.SwaggerJSON, "")
+ if err != nil {
+ log.Fatalln(err)
+ }
+ // create new service API
api := operations.NewFatcatAPI(swaggerSpec)
server := restapi.NewServer(api)
defer server.Shutdown()
@@ -30,7 +28,6 @@ func main() {
parser := flags.NewParser(server, flags.Default)
parser.ShortDescription = "fatcat"
parser.LongDescription = "A scalable, versioned, API-oriented catalog of bibliographic entities and file metadata"
-
server.ConfigureFlags()
for _, optsGroup := range api.CommandLineOptionsGroups {
_, err := parser.AddGroup(optsGroup.ShortDescription, optsGroup.LongDescription, optsGroup.Options)