return nil
}
-func (rh *Resthook) GetPolicyInstance(policyTypeId models.PolicyTypeID, policyInstanceID models.PolicyInstanceID) (interface{}, error) {
+func (rh *Resthook) GetPolicyInstance(policyTypeId models.PolicyTypeID, policyInstanceID models.PolicyInstanceID) (map[string]interface{}, error) {
a1.Logger.Debug("GetPolicyInstance1")
var keys [1]string
valmap, err := rh.db.Get(a1MediatorNs, keys[:])
if len(valmap) == 0 {
a1.Logger.Debug("policy type Not Present for policyid : %v", policyTypeId)
- return "{}", policyTypeNotFoundError
+ return map[string]interface{}{}, policyTypeNotFoundError
}
if err != nil {
a1.Logger.Error("error in retrieving policy type. err: %v", err)
- return "{}", err
+ return map[string]interface{}{}, err
}
if valmap[typekey] == nil {
a1.Logger.Debug("policy type Not Present for policyid : %v", policyTypeId)
- return "{}", policyTypeNotFoundError
+ return map[string]interface{}{}, policyTypeNotFoundError
}
a1.Logger.Debug("keysmap : %+v", valmap[typekey])
if instanceMap[instancekey] == nil {
a1.Logger.Debug("policy instance Not Present for policyinstaneid : %v", policyInstanceID)
- return "{}", policyInstanceNotFoundError
+ return map[string]interface{}{}, policyInstanceNotFoundError
}
- valStr := fmt.Sprint(instanceMap[instancekey])
+ var valStr map[string]interface{}
+ err = json.Unmarshal([]byte(instanceMap[instancekey].(string)), &valStr)
+ if err != nil {
+ fmt.Println("error:", err)
+ }
+ fmt.Println(valStr)
return valStr, nil
}
a1.Logger.Error("policy instance error : %v", err)
return err
}
- if len(policyTypeInstances.(string)) == 0 {
+ if policyTypeInstances == nil {
a1.Logger.Debug("policy instance Not Present ")
return policyInstanceNotFoundError
}
return instanceMetadataMap, nil
}
+func (rh *Resthook) getPolicyInstanceStatus(policyTypeId models.PolicyTypeID, policyInstanceID models.PolicyInstanceID) (bool, error) {
+ instancehandlerKey := a1HandlerPrefix + strconv.FormatInt((int64(policyTypeId)), 10) + "." + string(policyInstanceID)
+ var keys [1]string
+ keys[0] = instancehandlerKey
+ resp, err := rh.db.Get(a1MediatorNs, keys[:])
+ if err != nil {
+ a1.Logger.Error("error1 :%+v", err)
+ return false, err
+ }
+ for _, key := range resp {
+ if key == "OK" {
+ return true, nil
+ }
+ }
+ return false, nil
+}
+
func (rh *Resthook) GetPolicyInstanceStatus(policyTypeId models.PolicyTypeID, policyInstanceID models.PolicyInstanceID) (*a1_mediator.A1ControllerGetPolicyInstanceStatusOKBody, error) {
err := rh.instanceValidity(policyTypeId, policyInstanceID)
policyInstanceStatus := a1_mediator.A1ControllerGetPolicyInstanceStatusOKBody{}
+ policyInstanceStatus.InstanceStatus = "NOT IN EFFECT"
if err != nil && err == policyInstanceNotFoundError || err == policyTypeNotFoundError {
- policyInstanceStatus.InstanceStatus = "NOT IN EFFECT"
return &policyInstanceStatus, err
}
metadata, err := rh.getMetaData(policyTypeId, policyInstanceID)
a1.Logger.Debug(" metadata %v", metadata)
if err != nil {
a1.Logger.Error("policy instance error : %v", err)
- policyInstanceStatus.InstanceStatus = "NOT IN EFFECT"
return &policyInstanceStatus, err
}
jsonbody, err := json.Marshal(metadata)
//this error maps to 503 error but can be mapped to 500: internal error
return &policyInstanceStatus, err
}
- if policyInstanceStatus.HasBeenDeleted == false {
+ resp, err := rh.getPolicyInstanceStatus(policyTypeId, policyInstanceID)
+ if err != nil || (err == nil && resp == false) {
+ a1.Logger.Error("marshal error : %v", err)
+ return &policyInstanceStatus, err
+ } else if policyInstanceStatus.HasBeenDeleted == true {
policyInstanceStatus.InstanceStatus = "IN EFFECT"
- } else {
- policyInstanceStatus.InstanceStatus = "NOT IN EFFECT"
}
return &policyInstanceStatus, nil
}
instanceMetadataKey := a1InstanceMetadataPrefix + strconv.FormatInt((int64(policyTypeId)), 10) + "." + string(policyInstanceID)
creation_metadata := createdmetadata[instanceMetadataKey]
var metadata map[string]interface{}
- if err = json.Unmarshal([]byte(creation_metadata.(string)), &metadata); err != nil {
+ creation_metadata_string := creation_metadata.(string)
+ creation_metadata_string = strings.TrimRight(creation_metadata_string, "]")
+ creation_metadata_string = strings.TrimLeft(creation_metadata_string, "[")
+ if err = json.Unmarshal([]byte(creation_metadata_string), &metadata); err != nil {
a1.Logger.Error("unmarshal error : %v", err)
return err
}