Refactored configuration DataLayer Extractor elements

Signed-off-by: Shmuel Kallner <kallner@il.ibm.com>

Author: shmuelk

apix/config/v1alpha1/endpointpickerconfig_types.go

@@ -29,6 +29,11 @@ import (
 type EndpointPickerConfig struct {
 	metav1.TypeMeta `json:",inline"`
 
+	// +optional
+	// FeatureGates is a set of flags that enable various experimental features with the EPP.
+	// If omitted non of these experimental features will be enabled.
+	FeatureGates FeatureGates `json:"featureGates,omitempty"`
+
 	// +required
 	// +kubebuilder:validation:Required
 	// Plugins is the list of plugins that will be instantiated.
@@ -40,11 +45,6 @@ type EndpointPickerConfig struct {
 	// that will be created.
 	SchedulingProfiles []SchedulingProfile `json:"schedulingProfiles"`
 
-	// +optional
-	// FeatureGates is a set of flags that enable various experimental features with the EPP.
-	// If omitted non of these experimental features will be enabled.
-	FeatureGates FeatureGates `json:"featureGates,omitempty"`
-
 	// +optional
 	// SaturationDetector when present specifies the configuration of the
 	// Saturation detector. If not present, default values are used.
@@ -57,11 +57,11 @@ type EndpointPickerConfig struct {
 
 func (cfg EndpointPickerConfig) String() string {
 	return fmt.Sprintf(
-		"{Plugins: %v, SchedulingProfiles: %v, Data: %v, FeatureGates: %v, SaturationDetector: %v}",
+		"{FeatureGates: %v, Plugins: %v, SchedulingProfiles: %v, Data: %v, SaturationDetector: %v}",
+		cfg.FeatureGates,
 		cfg.Plugins,
 		cfg.SchedulingProfiles,
 		cfg.Data,
-		cfg.FeatureGates,
 		cfg.SaturationDetector,
 	)
 }
@@ -209,6 +209,7 @@ func (dlc DataLayerConfig) String() string {
 	return fmt.Sprintf("{Sources: %v}", dlc.Sources)
 }
 
+// DataLayerSource contains the configuration of a DataSource of the V2 DataLayer feature
 type DataLayerSource struct {
 	// +required
 	// +kubebuilder:validation:Required
@@ -222,9 +223,23 @@ type DataLayerSource struct {
 	// Extractors specifies the list of Plugin instances to be associated with
 	// this Source. The entries are references to the names of entries of the Plugins
 	// defined in the configuration's Plugins section
-	Extractors []string `json:"extractors"`
+	Extractors []DataLayerExtractor `json:"extractors"`
 }
 
 func (dls DataLayerSource) String() string {
 	return fmt.Sprintf("{PluginRef: %s, Extractors: %v}", dls.PluginRef, dls.Extractors)
 }
+
+// DataLayerExtractor contains the configuration of an Extractor of the V2 DataLayer feature
+type DataLayerExtractor struct {
+	// +required
+	// +kubebuilder:validation:Required
+	// PluginRef specifies a partiular Plugin instance to be associated with
+	// this Extractor. The reference is to the name of an entry of the Plugins
+	// defined in the configuration's Plugins section
+	PluginRef string `json:"pluginRef"`
+}
+
+func (dle DataLayerExtractor) String() string {
+	return "{PluginRef: " + dle.PluginRef + "}"
+}

apix/config/v1alpha1/zz_generated.deepcopy.go

@@ -196,7 +196,7 @@ func loadDataLayerConfig(rawDataConfig *configapi.DataLayerConfig, rawFeatureGat
 				Extractors: []datalayer.Extractor{},
 			}
 			for _, extractor := range source.Extractors {
-				if extractorPlugin, ok := handle.Plugin(extractor).(datalayer.Extractor); ok {
+				if extractorPlugin, ok := handle.Plugin(extractor.PluginRef).(datalayer.Extractor); ok {
 					sourceConfig.Extractors = append(sourceConfig.Extractors, extractorPlugin)
 				} else {
 					return nil, fmt.Errorf("the plugin %s is not a datalayer.Extractor", source.PluginRef)

pkg/epp/config/loader/configloader.go

@@ -112,8 +112,12 @@ func TestLoadRawConfiguration(t *testing.T) {
 		Data: &configapi.DataLayerConfig{
 			Sources: []configapi.DataLayerSource{
 				{
-					PluginRef:  "test-source",
-					Extractors: []string{"test-extractor"},
+					PluginRef: "test-source",
+					Extractors: []configapi.DataLayerExtractor{
+						{
+							PluginRef: "test-extractor",
+						},
+					},
 				},
 			},
 		},
@@ -234,8 +238,12 @@ func TestLoadRawConfigurationWithDefaults(t *testing.T) {
 		Data: &configapi.DataLayerConfig{
 			Sources: []configapi.DataLayerSource{
 				{
-					PluginRef:  "test-source",
-					Extractors: []string{"test-extractor"},
+					PluginRef: "test-source",
+					Extractors: []configapi.DataLayerExtractor{
+						{
+							PluginRef: "test-extractor",
+						},
+					},
 				},
 			},
 		},
@@ -638,7 +646,7 @@ data:
   sources:
   - pluginRef: test-source
     extractors:
-    - test-extractor
+    - pluginRef: test-extractor
 featureGates:
 - dataLayer
 saturationDetector:
@@ -884,7 +892,7 @@ data:
   sources:
   - pluginRef: test-source
     extractors:
-    - test-one
+    - pluginRef: test-one
 featureGates:
 - dataLayer
 `