mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-01-10 15:07:29 +00:00
Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> feat: Add CA cert fallback when caCertFile fails in download requests - Fallback to BSL cert when caCertFile cannot be opened - Combine certificate handling blocks to reuse CA pool initialization - Add comprehensive unit tests for fallback behavior This improves robustness by allowing downloads to proceed with BSL CA cert when the provided CA cert file is unavailable or unreadable. 🤖 Generated with [Claude Code](https://claude.ai/code) Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com> Co-Authored-By: Claude <noreply@anthropic.com>
170 lines
5.2 KiB
Go
170 lines
5.2 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 (
|
|
"os"
|
|
"testing"
|
|
"time"
|
|
|
|
"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)
|
|
|
|
// The restore command exits with an error message when restore is not complete
|
|
// We can't easily test this since it calls cmd.Exit, which exits the process
|
|
// So we'll skip this test case
|
|
t.Skip("Cannot test restore not complete case due to cmd.Exit() call")
|
|
})
|
|
|
|
t.Run("Restore not exist test", func(t *testing.T) {
|
|
// 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)
|
|
|
|
// The restore command exits with an error message when restore doesn't exist
|
|
// We can't easily test this since it calls cmd.Exit, which exits the process
|
|
// So we'll skip this test case
|
|
t.Skip("Cannot test restore not exist case due to cmd.Exit() call")
|
|
})
|
|
|
|
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
|
|
}
|
|
})
|
|
}
|