RHINENG-18242: remove candlepin call from listener

system's enviroment is in both reporters no need to call API anymore

Author: MichaelMraka

base/candlepin/candlepin.go

@@ -21,14 +21,6 @@ type ConsumersUpdateResponse struct {
 	Message string `json:"displayMessage"`
 }
 
-type ConsumersDetailResponse struct {
-	Environments []ConsumersEnvironment `json:"environments"`
-}
-
-type ConsumersEnvironment struct {
-	ID string `json:"id"`
-}
-
 var ErrCandlepin = errors.New("candlepin error")
 
 var (

deploy/clowdapp.yaml

@@ -141,10 +141,6 @@ objects:
         - {name: DB_USER, value: listener}
         - {name: DB_PASSWD, valueFrom: {secretKeyRef: {name: patchman-engine-database-passwords,
                                                         key: listener-database-password}}}
-        - {name: CANDLEPIN_ADDRESS, value: '${CANDLEPIN_ADDRESS}'}
-        - {name: CANDLEPIN_CERT, valueFrom: {secretKeyRef: {name: candlepin, key: cert}}}
-        - {name: CANDLEPIN_KEY, valueFrom: {secretKeyRef: {name: candlepin, key: key}}}
-        - {name: CANDLEPIN_CA, valueFrom: {secretKeyRef: {name: candlepin, key: ca}}}
         - {name: KAFKA_GROUP, value: patchman}
         - {name: KAFKA_READER_MAX_ATTEMPTS, value: '${KAFKA_READER_MAX_ATTEMPTS}'}
         - {name: KAFKA_WRITER_MAX_ATTEMPTS, value: '${KAFKA_WRITER_MAX_ATTEMPTS}'}

listener/rhsm.go

@@ -1,13 +1,9 @@
 package listener
 
 import (
-	"app/base/candlepin"
 	"app/base/models"
 	"app/base/utils"
-	"context"
-	"net/http"
 
-	"github.com/pkg/errors"
 	"gorm.io/gorm"
 )
 
@@ -41,27 +37,3 @@ func getTemplate(db *gorm.DB, accountID int, environments []string) (*int64, err
 	}
 	return templateID, nil
 }
-
-func callCandlepinEnvironment(ctx context.Context, consumer string) (
-	*candlepin.ConsumersDetailResponse, 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
-	}
-
-	candlepinRespPtr, err := utils.HTTPCallRetry(candlepinFunc,
-		candlepin.CandlepinExpRetries, candlepin.CandlepinRetries, http.StatusServiceUnavailable)
-	if err != nil {
-		return nil, errors.Wrap(err, "candlepin /consumers call failed")
-	}
-	return candlepinRespPtr.(*candlepin.ConsumersDetailResponse), nil
-}

listener/upload.go

@@ -3,7 +3,6 @@ package listener
 import (
 	"app/base"
 	"app/base/api"
-	"app/base/candlepin"
 	"app/base/database"
 	"app/base/inventory"
 	"app/base/models"
@@ -51,7 +50,6 @@ const (
 	RepoPathPattern           = "(/content/.*)"
 	RepoBasearchPlaceholder   = "$basearch"
 	RepoReleaseverPlaceholder = "$releasever"
-	TemplateRepoPattern       = `^https://cert\.console.*/api/pulp-content/(cs-)?[[:xdigit:]]+/templates/`
 )
 
 var (
@@ -65,12 +63,10 @@ var (
 )
 
 var (
-	repoPathRegex    = regexp.MustCompile(RepoPathPattern)
-	spacesRegex      = regexp.MustCompile(`^\s*$`)
-	templateRepoPath = regexp.MustCompile(TemplateRepoPattern)
-	httpClient       *api.Client
-	candlepinClient  = candlepin.CreateCandlepinClient()
-	metricByErr      = map[error]string{
+	repoPathRegex = regexp.MustCompile(RepoPathPattern)
+	spacesRegex   = regexp.MustCompile(`^\s*$`)
+	httpClient    *api.Client
+	metricByErr   = map[error]string{
 		ErrNoPackages:        ReceivedWarnNoPackages,
 		ErrReporter:          ReceivedWarnExcludedReporter,
 		ErrHostType:          ReceivedWarnExcludedHostType,
@@ -332,31 +328,11 @@ func hostTemplate(tx *gorm.DB, accountID int, host *Host) *int64 {
 	var templateID *int64
 	var err error
 	switch host.Reporter {
-	case rhsmReporter:
+	case rhsmReporter, puptooReporter:
 		templateID, err = getTemplate(tx, accountID, host.SystemProfile.Rhsm.Environments)
 		if err != nil {
 			utils.LogWarn("inventoryID", host.ID, "err", errors.Wrap(err, "Unable to assign templates"))
 		}
-	case puptooReporter:
-		if hasTemplateRepo(&host.SystemProfile) {
-			// check system's env in candlepin
-			resp, err := callCandlepinEnvironment(base.Context, host.SystemProfile.ConsumerID)
-			if err != nil {
-				utils.LogWarn("inventoryID", host.ID, "err", errors.Wrap(err, "Unable to assign templates"))
-			}
-
-			// get template from candlepin
-			if resp != nil {
-				envs := make([]string, 0, len(resp.Environments))
-				for _, env := range resp.Environments {
-					envs = append(envs, env.ID)
-				}
-				templateID, err = getTemplate(tx, accountID, envs)
-				if err != nil {
-					utils.LogWarn("inventoryID", host.ID, "err", errors.Wrap(err, "Unable to assign templates"))
-				}
-			}
-		}
 	}
 	return templateID
 }
@@ -667,16 +643,6 @@ func getRepoPath(systemProfile *inventory.SystemProfile, repo *inventory.YumRepo
 	return repoPath, nil
 }
 
-func hasTemplateRepo(systemProfile *inventory.SystemProfile) bool {
-	yumRepos := systemProfile.GetYumRepos()
-	for _, r := range yumRepos {
-		if r.Enabled && templateRepoPath.MatchString(r.BaseURL) {
-			return true
-		}
-	}
-	return false
-}
-
 func processRepos(systemProfile *inventory.SystemProfile) ([]string, []string) {
 	yumRepos := systemProfile.GetYumRepos()
 	seen := make(map[string]bool, len(yumRepos))

platform/candlepin.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"net/http"
 	"slices"
-	"strings"
 
 	"github.com/gin-gonic/gin"
 )
@@ -23,19 +22,6 @@ func candlepinConsumersPutHandler(c *gin.Context) {
 	c.Data(http.StatusOK, gin.MIMEJSON, []byte{})
 }
 
-func candlepinConsumersGetHandler(c *gin.Context) {
-	consumer := c.Param("consumer")
-	utils.LogInfo("GET consumer", consumer, "body")
-	env := strings.ReplaceAll(consumer, "-", "")
-	env = strings.Replace(env, "000", "999", 1)
-	response := candlepin.ConsumersDetailResponse{
-		Environments: []candlepin.ConsumersEnvironment{
-			{ID: env},
-		},
-	}
-	c.JSON(http.StatusOK, response)
-}
-
 func candlepinConsumersEnvironmentsHandler(c *gin.Context) {
 	owner := c.Param("owner")
 	jsonData, _ := io.ReadAll(c.Request.Body)
@@ -56,6 +42,5 @@ func candlepinConsumersEnvironmentsHandler(c *gin.Context) {
 
 func initCandlepin(app *gin.Engine) {
 	app.PUT("/candlepin/consumers/:consumer", candlepinConsumersPutHandler)
-	app.GET("/candlepin/consumers/:consumer", candlepinConsumersGetHandler)
 	app.PUT("/candlepin/owners/:owner/consumers/environments", candlepinConsumersEnvironmentsHandler)
 }