mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-07 13:55:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove Warning from restore item action output (#1318)

Browse Source 
Signed-off-by: Steve Kriss <krisss@vmware.com>
This commit is contained in:
Steve Kriss
2019-03-28 14:08:37 -06:00
committed by KubeKween
parent be42ea782d
commit a696cd09f2
10 changed files with 28 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/plugin/framework/restore_item_action_client.go
View File

@@ -100,11 +100,6 @@ func (c *RestoreItemActionGRPCClient) Execute(input *velero.RestoreItemActionExe
return nil, errors.WithStack(err)
}
var warning error
if res.Warning != "" {
warning = errors.New(res.Warning)
}
var additionalItems []velero.ResourceIdentifier
for _, itm := range res.AdditionalItems {
newItem := velero.ResourceIdentifier{
@@ -121,7 +116,6 @@ func (c *RestoreItemActionGRPCClient) Execute(input *velero.RestoreItemActionExe
return &velero.RestoreItemActionExecuteOutput{
UpdatedItem: &updatedItem,
Warning: warning,
AdditionalItems: additionalItems,
}, nil
}

8
pkg/plugin/framework/restore_item_action_server.go
View File

@@ -125,14 +125,8 @@ func (s *RestoreItemActionGRPCServer) Execute(ctx context.Context, req *proto.Re
}
}
var warnMessage string
if executeOutput.Warning != nil {
warnMessage = executeOutput.Warning.Error()
}
res := &proto.RestoreItemActionExecuteResponse{
Item: updatedItemJSON,
Warning: warnMessage,
Item: updatedItemJSON,
}
for _, item := range executeOutput.AdditionalItems {