diff --git a/.github/images/workflow.drawio b/.github/images/workflow.drawio new file mode 100644 index 0000000..5dae626 --- /dev/null +++ b/.github/images/workflow.drawio @@ -0,0 +1 @@ +7Vpdc9o4FP01PJKxZWzgMYRkdzvZ3U7pTNt92ZHta1utbHkkOUB//UpYBoyAZGdMnCZ5wjr6Pufq3isNA+8mX/3GcZn9yWKgA+TEq4E3HyDkjlCgfjSyrpGJ49dAyklsGu2ABfkJBnQMWpEYRKuhZIxKUrbBiBUFRLKFYc7Zst0sYbQ9a4lTsIBFhKmNfiGxzAzqBtNdxe9A0sxMPUHjuiLHTWOzE5HhmC33IO924N1wxmT9la9ugGryGl7qfncnarcL41DIp3T4MFysq08f1cqInA+X/8w+Z9OhEUPIdbNhiNX+TZFxmbGUFZje7tAZZ1URgx7VUaVdm3vGSgW6CvwOUq6NmLiSTEGZzKmpVQvm66+m/6bwTReu/KY4X+1XztemVK9VL/AkBQYSrOIRnNl3Y0qYpyDPtENboZSFA8tBrUf140CxJA/tdWBjaum23U4N9WEE+R/iBO/inBVn1Kc443dxzorj9SmO28vR6YFl1++V5nrcB0wrM1MGmMpsiEtiCdCmd5kRCYsSb1hYqtyhTWVCKL1hlPFNXy9JEhRFCheSsx+wVxMHYeAHW/IfgEtYnaffZst08KYmHJpcBY1MkF/uRf4mnGf7Qd+5EMHIIjjM+TDlZTQUwB+IYq9LmmMMk+QozUE0gTDphmb/gGYX9U3z9I36cu+JXmbSq5NB7+qcjwFOr/KM3uU5L0+vmZBnRRAOEctzKGI1OyvEa4smXtB3NBlZlJM8em00958bTSyaS84kkF/fpCfeS+O6eY3bIzvCau8EXh3Z/fsP1/bZSyzhl8/7D5keTXpn2reY/gtLMVwojoFbFIsMl/qT5JtH45lmg6hzcI9DoB+ZIDqgqvqQScly1YDqihmOfqQbdRpeY0hwReXeCNeUpLqn1OnPDIuyfspOyEorOttMeN2gToOo70xK/RB+rXlAdzEWWcgwj69EgcuI40ReEaYq1NLg3xxiglUBl2XziRzN952jLO6u0DsnESuGkV7nVVmk3eg+arxHo/uREzY9Ivv0YrKP7dBRhZSIzJJc7Vq2jw42UkVq98pGbA1zEsd1kguC/MThZiitWclIITd78WcDf67HUnmtqFNc1zp9BSvg4KgaSIU5bExt6nSkkX/gBY+czeCIRt7FNOrlTj7o8AXP5Ccv/AkP9XK77oPnUyfgma7JdrqqLmA4xAKGQjIOFwns4MY+jI8F9mkw9nBH76aHdwPf7zuwIztfFVUoIk5Cm+AX6eO7kMV9PN8aP6dPb7awp8rJHCtaU6LMnnuP23xYH5D7cAtsM66/K6mG2XJvZPA7ymeDNr+B+7SYeTmrty8OfxTKrcg3Y/LjA08UHPFE/rOafC9/sOgwvKLRU9OYXrMY+83tpGfBkdRW95hX6cAa0YEDRkescXTEGoOLWWNg0fTpdvH5zbgHNHlckI5uOaq4+2vXpm7vD3Le7X8= \ No newline at end of file diff --git a/.github/images/workflow.png b/.github/images/workflow.png index 4ebce45..1f86db7 100644 Binary files a/.github/images/workflow.png and b/.github/images/workflow.png differ diff --git a/.github/workflows/database-store-service.yml b/.github/workflows/database-store-service.yml new file mode 100644 index 0000000..b006661 --- /dev/null +++ b/.github/workflows/database-store-service.yml @@ -0,0 +1,82 @@ +name: 'database-store-service ci' +on: + push: + pull_request: + types: [ opened, reopened ] +jobs: + unit-test: + strategy: + matrix: + go-version: [1.17.x] + platform: [ubuntu-latest] + runs-on: ${{ matrix.platform }} + steps: + + - uses: actions/setup-go@v1 + with: + go-version: ${{ matrix.go-version }} + + - name: setup GOPATH into PATH + run: | + echo "::set-env name=GOPATH::$(go env GOPATH)" + echo "::add-path::$(go env GOPATH)/bin" + shell: bash + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true + + - uses: actions/checkout@v2 + + - name: Run's Golint + working-directory: database-store-service + run: | + export PATH=$PATH:$(go env GOPATH)/bin + go get -u golang.org/x/lint/golint + # golint -set_exit_status ./... + + - name: Install dependencies + working-directory: database-store-service + run: go get -u + + - name: Test + working-directory: database-store-service + run: go test -v + + build-docker-artifacts: + needs: [ unit-test ] + runs-on: ubuntu-latest + if: contains(github.ref, 'main') + steps: + - uses: actions/setup-go@v1 + with: + go-version: '1.17.x' + + - uses: actions/checkout@v1 + + - name: Docker Build + working-directory: database-store-service + run: docker build -t database-store-service:latest . + + - name: Docker Tag Latest + working-directory: database-store-service + run: docker tag database-store-service:latest fidelissauro/database-store-service:latest + + - name: Docker Tag Release + run: | + TAG=$(git describe --tags --abbrev=0) + docker tag database-store-service:latest fidelissauro/database-store-service:$TAG + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD}} + + - name: Docker Push Latest + working-directory: database-store-service + run: docker push fidelissauro/database-store-service:latest + + - name: Docker Push Release Tag + working-directory: database-store-service + run: | + TAG=$(git describe --tags --abbrev=0) + docker push fidelissauro/database-store-service:$TAG + \ No newline at end of file diff --git a/.gitignore b/.gitignore index 21300a0..81a9709 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ tmp/* tmp # Dependency directories (remove the comment below to include it) # vendor/ +.tmp/* +.tmp \ No newline at end of file diff --git a/database-store-service/Dockerfile b/database-store-service/Dockerfile new file mode 100644 index 0000000..5dae279 --- /dev/null +++ b/database-store-service/Dockerfile @@ -0,0 +1,21 @@ +FROM golang:1.17 AS builder + +WORKDIR $GOPATH/src/database-store-service + +COPY . ./ + +RUN go get -u github.com/swaggo/swag/cmd/swag@v1.6.7 +RUN swag init + +RUN go get -u +RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o main . + + +FROM alpine:3.12.3 + +COPY --from=builder /go/src/database-store-service/main ./ +COPY --from=builder /go/src/database-store-service/configs ./configs + +EXPOSE 8080 + +ENTRYPOINT ["./main"] diff --git a/database-store-service/Dockerfile.dev b/database-store-service/Dockerfile.dev new file mode 100644 index 0000000..f41d4c3 --- /dev/null +++ b/database-store-service/Dockerfile.dev @@ -0,0 +1,12 @@ +FROM golang:1.17 AS builder + +WORKDIR $GOPATH/src/database-store-service + +COPY . ./ + +RUN pwd; ls -lha + +# Install Air +RUN go get -u github.com/cosmtrek/air@v1.28 + +CMD ["air"] diff --git a/database-store-service/configs/.gitkeep b/database-store-service/configs/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/database-store-service/go.mod b/database-store-service/go.mod new file mode 100644 index 0000000..ccefabb --- /dev/null +++ b/database-store-service/go.mod @@ -0,0 +1,16 @@ +module database-store-service + +go 1.17 + +require ( + github.com/gogo/protobuf v1.3.2 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/nats-io/nats.go v1.16.0 // indirect + github.com/nats-io/nkeys v0.3.0 // indirect + github.com/nats-io/nuid v1.0.1 // indirect + github.com/nats-io/stan.go v0.10.3 // indirect + github.com/rs/zerolog v1.28.0 // indirect + golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect + golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect +) diff --git a/database-store-service/go.sum b/database-store-service/go.sum new file mode 100644 index 0000000..85a2845 --- /dev/null +++ b/database-store-service/go.sum @@ -0,0 +1,63 @@ +github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/nats-io/nats.go v1.16.0 h1:zvLE7fGBQYW6MWaFaRdsgm9qT39PJDQoju+DS8KsO1g= +github.com/nats-io/nats.go v1.16.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= +github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= +github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= +github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/nats-io/stan.go v0.10.3 h1:8DOyQJ0+nza3zSVJZ19/cpikkrWA4rSKB3YvckIGOTI= +github.com/nats-io/stan.go v0.10.3/go.mod h1:Cgf5zk6kKpOCqqUIJeuBz6ZDz9osT791VhS6m28sSQQ= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY= +github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b h1:wSOdpTq0/eI46Ez/LkDwIsAKA71YP2SRKBODiRWM0as= +golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/database-store-service/main.go b/database-store-service/main.go new file mode 100644 index 0000000..9cf378a --- /dev/null +++ b/database-store-service/main.go @@ -0,0 +1,57 @@ +package main + +import ( + "database-store-service/pkg/logger" + "fmt" + "sync" + + "github.com/nats-io/nats.go" +) + +func main() { + log := logger.Instance() + log.Info().Msg("Hello World") + + wg := sync.WaitGroup{} + wg.Add(10) + + // Nats Client + nc, err := nats.Connect("nats://nats-1:4222,nats://nats-2:4222") + defer nc.Close() + + if err != nil { + log.Error(). + Str("Error", err.Error()). + Msg("Error to connect to Nats") + } + + // Create JetStream Context + js, err := nc.JetStream() + + _, err = js.AddStream(&nats.StreamConfig{ + Name: "orders", + Subjects: []string{"ORDERS.*"}, + }) + + if err != nil { + log.Error(). + Str("Error", err.Error()). + Msg("Failed to add Stream") + } + + if err != nil { + log.Error(). + Str("Error", err.Error()). + Msg("Failed to add a durable consumer") + } + + js.QueueSubscribe("ORDERS.*", "store", func(m *nats.Msg) { + log.Info(). + Msg(fmt.Sprintf("Received a person: %+v\n", string(m.Data))) + m.Ack() + }, nats.ManualAck()) + + // Wait for a message to come in + wg.Wait() + +} diff --git a/database-store-service/pkg/logger/main.go b/database-store-service/pkg/logger/main.go new file mode 100644 index 0000000..729b948 --- /dev/null +++ b/database-store-service/pkg/logger/main.go @@ -0,0 +1,13 @@ +package logger + +import ( + "os" + + "github.com/rs/zerolog" +) + +func Instance() zerolog.Logger { + zerolog.TimeFieldFormat = zerolog.TimeFormatUnix + logger := zerolog.New(os.Stderr).With().Timestamp().Logger() + return logger +} diff --git a/docker-compose.yml b/docker-compose.yml index 8a8d174..425a799 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,29 @@ services: - "14268:14268" networks: - health + + nats-1: + image: nats:alpine + volumes: + - ./nats/nats-server-1.conf:/etc/nats/nats-server.conf + - .tmp/nats/data/jetstream/1:/data/jetstream + ports: + - "4223:4222" + - "8223:8222" + networks: + - health + + nats-2: + image: nats:alpine + volumes: + - ./nats/nats-server-2.conf:/etc/nats/nats-server.conf + - .tmp/nats/data/jetstream/2:/data/jetstream + ports: + - "4224:4222" + - "8224:8222" + networks: + - health + health-api: build: context: ./health-api @@ -18,12 +41,17 @@ services: - IMC_SERVICE_ENDPOINT=imc-grpc:30000 - RECOMMENDATIONS_SERVICE_ENDPOINT=recommendations-grpc:30000 - JAEGER_COLLECTOR_ENDPOINT=http://jaeger:14268/api/traces + - NATS_URI=nats://nats-1:4222,nats://nats-2:4222 ports: - 8080:8080 volumes: - ./health-api:/go/src/health-api networks: - health + depends_on: + - nats-1 + - nats-2 + bmr-grpc: build: context: ./bmr-grpc-service @@ -50,6 +78,7 @@ services: - ./imc-grpc-service:/go/src/imc-grpc-service networks: - health + recommendations-grpc: build: context: ./recommendations-grpc-service @@ -66,6 +95,7 @@ services: - ./recommendations-grpc-service:/go/src/recommendations-grpc-service networks: - health + proteins-grpc: build: context: ./proteins-grpc-service @@ -79,6 +109,7 @@ services: - ./proteins-grpc-service:/go/src/proteins-grpc-service networks: - health + water-grpc: build: context: ./water-grpc-service @@ -92,6 +123,7 @@ services: - ./water-grpc-service:/go/src/water-grpc-service networks: - health + calories-grpc: build: context: ./calories-grpc-service @@ -105,5 +137,23 @@ services: - ./calories-grpc-service:/go/src/calories-grpc-service networks: - health + + database-store-service: + build: + context: ./database-store-service + dockerfile: Dockerfile.dev + environment: + - ENVIRONMENT=dev + - JAEGER_COLLECTOR_ENDPOINT=http://jaeger:14268/api/traces + - NATS_URI=nats://nats-1:4222,nats://nats-2:4222 + volumes: + - ./database-store-service:/go/src/database-store-service + networks: + - health + depends_on: + - health-api + - nats-1 + - nats-2 + networks: health: \ No newline at end of file diff --git a/health-api/controllers/calculator/main.go b/health-api/controllers/calculator/main.go index 92c967f..841dbca 100644 --- a/health-api/controllers/calculator/main.go +++ b/health-api/controllers/calculator/main.go @@ -1,6 +1,7 @@ package calculator import ( + "encoding/json" "net/http" "github.com/gin-gonic/gin" @@ -11,7 +12,10 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/trace" + guuid "github.com/google/uuid" "go.opentelemetry.io/otel/attribute" + + "github.com/nats-io/nats.go" ) type Request struct { @@ -23,7 +27,8 @@ type Request struct { } type Response struct { - Status int `json:"status" binding:"required"` + Id string `json:"id" binding:"required"` + Status int `json:"status" binding:"required"` Imc struct { Result float64 `json:"result"` Class string `json:"class"` @@ -106,6 +111,10 @@ func Post(c *gin.Context) { ctxBMR, spanBMR := tr.Start(c.Request.Context(), "BMR Service Call") defer spanBMR.End() + log.Info(). + Str("Service", "bmr"). + Msg("Creating remote connection with gRPC Endpoint for BMR Service") + spanBMR.SetAttributes( attribute.String("Service", "BMR"), ) @@ -162,6 +171,10 @@ func Post(c *gin.Context) { ctxRecommendations, spanRecommendations := tr.Start(c.Request.Context(), "Recommendations Service Call") defer spanRecommendations.End() + log.Info(). + Str("Service", "recommendations"). + Msg("Creating remote connection with gRPC Endpoint for IMC Service") + resRecommendations, err := recommendations.Call(ctxRecommendations, request.Weight, request.Height, resBMR.Necessity, tr) if err != nil { @@ -189,6 +202,14 @@ func Post(c *gin.Context) { ) _, spanResponse := tr.Start(c.Request.Context(), "HTTP Response") + defer spanResponse.End() + + log.Info(). + Str("Service", "health-api"). + Msg("Creating response payload") + + // UUID + response.Id = guuid.New().String() // BMR Response response.Basal.BMR.Value = resBMR.Bmr @@ -246,6 +267,46 @@ func Post(c *gin.Context) { attribute.String("http.response.Recomendations.Calories.Loss.Unit", response.Basal.Necessity.Unit), ) + _, spanNatsPublich := tr.Start(c.Request.Context(), "NATS Publish") + defer spanNatsPublich.End() + + log.Info(). + Str("Service", "nats"). + Str("Queue", "nutrition"). + Msg("Sending message to NATS Server") + + // Publish on Nats to Save Data + nc, err := nats.Connect("nats://nats-1:4222,nats-2://nats-2:4222") + defer nc.Close() + if err != nil { + log.Error(). + Str("Error", err.Error()). + Msg("Error to connect to Nats") + } + + // Create JetStream Context + js, err := nc.JetStream() + + if err != nil { + log.Error(). + Str("Error", err.Error()). + Msg("Error to create jetstream to Nats") + } + + if err != nil { + log.Error(). + Str("Error", err.Error()). + Msg("Error to convert response to json") + } + + b, err := json.Marshal(response) + _, err = js.Publish("ORDERS.scratch", b) + + if err != nil { + log.Error(). + Str("Error", err.Error()). + Msg("Error to publish message on jetstream") + } + c.JSON(http.StatusOK, response) - defer spanResponse.End() } diff --git a/health-api/go.mod b/health-api/go.mod index e2da764..50039f7 100644 --- a/health-api/go.mod +++ b/health-api/go.mod @@ -7,7 +7,9 @@ require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 github.com/gin-gonic/gin v1.7.7 github.com/go-openapi/spec v0.20.0 // indirect + github.com/google/uuid v1.3.0 // indirect github.com/msfidelis/gin-chaos-monkey v0.0.5 + github.com/nats-io/nats.go v1.16.0 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible github.com/rs/zerolog v1.22.0 github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14 @@ -22,7 +24,6 @@ require ( go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.6.3 go.opentelemetry.io/otel/sdk v1.6.3 go.opentelemetry.io/otel/trace v1.6.3 // indirect - golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect google.golang.org/grpc v1.45.0 google.golang.org/protobuf v1.26.0 diff --git a/health-api/go.sum b/health-api/go.sum index c023e17..2410464 100644 --- a/health-api/go.sum +++ b/health-api/go.sum @@ -134,6 +134,8 @@ github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= @@ -180,6 +182,12 @@ github.com/msfidelis/gin-chaos-monkey v0.0.5 h1:G4R70dvEM5nG+jyyWPXmnOA2CYUA62WW github.com/msfidelis/gin-chaos-monkey v0.0.5/go.mod h1:Gl1jwZ8jcJEH7SCQR2oogFT5Stwjvs3taWykF6fJzUw= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nats-io/nats.go v1.16.0 h1:zvLE7fGBQYW6MWaFaRdsgm9qT39PJDQoju+DS8KsO1g= +github.com/nats-io/nats.go v1.16.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= +github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= +github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= +github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= @@ -279,6 +287,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b h1:wSOdpTq0/eI46Ez/LkDwIsAKA71YP2SRKBODiRWM0as= +golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -305,6 +315,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= diff --git a/nats/nats-server-1.conf b/nats/nats-server-1.conf new file mode 100644 index 0000000..7cb7093 --- /dev/null +++ b/nats/nats-server-1.conf @@ -0,0 +1,14 @@ +server_name=nats-1 +listen=4222 + +jetstream { + store_dir=/data/jetstream +} + +cluster { + name: C1 + listen: 0.0.0.0:6222 + routes: [ + nats-route://nats-2:6222 + ] +} \ No newline at end of file diff --git a/nats/nats-server-2.conf b/nats/nats-server-2.conf new file mode 100644 index 0000000..4d34abc --- /dev/null +++ b/nats/nats-server-2.conf @@ -0,0 +1,14 @@ +server_name=nats-2 +listen=4222 + +jetstream { + store_dir=/data/jetstream +} + +cluster { + name: C1 + listen: 0.0.0.0:6222 + routes: [ + nats-route://nats-1:6222 + ] +} \ No newline at end of file