planetscale 0.1.0 → 0.3.1

data/vendor/github.com/planetscale/planetscale-go/planetscale/certs.go

@@ -3,13 +3,14 @@ package planetscale
 import (
 	"bytes"
 	"context"
+	"crypto"
+	"crypto/ecdsa"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/tls"
 	"crypto/x509"
 	"crypto/x509/pkix"
 	"encoding/pem"
-	"errors"
 	"fmt"
 	"net/http"
 )
@@ -19,8 +20,8 @@ type CreateCertificateRequest struct {
 	DatabaseName string
 	Branch       string
 
-	// PrivateKey is used to sign the Certificate Sign Request (CSR).
-	PrivateKey *rsa.PrivateKey
+	// PrivateKey is used to generate the Certificate Sign Request (CSR).
+	PrivateKey crypto.PrivateKey
 }
 
 type CertificatesService interface {
@@ -29,7 +30,7 @@ type CertificatesService interface {
 
 type Cert struct {
 	ClientCert tls.Certificate
-	CACert     *x509.Certificate
+	CACerts    []*x509.Certificate
 	RemoteAddr string
 	Ports      RemotePorts
 }
@@ -57,10 +58,16 @@ func (c *certificatesService) Create(ctx context.Context, r *CreateCertificateRe
 		CommonName: cn,
 	}
 
+	switch priv := r.PrivateKey.(type) {
+	case *rsa.PrivateKey:
+	case *ecdsa.PrivateKey:
+	default:
+		return nil, fmt.Errorf("unsupported key type: %T, only supports ECDSA and RSA private keys", priv)
+	}
+
 	template := x509.CertificateRequest{
-		Version:            1,
-		Subject:            subj,
-		SignatureAlgorithm: x509.SHA256WithRSA,
+		Version: 1,
+		Subject: subj,
 	}
 
 	csrBytes, err := x509.CreateCertificateRequest(rand.Reader, &template, r.PrivateKey)
@@ -105,15 +112,20 @@ func (c *certificatesService) Create(ctx context.Context, r *CreateCertificateRe
 		return nil, err
 	}
 
-	caCert, err := parseCert(cr.CertificateChain)
+	caCerts, err := parseCerts(cr.CertificateChain)
 	if err != nil {
 		return nil, fmt.Errorf("parsing certificate chain failed: %s", err)
 	}
 
+	privateKeyBytes, err := x509.MarshalPKCS8PrivateKey(r.PrivateKey)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal private key: %s", err)
+	}
+
 	privateKey := pem.EncodeToMemory(
 		&pem.Block{
-			Type:  "RSA PRIVATE KEY",
-			Bytes: x509.MarshalPKCS1PrivateKey(r.PrivateKey),
+			Type:  "PRIVATE KEY",
+			Bytes: privateKeyBytes,
 		},
 	)
 
@@ -124,7 +136,7 @@ func (c *certificatesService) Create(ctx context.Context, r *CreateCertificateRe
 
 	return &Cert{
 		ClientCert: clientCert,
-		CACert:     caCert,
+		CACerts:    caCerts,
 		RemoteAddr: cr.RemoteAddr,
 		Ports: RemotePorts{
 			Proxy: cr.Ports["proxy"],
@@ -133,10 +145,22 @@ func (c *certificatesService) Create(ctx context.Context, r *CreateCertificateRe
 	}, nil
 }
 
-func parseCert(pemCert string) (*x509.Certificate, error) {
-	bl, _ := pem.Decode([]byte(pemCert))
-	if bl == nil {
-		return nil, errors.New("invalid PEM: " + pemCert)
+func parseCerts(pemCert string) ([]*x509.Certificate, error) {
+	perCertBlock := []byte(pemCert)
+	var certs []*x509.Certificate
+
+	for {
+		var certBlock *pem.Block
+		certBlock, perCertBlock = pem.Decode(perCertBlock)
+		if certBlock == nil {
+			break
+		}
+		cert, err := x509.ParseCertificate(certBlock.Bytes)
+		if err != nil {
+			return nil, err
+		}
+
+		certs = append(certs, cert)
 	}
-	return x509.ParseCertificate(bl.Bytes)
+	return certs, nil
 }

data/vendor/github.com/planetscale/planetscale-go/planetscale/client.go

@@ -38,11 +38,13 @@ type Client struct {
 	// base URL for the API
 	baseURL *url.URL
 
+	AuditLogs        AuditLogsService
 	Backups          BackupsService
 	Databases        DatabasesService
 	Certificates     CertificatesService
 	DatabaseBranches DatabaseBranchesService
 	Organizations    OrganizationsService
+	Regions          RegionsService
 	DeployRequests   DeployRequestsService
 	ServiceTokens    ServiceTokenService
 }
@@ -130,11 +132,13 @@ func NewClient(opts ...ClientOption) (*Client, error) {
 		}
 	}
 
+	c.AuditLogs = &auditlogsService{client: c}
 	c.Backups = &backupsService{client: c}
 	c.Databases = &databasesService{client: c}
 	c.Certificates = &certificatesService{client: c}
 	c.DatabaseBranches = &databaseBranchesService{client: c}
 	c.Organizations = &organizationsService{client: c}
+	c.Regions = &regionsService{client: c}
 	c.DeployRequests = &deployRequestsService{client: c}
 	c.ServiceTokens = &serviceTokenService{client: c}
 
@@ -174,11 +178,12 @@ func (c *Client) handleResponse(ctx context.Context, res *http.Response, v inter
 		if err != nil {
 			if _, ok := err.(*json.SyntaxError); ok {
 				return &Error{
-					msg:  "malformed response body received",
+					msg:  "malformed error response body received",
 					Code: ErrResponseMalformed,
 					Meta: map[string]string{
-						"body": string(out),
-						"err":  err.Error(),
+						"body":        string(out),
+						"err":         err.Error(),
+						"http_status": http.StatusText(res.StatusCode),
 					},
 				}
 			}
@@ -193,10 +198,11 @@ func (c *Client) handleResponse(ctx context.Context, res *http.Response, v inter
 		// TODO(fatih): fix the behavior on the API side
 		if *errorRes == (errorResponse{}) {
 			return &Error{
-				msg:  "internal error, please open an issue to github.com/planetscale/planetscale-go",
+				msg:  "internal error, response body doesn't match error type signature",
 				Code: ErrInternal,
 				Meta: map[string]string{
-					"body": string(out),
+					"body":        string(out),
+					"http_status": http.StatusText(res.StatusCode),
 				},
 			}
 		}
@@ -231,7 +237,8 @@ func (c *Client) handleResponse(ctx context.Context, res *http.Response, v inter
 				msg:  "malformed response body received",
 				Code: ErrResponseMalformed,
 				Meta: map[string]string{
-					"body": string(out),
+					"body":        string(out),
+					"http_status": http.StatusText(res.StatusCode),
 				},
 			}
 		}

data/vendor/github.com/planetscale/planetscale-go/planetscale/databases.go

@@ -14,6 +14,7 @@ type CreateDatabaseRequest struct {
 	Organization string
 	Name         string `json:"name"`
 	Notes        string `json:"notes"`
+	Region       string `json:"region,omitempty"`
 }
 
 // DatabaseRequest encapsulates the request for getting a single database.
@@ -48,6 +49,7 @@ type DatabasesService interface {
 type Database struct {
 	Name      string    `json:"name"`
 	Notes     string    `json:"notes"`
+	Region    Region    `json:"region"`
 	CreatedAt time.Time `json:"created_at"`
 	UpdatedAt time.Time `json:"updated_at"`
 }

data/vendor/github.com/planetscale/planetscale-go/planetscale/organizations.go

@@ -22,6 +22,13 @@ type GetOrganizationRequest struct {
 type OrganizationsService interface {
 	Get(context.Context, *GetOrganizationRequest) (*Organization, error)
 	List(context.Context) ([]*Organization, error)
+	ListRegions(context.Context, *ListOrganizationRegionsRequest) ([]*Region, error)
+}
+
+// ListRegionsRequest encapsulates the request for getting a list of regions for
+// an organization.
+type ListOrganizationRegionsRequest struct {
+	Organization string
 }
 
 // Organization represents a PlanetScale organization.
@@ -76,3 +83,21 @@ func (o *organizationsService) List(ctx context.Context) ([]*Organization, error
 
 	return orgResponse.Organizations, nil
 }
+
+type listRegionsResponse struct {
+	Regions []*Region `json:"data"`
+}
+
+func (o *organizationsService) ListRegions(ctx context.Context, listReq *ListOrganizationRegionsRequest) ([]*Region, error) {
+	req, err := o.client.newRequest(http.MethodGet, fmt.Sprintf("%s/%s/regions", organizationsAPIPath, listReq.Organization), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	listResponse := &listRegionsResponse{}
+	if err := o.client.do(ctx, req, &listResponse); err != nil {
+		return nil, err
+	}
+
+	return listResponse.Regions, nil
+}

data/vendor/github.com/planetscale/planetscale-go/planetscale/regions.go

@@ -0,0 +1,52 @@
+package planetscale
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/pkg/errors"
+)
+
+const regionsAPIPath = "v1/regions"
+
+type Region struct {
+	Slug    string `json:"slug"`
+	Name    string `json:"display_name"`
+	Enabled bool   `json:"enabled"`
+}
+
+type regionsResponse struct {
+	Regions []*Region `json:"data"`
+}
+
+type ListRegionsRequest struct{}
+
+type RegionsService interface {
+	List(ctx context.Context, req *ListRegionsRequest) ([]*Region, error)
+}
+
+type regionsService struct {
+	client *Client
+}
+
+var _ RegionsService = &regionsService{}
+
+func NewRegionsSevice(client *Client) *regionsService {
+	return &regionsService{
+		client: client,
+	}
+}
+
+func (r *regionsService) List(ctx context.Context, listReq *ListRegionsRequest) ([]*Region, error) {
+	req, err := r.client.newRequest(http.MethodGet, regionsAPIPath, nil)
+	if err != nil {
+		return nil, errors.Wrap(err, "error creating request for list regions")
+	}
+
+	regionsResponse := &regionsResponse{}
+	if err := r.client.do(ctx, req, &regionsResponse); err != nil {
+		return nil, err
+	}
+
+	return regionsResponse.Regions, nil
+}

data/vendor/github.com/planetscale/planetscale-go/planetscale/service_tokens.go

@@ -140,7 +140,7 @@ type serviceTokensResponse struct {
 }
 
 type ServiceTokenAccess struct {
-	ID       int      `json:"id"`
+	ID       string   `json:"id"`
 	Access   string   `json:"access"`
 	Type     string   `json:"type"`
 	Resource Database `json:"resource"`

data/vendor/github.com/planetscale/sql-proxy/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2021 PlanetScale, Inc.
+
+   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
+
+       http://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.