diff --git a/cmd/deployer/app/resource_handler.go b/cmd/deployer/app/resource_handler.go index eb12349c8..11cf4d8d6 100644 --- a/cmd/deployer/app/resource_handler.go +++ b/cmd/deployer/app/resource_handler.go @@ -356,9 +356,9 @@ func (r *resourceHandler) deployResources(deploymentConfig openapi.DeploymentCon } ctx := map[string]string{ - "imageLoc": deploymentConfig.ImageLoc, + "imageLoc": deploymentConfig.ImageLoc, constants.ParamTaskID: taskId, - "taskKey": deploymentConfig.AgentKVs[taskId], + "taskKey": deploymentConfig.AgentKVs[taskId], } rendered, renderErr := mustache.RenderFile(r.jobTemplatePath, &ctx) diff --git a/lib/python/flame/config.py b/lib/python/flame/config.py index 1f50656d6..3b843ffe1 100644 --- a/lib/python/flame/config.py +++ b/lib/python/flame/config.py @@ -83,7 +83,7 @@ class Selector(FlameSchema): sort: SelectorType = Field(default=SelectorType.DEFAULT) kwargs: dict = Field(default={}) - + class Optimizer(FlameSchema): sort: OptimizerType = Field(default=OptimizerType.DEFAULT) kwargs: dict = Field(default={}) diff --git a/lib/python/setup.py b/lib/python/setup.py index f0979863c..a7c591447 100644 --- a/lib/python/setup.py +++ b/lib/python/setup.py @@ -41,6 +41,7 @@ 'protobuf==3.19.5', 'grpcio==1.51.1', 'pydantic', + 'grpcio==1.51.1', ], extras_require={ 'dev': [ diff --git a/pkg/openapi/model_role.go b/pkg/openapi/model_role.go index 55469d8dd..310c34999 100644 --- a/pkg/openapi/model_role.go +++ b/pkg/openapi/model_role.go @@ -63,29 +63,3 @@ func AssertRecurseRoleRequired(objSlice interface{}) error { return AssertRoleRequired(aRole) }) } - -// AssertRoleRequired checks if the required fields are not zero-ed -func AssertRoleRequired(obj Role) error { - elements := map[string]interface{}{ - "name": obj.Name, - } - for name, el := range elements { - if isZero := IsZeroValue(el); isZero { - return &RequiredError{Field: name} - } - } - - return nil -} - -// AssertRecurseRoleRequired recursively checks if required fields are not zero-ed in a nested slice. -// Accepts only nested slice of Role (e.g. [][]Role), otherwise ErrTypeAssertionError is thrown. -func AssertRecurseRoleRequired(objSlice interface{}) error { - return AssertRecurseInterfaceRequired(objSlice, func(obj interface{}) error { - aRole, ok := obj.(Role) - if !ok { - return ErrTypeAssertionError - } - return AssertRoleRequired(aRole) - }) -}