Skip to content

Commit

Permalink
feat: use cloud.google.com/go/cloudsqlconn (#30)
Browse files Browse the repository at this point in the history
  • Loading branch information
enocom authored Jul 21, 2021
1 parent c6cb7ac commit a251fd7
Show file tree
Hide file tree
Showing 11 changed files with 57 additions and 8 deletions.
1 change: 0 additions & 1 deletion dial.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Package cloudsqlconn contains methods for creating secure, authorized connections to a Cloud SQL instance.
package cloudsqlconn

import (
Expand Down
2 changes: 1 addition & 1 deletion dialer.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"sync"
"time"

"cloud.google.com/cloudsqlconn/internal/cloudsql"
"cloud.google.com/go/cloudsqlconn/internal/cloudsql"
"golang.org/x/net/proxy"
"google.golang.org/api/option"
sqladmin "google.golang.org/api/sqladmin/v1beta4"
Expand Down
2 changes: 1 addition & 1 deletion dialer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"testing"
"time"

"cloud.google.com/cloudsqlconn/internal/mock"
"cloud.google.com/go/cloudsqlconn/internal/mock"
"google.golang.org/api/option"
sqladmin "google.golang.org/api/sqladmin/v1beta4"
)
Expand Down
17 changes: 17 additions & 0 deletions doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2021 Google LLC

// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at

// https://www.apache.org/licenses/LICENSE-2.0

// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// Package cloudsqlconn contains methods for creating secure, authorized
// connections to a Cloud SQL instance.
package cloudsqlconn // import "cloud.google.com/go/cloudsqlconn
2 changes: 1 addition & 1 deletion e2e_postgres_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"testing"
"time"

"cloud.google.com/cloudsqlconn"
"cloud.google.com/go/cloudsqlconn"
"github.com/jackc/pgx/v4"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module cloud.google.com/cloudsqlconn
module cloud.google.com/go/cloudsqlconn

go 1.15

Expand Down
16 changes: 16 additions & 0 deletions internal/cloudsql/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright 2021 Google LLC

// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at

// https://www.apache.org/licenses/LICENSE-2.0

// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// Package cloudsql supports Cloud SQL Admin API operations.
package cloudsql // import "cloud.google.com/go/cloudsqlconn/internal/cloudsql"
2 changes: 1 addition & 1 deletion internal/cloudsql/instance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"testing"
"time"

"cloud.google.com/cloudsqlconn/internal/mock"
"cloud.google.com/go/cloudsqlconn/internal/mock"
"google.golang.org/api/option"
sqladmin "google.golang.org/api/sqladmin/v1beta4"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/cloudsql/refresh_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"crypto/rsa"
"testing"

"cloud.google.com/cloudsqlconn/internal/mock"
"cloud.google.com/go/cloudsqlconn/internal/mock"
"google.golang.org/api/option"
sqladmin "google.golang.org/api/sqladmin/v1beta4"
)
Expand Down
17 changes: 17 additions & 0 deletions internal/mock/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2021 Google LLC

// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at

// https://www.apache.org/licenses/LICENSE-2.0

// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// Package mock provides a number of test utilities to mock Cloud SQL backend
// components.
package mock // import "cloud.google.com/go/cloudsqlconn/internal/mock"
2 changes: 1 addition & 1 deletion options.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"crypto/rsa"
"time"

"cloud.google.com/cloudsqlconn/internal/cloudsql"
"cloud.google.com/go/cloudsqlconn/internal/cloudsql"
"golang.org/x/oauth2"
apiopt "google.golang.org/api/option"
)
Expand Down

0 comments on commit a251fd7

Please sign in to comment.