improved admin handler and changed GetDynamicConfigRequest struct

common/dynamicconfig/configstore/config_store_client.go

@@ -202,6 +202,8 @@ func (csc *configStoreClient) UpdateValue(name dc.Key, value interface{}) error
 }
 
 func (csc *configStoreClient) RestoreValue(name dc.Key, filters map[dc.Filter]interface{}) error {
+	//if empty filter provided, update fallback value.
+	//if u want to remove entire entry, just do update value with empty
 	currentCached := csc.values.Load().(cacheEntry)
 	if currentCached.dcEntries == nil {
 		return dc.NotFoundError

common/metrics/defs.go

@@ -744,6 +744,14 @@ const (
 	AdminDescribeShardDistributionScope
 	// AdminGetCrossClusterTasksScope is the metric scope for admin.GetCrossClusterTasks
 	AdminGetCrossClusterTasksScope
+	// AdminGetDynamicConfigScope is the metric scope for admin.GetDynamicConfig
+	AdminGetDynamicConfigScope
+	// AdminUpdateDynamicConfigScope is the metric scope for admin.UpdateDynamicConfig
+	AdminUpdateDynamicConfigScope
+	// AdminRestoreDynamicConfigScope is the metric scope for admin.RestoreDynamicConfig
+	AdminRestoreDynamicConfigScope
+	// AdminListDynamicConfigScope is the metric scope for admin.ListDynamicConfig
+	AdminListDynamicConfigScope
 
 	NumAdminScopes
 )
@@ -1447,6 +1455,10 @@ var ScopeDefs = map[ServiceIdx]map[int]scopeDefinition{
 		AdminRefreshWorkflowTasksScope:             {operation: "RefreshWorkflowTasks"},
 		AdminResendReplicationTasksScope:           {operation: "ResendReplicationTasks"},
 		AdminGetCrossClusterTasksScope:             {operation: "AdminGetCrossClusterTasksScope"},
+		AdminGetDynamicConfigScope:                 {operation: "AdminGetDynamicConfigScope"},
+		AdminUpdateDynamicConfigScope:              {operation: "AdminUpdateDynamicConfigScope"},
+		AdminRestoreDynamicConfigScope:             {operation: "AdminRestoreDynamicConfigScope"},
+		AdminListDynamicConfigScope:                {operation: "AdminListDynamicConfigScope"},
 
 		FrontendStartWorkflowExecutionScope:             {operation: "StartWorkflowExecution"},
 		FrontendPollForDecisionTaskScope:                {operation: "PollForDecisionTask"},

common/types/admin.go

@@ -406,7 +406,8 @@ func (v *RingInfo) GetMembers() (o []*HostInfo) {
 }
 
 type GetDynamicConfigRequest struct {
-	ConfigName string `json:"configName,omitempty"`
+	ConfigName string                 `json:"configName,omitempty"`
+	Filters    []*DynamicConfigFilter `json:"filters,omitempty"`
 }
 
 func (v *GetDynamicConfigRequest) GetConfigName() (o string) {
@@ -416,6 +417,13 @@ func (v *GetDynamicConfigRequest) GetConfigName() (o string) {
 	return
 }
 
+func (v *GetDynamicConfigRequest) GetFilters() (o []*DynamicConfigFilter) {
+	if v != nil && v.Filters != nil {
+		return v.Filters
+	}
+	return
+}
+
 type GetDynamicConfigResponse struct {
 	Value       *DataBlob `json:"value,omitempty"`
 	ValueSource string    `json:"valueSource,omitempty"`

common/types/mapper/proto/admin.go

@@ -730,6 +730,7 @@ func FromGetDynamicConfigRequest(t *types.GetDynamicConfigRequest) *adminv1.GetD
 	}
 	return &adminv1.GetDynamicConfigRequest{
 		ConfigName: t.ConfigName,
+		Filters:    FromDynamicConfigFilterArray(t.Filters),
 	}
 }
 
@@ -740,6 +741,7 @@ func ToGetDynamicConfigRequest(t *adminv1.GetDynamicConfigRequest) *types.GetDyn
 	}
 	return &types.GetDynamicConfigRequest{
 		ConfigName: t.ConfigName,
+		Filters:    ToDynamicConfigFilterArray(t.Filters),
 	}
 }
 

common/types/mapper/thrift/admin.go

@@ -475,6 +475,7 @@ func FromGetDynamicConfigRequest(t *types.GetDynamicConfigRequest) *admin.GetDyn
 	}
 	return &admin.GetDynamicConfigRequest{
 		ConfigName: &t.ConfigName,
+		Filters:    FromDynamicConfigFilterArray(t.Filters),
 	}
 }
 
@@ -485,6 +486,7 @@ func ToGetDynamicConfigRequest(t *admin.GetDynamicConfigRequest) *types.GetDynam
 	}
 	return &types.GetDynamicConfigRequest{
 		ConfigName: t.GetConfigName(),
+		Filters:    ToDynamicConfigFilterArray(t.Filters),
 	}
 }
 

proto/internal/uber/cadence/admin/v1/service.proto

@@ -333,6 +333,7 @@ will be returned. If get_all is False and a filter(s) is specified, value that m
 If config_name cannot be found in database, default value will be returned. */
 message GetDynamicConfigRequest {
 	string config_name = 1;
+  repeated DynamicConfigFilter filters = 2;
 }
 
 message GetDynamicConfigResponse {

service/frontend/adminHandler.go

@@ -1259,20 +1259,39 @@ func deserializeRawHistoryToken(bytes []byte) (*getWorkflowRawHistoryV2Token, er
 	return token, err
 }
 
-func (adh *adminHandlerImpl) GetDynamicConfig(ctx context.Context, request *types.GetDynamicConfigRequest) (*types.GetDynamicConfigResponse, error) {
+func (adh *adminHandlerImpl) GetDynamicConfig(ctx context.Context, request *types.GetDynamicConfigRequest) (_ *types.GetDynamicConfigResponse, retError error) {
+	defer log.CapturePanic(adh.GetLogger(), &retError)
+	scope, sw := adh.startRequestProfile(metrics.AdminGetDynamicConfigScope)
+	defer sw.Stop()
+
+	if request == nil || request.ConfigName == "" {
+		return nil, adh.error(errRequestNotSet, scope)
+	}
+
 	keyVal, err := checkValidKey(request.ConfigName)
 	if err != nil {
-		return nil, errors.New("invalid dynamic config parameter name")
+		return nil, adh.error(err, scope)
 	}
 
-	value, err := adh.params.DynamicConfig.GetValue(keyVal, nil)
-	if err != nil {
-		return nil, err
+	var value interface{}
+	if request.Filters == nil {
+		value, err = adh.params.DynamicConfig.GetValue(keyVal, nil)
+		if err != nil {
+			return nil, adh.error(err, scope)
+		}
+	} else {
+		convFilters, err := convertFilterMapToList(request.Filters)
+		if err != nil {
+			return nil, adh.error(err, scope)
+		}
+		value, err = adh.params.DynamicConfig.GetValueWithFilters(keyVal, convFilters, nil)
 	}
+
 	data, err := json.Marshal(value)
 	if err != nil {
-		return nil, err
+		return nil, adh.error(err, scope)
 	}
+
 	return &types.GetDynamicConfigResponse{
 		Value: &types.DataBlob{
 			EncodingType: types.EncodingTypeJSON.Ptr(),
@@ -1282,39 +1301,64 @@ func (adh *adminHandlerImpl) GetDynamicConfig(ctx context.Context, request *type
 	}, nil
 }
 
-func (adh *adminHandlerImpl) UpdateDynamicConfig(ctx context.Context, request *types.UpdateDynamicConfigRequest) error {
+func (adh *adminHandlerImpl) UpdateDynamicConfig(ctx context.Context, request *types.UpdateDynamicConfigRequest) (retError error) {
+	defer log.CapturePanic(adh.GetLogger(), &retError)
+	scope, sw := adh.startRequestProfile(metrics.AdminUpdateDynamicConfigScope)
+	defer sw.Stop()
+
+	if request == nil {
+		return adh.error(errRequestNotSet, scope)
+	}
+
 	keyVal, err := checkValidKey(request.ConfigName)
 	if err != nil {
-		return errors.New("invalid dynamic config parameter name")
+		return adh.error(err, scope)
 	}
 
 	return adh.params.DynamicConfig.UpdateValue(keyVal, request.ConfigValues)
 }
 
-func (adh *adminHandlerImpl) RestoreDynamicConfig(ctx context.Context, request *types.RestoreDynamicConfigRequest) error {
+func (adh *adminHandlerImpl) RestoreDynamicConfig(ctx context.Context, request *types.RestoreDynamicConfigRequest) (retError error) {
+	defer log.CapturePanic(adh.GetLogger(), &retError)
+	scope, sw := adh.startRequestProfile(metrics.AdminRestoreDynamicConfigScope)
+	defer sw.Stop()
+
+	if request == nil || request.ConfigName == "" {
+		return adh.error(errRequestNotSet, scope)
+	}
+
 	keyVal, err := checkValidKey(request.ConfigName)
 	if err != nil {
-		return errors.New("invalid dynamic config parameter name")
+		return adh.error(err, scope)
 	}
 
-	filters := make(map[dc.Filter]interface{})
-	for _, filter := range request.Filters {
-		val, err := convertFromDataBlob(filter.Value)
+	var filters map[dc.Filter]interface{}
+
+	if request.Filters == nil {
+		filters = nil
+	} else {
+		filters, err = convertFilterMapToList(request.Filters)
 		if err != nil {
-			return err
+			return adh.error(errInvalidFilters, scope)
 		}
-		filters[dc.ParseFilter(filter.Name)] = val
 	}
-
 	return adh.params.DynamicConfig.RestoreValue(keyVal, filters)
 }
 
-func (adh *adminHandlerImpl) ListDynamicConfig(ctx context.Context, request *types.ListDynamicConfigRequest) (*types.ListDynamicConfigResponse, error) {
+func (adh *adminHandlerImpl) ListDynamicConfig(ctx context.Context, request *types.ListDynamicConfigRequest) (_ *types.ListDynamicConfigResponse, retError error) {
+	defer log.CapturePanic(adh.GetLogger(), &retError)
+	scope, sw := adh.startRequestProfile(metrics.AdminListDynamicConfigScope)
+	defer sw.Stop()
+
+	if request == nil {
+		return nil, adh.error(errRequestNotSet, scope)
+	}
+
 	keyVal, err := checkValidKey(request.ConfigName)
 	if err != nil {
 		entries, err2 := adh.params.DynamicConfig.ListValue(dc.UnknownKey)
 		if err2 != nil {
-			err = err2
+			err = adh.error(err2, scope)
 		}
 		return &types.ListDynamicConfigResponse{
 			Entries: entries,
@@ -1323,7 +1367,7 @@ func (adh *adminHandlerImpl) ListDynamicConfig(ctx context.Context, request *typ
 
 	entries, err2 := adh.params.DynamicConfig.ListValue(keyVal)
 	if err2 != nil {
-		err = err2
+		err = adh.error(err2, scope)
 	}
 	return &types.ListDynamicConfigResponse{
 		Entries: entries,
@@ -1348,3 +1392,16 @@ func convertFromDataBlob(blob *types.DataBlob) (interface{}, error) {
 		return nil, errors.New("unsupported blob encoding")
 	}
 }
+
+func convertFilterMapToList(filters []*types.DynamicConfigFilter) (map[dc.Filter]interface{}, error) {
+	newFilters := make(map[dc.Filter]interface{})
+
+	for _, filter := range filters {
+		val, err := convertFromDataBlob(filter.Value)
+		if err != nil {
+			return nil, err
+		}
+		newFilters[dc.ParseFilter(filter.Name)] = val
+	}
+	return newFilters, nil
+}

service/frontend/workflowHandler.go

@@ -130,6 +130,7 @@ var (
 	errEmptyReplicationInfo                       = &types.BadRequestError{Message: "Replication task info is not set."}
 	errEmptyQueueType                             = &types.BadRequestError{Message: "Queue type is not set."}
 	errShuttingDown                               = &types.InternalServiceError{Message: "Shutting down"}
+	errInvalidFilters                             = &types.BadRequestError{Message: "Request Filters are invalid, unable to parse."}
 
 	// err for archival
 	errHistoryNotFound = &types.BadRequestError{Message: "Requested workflow history not found, may have passed retention period."}