Merge pull request #215 from infobloxopen/khous/remove-gogo

remove gogo

.github/workflows/test-gorm.yml

@@ -0,0 +1,13 @@
+name: Go
+
+on: [push]
+  #   branches: [ main ]
+  # pull_request:
+  #   branches: [ main ]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Unit Tests
+      run: make test

Makefile

@@ -16,11 +16,19 @@ build: $(BUF)
 test: lint build
 	go test -v ./...
 
+clean:
+	@echo "WARNING: this kills test, override and custom files, fixme"
+# rm -rf example/feature_demo/feature_demo example/user/user example/postgres_arrays/postgres_arrays example/**/*.go example/**/github.com example/github.com || true
+
+regenerate: clean generate
+
 generate: options/gorm.pb.go example/user/*.pb.go example/postgres_arrays/*.pb.go example/feature_demo/*.pb.go
 
 options/gorm.pb.go: proto/options/gorm.proto
 	buf generate --template proto/options/buf.gen.yaml --path proto/options
 
+options/types.pb.go: proto/types/types.proto
+	buf generate --template proto/types/buf.gen.yaml --path proto/types
 # TODO: gorm files are not being built by buf generate yet, use docker for now
 
 example/feature_demo/*.pb.go: example/feature_demo/*.proto

buf.yaml

@@ -16,7 +16,6 @@ lint:
     - protoc-gen-openapiv2
     - github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options/openapiv2.proto
     - google
-    - github.com/gogo
   ignore_only:
     PACKAGE_DIRECTORY_MATCH:
     - options

example/feature_demo/buf.gen.yaml

@@ -11,5 +11,5 @@ plugins:
   - name: gorm
     out: example
     opt:
-      - engine=postgres,enums=string,gateway
+      - engine=postgres,enums=string,gateway:./example/feature_demo
       - Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp

example/feature_demo/demo_service_test.go

@@ -24,4 +24,4 @@ func TestMultipleCrud(t *testing.T) {
 			}
 		}
 	})
-}
+}

example/feature_demo/demo_types_gorm.custom.go

@@ -24,4 +24,4 @@ func (orm *TypeWithIDORM) AfterToPB(ctx context.Context, pb *TypeWithID) error {
 	pb.MultiaccountTypeIds = ids
 
 	return nil
-}
+}

example/feature_demo/demo_types_test.go

@@ -108,4 +108,4 @@ func TestTypeWithIDORM_ToPB(t *testing.T) {
 			}
 		}
 	})
-}
+}