mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-09-13 11:34:54 +00:00
Max Freedom PollardandGitHub
4c007c0af4
Run the E2E test on kind / setup-test-matrix (push) Failing after 4s
e2e-test-kind.yaml / extract (push) Failing after 6s
Run the E2E test on kind / get-go-version (push) Failing after 7s
Run the E2E test on kind / build (push) Skipped
Run the E2E test on kind / run-e2e-test (push) Skipped
push.yml / extract (push) Failing after 6s
Main CI / get-go-version (push) Failing after 8s
Main CI / Build (push) Skipped
Scorecard supply-chain security / Scorecard analysis (push) Skipped
* Scope schedule and repo CLI list calls to the Velero namespace velero schedule get, velero schedule describe, velero schedule pause/unpause and velero repo get built a ctrlclient.ListOptions with a LabelSelector but no Namespace, so the list ran across every namespace in the cluster. Their single-name paths in the same functions already scope to f.Namespace(), and every sibling command (backup get, restore get, backup describe, restore describe, snapshot-location get, schedule delete) passes Namespace too, so the omission was an oversight rather than intent. The read commands print another installation's Schedules and BackupRepositories. runPause is worse: velero schedule pause --all and velero schedule unpause --all fetch Schedules from every namespace and then write Spec.Paused on each, so pausing one installation's schedules pauses every other installation's schedules as well. Add Namespace: f.Namespace() to the four List calls: pkg/cmd/cli/schedule/get.go:61 pkg/cmd/cli/schedule/describe.go:59 pkg/cmd/cli/schedule/pause.go:114 pkg/cmd/cli/repo/get.go:61 Neither pkg/cmd/cli/schedule nor pkg/cmd/cli/repo had any tests, so the regression tests are new files. Each seeds a fake client with one object in the Velero namespace and one in another-velero, and asserts the second is neither listed, described, nor paused. Signed-off-by: Max Freedom Pollard <272618364+MaxFreedomPollard@users.noreply.github.com> * Add changelog for PR 10482 Signed-off-by: Max Freedom Pollard <272618364+MaxFreedomPollard@users.noreply.github.com> --------- Signed-off-by: Max Freedom Pollard <272618364+MaxFreedomPollard@users.noreply.github.com>
78 lines
2.1 KiB
Go
78 lines
2.1 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 schedule
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"os"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"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"
|
|
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
|
)
|
|
|
|
// captureStdout runs execute and returns everything it wrote to os.Stdout. The
|
|
// describe and output helpers write to os.Stdout directly rather than to the
|
|
// command's output writer, so the file has to be swapped to read them back.
|
|
func captureStdout(t *testing.T, execute func()) string {
|
|
t.Helper()
|
|
|
|
r, w, err := os.Pipe()
|
|
require.NoError(t, err)
|
|
|
|
original := os.Stdout
|
|
os.Stdout = w
|
|
defer func() { os.Stdout = original }()
|
|
|
|
execute()
|
|
|
|
require.NoError(t, w.Close())
|
|
|
|
var buf bytes.Buffer
|
|
_, err = io.Copy(&buf, r)
|
|
require.NoError(t, err)
|
|
|
|
return buf.String()
|
|
}
|
|
|
|
func TestNewGetCommandListsOnlyTheVeleroNamespace(t *testing.T) {
|
|
ours := builder.ForSchedule(cmdtest.VeleroNameSpace, "ours").CronSchedule("@daily").Result()
|
|
theirs := builder.ForSchedule("another-velero", "theirs").CronSchedule("@daily").Result()
|
|
|
|
crClient := velerotest.NewFakeControllerRuntimeClient(t, ours, theirs)
|
|
|
|
f := &factorymocks.Factory{}
|
|
f.On("Namespace").Return(cmdtest.VeleroNameSpace)
|
|
f.On("KubebuilderClient").Return(crClient, nil)
|
|
|
|
c := NewGetCommand(f, "get")
|
|
c.SetArgs([]string{})
|
|
|
|
out := captureStdout(t, func() {
|
|
require.NoError(t, c.Execute())
|
|
})
|
|
|
|
assert.Contains(t, out, "ours")
|
|
assert.NotContains(t, out, "theirs")
|
|
}
|