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

Add InitWithClient and deprecate InitClient because we don't want to copy Client's field sync.RWMutex by value #273

Merged
merged 9 commits into from
Jun 5, 2019
Merged

Add InitWithClient and deprecate InitClient because we don't want to copy Client's field sync.RWMutex by value #273

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e88d662
Merge pull request #3 from GoogleCloudPlatform/master
mandyh2018 May 2, 2019
5ab702d
Init proxy client using pointer because we don't want to copy it's fi…
mandyh2018 May 2, 2019
73a412d
Merge branch 'master' of github.com:GoogleCloudPlatform/cloudsql-proxy
mandyh2018 May 2, 2019
2baf87d
Merge branch 'master' of github.com:mandyh2018/cloudsql-proxy
mandyh2018 May 2, 2019
946de47
Added the new API InitWithClient and InitClient is deprecated because…
mandyh2018 Jun 4, 2019
f05e52f
run gofmt
mandyh2018 Jun 4, 2019
aece595
Merge branch 'master' into master
kurtisvg Jun 4, 2019
9727d22
change the deprecation warning comment.
mandyh2018 Jun 4, 2019
ce55b05
Merge branch 'master' of github.com:mandyh2018/cloudsql-proxy
mandyh2018 Jun 4, 2019
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
12 changes: 11 additions & 1 deletion proxy/proxy/dial.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ import (
const port = 3307

var dialClient struct {
// This client is initialized in Init/InitClient/InitDefault and read in Dial.
// This client is initialized in Init/InitWithClient/InitDefault
// and read in Dial.
c *Client
sync.Mutex
}
Expand Down Expand Up @@ -80,12 +81,21 @@ func Init(auth *http.Client, connset *ConnSet, dialer Dialer) {

// InitClient is similar to Init, but allows you to specify the Client
// directly.

// Deprecated: Use InitWithClient instead.
func InitClient(c Client) {
dialClient.Lock()
dialClient.c = &c
dialClient.Unlock()
}

// InitWithClient specifies the Client directly.
func InitWithClient(c *Client) {
dialClient.Lock()
dialClient.c = c
dialClient.Unlock()
}

// InitDefault attempts to initialize the Dial function using application
// default credentials.
func InitDefault(ctx context.Context) error {
Expand Down