Go install bug fix (#117)

* TLS for grpc service

Signed-off-by: James-Milligan <[email protected]>

* buf remote generation

Signed-off-by: James-Milligan <[email protected]>

* removed main schemas directory

Signed-off-by: James-Milligan <[email protected]>

* import flagd-definitions from temporary replace module

Signed-off-by: James-Milligan <[email protected]>

* temporary replaced submodule

Signed-off-by: James-Milligan <[email protected]>

* removed temporary files and replaced with new flagd-definitions import

Signed-off-by: James-Milligan <[email protected]>

* removed embed import, updated github actions

Signed-off-by: James-Milligan <[email protected]>

Author: james-milligan

.github/workflows/build.yaml

@@ -23,10 +23,6 @@ jobs:
         uses: actions/setup-go@v1
         with:
           go-version: '1.18.1'
-      - uses: bufbuild/[email protected]
-        with:
-          version: '1.1.1'
-      - run: make generate
       - run: make lint
 
   test:
@@ -41,10 +37,6 @@ jobs:
         uses: actions/setup-go@v1
         with:
           go-version: '1.18.1' 
-      - uses: bufbuild/[email protected]
-        with:
-          version: '1.1.1'
-      - run: make generate
       - run: make test
 
   docker-local:

.github/workflows/release.yaml

@@ -63,11 +63,6 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: "1.18.1"
-
-      - uses: bufbuild/[email protected]
-        with:
-          version: "1.1.1"
-      - run: make generate
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v3
         with:

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "schemas"]
-	path = schemas
-	url = https://github.com/open-feature/schemas
-	branch = main

Dockerfile

@@ -10,24 +10,12 @@ COPY go.sum go.sum
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download
-# install buf and protoc binaries
-RUN go install github.com/bufbuild/buf/cmd/buf@latest
-RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
-RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
-RUN go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@latest
-RUN go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@latest
 
 # Copy the go source
 COPY main.go main.go
 COPY cmd/ cmd/
 COPY pkg/ pkg/
-COPY schemas/ schemas/
 
-# Copy the code generation configs
-COPY schemas/protobuf schemas/protobuf
-COPY schemas/json/flagd-definitions.json pkg/eval/flagd-definitions.json
-# Generate http/grpc stubs
-RUN cd schemas/protobuf && ${GOPATH}/bin/buf generate --template buf.gen.go-server.yaml && cd ../..
 # Build
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -a -o flagd main.go
 

Makefile

@@ -6,20 +6,15 @@ guard-%:
         echo "Environment variable $* not set"; \
         exit 1; \
     fi
-generate:
-	git submodule update --init --recursive
-	cp schemas/json/flagd-definitions.json pkg/eval/flagd-definitions.json
-	go install github.com/bufbuild/buf/cmd/buf@latest
-	cd schemas/protobuf && buf generate --template buf.gen.go-server.yaml
-docker-build: generate
+docker-build:
 	docker buildx build --platform="linux/ppc64le,linux/s390x,linux/amd64,linux/arm64" -t ${IMG} .
-docker-push: generate
+docker-push:
 	docker buildx build --push --platform="linux/ppc64le,linux/s390x,linux/amd64,linux/arm64" -t ${IMG} .
-build: generate
+build:
 	go build -o flagd
-test: generate
+test:
 	go test -cover ./...
-run: generate
+run:
 	go run main.go start -f config/samples/example_flags.json
 install:
 	cp systemd/flagd.service /etc/systemd/system/flagd.service

go.mod

@@ -7,18 +7,19 @@ require (
 	github.com/diegoholiveira/jsonlogic/v3 v3.2.3
 	github.com/fsnotify/fsnotify v1.5.4
 	github.com/go-chi/chi/v5 v5.0.7
-	github.com/golang/mock v1.4.4
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.3
+	github.com/golang/mock v1.6.0
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.1
+	github.com/open-feature/schemas v0.0.0-20220809125026-ba7ea0aa4841
 	github.com/robfig/cron v1.2.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/soheilhy/cmux v0.1.5
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/viper v1.11.0
 	github.com/stretchr/testify v1.7.4
 	github.com/xeipuuv/gojsonschema v1.2.0
-	google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad
-	google.golang.org/grpc v1.47.0
-	google.golang.org/protobuf v1.28.0
+	go.buf.build/open-feature/flagd-server/open-feature/flagd v1.1.2
+	google.golang.org/grpc v1.48.0
+	google.golang.org/protobuf v1.28.1
 )
 
 require gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -43,9 +44,10 @@ require (
 	github.com/subosito/gotenv v1.2.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect
+	golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect
 	golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect
 	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/genproto v0.0.0-20220728213248-dd149ef739b9 // indirect
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )