🚧 WiP: Start separating json-Representation from internal Data-Representation for the clean-parser;

Author: joergdw

src/autoscaler/api/binding_request/binding-request-parser.go

@@ -9,8 +9,11 @@ import (
 )
 
 type Parameters struct {
-	Configuration *models.BindingConfig `json:"configuration"`
-	ScalingPolicy *models.ScalingPolicy `json:"scaling-policy"`
+	// 🚧 To-do: We should distinguish between raw data and correctly validated data.
+	Configuration *models.BindingConfig
+
+	// 🚧 To-do: We should distinguish between raw data and correctly validated data.
+	ScalingPolicy *models.ScalingPolicy
 }
 
 type JsonSchemaError []gojsonschema.ResultError
@@ -21,7 +24,9 @@ func (e JsonSchemaError) Error() string {
 }
 
 type Parser interface {
-	// NewFromString(jsonSchema string) (BindingRequestParser, error)
-	// NewFromFile(pathToSchemaFile string) (BindingRequestParser, error)
+	// Default policies are specified on service-instance-level. Consequently, we need to leave the
+	// field Parameters.ScalingPolicy empty when no policy has been specified and instead … let the
+	// consumer of the BindingRequest decided what to do with this (i.e. he will use then the
+	// default-policy.)
 	Parse(bindingReqParams string) (Parameters, error)
 }

src/autoscaler/api/binding_request/clean_parser/json-structure.go

@@ -0,0 +1,74 @@
+package clean_parser
+
+type parameters struct {
+	Configuration *bindingCfg `json:"configuration"`
+	ScalingPolicy *scalingPolicy `json:"scaling-policy"`
+}
+
+
+
+// ================================================================================
+// Binding-configuration
+// ================================================================================
+
+type bindingCfg struct {
+	CustomMetricsCfg customMetricsCfg
+	AppGuid string `json:"app_guid"`
+}
+
+type customMetricsCfg struct {
+	MetricSubmStrat metricSubmStrat `json:"metric_submission_strategy"`
+}
+
+type metricSubmStrat struct {
+	AllowFrom string `json:"allow_from"`
+}
+
+
+
+// ================================================================================
+// Scaling-policy
+// ================================================================================
+
+type scalingPolicy struct {
+	SchemaVersion    string           `json:"schema-version"`
+	InstanceMinCount int              `json:"instance_min_count"`
+	InstanceMaxCount int              `json:"instance_max_count"`
+	ScalingRules     []scalingRule    `json:"scaling_rules,omitempty"`
+	Schedules        *scalingSchedule `json:"schedules,omitempty"`
+}
+
+type scalingRule struct {
+	MetricType          string `json:"metric_type"`
+	BreachDurationSecs  int    `json:"breach_duration_secs,omitempty"`
+	Threshold           int    `json:"threshold"`
+	Operator            string `json:"operator"`
+	CoolDownSecs        int    `json:"cool_down_secs,omitempty"`
+	Adjustment          string `json:"adjustment"`
+}
+
+type scalingSchedule struct {
+	Timezone         string               `json:"timezone"`
+	RecurringSchedule []recurringSchedule `json:"recurring_schedule,omitempty"`
+	SpecificDate     []specificDate       `json:"specific_date,omitempty"`
+}
+
+type recurringSchedule struct {
+	StartTime           string  `json:"start_time"`
+	EndTime             string  `json:"end_time"`
+	DaysOfWeek          []int   `json:"days_of_week,omitempty"`
+	DaysOfMonth         []int   `json:"days_of_month,omitempty"`
+	InstanceMinCount    int     `json:"instance_min_count"`
+	InstanceMaxCount    int     `json:"instance_max_count"`
+	InitialMinInstanceCount int `json:"initial_min_instance_count,omitempty"`
+	StartDate           string  `json:"start_date,omitempty"`
+	EndDate             string  `json:"end_date,omitempty"`
+}
+
+type specificDate struct {
+	StartDateTime       string  `json:"start_date_time"`
+	EndDateTime         string  `json:"end_date_time"`
+	InstanceMinCount    int     `json:"instance_min_count"`
+	InstanceMaxCount    int     `json:"instance_max_count"`
+	InitialMinInstanceCount int `json:"initial_min_instance_count,omitempty"`
+}

src/autoscaler/api/binding_request/clean_parser/parser.go

@@ -6,12 +6,15 @@ import (
 	"github.com/xeipuuv/gojsonschema"
 
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/api/binding_request"
+	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/models"
 )
 
 type CleanBindingRequestParser struct {
 	schema *gojsonschema.Schema
 }
 
+var _ binding_request.Parser = CleanBindingRequestParser{}
+
 func new(jsonLoader gojsonschema.JSONLoader) (CleanBindingRequestParser, error) {
 	schema, err := gojsonschema.NewSchema(jsonLoader)
 	if err != nil {
@@ -45,11 +48,21 @@ func (p CleanBindingRequestParser) Parse(bindingReqParams string) (binding_reque
 		return binding_request.Parameters{}, allErrors
 	}
 
-	var result binding_request.Parameters
-	err = json.Unmarshal([]byte(bindingReqParams), &result)
+	var parsedParameters parameters
+	err = json.Unmarshal([]byte(bindingReqParams), &parsedParameters)
 	if err != nil {
 		return binding_request.Parameters{}, err
-	} else {
-		return result, nil
 	}
+
+	return toBindingParameters(parsedParameters), nil
+}
+
+func toBindingParameters(parameters) binding_request.Parameters {
+	result := binding_request.Parameters{}
+	result.Configuration.AppGUID = models.GUID(parameters.Configuration.AppGuid)
+	result.Configuration.CustomMetrics.MetricSubmissionStrategy.AllowFrom = parameters.Configuration.CustomMetricsCfg.MetricSubmStrat.AllowFrom
+
+	// 🚧 To-do: Do the same for the policy.
+
+	return result
 }