refactor request pointers

opsgenie · Feb 25, 2019 · 523f64f · 523f64f
1 parent cda04f3
commit 523f64f
Show file tree

Hide file tree

Showing 85 changed files with 1,324 additions and 1,363 deletions.
diff --git a/account/account.go b/account/account.go
@@ -1,28 +1,26 @@
 package account
 
 import (
-	"github.com/opsgenie/opsgenie-go-sdk-v2/client"
 	"context"
+	"github.com/opsgenie/opsgenie-go-sdk-v2/client"
 )
 
 type Client struct {
-	client client.OpsGenieClient
+	client *client.OpsGenieClient
 }
 
 func NewClient(config *client.Config) (*Client, error) {
 	opsgenieClient, err := client.NewOpsGenieClient(config)
 	if err != nil {
 		return nil, err
 	}
-	client := &Client{}
-	client.client = *opsgenieClient
-	return client, nil
+	return &Client{opsgenieClient}, nil
 }
 
-func (ac *Client) Get(ctx context.Context, req GetRequest) (*GetResult, error) {
+func (c *Client) Get(ctx context.Context, req *GetRequest) (*GetResult, error) {
 	getResult := &GetResult{}
 
-	err := ac.client.Exec(ctx, req, getResult)
+	err := c.client.Exec(ctx, req, getResult)
 	if err != nil {
 		return nil, err
 	}

diff --git a/account/request.go b/account/request.go
@@ -6,14 +6,14 @@ type GetRequest struct {
 	client.BaseRequest
 }
 
-func (lr GetRequest) Validate() error {
+func (r *GetRequest) Validate() error {
 	return nil
 }
 
-func (lr GetRequest) ResourcePath() string {
+func (r *GetRequest) ResourcePath() string {
 	return "/v2/account"
 }
 
-func (lr GetRequest) Method() string {
+func (r *GetRequest) Method() string {
 	return "GET"
 }
diff --git a/alert/acknowledge_request.go b/alert/acknowledge_request.go
@@ -14,24 +14,24 @@ type AcknowledgeAlertRequest struct {
 	Note            string `json:"note,omitempty"`
 }
 
-func (r AcknowledgeAlertRequest) Validate() error {
+func (r *AcknowledgeAlertRequest) Validate() error {
 	if r.IdentifierValue == "" {
 		return errors.New("Identifier can not be empty")
 	}
 	return nil
 }
 
-func (r AcknowledgeAlertRequest) ResourcePath() string {
+func (r *AcknowledgeAlertRequest) ResourcePath() string {
 
 	return "/v2/alerts/" + r.IdentifierValue + "/acknowledge"
 
 }
 
-func (r AcknowledgeAlertRequest) Method() string {
+func (r *AcknowledgeAlertRequest) Method() string {
 	return "POST"
 }
 
-func (r AcknowledgeAlertRequest) RequestParams() map[string]string {
+func (r *AcknowledgeAlertRequest) RequestParams() map[string]string {
 
 	params := make(map[string]string)
 

diff --git a/alert/add_details_request.go b/alert/add_details_request.go
@@ -15,7 +15,7 @@ type AddDetailsRequest struct {
 	Note            string            `json:"note,omitempty"`
 }
 
-func (r AddDetailsRequest) Validate() error {
+func (r *AddDetailsRequest) Validate() error {
 	if len(r.Details) == 0 {
 		return errors.New("Details can not be empty")
 	}
@@ -26,17 +26,17 @@ func (r AddDetailsRequest) Validate() error {
 	return nil
 }
 
-func (r AddDetailsRequest) ResourcePath() string {
+func (r *AddDetailsRequest) ResourcePath() string {
 
 	return "/v2/alerts/" + r.IdentifierValue + "/details"
 
 }
 
-func (r AddDetailsRequest) Method() string {
+func (r *AddDetailsRequest) Method() string {
 	return "POST"
 }
 
-func (r AddDetailsRequest) RequestParams() map[string]string {
+func (r *AddDetailsRequest) RequestParams() map[string]string {
 
 	params := make(map[string]string)
 

diff --git a/alert/add_note_request.go b/alert/add_note_request.go
@@ -14,7 +14,7 @@ type AddNoteRequest struct {
 	Note            string `json:"note,omitempty"`
 }
 
-func (r AddNoteRequest) Validate() error {
+func (r *AddNoteRequest) Validate() error {
 	if r.Note == "" {
 		return errors.New("Note can not be empty")
 	}
@@ -24,17 +24,17 @@ func (r AddNoteRequest) Validate() error {
 	return nil
 }
 
-func (r AddNoteRequest) ResourcePath() string {
+func (r *AddNoteRequest) ResourcePath() string {
 
 	return "/v2/alerts/" + r.IdentifierValue + "/notes"
 
 }
 
-func (r AddNoteRequest) Method() string {
+func (r *AddNoteRequest) Method() string {
 	return "POST"
 }
 
-func (r AddNoteRequest) RequestParams() map[string]string {
+func (r *AddNoteRequest) RequestParams() map[string]string {
 
 	params := make(map[string]string)
 

diff --git a/alert/add_responder.go b/alert/add_responder.go
@@ -15,35 +15,35 @@ type AddResponderRequest struct {
 	Note            string    `json:"note,omitempty"`
 }
 
-func (r AddResponderRequest) Validate() error {
+func (r *AddResponderRequest) Validate() error {
 
 	if r.Responder.Type != UserResponder && r.Responder.Type != TeamResponder {
-			return errors.New("Responder type must be user or team")
-		}
+		return errors.New("Responder type must be user or team")
+	}
 	if r.Responder.Type == UserResponder && r.Responder.Id == "" && r.Responder.Username == "" {
-			return errors.New("User ID or username must be defined")
-		}
+		return errors.New("User ID or username must be defined")
+	}
 	if r.Responder.Type == TeamResponder && r.Responder.Id == "" && r.Responder.Name == "" {
-			return errors.New("Team ID or name must be defined")
-		}
+		return errors.New("Team ID or name must be defined")
+	}
 
 	if r.IdentifierValue == "" {
 		return errors.New("Identifier can not be empty")
 	}
 	return nil
 }
 
-func (r AddResponderRequest) ResourcePath() string {
+func (r *AddResponderRequest) ResourcePath() string {
 
 	return "/v2/alerts/" + r.IdentifierValue + "/responders"
 
 }
 
-func (r AddResponderRequest) Method() string {
+func (r *AddResponderRequest) Method() string {
 	return "POST"
 }
 
-func (r AddResponderRequest) RequestParams() map[string]string {
+func (r *AddResponderRequest) RequestParams() map[string]string {
 
 	params := make(map[string]string)
 

diff --git a/alert/add_tags_request.go b/alert/add_tags_request.go
@@ -15,7 +15,7 @@ type AddTagsRequest struct {
 	Note            string   `json:"note,omitempty"`
 }
 
-func (r AddTagsRequest) Validate() error {
+func (r *AddTagsRequest) Validate() error {
 	if len(r.Tags) == 0 {
 		return errors.New("Tags list can not be empty")
 	}
@@ -26,17 +26,17 @@ func (r AddTagsRequest) Validate() error {
 	return nil
 }
 
-func (r AddTagsRequest) ResourcePath() string {
+func (r *AddTagsRequest) ResourcePath() string {
 
 	return "/v2/alerts/" + r.IdentifierValue + "/tags"
 
 }
 
-func (r AddTagsRequest) Method() string {
+func (r *AddTagsRequest) Method() string {
 	return "POST"
 }
 
-func (r AddTagsRequest) RequestParams() map[string]string {
+func (r *AddTagsRequest) RequestParams() map[string]string {
 
 	params := make(map[string]string)
 

diff --git a/alert/add_team_request.go b/alert/add_team_request.go
@@ -15,7 +15,7 @@ type AddTeamRequest struct {
 	Note            string `json:"note,omitempty"`
 }
 
-func (r AddTeamRequest) Validate() error {
+func (r *AddTeamRequest) Validate() error {
 	if r.Team.ID == "" && r.Team.Name == "" {
 		return errors.New("Team ID or name must be defined")
 	}
@@ -26,17 +26,17 @@ func (r AddTeamRequest) Validate() error {
 	return nil
 }
 
-func (r AddTeamRequest) ResourcePath() string {
+func (r *AddTeamRequest) ResourcePath() string {
 
 	return "/v2/alerts/" + r.IdentifierValue + "/teams"
 
 }
 
-func (r AddTeamRequest) Method() string {
+func (r *AddTeamRequest) Method() string {
 	return "POST"
 }
 
-func (r AddTeamRequest) RequestParams() map[string]string {
+func (r *AddTeamRequest) RequestParams() map[string]string {
 
 	params := make(map[string]string)