Skip to content

Commit d35c405

Browse files
mahendraintelopsmahendraintelops
committed
fix: issues in Dockerfile and added install command for protoc
1 parent 272949f commit d35c405

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+3896
-1876
lines changed

‎.github/workflows/core-ci.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,18 @@ jobs:
3737
cd core
3838
golangci-lint run
3939
cd ..
40+
- name: Install Protoc
41+
uses: arduino/setup-protoc@v2
42+
with:
43+
version: "23.x"
4044
- name: Test
4145
run: |
4246
cd core
47+
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
48+
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
49+
export GOPATH=$HOME/go
50+
export GOBIN=$GOPATH/bin
51+
export PATH=$PATH:$GOROOT:$GOBIN
4352
go test -v ./... -race -coverprofile=coverage.out -coverpkg=./... -covermode=atomic
4453
cd ..
4554
- name: Upload coverage to Codecov

‎core/.dockerignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.dockerignore
2+
**/*.log
3+
Dockerfile
4+
.git
5+
.gitignore

‎core/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflag
1818
CMD ["go", "run", "main.go"]
1919

2020
################ Production ################
21-
FROM openjdk:8-jdk-alpine3.9
21+
FROM alpine:3.18.2
2222
# Create project directory (workdir)
2323
WORKDIR /app
2424

25+
RUN apk update && apk add protoc && apk add openjdk8
2526
RUN apk update && apk add bash && apk add curl && apk add jq && apk add --update go \
2627
&& curl https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/bin/utils/openapi-generator-cli.sh \
2728
> /app/openapi-generator-cli \

‎core/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ require (
88
github.com/sirupsen/logrus v1.9.0
99
golang.org/x/exp v0.0.0-20230321023759-10a507213a29
1010
golang.org/x/text v0.9.0
11-
google.golang.org/grpc v1.53.0
12-
google.golang.org/protobuf v1.28.1
11+
google.golang.org/grpc v1.56.0
12+
google.golang.org/protobuf v1.30.0
1313
)
1414

1515
require (
16-
github.com/golang/protobuf v1.5.2 // indirect
16+
github.com/golang/protobuf v1.5.3 // indirect
1717
github.com/stretchr/testify v1.8.1 // indirect
1818
golang.org/x/net v0.9.0 // indirect
1919
golang.org/x/sys v0.7.0 // indirect
20-
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
20+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
2121
)

‎core/go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
44
github.com/gertd/go-pluralize v0.2.1 h1:M3uASbVjMnTsPb0PNqg+E/24Vwigyo/tvyMTtAlLgiA=
55
github.com/gertd/go-pluralize v0.2.1/go.mod h1:rbYaKDbsXxmRfr8uygAEKhOWsjyrrqrkHVpZvoOp8zk=
66
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
7-
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
8-
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
7+
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
8+
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
99
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
1010
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
1111
github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0=
@@ -32,14 +32,14 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3232
golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
3333
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
3434
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
35-
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w=
36-
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
37-
google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc=
38-
google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
35+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
36+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
37+
google.golang.org/grpc v1.56.0 h1:+y7Bs8rtMd07LeXmL3NxcTLn7mUkbKZqEpPhMNkwJEE=
38+
google.golang.org/grpc v1.56.0/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
3939
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
4040
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
41-
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
42-
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
41+
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
42+
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
4343
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
4444
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
4545
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎core/internal/languages/golang/make-proto-runner.go‎

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,44 @@
11
package golang
22

33
import (
4+
"bytes"
5+
"fmt"
46
log "github.com/sirupsen/logrus"
57
"os/exec"
68
)
79

810
// RunMakeProto runs protoc with args passed on generated code present in the directory passed.
911
func RunMakeProto(directoryName string) error {
10-
args := []string{"proto"}
11-
command := exec.Command("make", args...)
12-
command.Dir = directoryName
13-
14-
if err := command.Run(); err != nil {
15-
log.Debugf("err : %s", err)
16-
return err
12+
protocCommand := "protoc"
13+
makeCommand := "make"
14+
makeSubCommand := "proto"
15+
if commandExists(protocCommand) {
16+
if commandExists(makeCommand) {
17+
args := []string{makeSubCommand}
18+
command := exec.Command(makeCommand, args...)
19+
command.Dir = directoryName
20+
var stdErr bytes.Buffer
21+
command.Stderr = &stdErr
22+
var stdOut bytes.Buffer
23+
command.Stdout = &stdOut
24+
if err := command.Run(); err != nil {
25+
log.Debugf("err : %s", err)
26+
log.Debugf("stdOut: %s\n", stdOut.String())
27+
log.Debugf("stdErr: %s\n", stdErr.String())
28+
return err
29+
}
30+
log.Debugf("stdOut: %s\n", stdOut.String())
31+
log.Debugf("stdErr: %s\n", stdErr.String())
32+
return nil
33+
} else {
34+
return fmt.Errorf("%s command doesn't exist", makeCommand)
35+
}
1736
}
18-
return nil
37+
return fmt.Errorf("%s command doesn't exist", protocCommand)
38+
}
39+
40+
// as util
41+
func commandExists(cmd string) bool {
42+
_, err := exec.LookPath(cmd)
43+
return err == nil
1944
}

‎core/templates/compage-template-go‎

‎core/vendor/github.com/golang/protobuf/jsonpb/decode.go‎

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core/vendor/google.golang.org/grpc/CONTRIBUTING.md‎

Lines changed: 19 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core/vendor/google.golang.org/grpc/attributes/attributes.go‎

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)