diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 125c4147a..ff97ab78c 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -26,7 +26,7 @@ on: jobs: unit: - # run job on proper workflow event triggers (skip job for pull_request event from forks and only run pull_request_target for "tests: run" label) + # run job on proper workflow event triggers (skip job for pull_request event from forks and only run pull_request_target for "tests: run" label) if: "${{ (github.event.action != 'labeled' && github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name) || github.event.label.name == 'tests: run' }}" name: unit tests runs-on: "ubuntu-latest" @@ -65,7 +65,7 @@ jobs: uses: actions/setup-go@v3 with: go-version: ${{ matrix.go-version }} - + - id: 'auth' name: 'Authenticate to Google Cloud' uses: 'google-github-actions/auth@v0.8.0' @@ -78,7 +78,7 @@ jobs: run: go test -short -race -v ./... integration: - # run job on proper workflow event triggers (skip job for pull_request event from forks and only run pull_request_target for "tests: run" label) + # run job on proper workflow event triggers (skip job for pull_request event from forks and only run pull_request_target for "tests: run" label) if: "${{ (github.event.action != 'labeled' && github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name) || github.event.label.name == 'tests: run' }}" name: integration tests runs-on: ${{ matrix.os }} @@ -117,7 +117,7 @@ jobs: uses: actions/setup-go@v3 with: go-version: 1.18 - + - id: 'auth' name: 'Authenticate to Google Cloud' uses: 'google-github-actions/auth@v0.8.0' @@ -144,7 +144,7 @@ jobs: SQLSERVER_USER:${{ secrets.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_USER SQLSERVER_PASS:${{ secrets.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_PASS SQLSERVER_DB:${{ secrets.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_DB - + - name: Enable fuse config (Linux) if: matrix.os == 'ubuntu-latest' run: | diff --git a/cmd/cloud_sql_proxy/cloud_sql_proxy.go b/cmd/cloud_sql_proxy/cloud_sql_proxy.go index 9749cc943..61ce326ea 100644 --- a/cmd/cloud_sql_proxy/cloud_sql_proxy.go +++ b/cmd/cloud_sql_proxy/cloud_sql_proxy.go @@ -34,13 +34,13 @@ import ( "syscall" "time" - "github.com/GoogleCloudPlatform/cloudsql-proxy/cmd/cloud_sql_proxy/internal/healthcheck" - "github.com/GoogleCloudPlatform/cloudsql-proxy/logging" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/certs" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/fuse" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/limits" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/proxy" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/util" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/cmd/cloud_sql_proxy/internal/healthcheck" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/logging" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/certs" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/fuse" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/limits" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/proxy" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/util" "cloud.google.com/go/compute/metadata" "github.com/coreos/go-systemd/v22/daemon" diff --git a/cmd/cloud_sql_proxy/internal/healthcheck/healthcheck.go b/cmd/cloud_sql_proxy/internal/healthcheck/healthcheck.go index cd57758eb..7b5ed0e70 100644 --- a/cmd/cloud_sql_proxy/internal/healthcheck/healthcheck.go +++ b/cmd/cloud_sql_proxy/internal/healthcheck/healthcheck.go @@ -22,8 +22,8 @@ import ( "net/http" "sync" - "github.com/GoogleCloudPlatform/cloudsql-proxy/logging" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/proxy" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/logging" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/proxy" ) const ( diff --git a/cmd/cloud_sql_proxy/internal/healthcheck/healthcheck_test.go b/cmd/cloud_sql_proxy/internal/healthcheck/healthcheck_test.go index c8ca8277a..f6e0e2c9a 100644 --- a/cmd/cloud_sql_proxy/internal/healthcheck/healthcheck_test.go +++ b/cmd/cloud_sql_proxy/internal/healthcheck/healthcheck_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/cloudsql-proxy/cmd/cloud_sql_proxy/internal/healthcheck" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/proxy" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/cmd/cloud_sql_proxy/internal/healthcheck" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/proxy" ) const ( diff --git a/cmd/cloud_sql_proxy/proxy.go b/cmd/cloud_sql_proxy/proxy.go index 42917a5da..c9943ee2c 100644 --- a/cmd/cloud_sql_proxy/proxy.go +++ b/cmd/cloud_sql_proxy/proxy.go @@ -28,9 +28,9 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/cloudsql-proxy/logging" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/fuse" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/proxy" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/logging" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/fuse" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/proxy" sqladmin "google.golang.org/api/sqladmin/v1beta4" ) diff --git a/go.mod b/go.mod index 9a90ae0ad..55f39d791 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,10 @@ -module github.com/GoogleCloudPlatform/cloudsql-proxy +module github.com/GoogleCloudPlatform/cloudsql-proxy/v2 go 1.16 require ( cloud.google.com/go/compute v1.7.0 + github.com/GoogleCloudPlatform/cloudsql-proxy v1.29.0 github.com/coreos/go-systemd/v22 v22.3.2 github.com/denisenkom/go-mssqldb v0.12.2 github.com/go-sql-driver/mysql v1.6.0 diff --git a/go.sum b/go.sum index 09f9a8027..d22980cfc 100644 --- a/go.sum +++ b/go.sum @@ -36,6 +36,7 @@ cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUM cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= +cloud.google.com/go/compute v1.2.0/go.mod h1:xlogom/6gr8RJGBe7nT2eGsQYAFUbbv8dbC29qE3Xmw= cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= @@ -61,6 +62,8 @@ github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJc github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/GoogleCloudPlatform/cloudsql-proxy v1.29.0 h1:YNu23BtH0PKF+fg3ykSorCp6jSTjcEtfnYLzbmcjVRA= +github.com/GoogleCloudPlatform/cloudsql-proxy v1.29.0/go.mod h1:spvB9eLJH9dutlbPSRmHvSXXHOwGRyeXh1jVdquA2G8= github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= @@ -94,6 +97,7 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/denisenkom/go-mssqldb v0.12.0/go.mod h1:iiK0YP1ZeepvmBQk/QpLEhhTNJgfzrpArPY/aFvc9yU= github.com/denisenkom/go-mssqldb v0.12.2 h1:1OcPn5GBIobjWNd+8yjfHNIaFX14B1pWI3F9HZy5KXw= github.com/denisenkom/go-mssqldb v0.12.2/go.mod h1:lnIw1mZukFRZDJYQ0Pb833QS2IaC3l5HkEfra2LJ+sk= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= @@ -121,6 +125,7 @@ github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPh github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188/go.mod h1:vXjM/+wXQnTPR4KqTKDgJukSZ6amVRtWMPEjE6sQoK8= github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -227,6 +232,7 @@ github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsU github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= +github.com/jackc/pgconn v1.11.0/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= github.com/jackc/pgconn v1.12.1 h1:rsDFzIpRk7xT4B8FufgpCCeyjdNpKyghZeSefViE5W8= github.com/jackc/pgconn v1.12.1/go.mod h1:ZkhRC59Llhrq3oSfrikvwQ5NaxYExr6twkdkMLaKono= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= @@ -245,6 +251,7 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvW github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.2.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.3.0 h1:brH0pCGBDkBW07HWlN/oSBXrmo3WB0UvZd1pIuDcL8Y= github.com/jackc/pgproto3/v2 v2.3.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= @@ -253,12 +260,14 @@ github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01C github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= +github.com/jackc/pgtype v1.10.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= github.com/jackc/pgtype v1.11.0 h1:u4uiGPz/1hryuXzyaBhSk6dnIyyG2683olG2OV+UUgs= github.com/jackc/pgtype v1.11.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= +github.com/jackc/pgx/v4 v4.15.0/go.mod h1:D/zyOyXiaM1TmVWnOM18p0xdDtdakRBa0RsVGI3U3bw= github.com/jackc/pgx/v4 v4.16.1 h1:JzTglcal01DrghUqt+PmzWsZx/Yh7SC/CTQmSBMTd0Y= github.com/jackc/pgx/v4 v4.16.1/go.mod h1:SIhx0D5hoADaiXZVyv+3gSm3LCIIINTVO0PficsvWGQ= github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= @@ -280,6 +289,7 @@ github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs= github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= @@ -434,6 +444,7 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -533,7 +544,9 @@ golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -560,6 +573,7 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U= golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -659,7 +673,9 @@ google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqiv google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= +google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= +google.golang.org/api v0.68.0/go.mod h1:sOM8pTpwgflXRhz+oC8H2Dr+UcbMqkPPWNJo88Q7TH8= google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= @@ -738,7 +754,10 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220204002441-d6cc3cc0770e/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= diff --git a/proxy/certs/certs.go b/proxy/certs/certs.go index e26aa572e..892cf2964 100644 --- a/proxy/certs/certs.go +++ b/proxy/certs/certs.go @@ -30,8 +30,8 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/cloudsql-proxy/logging" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/util" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/logging" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/util" "golang.org/x/oauth2" "google.golang.org/api/googleapi" sqladmin "google.golang.org/api/sqladmin/v1beta4" diff --git a/proxy/dialers/mysql/hook.go b/proxy/dialers/mysql/hook.go index 68948b488..7bee55d5b 100644 --- a/proxy/dialers/mysql/hook.go +++ b/proxy/dialers/mysql/hook.go @@ -22,7 +22,7 @@ import ( "database/sql" "errors" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/proxy" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/proxy" "github.com/go-sql-driver/mysql" ) diff --git a/proxy/dialers/mysql/hook_test.go b/proxy/dialers/mysql/hook_test.go index 8ddda86b7..a2c8df320 100644 --- a/proxy/dialers/mysql/hook_test.go +++ b/proxy/dialers/mysql/hook_test.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/dialers/mysql" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/dialers/mysql" ) // ExampleCfg shows how to use Cloud SQL Auth proxy dialer if you must update some diff --git a/proxy/dialers/postgres/hook.go b/proxy/dialers/postgres/hook.go index 8df85147f..678bef0fe 100644 --- a/proxy/dialers/postgres/hook.go +++ b/proxy/dialers/postgres/hook.go @@ -27,7 +27,7 @@ import ( "regexp" "time" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/proxy" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/proxy" "github.com/lib/pq" ) diff --git a/proxy/dialers/postgres/hook_test.go b/proxy/dialers/postgres/hook_test.go index 8dc363162..cfead5bbc 100644 --- a/proxy/dialers/postgres/hook_test.go +++ b/proxy/dialers/postgres/hook_test.go @@ -20,7 +20,7 @@ import ( "log" "time" - _ "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/dialers/postgres" + _ "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/dialers/postgres" ) // Example shows how to use cloudsqlpostgres dialer diff --git a/proxy/fuse/fuse.go b/proxy/fuse/fuse.go index 6159527bb..ec3b8178c 100644 --- a/proxy/fuse/fuse.go +++ b/proxy/fuse/fuse.go @@ -47,8 +47,8 @@ import ( "syscall" "time" - "github.com/GoogleCloudPlatform/cloudsql-proxy/logging" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/proxy" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/logging" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/proxy" "github.com/hanwen/go-fuse/v2/fs" "github.com/hanwen/go-fuse/v2/fuse" "github.com/hanwen/go-fuse/v2/fuse/nodefs" diff --git a/proxy/fuse/fuse_darwin.go b/proxy/fuse/fuse_darwin.go index 19ff5cba2..5adb84482 100644 --- a/proxy/fuse/fuse_darwin.go +++ b/proxy/fuse/fuse_darwin.go @@ -17,7 +17,7 @@ package fuse import ( "os" - "github.com/GoogleCloudPlatform/cloudsql-proxy/logging" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/logging" ) const ( diff --git a/proxy/fuse/fuse_linux.go b/proxy/fuse/fuse_linux.go index 4bd1dde67..45f14b885 100644 --- a/proxy/fuse/fuse_linux.go +++ b/proxy/fuse/fuse_linux.go @@ -17,7 +17,7 @@ package fuse import ( "os/exec" - "github.com/GoogleCloudPlatform/cloudsql-proxy/logging" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/logging" ) // Supported returns true if the current system supports FUSE. diff --git a/proxy/fuse/fuse_linux_test.go b/proxy/fuse/fuse_linux_test.go index 6371c2a6c..928442a5e 100644 --- a/proxy/fuse/fuse_linux_test.go +++ b/proxy/fuse/fuse_linux_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/fuse" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/fuse" ) func TestFUSESupport(t *testing.T) { diff --git a/proxy/fuse/fuse_openbsd.go b/proxy/fuse/fuse_openbsd.go index 3db7628c1..61908d4a6 100644 --- a/proxy/fuse/fuse_openbsd.go +++ b/proxy/fuse/fuse_openbsd.go @@ -20,7 +20,7 @@ import ( "errors" "io" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/proxy" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/proxy" ) func Supported() bool { diff --git a/proxy/fuse/fuse_windows.go b/proxy/fuse/fuse_windows.go index 93e0c5918..1b4666a7b 100644 --- a/proxy/fuse/fuse_windows.go +++ b/proxy/fuse/fuse_windows.go @@ -19,7 +19,7 @@ import ( "errors" "io" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/proxy" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/proxy" ) func Supported() bool { diff --git a/proxy/limits/limits.go b/proxy/limits/limits.go index 1e636b84c..02b3bb913 100644 --- a/proxy/limits/limits.go +++ b/proxy/limits/limits.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !windows && !freebsd // +build !windows,!freebsd // Package limits provides routines to check and enforce certain resource @@ -22,7 +23,7 @@ import ( "fmt" "syscall" - "github.com/GoogleCloudPlatform/cloudsql-proxy/logging" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/logging" ) var ( diff --git a/proxy/limits/limits_freebsd.go b/proxy/limits/limits_freebsd.go index a8b222df4..485b6a7ae 100644 --- a/proxy/limits/limits_freebsd.go +++ b/proxy/limits/limits_freebsd.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build freebsd // +build freebsd // Package limits provides routines to check and enforce certain resource @@ -22,7 +23,7 @@ import ( "fmt" "syscall" - "github.com/GoogleCloudPlatform/cloudsql-proxy/logging" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/logging" ) var ( diff --git a/proxy/limits/limits_test.go b/proxy/limits/limits_test.go index 4f9bdbb00..1ae394a54 100644 --- a/proxy/limits/limits_test.go +++ b/proxy/limits/limits_test.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !windows // +build !windows package limits diff --git a/proxy/proxy/client.go b/proxy/proxy/client.go index 89b04ba14..a67088d7c 100644 --- a/proxy/proxy/client.go +++ b/proxy/proxy/client.go @@ -26,8 +26,8 @@ import ( "sync/atomic" "time" - "github.com/GoogleCloudPlatform/cloudsql-proxy/logging" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/util" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/logging" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/util" "golang.org/x/net/proxy" "golang.org/x/time/rate" ) diff --git a/proxy/proxy/common.go b/proxy/proxy/common.go index 73cfadd14..c5b6c034b 100644 --- a/proxy/proxy/common.go +++ b/proxy/proxy/common.go @@ -23,7 +23,7 @@ import ( "net" "sync" - "github.com/GoogleCloudPlatform/cloudsql-proxy/logging" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/logging" ) // SQLScope is the Google Cloud Platform scope required for executing API diff --git a/proxy/proxy/dial.go b/proxy/proxy/dial.go index 2075ebb9c..d83614db5 100644 --- a/proxy/proxy/dial.go +++ b/proxy/proxy/dial.go @@ -20,7 +20,7 @@ import ( "net/http" "sync" - "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/certs" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/certs" "golang.org/x/net/context" "golang.org/x/oauth2/google" ) diff --git a/proxy/util/gcloudutil.go b/proxy/util/gcloudutil.go index 11c0f3711..a22b3ff9f 100644 --- a/proxy/util/gcloudutil.go +++ b/proxy/util/gcloudutil.go @@ -22,7 +22,7 @@ import ( "runtime" "time" - "github.com/GoogleCloudPlatform/cloudsql-proxy/logging" + "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/logging" "golang.org/x/oauth2" exec "golang.org/x/sys/execabs" ) diff --git a/tests/postgres_test.go b/tests/postgres_test.go index 9f2465c61..4dd726e32 100644 --- a/tests/postgres_test.go +++ b/tests/postgres_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - _ "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/dialers/postgres" + _ "github.com/GoogleCloudPlatform/cloudsql-proxy/v2/proxy/dialers/postgres" _ "github.com/lib/pq" )