mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-08-16 12:16:06 +00:00
pkg/cmd/cli/restore/logs.go was the last command in the CLI still calling
cmd.Exit, which calls os.Exit directly. Two of its own tests were skipped
because of it, and said so:
t.Skip("Cannot test restore not complete case due to cmd.Exit() call")
This gives restore logs the LogsOptions shape that backup logs already
uses: Complete, BindFlags and Run returning an error, with the cobra
command passing that to cmd.CheckError. Both skipped tests now run and
assert on the returned errors.
Exit status is unchanged; cmd.CheckError also exits 1. The two refusal
messages now carry the standard "An error occurred:" prefix and match
the wording backup logs uses.
Signed-off-by: saral <ilovegojo2580@gmail.com>
184 lines
5.4 KiB
Go
184 lines
5.4 KiB
Go
/*
|
|
Copyright The Velero Contributors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package restore
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"testing"
|
|
"time"
|
|
|
|
flag "github.com/spf13/pflag"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
|
|
|
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
|
"github.com/vmware-tanzu/velero/pkg/builder"
|
|
factorymocks "github.com/vmware-tanzu/velero/pkg/client/mocks"
|
|
cmdtest "github.com/vmware-tanzu/velero/pkg/cmd/test"
|
|
"github.com/vmware-tanzu/velero/pkg/cmd/util/cacert"
|
|
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
|
)
|
|
|
|
func TestNewLogsCommand(t *testing.T) {
|
|
t.Run("Flag test", func(t *testing.T) {
|
|
// create a factory
|
|
f := &factorymocks.Factory{}
|
|
|
|
c := NewLogsCommand(f)
|
|
require.Equal(t, "Get restore logs", c.Short)
|
|
|
|
// Test flag parsing
|
|
timeout := "1s"
|
|
insecureSkipTLSVerify := "true"
|
|
caCertFile := "testing"
|
|
|
|
c.Flags().Set("timeout", timeout)
|
|
c.Flags().Set("insecure-skip-tls-verify", insecureSkipTLSVerify)
|
|
c.Flags().Set("cacert", caCertFile)
|
|
|
|
timeoutFlag, _ := c.Flags().GetDuration("timeout")
|
|
require.Equal(t, 1*time.Second, timeoutFlag)
|
|
|
|
insecureFlag, _ := c.Flags().GetBool("insecure-skip-tls-verify")
|
|
require.True(t, insecureFlag)
|
|
|
|
caCertFlag, _ := c.Flags().GetString("cacert")
|
|
require.Equal(t, caCertFile, caCertFlag)
|
|
})
|
|
|
|
t.Run("Restore not complete test", func(t *testing.T) {
|
|
restoreName := "rs-logs-1"
|
|
|
|
// create a factory
|
|
f := &factorymocks.Factory{}
|
|
|
|
kbClient := velerotest.NewFakeControllerRuntimeClient(t)
|
|
restore := builder.ForRestore(cmdtest.VeleroNameSpace, restoreName).Result()
|
|
err := kbClient.Create(t.Context(), restore, &kbclient.CreateOptions{})
|
|
require.NoError(t, err)
|
|
|
|
f.On("Namespace").Return(cmdtest.VeleroNameSpace)
|
|
f.On("KubebuilderClient").Return(kbClient, nil)
|
|
|
|
c := NewLogsCommand(f)
|
|
assert.Equal(t, "Get restore logs", c.Short)
|
|
|
|
l := NewLogsOptions()
|
|
flags := new(flag.FlagSet)
|
|
l.BindFlags(flags)
|
|
err = l.Complete([]string{restoreName}, f)
|
|
require.NoError(t, err)
|
|
|
|
err = l.Run(c, f)
|
|
require.Error(t, err)
|
|
require.ErrorContains(t, err, fmt.Sprintf("logs for restore %q are not available until it's finished processing", restoreName))
|
|
})
|
|
|
|
t.Run("Restore not exist test", func(t *testing.T) {
|
|
restoreName := "not-exist"
|
|
|
|
// create a factory
|
|
f := &factorymocks.Factory{}
|
|
|
|
kbClient := velerotest.NewFakeControllerRuntimeClient(t)
|
|
|
|
f.On("Namespace").Return(cmdtest.VeleroNameSpace)
|
|
f.On("KubebuilderClient").Return(kbClient, nil)
|
|
|
|
c := NewLogsCommand(f)
|
|
assert.Equal(t, "Get restore logs", c.Short)
|
|
|
|
l := NewLogsOptions()
|
|
flags := new(flag.FlagSet)
|
|
l.BindFlags(flags)
|
|
err := l.Complete([]string{restoreName}, f)
|
|
require.NoError(t, err)
|
|
|
|
err = l.Run(c, f)
|
|
require.Error(t, err)
|
|
require.Equal(t, fmt.Sprintf("restore %q does not exist", restoreName), err.Error())
|
|
})
|
|
|
|
t.Run("Restore with BSL cacert test", func(t *testing.T) {
|
|
restoreName := "rs-logs-with-cacert"
|
|
backupName := "bk-for-restore"
|
|
bslName := "test-bsl"
|
|
|
|
// create a factory
|
|
f := &factorymocks.Factory{}
|
|
|
|
kbClient := velerotest.NewFakeControllerRuntimeClient(t)
|
|
|
|
// Create BSL with cacert
|
|
bsl := builder.ForBackupStorageLocation(cmdtest.VeleroNameSpace, bslName).
|
|
Provider("aws").
|
|
Bucket("test-bucket").
|
|
CACert([]byte("test-cacert-content")).
|
|
Result()
|
|
err := kbClient.Create(t.Context(), bsl, &kbclient.CreateOptions{})
|
|
require.NoError(t, err)
|
|
|
|
// Create backup referencing the BSL
|
|
backup := builder.ForBackup(cmdtest.VeleroNameSpace, backupName).
|
|
StorageLocation(bslName).
|
|
Result()
|
|
err = kbClient.Create(t.Context(), backup, &kbclient.CreateOptions{})
|
|
require.NoError(t, err)
|
|
|
|
// Create restore referencing the backup
|
|
restore := builder.ForRestore(cmdtest.VeleroNameSpace, restoreName).
|
|
Phase(velerov1api.RestorePhaseCompleted).
|
|
Backup(backupName).
|
|
Result()
|
|
err = kbClient.Create(t.Context(), restore, &kbclient.CreateOptions{})
|
|
require.NoError(t, err)
|
|
|
|
f.On("Namespace").Return(cmdtest.VeleroNameSpace)
|
|
f.On("KubebuilderClient").Return(kbClient, nil)
|
|
|
|
c := NewLogsCommand(f)
|
|
assert.Equal(t, "Get restore logs", c.Short)
|
|
|
|
// We can verify that BSL cacert fetching logic is in place
|
|
// The actual command will call downloadrequest which requires a controller
|
|
// to be running, so we'll just verify the command structure
|
|
require.NotNil(t, c.Run)
|
|
|
|
// Verify the BSL cacert can be fetched
|
|
cacertValue, err := cacert.GetCACertFromRestore(t.Context(), kbClient, f.Namespace(), restore)
|
|
require.NoError(t, err)
|
|
require.Equal(t, "test-cacert-content", cacertValue)
|
|
})
|
|
|
|
t.Run("CLI execution test", func(t *testing.T) {
|
|
// create a factory
|
|
f := &factorymocks.Factory{}
|
|
|
|
c := NewLogsCommand(f)
|
|
require.Equal(t, "Get restore logs", c.Short)
|
|
|
|
if os.Getenv(cmdtest.CaptureFlag) == "1" {
|
|
c.SetArgs([]string{"test"})
|
|
e := c.Execute()
|
|
assert.NoError(t, e)
|
|
return
|
|
}
|
|
})
|
|
}
|