Merge pull request #147 from SumoLogic/ssain-move-data-source-role-code

move some code around for generator

Author: seansain

sumologic/data_source_sumologic_role.go

@@ -1,6 +1,7 @@
 package sumologic
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"log"
@@ -79,3 +80,26 @@ func dataSourceSumologicRoleRead(d *schema.ResourceData, meta interface{}) error
 	log.Printf("[DEBUG] data_source_sumologic_role: retrieved %v", role)
 	return nil
 }
+
+func (s *Client) GetRoleName(name string) (*Role, error) {
+	data, _, err := s.Get(fmt.Sprintf("v1/roles?name=%s", name))
+	if err != nil {
+		return nil, err
+	}
+
+	if data == nil {
+		return nil, fmt.Errorf("role with name '%s' does not exist", name)
+	}
+
+	var response RoleResponse
+	err = json.Unmarshal(data, &response)
+	if err != nil {
+		return nil, err
+	}
+
+	return &response.Roles[0], nil
+}
+
+type RoleResponse struct {
+	Roles []Role `json:"data"`
+}

sumologic/sumologic_role.go

@@ -53,25 +53,6 @@ func (s *Client) GetRole(id string) (*Role, error) {
 	return &role, nil
 }
 
-func (s *Client) GetRoleName(name string) (*Role, error) {
-	data, _, err := s.Get(fmt.Sprintf("v1/roles?name=%s", name))
-	if err != nil {
-		return nil, err
-	}
-
-	if data == nil {
-		return nil, fmt.Errorf("role with name '%s' does not exist", name)
-	}
-
-	var response RoleResponse
-	err = json.Unmarshal(data, &response)
-	if err != nil {
-		return nil, err
-	}
-
-	return &response.Roles[0], nil
-}
-
 func (s *Client) UpdateRole(role Role) error {
 	url := fmt.Sprintf("v1/roles/%s", role.ID)
 
@@ -81,10 +62,6 @@ func (s *Client) UpdateRole(role Role) error {
 	return err
 }
 
-type RoleResponse struct {
-	Roles []Role `json:"data"`
-}
-
 // models
 type Role struct {
 	ID string `json:"id,omitempty"`