HMS-5501: support new features api (#1006)

* HMS-5501: support new features api

* move client packages to shared directory

* fix distribution version returned for high-availability content

Author: rverdile

README.md

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/content-services/content-sources-backend/pkg/candlepin_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/candlepin_client"
 	"github.com/content-services/content-sources-backend/pkg/config"
 	"github.com/content-services/content-sources-backend/pkg/dao"
 	"github.com/content-services/content-sources-backend/pkg/db"

cmd/candlepin/main.go

@@ -10,13 +10,13 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/config"
 	"github.com/content-services/content-sources-backend/pkg/db"
 	ce "github.com/content-services/content-sources-backend/pkg/errors"
 	"github.com/content-services/content-sources-backend/pkg/handler"
 	m "github.com/content-services/content-sources-backend/pkg/instrumentation"
 	custom_collector "github.com/content-services/content-sources-backend/pkg/instrumentation/custom"
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/router"
 	"github.com/content-services/content-sources-backend/pkg/tasks"
 	"github.com/content-services/content-sources-backend/pkg/tasks/queue"

cmd/content-sources/main.go

@@ -10,13 +10,13 @@ import (
 	"sync"
 	"time"
 
+	"github.com/content-services/content-sources-backend/pkg/clients/feature_service_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/config"
 	"github.com/content-services/content-sources-backend/pkg/dao"
 	"github.com/content-services/content-sources-backend/pkg/db"
 	"github.com/content-services/content-sources-backend/pkg/external_repos"
-	"github.com/content-services/content-sources-backend/pkg/feature_service_client"
 	"github.com/content-services/content-sources-backend/pkg/models"
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/tasks"
 	"github.com/content-services/content-sources-backend/pkg/tasks/client"
 	"github.com/content-services/content-sources-backend/pkg/tasks/payloads"

cmd/external-repos/main.go

@@ -135,7 +135,7 @@ clients:
       pulp_content_path: 1h
       subscription_check: 1h
   feature_service:
-    server: #https://subscription.stage.api.redhat.com/svcrest/subscription/v5
+    server: #https://feature.stage.api.redhat.com/features/v1
     client_cert:
     client_key:
     ca_cert:

configs/config.yaml.example

@@ -19,10 +19,10 @@ import (
 )
 
 type FeaturesResponse struct {
-	Content []Content `json:"content"`
+	Features []Feature `json:"features"`
 }
 
-type Content struct {
+type Feature struct {
 	Name  string `json:"name"`
 	Rules Rules  `json:"rules"`
 }
@@ -38,15 +38,15 @@ type MatchProducts struct {
 type FeatureStatusResponse struct {
 	Features []struct {
 		Name     string `json:"name"`
-		Entitled bool   `json:"entitled"`
+		Entitled bool   `json:"isEntitled"`
 	} `json:"features"`
 }
 
 func (fs featureServiceImpl) ListFeatures(ctx context.Context) (FeaturesResponse, int, error) {
 	statusCode := http.StatusInternalServerError
 	var err error
 
-	server := config.Get().Clients.FeatureService.Server + "/features/"
+	server := config.Get().Clients.FeatureService.Server
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, server, nil)
 	if err != nil {
 		return FeaturesResponse{}, statusCode, err
@@ -235,6 +235,12 @@ func getVersionFromLabel(label string) string {
 	for i := 0; i < len(splitLabel); i++ {
 		if splitLabel[i] == "rhel" {
 			version = splitLabel[i+1]
+
+			// high-availability repos have different label formatting "rhel-ha-for-rhel-<version>..."
+			if version == "ha" {
+				continue
+			}
+
 			break
 		}
 	}

pkg/candlepin_client/candlepin_client_mock.go pkg/clients/candlepin_client/candlepin_client_mock.go

@@ -31,7 +31,7 @@ func (r *pulpDaoImpl) GetContentPath(ctx context.Context) (string, error) {
 	logger := zerolog.Ctx(ctx)
 
 	pulpContentPath, err := r.cache.GetPulpContentPath(ctx)
-	if err != nil && (!errors.Is(err, cache.NotFound) || !errors.Is(err, context.Canceled)) {
+	if err != nil && !(errors.Is(err, cache.NotFound) || errors.Is(err, context.Canceled)) {
 		logger.Error().Err(err).Msg("GetContentPath: error reading from cache")
 	}
 

pkg/candlepin_client/client.go pkg/clients/candlepin_client/client.go

@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/content-services/content-sources-backend/pkg/api"
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	ce "github.com/content-services/content-sources-backend/pkg/errors"
 	"github.com/content-services/content-sources-backend/pkg/models"
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/tasks/payloads"
 	"gorm.io/gorm"
 )

pkg/candlepin_client/consumer.go pkg/clients/candlepin_client/consumer.go

@@ -9,10 +9,10 @@ import (
 	"time"
 
 	"github.com/content-services/content-sources-backend/pkg/api"
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/config"
 	ce "github.com/content-services/content-sources-backend/pkg/errors"
 	"github.com/content-services/content-sources-backend/pkg/models"
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/seeds"
 	"github.com/content-services/content-sources-backend/pkg/tasks/payloads"
 	"github.com/content-services/content-sources-backend/pkg/utils"

pkg/candlepin_client/content.go pkg/clients/candlepin_client/content.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/content-services/content-sources-backend/pkg/candlepin_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/candlepin_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/config"
 	"github.com/content-services/content-sources-backend/pkg/models"
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
 	"github.com/labstack/gommon/random"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"

pkg/candlepin_client/environment.go pkg/clients/candlepin_client/environment.go

@@ -5,10 +5,10 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/content-services/content-sources-backend/pkg/candlepin_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/candlepin_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/db"
 	"github.com/content-services/content-sources-backend/pkg/models"
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
 	uuid2 "github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"

pkg/candlepin_client/interface.go pkg/clients/candlepin_client/interface.go

@@ -4,10 +4,10 @@ import (
 	"context"
 
 	"github.com/content-services/content-sources-backend/pkg/api"
-	"github.com/content-services/content-sources-backend/pkg/candlepin_client"
-	"github.com/content-services/content-sources-backend/pkg/feature_service_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/candlepin_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/feature_service_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/models"
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
 	"github.com/content-services/tang/pkg/tangy"
 	"github.com/content-services/yummy/pkg/yum"
 	"gorm.io/gorm"

pkg/candlepin_client/manifest.go pkg/clients/candlepin_client/manifest.go

@@ -12,12 +12,12 @@ import (
 	"github.com/ProtonMail/go-crypto/openpgp"
 	"github.com/RedHatInsights/event-schemas-go/apps/repositories/v1"
 	"github.com/content-services/content-sources-backend/pkg/api"
+	"github.com/content-services/content-sources-backend/pkg/clients/feature_service_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/config"
 	ce "github.com/content-services/content-sources-backend/pkg/errors"
 	"github.com/content-services/content-sources-backend/pkg/event"
-	"github.com/content-services/content-sources-backend/pkg/feature_service_client"
 	"github.com/content-services/content-sources-backend/pkg/models"
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/utils"
 	"github.com/content-services/yummy/pkg/yum"
 	"github.com/jackc/pgx/v5/pgconn"

pkg/candlepin_client/owner.go pkg/clients/candlepin_client/owner.go

@@ -11,11 +11,11 @@ import (
 	"time"
 
 	"github.com/content-services/content-sources-backend/pkg/api"
+	"github.com/content-services/content-sources-backend/pkg/clients/feature_service_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/config"
 	ce "github.com/content-services/content-sources-backend/pkg/errors"
-	"github.com/content-services/content-sources-backend/pkg/feature_service_client"
 	"github.com/content-services/content-sources-backend/pkg/models"
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/seeds"
 	"github.com/content-services/content-sources-backend/pkg/test"
 	"github.com/content-services/content-sources-backend/pkg/utils"

pkg/candlepin_client/pool.go pkg/clients/candlepin_client/pool.go

@@ -9,11 +9,11 @@ import (
 	"time"
 
 	"github.com/content-services/content-sources-backend/pkg/api"
+	"github.com/content-services/content-sources-backend/pkg/clients/feature_service_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/config"
 	ce "github.com/content-services/content-sources-backend/pkg/errors"
-	"github.com/content-services/content-sources-backend/pkg/feature_service_client"
 	"github.com/content-services/content-sources-backend/pkg/models"
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/utils"
 	"golang.org/x/exp/slices"
 	"gorm.io/gorm"

pkg/candlepin_client/product.go pkg/clients/candlepin_client/product.go

@@ -10,11 +10,11 @@ import (
 	"time"
 
 	"github.com/content-services/content-sources-backend/pkg/api"
+	"github.com/content-services/content-sources-backend/pkg/clients/feature_service_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/config"
 	ce "github.com/content-services/content-sources-backend/pkg/errors"
-	"github.com/content-services/content-sources-backend/pkg/feature_service_client"
 	"github.com/content-services/content-sources-backend/pkg/models"
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/seeds"
 	"github.com/content-services/content-sources-backend/pkg/utils"
 	"github.com/content-services/yummy/pkg/yum"

pkg/feature_service_client/client.go pkg/clients/feature_service_client/client.go

@@ -7,11 +7,11 @@ import (
 	"time"
 
 	"github.com/content-services/content-sources-backend/pkg/api"
+	"github.com/content-services/content-sources-backend/pkg/clients/feature_service_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/config"
 	ce "github.com/content-services/content-sources-backend/pkg/errors"
-	"github.com/content-services/content-sources-backend/pkg/feature_service_client"
 	"github.com/content-services/content-sources-backend/pkg/models"
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/seeds"
 	"github.com/content-services/content-sources-backend/pkg/test/handler"
 	"github.com/content-services/content-sources-backend/pkg/utils"

pkg/feature_service_client/feature_service_client_mock.go pkg/clients/feature_service_client/feature_service_client_mock.go

@@ -10,13 +10,13 @@ import (
 	"time"
 
 	"github.com/content-services/content-sources-backend/pkg/api"
-	"github.com/content-services/content-sources-backend/pkg/candlepin_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/candlepin_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/feature_service_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/config"
 	ce "github.com/content-services/content-sources-backend/pkg/errors"
 	"github.com/content-services/content-sources-backend/pkg/event"
-	"github.com/content-services/content-sources-backend/pkg/feature_service_client"
 	"github.com/content-services/content-sources-backend/pkg/models"
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
 	"github.com/jackc/pgx/v5/pgconn"
 	"golang.org/x/exp/slices"
 	"gorm.io/gorm"

pkg/feature_service_client/features.go pkg/clients/feature_service_client/features.go

@@ -9,11 +9,11 @@ import (
 	"time"
 
 	"github.com/content-services/content-sources-backend/pkg/api"
-	"github.com/content-services/content-sources-backend/pkg/candlepin_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/candlepin_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/config"
 	ce "github.com/content-services/content-sources-backend/pkg/errors"
 	"github.com/content-services/content-sources-backend/pkg/models"
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/seeds"
 	"github.com/content-services/content-sources-backend/pkg/utils"
 	"github.com/google/uuid"

pkg/pulp_client/artifacts.go pkg/clients/pulp_client/artifacts.go

@@ -3,8 +3,8 @@ package dao
 import (
 	"context"
 
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	"github.com/content-services/content-sources-backend/pkg/models"
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
 	"gorm.io/gorm"
 )
 

pkg/pulp_client/client.go pkg/clients/pulp_client/client.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/content-services/content-sources-backend/pkg/pulp_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/pulp_client"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )

pkg/pulp_client/content_guard.go pkg/clients/pulp_client/content_guard.go

@@ -6,18 +6,18 @@ import (
 
 	caliri "github.com/content-services/caliri/release/v4"
 	"github.com/content-services/content-sources-backend/pkg/api"
-	"github.com/content-services/content-sources-backend/pkg/candlepin_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/candlepin_client"
+	"github.com/content-services/content-sources-backend/pkg/clients/feature_service_client"
 	"github.com/content-services/content-sources-backend/pkg/dao"
 	ce "github.com/content-services/content-sources-backend/pkg/errors"
-	fs "github.com/content-services/content-sources-backend/pkg/feature_service_client"
 	"github.com/content-services/content-sources-backend/pkg/rbac"
 	"github.com/labstack/echo/v4"
 	"github.com/rs/zerolog/log"
 )
 
 type AdminTaskHandler struct {
 	DaoRegistry dao.DaoRegistry
-	fsClient    fs.FeatureServiceClient
+	fsClient    feature_service_client.FeatureServiceClient
 	cpClient    candlepin_client.CandlepinClient
 }
 
@@ -30,7 +30,7 @@ func checkAccessible(next echo.HandlerFunc) echo.HandlerFunc {
 	}
 }
 
-func RegisterAdminTaskRoutes(engine *echo.Group, daoReg *dao.DaoRegistry, fsClient *fs.FeatureServiceClient, cpClient *candlepin_client.CandlepinClient) {
+func RegisterAdminTaskRoutes(engine *echo.Group, daoReg *dao.DaoRegistry, fsClient *feature_service_client.FeatureServiceClient, cpClient *candlepin_client.CandlepinClient) {
 	if engine == nil {
 		panic("engine is nil")
 	}
@@ -84,7 +84,7 @@ func (adminTaskHandler *AdminTaskHandler) listFeatures(c echo.Context) error {
 	}
 
 	subsAsFeatResp := api.ListFeaturesResponse{}
-	for _, content := range resp.Content {
+	for _, content := range resp.Features {
 		subsAsFeatResp.Features = append(subsAsFeatResp.Features, content.Name)
 	}
 
@@ -102,7 +102,7 @@ func (adminTaskHandler *AdminTaskHandler) listContentForFeature(c echo.Context)
 
 	var found bool
 	var engIDs []int
-	for _, content := range resp.Content {
+	for _, content := range resp.Features {
 		if name == content.Name {
 			found = true
 			engIDs = content.Rules.MatchProducts[0].EngIDs
@@ -125,7 +125,7 @@ func (adminTaskHandler *AdminTaskHandler) listContentForFeature(c echo.Context)
 
 	var contents []api.FeatureServiceContentResponse
 	for _, product := range products {
-		contents = append(contents, fs.ProductToRepoJSON(product, name)...)
+		contents = append(contents, feature_service_client.ProductToRepoJSON(product, name)...)
 	}
 	return c.JSON(http.StatusOK, contents)
 }