Skip to content

Commit

Permalink
Change consul docs and rename the default resolver
Browse files Browse the repository at this point in the history
  • Loading branch information
azzz committed Nov 6, 2020
1 parent 116cacc commit 5a2d546
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 25 deletions.
6 changes: 0 additions & 6 deletions examples/consul/Makefile

This file was deleted.

4 changes: 2 additions & 2 deletions examples/consul/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ To run this example you need to have Go 1.13> installed on your machine.

Prepare the environment:

1. Run consul `consul agent -dev --config-dir=./awesome-dogs/consul.d -ui`
1. Run consul using configuration `/awesome-dogs/consul.d`
2. Run awesome-dogs service: `go run ./awesome-dogs/main.go`
3. Run semaphore `semaphore daemon`

Now, you can execute the `FetchPets` flow by executing a `GET` request on port `8080`.
Now, you can execute the `ListAwesomeDogs` flow by executing a `GET` request on port `8080`.

```bash
$ curl 127.0.0.1:8080
Expand Down
2 changes: 1 addition & 1 deletion pkg/providers/hcl/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func ParseIntermediateService(parent *broker.Context, manifest Service) (*specs.
return nil, err
}

resolver := "default"
resolver := "dns"
if manifest.Resolver != "" {
resolver = manifest.Resolver
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/providers/protobuffers/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func NewService(descriptor *desc.ServiceDescriptor) *specs.Service {
RequestCodec: options[CodecOption],
ResponseCodec: options[CodecOption],
Options: options,
Resolver: "default",
Resolver: "dns",
}

req := options[RequestCodecOption]
Expand Down
12 changes: 6 additions & 6 deletions pkg/providers/providers.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,19 +117,19 @@ type ServiceDiscoveryClientsResolver func(ctx *broker.Context) (specs.ServiceDis

type ServiceDiscoveryClientsResolvers []ServiceDiscoveryClientsResolver

// defaultServiceResolver is a factory that builds plain resolver for the given service host.
type defaultServiceResolver struct{}
// dnsServiceResolver is a factory that builds plain resolver for the given service host.
type dnsServiceResolver struct{}

func (d defaultServiceResolver) Resolver(host string) (discovery.Resolver, error) {
func (d dnsServiceResolver) Resolver(host string) (discovery.Resolver, error) {
return discovery.NewPlainResolver(host), nil
}

func (d defaultServiceResolver) Provider() string {
return "default"
func (d dnsServiceResolver) Provider() string {
return "dns"
}

func (resolvers ServiceDiscoveryClientsResolvers) Resolve(ctx *broker.Context) (specs.ServiceDiscoveryClients, error) {
clients := specs.ServiceDiscoveryClients{"default": defaultServiceResolver{}}
clients := specs.ServiceDiscoveryClients{"dns": dnsServiceResolver{}}

for _, resolver := range resolvers {
if resolver == nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/providers/providers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func TestDefaultServiceResolverClient_Resolver(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
d := defaultServiceResolver{}
d := dnsServiceResolver{}
got, err := d.Resolver(tt.args.host)
if (err != nil) != tt.wantErr {
t.Errorf("Resolver() error = %v, wantErr %v", err, tt.wantErr)
Expand Down
12 changes: 4 additions & 8 deletions website/sidebars.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,17 @@ module.exports = {
'flows.rollbacks',
],
},
{
type: 'docs',
id: 'service_discovery',
label: 'Using Service Discovery',
items: [
"service_discovery.configuration",
]
},
{
type: 'doc',
id: 'functions',
},
{
type: 'doc',
id: 'devops',
label: 'Infrastructure',
items: [
"service_discovery.configuration",
]
}
]
};

0 comments on commit 5a2d546

Please sign in to comment.