Merge pull request cloudflare#787 from cehrig/magic-ipsec

Adds support for Magic Transit IPsec tunnels

README.md

@@ -28,23 +28,24 @@ The current feature list includes:
 * [x] Cache purging
 * [x] Cloudflare IPs
 * [x] Custom hostnames
+* [x] DNS Firewall
 * [x] DNS Records
 * [x] Firewall (partial)
+* [x] Gateway Locations
 * [x] [Keyless SSL](https://blog.cloudflare.com/keyless-ssl-the-nitty-gritty-technical-details/)
 * [x] [Load Balancing](https://blog.cloudflare.com/introducing-load-balancing-intelligent-failover-with-cloudflare/)
 * [x] [Logpush Jobs](https://developers.cloudflare.com/logs/logpush/)
+* [x] Magic Transit / Magic WAN
+* [x] Notifications
 * [ ] Organization Administration
 * [x] [Origin CA](https://blog.cloudflare.com/universal-ssl-encryption-all-the-way-to-the-origin-for-free/)
 * [x] [Railgun](https://www.cloudflare.com/railgun/) administration
 * [x] Rate Limiting
 * [x] User Administration (partial)
-* [x] DNS Firewall
 * [x] Web Application Firewall (WAF)
+* [x] Workers KV
 * [x] Zone Lockdown and User-Agent Block rules
 * [x] Zones
-* [x] Workers KV
-* [x] Notifications
-* [x] Gateway Locations
 
 Pull Requests are welcome, but please open an issue (or comment in an existing
 issue) to discuss any non-trivial changes before submitting code.

magic_transit_ipsec_tunnel.go

@@ -0,0 +1,171 @@
+package cloudflare
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/pkg/errors"
+)
+
+// Magic Transit IPsec Tunnel Error messages.
+const (
+	errMagicTransitIPsecTunnelNotModified = "When trying to modify IPsec tunnel, API returned modified: false"
+	errMagicTransitIPsecTunnelNotDeleted  = "When trying to delete IPsec tunnel, API returned deleted: false"
+)
+
+// MagicTransitIPsecTunnel contains information about an IPsec tunnel.
+type MagicTransitIPsecTunnel struct {
+	ID                 string     `json:"id,omitempty"`
+	CreatedOn          *time.Time `json:"created_on,omitempty"`
+	ModifiedOn         *time.Time `json:"modified_on,omitempty"`
+	Name               string     `json:"name"`
+	CustomerEndpoint   string     `json:"customer_endpoint"`
+	CloudflareEndpoint string     `json:"cloudflare_endpoint"`
+	InterfaceAddress   string     `json:"interface_address"`
+	Description        string     `json:"description,omitempty"`
+}
+
+// ListMagicTransitIPsecTunnelsResponse contains a response including IPsec tunnels.
+type ListMagicTransitIPsecTunnelsResponse struct {
+	Response
+	Result struct {
+		IPsecTunnels []MagicTransitIPsecTunnel `json:"ipsec_tunnels"`
+	} `json:"result"`
+}
+
+// GetMagicTransitIPsecTunnelResponse contains a response including zero or one IPsec tunnels.
+type GetMagicTransitIPsecTunnelResponse struct {
+	Response
+	Result struct {
+		IPsecTunnel MagicTransitIPsecTunnel `json:"ipsec_tunnel"`
+	} `json:"result"`
+}
+
+// CreateMagicTransitIPsecTunnelsRequest is an array of IPsec tunnels to create.
+type CreateMagicTransitIPsecTunnelsRequest struct {
+	IPsecTunnels []MagicTransitIPsecTunnel `json:"ipsec_tunnels"`
+}
+
+// UpdateMagicTransitIPsecTunnelResponse contains a response after updating an IPsec Tunnel.
+type UpdateMagicTransitIPsecTunnelResponse struct {
+	Response
+	Result struct {
+		Modified            bool                    `json:"modified"`
+		ModifiedIPsecTunnel MagicTransitIPsecTunnel `json:"modified_ipsec_tunnel"`
+	} `json:"result"`
+}
+
+// DeleteMagicTransitIPsecTunnelResponse contains a response after deleting an IPsec Tunnel.
+type DeleteMagicTransitIPsecTunnelResponse struct {
+	Response
+	Result struct {
+		Deleted            bool                    `json:"deleted"`
+		DeletedIPsecTunnel MagicTransitIPsecTunnel `json:"deleted_ipsec_tunnel"`
+	} `json:"result"`
+}
+
+// ListMagicTransitIPsecTunnels lists all IPsec tunnels for a given account
+//
+// API reference: https://api.cloudflare.com/#magic-ipsec-tunnels-list-ipsec-tunnels
+func (api *API) ListMagicTransitIPsecTunnels(ctx context.Context, accountID string) ([]MagicTransitIPsecTunnel, error) {
+	uri := fmt.Sprintf("/accounts/%s/magic/ipsec_tunnels", accountID)
+	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
+	if err != nil {
+		return []MagicTransitIPsecTunnel{}, err
+	}
+
+	result := ListMagicTransitIPsecTunnelsResponse{}
+	if err := json.Unmarshal(res, &result); err != nil {
+		return []MagicTransitIPsecTunnel{}, errors.Wrap(err, errUnmarshalError)
+	}
+
+	return result.Result.IPsecTunnels, nil
+}
+
+// GetMagicTransitIPsecTunnel returns zero or one IPsec tunnel
+//
+// API reference: https://api.cloudflare.com/#magic-ipsec-tunnels-ipsec-tunnel-details
+func (api *API) GetMagicTransitIPsecTunnel(ctx context.Context, accountID string, id string) (MagicTransitIPsecTunnel, error) {
+	uri := fmt.Sprintf("/accounts/%s/magic/ipsec_tunnels/%s", accountID, id)
+	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
+	if err != nil {
+		return MagicTransitIPsecTunnel{}, err
+	}
+
+	result := GetMagicTransitIPsecTunnelResponse{}
+	if err := json.Unmarshal(res, &result); err != nil {
+		return MagicTransitIPsecTunnel{}, errors.Wrap(err, errUnmarshalError)
+	}
+
+	return result.Result.IPsecTunnel, nil
+}
+
+// CreateMagicTransitIPsecTunnels creates one or more IPsec tunnels
+//
+// API reference: https://api.cloudflare.com/#magic-ipsec-tunnels-create-ipsec-tunnels
+func (api *API) CreateMagicTransitIPsecTunnels(ctx context.Context, accountID string, tunnels []MagicTransitIPsecTunnel) ([]MagicTransitIPsecTunnel, error) {
+	uri := fmt.Sprintf("/accounts/%s/magic/ipsec_tunnels", accountID)
+	res, err := api.makeRequestContext(ctx, http.MethodPost, uri, CreateMagicTransitIPsecTunnelsRequest{
+		IPsecTunnels: tunnels,
+	})
+
+	if err != nil {
+		return []MagicTransitIPsecTunnel{}, err
+	}
+
+	result := ListMagicTransitIPsecTunnelsResponse{}
+	if err := json.Unmarshal(res, &result); err != nil {
+		return []MagicTransitIPsecTunnel{}, errors.Wrap(err, errUnmarshalError)
+	}
+
+	return result.Result.IPsecTunnels, nil
+}
+
+// UpdateMagicTransitIPsecTunnel updates an IPsec tunnel
+//
+// API reference: https://api.cloudflare.com/#magic-ipsec-tunnels-update-ipsec-tunnel
+func (api *API) UpdateMagicTransitIPsecTunnel(ctx context.Context, accountID string, id string, tunnel MagicTransitIPsecTunnel) (MagicTransitIPsecTunnel, error) {
+	uri := fmt.Sprintf("/accounts/%s/magic/ipsec_tunnels/%s", accountID, id)
+	res, err := api.makeRequestContext(ctx, http.MethodPut, uri, tunnel)
+
+	if err != nil {
+		return MagicTransitIPsecTunnel{}, err
+	}
+
+	result := UpdateMagicTransitIPsecTunnelResponse{}
+	if err := json.Unmarshal(res, &result); err != nil {
+		return MagicTransitIPsecTunnel{}, errors.Wrap(err, errUnmarshalError)
+	}
+
+	if !result.Result.Modified {
+		return MagicTransitIPsecTunnel{}, errors.New(errMagicTransitIPsecTunnelNotModified)
+	}
+
+	return result.Result.ModifiedIPsecTunnel, nil
+}
+
+// DeleteMagicTransitIPsecTunnel deletes an IPsec Tunnel
+//
+// API reference: https://api.cloudflare.com/#magic-ipsec-tunnels-delete-ipsec-tunnel
+func (api *API) DeleteMagicTransitIPsecTunnel(ctx context.Context, accountID string, id string) (MagicTransitIPsecTunnel, error) {
+	uri := fmt.Sprintf("/accounts/%s/magic/ipsec_tunnels/%s", accountID, id)
+	res, err := api.makeRequestContext(ctx, http.MethodDelete, uri, nil)
+
+	if err != nil {
+		return MagicTransitIPsecTunnel{}, err
+	}
+
+	result := DeleteMagicTransitIPsecTunnelResponse{}
+	if err := json.Unmarshal(res, &result); err != nil {
+		return MagicTransitIPsecTunnel{}, errors.Wrap(err, errUnmarshalError)
+	}
+
+	if !result.Result.Deleted {
+		return MagicTransitIPsecTunnel{}, errors.New(errMagicTransitIPsecTunnelNotDeleted)
+	}
+
+	return result.Result.DeletedIPsecTunnel, nil
+}