Remove unnecessary return value from Client.Get

Author: ErikAtSumo

sumologic/data_source_sumologic_folder.go

@@ -44,7 +44,7 @@ func dataSourceSumologicFolderRead(d *schema.ResourceData, meta interface{}) err
 }
 
 func (s *Client) GetFolderByPath(path string) (*Folder, error) {
-	data, _, err := s.Get(fmt.Sprintf("v2/content/path?path=%s", url.QueryEscape(path)))
+	data, err := s.Get(fmt.Sprintf("v2/content/path?path=%s", url.QueryEscape(path)))
 	if err != nil {
 		return nil, err
 	}

sumologic/data_source_sumologic_role.go

@@ -86,7 +86,7 @@ func dataSourceSumologicRoleRead(d *schema.ResourceData, meta interface{}) error
 }
 
 func (s *Client) GetRoleName(name string) (*Role, error) {
-	data, _, err := s.Get(fmt.Sprintf("v1/roles?name=%s", url.QueryEscape(name)))
+	data, err := s.Get(fmt.Sprintf("v1/roles?name=%s", url.QueryEscape(name)))
 	if err != nil {
 		return nil, err
 	}

sumologic/data_source_sumologic_role_v2.go

@@ -121,7 +121,7 @@ func dataSourceSumologicRoleV2Read(d *schema.ResourceData, meta interface{}) err
 }
 
 func (s *Client) GetRoleNameV2(name string) (*RoleV2, error) {
-	data, _, err := s.Get(fmt.Sprintf("v2/roles?name=%s", url.QueryEscape(name)))
+	data, err := s.Get(fmt.Sprintf("v2/roles?name=%s", url.QueryEscape(name)))
 	if err != nil {
 		return nil, err
 	}

sumologic/data_source_sumologic_user.go

@@ -91,7 +91,7 @@ func dataSourceSumologicUserRead(d *schema.ResourceData, meta interface{}) error
 }
 
 func (s *Client) GetUserByEmail(email string) (*User, error) {
-	data, _, err := s.Get(fmt.Sprintf("v1/users?email=%s", url.QueryEscape(email)))
+	data, err := s.Get(fmt.Sprintf("v1/users?email=%s", url.QueryEscape(email)))
 	if err != nil {
 		return nil, err
 	}

sumologic/sumologic_app.go

@@ -9,7 +9,7 @@ import (
 
 func (s *Client) GetAppInstance(id string) (*AppInstance, error) {
 	url := fmt.Sprintf("v2/apps/instances/%s", id)
-	data, _, err := s.Get(url)
+	data, err := s.Get(url)
 	if err != nil {
 		return nil, err
 	}
@@ -47,7 +47,7 @@ func (s *Client) CreateAppInstance(uuid string, appInstallPayload AppInstallPayl
 	}
 
 	var appInstallResponse AppInstallResponse
-	b, _, _ := s.Get(url)
+	b, _ := s.Get(url)
 	err = json.Unmarshal(b, &appInstallResponse)
 	if err != nil {
 		return "", err
@@ -96,7 +96,7 @@ func (s *Client) UpdateAppInstance(uuid string, appInstallPayload AppInstallPayl
 	}
 
 	var appInstallResponse AppInstallResponse
-	b, _, _ := s.Get(url)
+	b, _ := s.Get(url)
 	err = json.Unmarshal(b, &appInstallResponse)
 	if err != nil {
 		return "", err

sumologic/sumologic_client.go

@@ -169,38 +169,38 @@ func (s *Client) Put(urlPath string, payload interface{}) ([]byte, error) {
 	return s.handleSumoResponse(resp)
 }
 
-func (s *Client) Get(urlPath string) ([]byte, string, error) {
+func (s *Client) Get(urlPath string) ([]byte, error) {
 	return s.GetWithErrOpt(urlPath, false)
 }
 
-func (s *Client) GetWithErrOpt(urlPath string, return404Err bool) ([]byte, string, error) {
+func (s *Client) GetWithErrOpt(urlPath string, return404Err bool) ([]byte, error) {
 	req, err := s.createSumoRequest(http.MethodGet, urlPath, nil)
 	if err != nil {
-		return nil, "", err
+		return nil, err
 	}
 
 	resp, err := s.doSumoRequest(req)
 	if err != nil {
-		return nil, "", err
+		return nil, err
 	}
 
 	d, err := io.ReadAll(resp.Body)
 	defer resp.Body.Close()
 	if err != nil {
-		return nil, "", err
+		return nil, err
 	}
 
 	if resp.StatusCode == 404 {
 		if return404Err {
-			return nil, "", errors.New(string(d))
+			return nil, errors.New(string(d))
 		} else {
-			return nil, "", nil
+			return nil, nil
 		}
 	} else if resp.StatusCode >= 400 {
-		return nil, "", errors.New(string(d))
+		return nil, errors.New(string(d))
 	}
 
-	return d, resp.Header.Get("ETag"), nil
+	return d, nil
 }
 
 func (s *Client) GetETag(urlPath string) (string, error) {

sumologic/sumologic_cloud_to_cloud_source.go

@@ -46,7 +46,7 @@ func (s *Client) CreateCloudToCloudSource(source CloudToCloudSource, collectorID
 
 func (s *Client) GetCloudToCloudSource(collectorID, sourceID int) (*CloudToCloudSource, error) {
 	urlPath := fmt.Sprintf("v1/collectors/%d/sources/%d", collectorID, sourceID)
-	body, _, err := s.Get(urlPath)
+	body, err := s.Get(urlPath)
 
 	if err != nil {
 		return nil, err

sumologic/sumologic_cloudsyslog_source.go

@@ -39,7 +39,7 @@ func (s *Client) CreateCloudsyslogSource(cloudSyslogSource CloudSyslogSource, co
 
 func (s *Client) GetCloudSyslogSource(collectorID, sourceID int) (*CloudSyslogSource, error) {
 
-	body, _, err := s.Get(fmt.Sprintf("v1/collectors/%d/sources/%d", collectorID, sourceID))
+	body, err := s.Get(fmt.Sprintf("v1/collectors/%d/sources/%d", collectorID, sourceID))
 	if err != nil {
 		return nil, err
 	}

sumologic/sumologic_cmffgp.go

@@ -10,7 +10,7 @@ func (s *Client) GetCmfFgp(targetType string, targetId string) (*CmfFgpResponse,
 
 	// e.g. "v1/monitors/0000000000000003/permissions"
 	url := fmt.Sprintf("v1/%s/%s/permissions", targetType, targetId)
-	data, _, err := s.GetWithErrOpt(url, true)
+	data, err := s.GetWithErrOpt(url, true)
 	if err != nil {
 		return nil, err
 	}

sumologic/sumologic_collectors.go

@@ -6,7 +6,7 @@ import (
 )
 
 func (s *Client) GetCollector(id int) (*Collector, error) {
-	data, _, err := s.Get(fmt.Sprintf("v1/collectors/%d", id))
+	data, err := s.Get(fmt.Sprintf("v1/collectors/%d", id))
 	if err != nil {
 		return nil, err
 	}
@@ -25,7 +25,7 @@ func (s *Client) GetCollector(id int) (*Collector, error) {
 }
 
 func (s *Client) GetCollectorName(name string) (*Collector, error) {
-	data, _, err := s.Get(fmt.Sprintf("v1/collectors/name/%s", name))
+	data, err := s.Get(fmt.Sprintf("v1/collectors/name/%s", name))
 	if err != nil {
 		return nil, err
 	}