review

configs/config.yaml.example

@@ -121,6 +121,14 @@ clients:
       rbac: 1m
       pulp_content_path: 1h
       subscription_check: 1h
+  feature_service:
+    server: https://subscription.stage.api.redhat.com/svcrest/subscription/v5/features
+    client_cert:
+    client_key:
+    ca_cert:
+    client_cert_path:
+    client_key_path:
+    ca_cert_path:
 
 # Configuration for the mocks
 mocks:

deployments/deployment.yaml

@@ -158,6 +158,26 @@ objects:
                     name: content-sources-candlepin
                     key: ca
                     optional: true
+              - name: CLIENTS_FEATURE_SERVICE_SERVER
+                value: ${CLIENTS_FEATURE_SERVICE_SERVER}
+              - name: CLIENTS_FEATURE_SERVICE_CLIENT_CERT
+                valueFrom:
+                  secretKeyRef:
+                    name: content-sources-candlepin
+                    key: cert
+                    optional: true
+              - name: CLIENTS_FEATURE_SERVICE_CLIENT_KEY
+                valueFrom:
+                  secretKeyRef:
+                    name: content-sources-candlepin
+                    key: key
+                    optional: true
+              - name: CLIENTS_FEATURE_SERVICE_CA_CERT
+                valueFrom:
+                  secretKeyRef:
+                    name: content-sources-candlepin
+                    key: ca
+                    optional: true
             resources:
               limits:
                 cpu: ${CPU_LIMIT_CS_WORKER}
@@ -316,6 +336,26 @@ objects:
                     name: content-sources-candlepin
                     key: ca
                     optional: true
+              - name: CLIENTS_FEATURE_SERVICE_SERVER
+                value: ${CLIENTS_FEATURE_SERVICE_SERVER}
+              - name: CLIENTS_FEATURE_SERVICE_CLIENT_CERT
+                valueFrom:
+                  secretKeyRef:
+                    name: content-sources-candlepin
+                    key: cert
+                    optional: true
+              - name: CLIENTS_FEATURE_SERVICE_CLIENT_KEY
+                valueFrom:
+                  secretKeyRef:
+                    name: content-sources-candlepin
+                    key: key
+                    optional: true
+              - name: CLIENTS_FEATURE_SERVICE_CA_CERT
+                valueFrom:
+                  secretKeyRef:
+                    name: content-sources-candlepin
+                    key: ca
+                    optional: true
             resources:
               limits:
                 cpu: ${CPU_LIMIT_CS_API}

pkg/admin_client/client.go

@@ -47,7 +47,7 @@ func (ac adminClientImpl) ListFeatures(ctx context.Context) (FeaturesResponse, i
 	statusCode := http.StatusInternalServerError
 	var err error
 
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, config.Get().Clients.SubsAsFeatures.Server, nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, config.Get().Clients.FeatureService.Server, nil)
 	if err != nil {
 		return FeaturesResponse{}, 0, err
 	}

pkg/api/admin_task.go

@@ -80,7 +80,7 @@ type pulpProgressReportResponse struct {
 	Suffix zest.NullableString `json:"suffix,omitempty"`
 }
 
-type SubsAsFeaturesResponse struct {
+type ListFeaturesResponse struct {
 	Features []string `json:"features"`
 }
 

pkg/config/certificates.go

@@ -91,7 +91,7 @@ func certPool(caCert []byte) (*x509.CertPool, error) {
 	pool := x509.NewCertPool()
 	ok := pool.AppendCertsFromPEM(caCert)
 	if !ok {
-		return nil, fmt.Errorf("could not parse candlepin ca cert")
+		return nil, fmt.Errorf("could not parse ca cert")
 	}
 	return pool, nil
 }
@@ -100,27 +100,27 @@ type SubsAsFeatsCertUser struct {
 }
 
 func (c *SubsAsFeatsCertUser) ClientCert() string {
-	return Get().Clients.SubsAsFeatures.ClientCert
+	return Get().Clients.FeatureService.ClientCert
 }
 
 func (c *SubsAsFeatsCertUser) ClientKey() string {
-	return Get().Clients.SubsAsFeatures.ClientKey
+	return Get().Clients.FeatureService.ClientKey
 }
 
 func (c *SubsAsFeatsCertUser) CACert() string {
-	return Get().Clients.SubsAsFeatures.CACert
+	return Get().Clients.FeatureService.CACert
 }
 
 func (c *SubsAsFeatsCertUser) CACertPath() string {
-	return Get().Clients.SubsAsFeatures.CACertPath
+	return Get().Clients.FeatureService.CACertPath
 }
 
 func (c *SubsAsFeatsCertUser) ClientCertPath() string {
-	return Get().Clients.SubsAsFeatures.ClientCertPath
+	return Get().Clients.FeatureService.ClientCertPath
 }
 
 func (c *SubsAsFeatsCertUser) ClientKeyPath() string {
-	return Get().Clients.SubsAsFeatures.ClientKeyPath
+	return Get().Clients.FeatureService.ClientKeyPath
 }
 
 type CandlepinCertUser struct {

pkg/config/config.go

@@ -46,7 +46,7 @@ type Clients struct {
 	Pulp           Pulp           `mapstructure:"pulp"`
 	Redis          Redis          `mapstructure:"redis"`
 	Candlepin      Candlepin      `mapstructure:"candlepin"`
-	SubsAsFeatures SubsAsFeatures `mapstructure:"subs_as_features"`
+	FeatureService FeatureService `mapstructure:"feature_service"`
 }
 
 type Mocks struct {
@@ -97,7 +97,7 @@ type Candlepin struct {
 	DevelOrg   bool   `mapstructure:"devel_org"` // For use only in dev envs
 }
 
-type SubsAsFeatures struct {
+type FeatureService struct {
 	Server         string
 	ClientCert     string `mapstructure:"client_cert"`
 	ClientKey      string `mapstructure:"client_key"`

pkg/handler/admin_tasks.go

@@ -74,7 +74,7 @@ func (adminTaskHandler *AdminTaskHandler) listFeatures(c echo.Context) error {
 		return ce.NewErrorResponse(statusCode, "Error listing features", err.Error())
 	}
 
-	subsAsFeatResp := api.SubsAsFeaturesResponse{}
+	subsAsFeatResp := api.ListFeaturesResponse{}
 	for _, content := range resp.Content {
 		subsAsFeatResp.Features = append(subsAsFeatResp.Features, content.Name)
 	}

pkg/handler/admin_tasks_test.go

@@ -369,13 +369,13 @@ func (suite *AdminTasksSuite) TestListFeatures() {
 	req.Header.Set(api.IdentityHeader, test_handler.EncodedIdentity(t))
 
 	listFeaturesExpected := admin_client.FeaturesResponse{Content: []admin_client.Content{{Name: "test_feature"}}}
-	expected := api.SubsAsFeaturesResponse{Features: []string{"test_feature"}}
+	expected := api.ListFeaturesResponse{Features: []string{"test_feature"}}
 	suite.clientMock.On("ListFeatures", test.MockCtx()).Return(listFeaturesExpected, http.StatusOK, nil)
 
 	code, body, err := suite.serveAdminTasksRouter(req, true, true)
 	assert.NoError(t, err)
 
-	var response api.SubsAsFeaturesResponse
+	var response api.ListFeaturesResponse
 	err = json.Unmarshal(body, &response)
 	assert.NoError(t, err)
 	assert.Equal(t, http.StatusOK, code)