Make arguments to APIKey-related methods consistent by accepting poin…

…ters as arguments everywhere

api_keys.go

@@ -81,17 +81,17 @@ func (client *Client) GetAPIKeys() ([]APIKey, error) {
 }
 
 // GetAPIKey returns a single API key or error on failure
-func (client *Client) GetAPIKey(key string) (*APIKey, error) {
+func (client *Client) GetAPIKey(key *string) (*APIKey, error) {
 	var out reqAPIKey
-	if err := client.doJsonRequest("GET", fmt.Sprintf("/v1/api_key/%s", key), nil, &out); err != nil {
+	if err := client.doJsonRequest("GET", fmt.Sprintf("/v1/api_key/%s", *key), nil, &out); err != nil {
 		return nil, err
 	}
 
 	return out.APIKey, nil
 }
 
 // CreateAPIKey creates an API key from given struct and fills the rest of its
-// fileds, or returns an error on failure
+// fields, or returns an error on failure
 func (client *Client) CreateAPIKey(name *string) (*APIKey, error) {
 	toPost := struct {
 		Name *string `json:"name,omitempty"`
@@ -117,6 +117,6 @@ func (client *Client) UpdateAPIKey(apikey *APIKey) error {
 }
 
 // DeleteAPIKey deletes API key given by key, returns an error
-func (client *Client) DeleteAPIKey(key string) error {
-	return client.doJsonRequest("DELETE", fmt.Sprintf("/v1/api_key/%s", key), nil, nil)
+func (client *Client) DeleteAPIKey(key *string) error {
+	return client.doJsonRequest("DELETE", fmt.Sprintf("/v1/api_key/%s", *key), nil, nil)
 }

integration/api_keys_test.go

@@ -19,14 +19,14 @@ func TestAPIKeyCreateGetAndDelete(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Creating API key failed when it shouldn't. (%s)", err)
 	}
-	defer cleanUpAPIKey(t, *expected.Key)
+	defer cleanUpAPIKey(t, expected.Key)
 
 	if *expected.Name != keyName {
 		t.Errorf("Created key has wrong name. Got %s, want %s", *expected.Name, keyName)
 	}
 
 	// now try to fetch it freshly and compare it again
-	actual, err := client.GetAPIKey(*expected.Key)
+	actual, err := client.GetAPIKey(expected.Key)
 	if err != nil {
 		t.Fatalf("Retrieving API key failed when it shouldn't. (%s)", err)
 	}
@@ -40,7 +40,7 @@ func TestAPIKeyUpdateName(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Creating API key failed when it shouldn't. (%s)", err)
 	}
-	defer cleanUpAPIKey(t, *keyStruct.Key)
+	defer cleanUpAPIKey(t, keyStruct.Key)
 
 	keyStruct.Name = newKeyName
 	err = client.UpdateAPIKey(keyStruct)
@@ -60,12 +60,12 @@ func TestAPIKeyGetMultipleKeys(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Creating API key failed when it shouldn't. (%s)", err)
 	}
-	defer cleanUpAPIKey(t, *key1.Key)
+	defer cleanUpAPIKey(t, key1.Key)
 	key2, err := client.CreateAPIKey(key2Name)
 	if err != nil {
 		t.Fatalf("Creating API key failed when it shouldn't. (%s)", err)
 	}
-	defer cleanUpAPIKey(t, *key2.Key)
+	defer cleanUpAPIKey(t, key2.Key)
 	allKeys, err := client.GetAPIKeys()
 	if err != nil {
 		t.Fatalf("Getting all API keys failed when it shouldn't (%s)", err)
@@ -104,7 +104,7 @@ func assertAPIKeyEquals(t *testing.T, actual, expected *datadog.APIKey) {
 	}
 }
 
-func cleanUpAPIKey(t *testing.T, key string) {
+func cleanUpAPIKey(t *testing.T, key *string) {
 	if err := client.DeleteAPIKey(key); err != nil {
 		t.Fatalf("Deleting api key failed when it shouldn't. Manual cleanup needed. (%s)", err)
 	}