fixup! RHINENG-20967: verify system's environment with candlepin

Author: MichaelMraka

listener/rhsm.go

@@ -42,24 +42,31 @@ func getTemplate(db *gorm.DB, accountID int, environments []string) (*int64, err
 	return templateID, nil
 }
 
-func callCandlepinEnvironment(ctx context.Context, consumer string) (
-	*candlepin.ConsumersDetailResponse, error) {
+func httpCallCandlepinEnv(ctx context.Context, consumer string) (interface{}, *http.Response, error) {
 	candlepinEnvConsumersURL := utils.CoreCfg.CandlepinAddress + "/consumers/" + consumer
-	candlepinFunc := func() (interface{}, *http.Response, error) {
-		candlepinResp := candlepin.ConsumersDetailResponse{}
-		resp, err := candlepinClient.Request(&ctx, http.MethodGet, candlepinEnvConsumersURL, nil, &candlepinResp)
-		statusCode := utils.TryGetStatusCode(resp)
-		utils.LogDebug("candlepin_url", candlepinEnvConsumersURL, "status_code", statusCode, "err", err)
-		if err != nil {
-			err = errors.Wrap(candlepin.ErrCandlepin, err.Error())
-		} else if statusCode != http.StatusOK && statusCode != http.StatusNoContent {
-			err = errors.Errorf("candlepin API status %d", statusCode)
-		}
-		return &candlepinResp, resp, err
+	candlepinResp := candlepin.ConsumersDetailResponse{}
+	resp, err := candlepinClient.Request(&ctx, http.MethodGet, candlepinEnvConsumersURL, nil, &candlepinResp)
+	if err != nil {
+		utils.LogDebug("candlepin_url", candlepinEnvConsumersURL, "err", err)
+		return nil, resp, errors.Wrap(candlepin.ErrCandlepin, err.Error())
+	}
+	statusCode := utils.TryGetStatusCode(resp)
+	utils.LogDebug("candlepin_url", candlepinEnvConsumersURL, "status_code", statusCode)
+	if statusCode != http.StatusOK && statusCode != http.StatusNoContent {
+		err = errors.Errorf("candlepin API status %d", statusCode)
 	}
+	return &candlepinResp, resp, err
+}
 
-	candlepinRespPtr, err := utils.HTTPCallRetry(candlepinFunc,
-		candlepin.CandlepinExpRetries, candlepin.CandlepinRetries, http.StatusServiceUnavailable)
+func callCandlepinEnvironment(ctx context.Context, consumer string) (
+	*candlepin.ConsumersDetailResponse, error) {
+	candlepinRespPtr, err := utils.HTTPCallRetry(
+		func() (interface{}, *http.Response, error) {
+			return httpCallCandlepinEnv(ctx, consumer)
+		},
+		candlepin.CandlepinExpRetries,
+		candlepin.CandlepinRetries,
+		http.StatusServiceUnavailable)
 	if err != nil {
 		return nil, errors.Wrap(err, "candlepin /consumers call failed")
 	}