Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support etcd auth with env args #2184

Merged
merged 2 commits into from
Jun 23, 2021
Merged

support etcd auth with env args #2184

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e1a388
support etcd auth with env args
xpunch Jun 22, 2021
abd31bc
fixing MICRO_REGISTRY_ADDRESS may empty issue
xpunch Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions plugins/registry/etcd/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"encoding/json"
"errors"
"net"
"os"
"path"
"sort"
"strings"
Expand All @@ -17,7 +18,7 @@ import (
"github.com/asim/go-micro/v3/registry"
hash "github.com/mitchellh/hashstructure"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/client/v3"
clientv3 "go.etcd.io/etcd/client/v3"
"go.uber.org/zap"
)

Expand All @@ -36,10 +37,14 @@ type etcdRegistry struct {

func NewRegistry(opts ...registry.Option) registry.Registry {
e := &etcdRegistry{
options: registry.Options{},
options: registry.Options{Addrs: []string{os.Getenv("MICRO_REGISTRY_ADDRESS")}},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if the env var is blank this will create a blank entry, regardless of whether its parsed later, that's not useful. Please remove.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed it, it will be added into registry options as default address instead of 127.0.0.1:2379 when it's not blank.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, the unit test passed in my local environment, shouldn't be an issue caused by my codes.

register: make(map[string]uint64),
leases: make(map[string]clientv3.LeaseID),
}
username, password := os.Getenv("ETCD_USERNAME"), os.Getenv("ETCD_PASSWORD")
if len(username) > 0 && len(password) > 0 {
opts = append(opts, Auth(username, password))
}
configure(e, opts...)
return e
}
Expand Down