manage consul catalogue #10

vincentDcmps · 2022-05-21T12:09:48Z

Description

this PR bring suppport of consul catalog to get label
it's my first try in go devlelopment feel free to modify code if my work is a litle dirty

Type of change

Checklist:

I've read & comply with the contributing guidelines
I have made corresponding changes the documentation (README.md) if required.

calvinbui

take a look at the GitHub CI failures too

calvinbui · 2022-05-22T07:52:20Z

cmd/main.go

 		}
+	}else if conf.ServiceDiscovery == config.Consul {


you will need to run go fmt on your files

calvinbui · 2022-05-22T07:53:56Z

internal/consul/services.go

+func ListServices (consul *api.Client) (map[string][]string){
+
+	catalog:= consul.Catalog()


Suggested change

func ListServices (consul *api.Client) (map[string][]string){

catalog:= consul.Catalog()

func ListServices (consul *api.Client) (map[string][]string){

catalog:= consul.Catalog()

calvinbui · 2022-05-22T07:54:42Z

internal/entry/types.go

+package entry
+
+
+type RawEntry struct {


Suggested change

package entry

type RawEntry struct {

package entry

type RawEntry struct {

calvinbui · 2022-05-22T07:55:23Z

internal/entry/types.go

@@ -0,0 +1,21 @@
+package entry


why have you renamed Labels to Entry?

last name for thi type was container I would like something who work in both case but we can change entry by label if ou want

calvinbui · 2022-05-22T07:55:32Z

internal/entry/types.go

+}
+
+
+func (c RawEntry) GetLabelValue(label string) (string, bool) {


Suggested change

}

func (c RawEntry) GetLabelValue(label string) (string, bool) {

}

func (c RawEntry) GetLabelValue(label string) (string, bool) {

vincentDcmps · 2022-05-22T16:45:45Z

I have apply a go fmt

calvinbui

can you provide some steps for me to test as well?

README.md

internal/consul/services.go

README.md

cmd/main.go

internal/config/main.go

calvinbui · 2022-05-23T22:27:12Z

internal/config/main.go

+const (
+	Docker = "Docker"
+	Consul = "Consul"
+)


I dont find this necessary, unless you have a reason?

I just would like test to create something like an enumeration to avoid to modify all the if the configuration variable change

vincentDcmps · 2022-05-24T06:35:50Z

to test you can launch a consul server

docker run \
    -d \
    -p 8500:8500 \
    -p 8600:8600/udp \
    --name=consul \
    consul agent -server -ui -node=server-1 -bootstrap-expect=1 -client=0.0.0.0```

add a service


docker exec consul /bin/sh -c "echo '{\"service\": {\"name\": \"test\", \"tags\": [\"homer.enable=true\",\"homer.name=test\",\"homer.name=test\",\"homer.service=Application\"]}}' >> /consul/config/test.json"

and reload consul config

docker exec consul consul reload

calvinbui · 2022-05-26T21:23:14Z

i'm on leave, will review this when i'm back

calvinbui · 2022-06-11T13:40:28Z

@vincentDcmps please see test errors: https://github.com/calvinbui/homer-service-discovery/runs/6843542632?check_suite_focus=true

vincentDcmps · 2022-06-11T19:51:59Z

done

calvinbui

i have tested successfully. i'll write some tests and make a release

cmd/main.go

calvinbui · 2022-06-13T13:16:20Z

v1.5.0 released: https://github.com/calvinbui/homer-service-discovery/releases/tag/v1.5.0

vincentDcmps added 4 commits May 21, 2022 13:21

create consul package

e3a42e5

implement consul workflow

a035a64

add consul host variable

db57833

update readme

71770d2

calvinbui suggested changes May 22, 2022

View reviewed changes

go format

797adbd

vincentDcmps requested a review from calvinbui May 23, 2022 06:40

calvinbui suggested changes May 23, 2022

View reviewed changes

vincentDcmps added 2 commits May 24, 2022 08:08

change default consul host

86ba8ea

fix Typo

08a1bc7

vincentDcmps requested a review from calvinbui May 26, 2022 08:57

fix linter issue

0f3829d

calvinbui approved these changes Jun 12, 2022

View reviewed changes

cmd/main.go Show resolved Hide resolved

calvinbui merged commit 55af7b6 into calvinbui:master Jun 12, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

manage consul catalogue #10

manage consul catalogue #10

vincentDcmps commented May 21, 2022 •

edited

Loading

calvinbui left a comment

calvinbui May 22, 2022

calvinbui May 22, 2022

calvinbui May 22, 2022

calvinbui May 22, 2022

vincentDcmps May 22, 2022

calvinbui May 22, 2022

vincentDcmps commented May 22, 2022

calvinbui left a comment

calvinbui May 23, 2022

vincentDcmps May 24, 2022

vincentDcmps commented May 24, 2022 •

edited

Loading

calvinbui commented May 26, 2022

calvinbui commented Jun 11, 2022

vincentDcmps commented Jun 11, 2022

calvinbui left a comment

calvinbui commented Jun 13, 2022

		func ListServices (consul *api.Client) (map[string][]string){

		catalog:= consul.Catalog()

		}


		func (c RawEntry) GetLabelValue(label string) (string, bool) {

manage consul catalogue #10

manage consul catalogue #10

Conversation

vincentDcmps commented May 21, 2022 • edited Loading

Description

Type of change

Checklist:

calvinbui left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vincentDcmps commented May 22, 2022

calvinbui left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vincentDcmps commented May 24, 2022 • edited Loading

calvinbui commented May 26, 2022

calvinbui commented Jun 11, 2022

vincentDcmps commented Jun 11, 2022

calvinbui left a comment

Choose a reason for hiding this comment

calvinbui commented Jun 13, 2022

vincentDcmps commented May 21, 2022 •

edited

Loading

vincentDcmps commented May 24, 2022 •

edited

Loading