Merge pull request #850 from jacobbednarz/swap-out-api-account-for-ex…

…plicit-value s/api.AccountID/accountID
cloudflare · Apr 6, 2022 · 2f021c8 · 2f021c8
2 parents ae253f4 + 7da278b
commit 2f021c8
Show file tree

Hide file tree

Showing 10 changed files with 148 additions and 203 deletions.
diff --git a/ip_address_management.go b/ip_address_management.go
@@ -62,8 +62,8 @@ type AdvertisementStatusUpdateRequest struct {
 // ListPrefixes lists all IP prefixes for a given account
 //
 // API reference: https://api.cloudflare.com/#ip-address-management-prefixes-list-prefixes
-func (api *API) ListPrefixes(ctx context.Context) ([]IPPrefix, error) {
-	uri := fmt.Sprintf("/accounts/%s/addressing/prefixes", api.AccountID)
+func (api *API) ListPrefixes(ctx context.Context, accountID string) ([]IPPrefix, error) {
+	uri := fmt.Sprintf("/accounts/%s/addressing/prefixes", accountID)
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
 		return []IPPrefix{}, err
@@ -80,8 +80,8 @@ func (api *API) ListPrefixes(ctx context.Context) ([]IPPrefix, error) {
 // GetPrefix returns a specific IP prefix
 //
 // API reference: https://api.cloudflare.com/#ip-address-management-prefixes-prefix-details
-func (api *API) GetPrefix(ctx context.Context, id string) (IPPrefix, error) {
-	uri := fmt.Sprintf("/accounts/%s/addressing/prefixes/%s", api.AccountID, id)
+func (api *API) GetPrefix(ctx context.Context, accountID, ID string) (IPPrefix, error) {
+	uri := fmt.Sprintf("/accounts/%s/addressing/prefixes/%s", accountID, ID)
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
 		return IPPrefix{}, err
@@ -98,8 +98,8 @@ func (api *API) GetPrefix(ctx context.Context, id string) (IPPrefix, error) {
 // UpdatePrefixDescription edits the description of the IP prefix
 //
 // API reference: https://api.cloudflare.com/#ip-address-management-prefixes-update-prefix-description
-func (api *API) UpdatePrefixDescription(ctx context.Context, id string, description string) (IPPrefix, error) {
-	uri := fmt.Sprintf("/accounts/%s/addressing/prefixes/%s", api.AccountID, id)
+func (api *API) UpdatePrefixDescription(ctx context.Context, accountID, ID string, description string) (IPPrefix, error) {
+	uri := fmt.Sprintf("/accounts/%s/addressing/prefixes/%s", accountID, ID)
 	res, err := api.makeRequestContext(ctx, http.MethodPatch, uri, IPPrefixUpdateRequest{Description: description})
 	if err != nil {
 		return IPPrefix{}, err
@@ -116,8 +116,8 @@ func (api *API) UpdatePrefixDescription(ctx context.Context, id string, descript
 // GetAdvertisementStatus returns the BGP status of the IP prefix
 //
 // API reference: https://api.cloudflare.com/#ip-address-management-prefixes-update-prefix-description
-func (api *API) GetAdvertisementStatus(ctx context.Context, id string) (AdvertisementStatus, error) {
-	uri := fmt.Sprintf("/accounts/%s/addressing/prefixes/%s/bgp/status", api.AccountID, id)
+func (api *API) GetAdvertisementStatus(ctx context.Context, accountID, ID string) (AdvertisementStatus, error) {
+	uri := fmt.Sprintf("/accounts/%s/addressing/prefixes/%s/bgp/status", accountID, ID)
 	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
 		return AdvertisementStatus{}, err
@@ -134,8 +134,8 @@ func (api *API) GetAdvertisementStatus(ctx context.Context, id string) (Advertis
 // UpdateAdvertisementStatus changes the BGP status of an IP prefix
 //
 // API reference: https://api.cloudflare.com/#ip-address-management-prefixes-update-prefix-description
-func (api *API) UpdateAdvertisementStatus(ctx context.Context, id string, advertised bool) (AdvertisementStatus, error) {
-	uri := fmt.Sprintf("/accounts/%s/addressing/prefixes/%s/bgp/status", api.AccountID, id)
+func (api *API) UpdateAdvertisementStatus(ctx context.Context, accountID, ID string, advertised bool) (AdvertisementStatus, error) {
+	uri := fmt.Sprintf("/accounts/%s/addressing/prefixes/%s/bgp/status", accountID, ID)
 	res, err := api.makeRequestContext(ctx, http.MethodPatch, uri, AdvertisementStatusUpdateRequest{Advertised: advertised})
 	if err != nil {
 		return AdvertisementStatus{}, err

diff --git a/ip_address_management_test.go b/ip_address_management_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestListIPPrefix(t *testing.T) {
-	setup(UsingAccount("foo"))
+	setup()
 	defer teardown()
 
 	handler := func(w http.ResponseWriter, r *http.Request) {
@@ -39,7 +39,7 @@ func TestListIPPrefix(t *testing.T) {
 		}`)
 	}
 
-	mux.HandleFunc("/accounts/foo/addressing/prefixes", handler)
+	mux.HandleFunc("/accounts/"+testAccountID+"/addressing/prefixes", handler)
 
 	createdAt, _ := time.Parse(time.RFC3339, "2020-04-24T21:25:55.643771Z")
 	modifiedAt, _ := time.Parse(time.RFC3339, "2020-04-24T21:25:55.643771Z")
@@ -60,14 +60,14 @@ func TestListIPPrefix(t *testing.T) {
 		},
 	}
 
-	actual, err := client.ListPrefixes(context.Background())
+	actual, err := client.ListPrefixes(context.Background(), testAccountID)
 	if assert.NoError(t, err) {
 		assert.Equal(t, want, actual)
 	}
 }
 
 func TestGetIPPrefix(t *testing.T) {
-	setup(UsingAccount("foo"))
+	setup()
 	defer teardown()
 
 	handler := func(w http.ResponseWriter, r *http.Request) {
@@ -93,7 +93,7 @@ func TestGetIPPrefix(t *testing.T) {
 		}`)
 	}
 
-	mux.HandleFunc("/accounts/foo/addressing/prefixes/f68579455bd947efb65ffa1bcf33b52c", handler)
+	mux.HandleFunc("/accounts/"+testAccountID+"/addressing/prefixes/f68579455bd947efb65ffa1bcf33b52c", handler)
 
 	createdAt, _ := time.Parse(time.RFC3339, "2020-04-24T21:25:55.643771Z")
 	modifiedAt, _ := time.Parse(time.RFC3339, "2020-04-24T21:25:55.643771Z")
@@ -112,14 +112,14 @@ func TestGetIPPrefix(t *testing.T) {
 		AdvertisedModifiedAt: &advertisedModifiedAt,
 	}
 
-	actual, err := client.GetPrefix(context.Background(), "f68579455bd947efb65ffa1bcf33b52c")
+	actual, err := client.GetPrefix(context.Background(), testAccountID, "f68579455bd947efb65ffa1bcf33b52c")
 	if assert.NoError(t, err) {
 		assert.Equal(t, want, actual)
 	}
 }
 
 func TestUpdatePrefixDescription(t *testing.T) {
-	setup(UsingAccount("foo"))
+	setup()
 	defer teardown()
 
 	handler := func(w http.ResponseWriter, r *http.Request) {
@@ -145,7 +145,7 @@ func TestUpdatePrefixDescription(t *testing.T) {
 		}`)
 	}
 
-	mux.HandleFunc("/accounts/foo/addressing/prefixes/f68579455bd947efb65ffa1bcf33b52c", handler)
+	mux.HandleFunc("/accounts/"+testAccountID+"/addressing/prefixes/f68579455bd947efb65ffa1bcf33b52c", handler)
 
 	createdAt, _ := time.Parse(time.RFC3339, "2020-04-24T21:25:55.643771Z")
 	modifiedAt, _ := time.Parse(time.RFC3339, "2020-04-24T21:25:55.643771Z")
@@ -164,14 +164,14 @@ func TestUpdatePrefixDescription(t *testing.T) {
 		AdvertisedModifiedAt: &advertisedModifiedAt,
 	}
 
-	actual, err := client.UpdatePrefixDescription(context.Background(), "f68579455bd947efb65ffa1bcf33b52c", "My IP Prefix")
+	actual, err := client.UpdatePrefixDescription(context.Background(), testAccountID, "f68579455bd947efb65ffa1bcf33b52c", "My IP Prefix")
 	if assert.NoError(t, err) {
 		assert.Equal(t, want, actual)
 	}
 }
 
 func TestGetAdvertisementStatus(t *testing.T) {
-	setup(UsingAccount("foo"))
+	setup()
 	defer teardown()
 
 	handler := func(w http.ResponseWriter, r *http.Request) {
@@ -188,7 +188,7 @@ func TestGetAdvertisementStatus(t *testing.T) {
 		}`)
 	}
 
-	mux.HandleFunc("/accounts/foo/addressing/prefixes/f68579455bd947efb65ffa1bcf33b52c/bgp/status", handler)
+	mux.HandleFunc("/accounts/"+testAccountID+"/addressing/prefixes/f68579455bd947efb65ffa1bcf33b52c/bgp/status", handler)
 
 	advertisedModifiedAt, _ := time.Parse(time.RFC3339, "2020-04-24T21:25:55.643771Z")
 
@@ -197,14 +197,14 @@ func TestGetAdvertisementStatus(t *testing.T) {
 		AdvertisedModifiedAt: &advertisedModifiedAt,
 	}
 
-	actual, err := client.GetAdvertisementStatus(context.Background(), "f68579455bd947efb65ffa1bcf33b52c")
+	actual, err := client.GetAdvertisementStatus(context.Background(), testAccountID, "f68579455bd947efb65ffa1bcf33b52c")
 	if assert.NoError(t, err) {
 		assert.Equal(t, want, actual)
 	}
 }
 
 func TestUpdateAdvertisementStatus(t *testing.T) {
-	setup(UsingAccount("foo"))
+	setup()
 	defer teardown()
 
 	handler := func(w http.ResponseWriter, r *http.Request) {
@@ -221,7 +221,7 @@ func TestUpdateAdvertisementStatus(t *testing.T) {
 		}`)
 	}
 
-	mux.HandleFunc("/accounts/foo/addressing/prefixes/f68579455bd947efb65ffa1bcf33b52c/bgp/status", handler)
+	mux.HandleFunc("/accounts/"+testAccountID+"/addressing/prefixes/f68579455bd947efb65ffa1bcf33b52c/bgp/status", handler)
 
 	advertisedModifiedAt, _ := time.Parse(time.RFC3339, "2020-04-24T21:25:55.643771Z")
 
@@ -230,7 +230,7 @@ func TestUpdateAdvertisementStatus(t *testing.T) {
 		AdvertisedModifiedAt: &advertisedModifiedAt,
 	}
 
-	actual, err := client.UpdateAdvertisementStatus(context.Background(), "f68579455bd947efb65ffa1bcf33b52c", false)
+	actual, err := client.UpdateAdvertisementStatus(context.Background(), testAccountID, "f68579455bd947efb65ffa1bcf33b52c", false)
 	if assert.NoError(t, err) {
 		assert.Equal(t, want, actual)
 	}