Merge pull request #5621 from karlkfi/karl-require-assert

Use require for Error and NoError

api/filters/fieldspec/fieldspec_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/api/filters/fieldspec"
 	"sigs.k8s.io/kustomize/api/filters/filtersutil"
 	"sigs.k8s.io/kustomize/kyaml/kio"
@@ -621,7 +622,7 @@ kind: Pod
 
 		t.Run(name, func(t *testing.T) {
 			err := yaml.Unmarshal([]byte(tc.fieldSpec), &filter.FieldSpec)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			rw := &kio.ByteReadWriter{
 				Reader:                bytes.NewBufferString(tc.input),
 				Writer:                &bytes.Buffer{},
@@ -635,7 +636,7 @@ kind: Pod
 				Outputs: []kio.Writer{rw},
 			}.Execute()
 
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, tc.expected, fieldPaths)
 		})
 	}

api/internal/localizer/localizer_test.go

@@ -144,7 +144,7 @@ func reportFSysDiff(t *testing.T, fSysExpected filesys.FileSystem, fSysActual fi
 			actualContent, readErr := fSysActual.ReadFile(path)
 			require.NoError(t, readErr)
 			expectedContent, findErr := fSysExpected.ReadFile(path)
-			assert.NoErrorf(t, findErr, "unexpected file %q", path)
+			require.NoErrorf(t, findErr, "unexpected file %q", path)
 			if findErr == nil {
 				assert.Equal(t, string(expectedContent), string(actualContent))
 			}

api/internal/plugins/utils/utils_test.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/provider"
@@ -97,8 +96,8 @@ func TestUpdateResourceOptions(t *testing.T) {
 		require.NoError(t, err)
 	}
 	actual, err := UpdateResourceOptions(in)
-	assert.NoError(t, err)
-	assert.NoError(t, expected.ErrorIfNotEqualLists(actual))
+	require.NoError(t, err)
+	require.NoError(t, expected.ErrorIfNotEqualLists(actual))
 }
 
 func TestUpdateResourceOptionsWithInvalidHashAnnotationValues(t *testing.T) {

api/internal/target/kusttarget_test.go

@@ -285,15 +285,15 @@ metadata:
 	}
 	expected.RemoveBuildAnnotations()
 	expYaml, err := expected.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	kt := makeKustTargetWithRf(t, th.GetFSys(), "/whatever", pvd)
-	assert.NoError(t, kt.Load())
+	require.NoError(t, kt.Load())
 	actual, err := kt.MakeCustomizedResMap()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	actual.RemoveBuildAnnotations()
 	actYaml, err := actual.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, string(expYaml), string(actYaml))
 }
 
@@ -425,7 +425,7 @@ func TestDuplicateExternalGeneratorsForbidden(t *testing.T) {
     configPath: another_config.json
 `)
 	_, err := makeAndLoadKustTarget(t, th.GetFSys(), "/generator").AccumulateTarget()
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "may not add resource with an already registered id: ManifestGenerator.v1.generators.example/ManifestGenerator")
 }
 
@@ -454,6 +454,6 @@ func TestDuplicateExternalTransformersForbidden(t *testing.T) {
   value: 'fail'
 `)
 	_, err := makeAndLoadKustTarget(t, th.GetFSys(), "/transformer").AccumulateTarget()
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "may not add resource with an already registered id: ValueAnnotator.v1.transformers.example.co/notImportantHere")
 }

api/krusty/duplicatekeys_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 )
 
@@ -41,6 +42,6 @@ spec:
 `)
 	m := th.Run(".", th.MakeDefaultOptions())
 	_, err := m.AsYaml()
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "mapping key \"env\" already defined")
 }

api/krusty/fnplugin_test.go

@@ -4,12 +4,14 @@
 package krusty_test
 
 import (
+	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	. "sigs.k8s.io/kustomize/api/krusty"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
@@ -65,7 +67,7 @@ func TestFnExecGeneratorInBase(t *testing.T) {
 	o.PluginConfig.FnpLoadingOptions.EnableExec = true
 
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	th.WriteK(tmpDir.String(), `
 resources:
 - short_secret.yaml
@@ -90,7 +92,7 @@ stringData:
 `)
 	th.WriteF(filepath.Join(tmpDir.String(), "generateDeployment.sh"), generateDeploymentDotSh)
 
-	assert.NoError(t, os.Chmod(filepath.Join(tmpDir.String(), "generateDeployment.sh"), 0777))
+	require.NoError(t, os.Chmod(filepath.Join(tmpDir.String(), "generateDeployment.sh"), 0777))
 	th.WriteF(filepath.Join(tmpDir.String(), "gener.yaml"), `
 kind: executable
 metadata:
@@ -104,7 +106,7 @@ spec:
 
 	m := th.Run(tmpDir.String(), o)
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 kind: Secret
 metadata:
@@ -138,7 +140,7 @@ spec:
       - image: nginx
         name: nginx
 `, string(yml))
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
 func TestFnExecGeneratorInBaseWithOverlay(t *testing.T) {
@@ -149,11 +151,11 @@ func TestFnExecGeneratorInBaseWithOverlay(t *testing.T) {
 	o.PluginConfig.FnpLoadingOptions.EnableExec = true
 
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	base := filepath.Join(tmpDir.String(), "base")
 	prod := filepath.Join(tmpDir.String(), "prod")
-	assert.NoError(t, fSys.Mkdir(base))
-	assert.NoError(t, fSys.Mkdir(prod))
+	require.NoError(t, fSys.Mkdir(base))
+	require.NoError(t, fSys.Mkdir(prod))
 	th.WriteK(base, `
 resources:
 - short_secret.yaml
@@ -180,7 +182,7 @@ stringData:
 `)
 	th.WriteF(filepath.Join(base, "generateDeployment.sh"), generateDeploymentDotSh)
 
-	assert.NoError(t, os.Chmod(filepath.Join(base, "generateDeployment.sh"), 0777))
+	require.NoError(t, os.Chmod(filepath.Join(base, "generateDeployment.sh"), 0777))
 	th.WriteF(filepath.Join(base, "gener.yaml"), `
 kind: executable
 metadata:
@@ -193,9 +195,9 @@ spec:
 `)
 
 	m := th.Run(prod, o)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 kind: Secret
 metadata:
@@ -229,7 +231,7 @@ spec:
       - image: nginx
         name: nginx
 `, string(yml))
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
 func TestFnExecGeneratorInOverlay(t *testing.T) {
@@ -240,11 +242,11 @@ func TestFnExecGeneratorInOverlay(t *testing.T) {
 	o.PluginConfig.FnpLoadingOptions.EnableExec = true
 
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	base := filepath.Join(tmpDir.String(), "base")
 	prod := filepath.Join(tmpDir.String(), "prod")
-	assert.NoError(t, fSys.Mkdir(base))
-	assert.NoError(t, fSys.Mkdir(prod))
+	require.NoError(t, fSys.Mkdir(base))
+	require.NoError(t, fSys.Mkdir(prod))
 	th.WriteK(base, `
 resources:
 - short_secret.yaml
@@ -271,7 +273,7 @@ stringData:
 `)
 	th.WriteF(filepath.Join(prod, "generateDeployment.sh"), generateDeploymentDotSh)
 
-	assert.NoError(t, os.Chmod(filepath.Join(prod, "generateDeployment.sh"), 0777))
+	require.NoError(t, os.Chmod(filepath.Join(prod, "generateDeployment.sh"), 0777))
 	th.WriteF(filepath.Join(prod, "gener.yaml"), `
 kind: executable
 metadata:
@@ -284,9 +286,9 @@ spec:
 `)
 
 	m := th.Run(prod, o)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 kind: Secret
 metadata:
@@ -320,7 +322,7 @@ spec:
       - image: nginx
         name: nginx
 `, string(yml))
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
 func TestFnExecTransformerInBase(t *testing.T) {
@@ -331,9 +333,9 @@ func TestFnExecTransformerInBase(t *testing.T) {
 	o.PluginConfig.FnpLoadingOptions.EnableExec = true
 
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	base := filepath.Join(tmpDir.String(), "base")
-	assert.NoError(t, fSys.Mkdir(base))
+	require.NoError(t, fSys.Mkdir(base))
 	th.WriteK(base, `
 resources:
 - secret.yaml
@@ -352,7 +354,7 @@ stringData:
 `)
 	th.WriteF(filepath.Join(base, "krmTransformer.sh"), krmTransformerDotSh)
 
-	assert.NoError(t, os.Chmod(filepath.Join(base, "krmTransformer.sh"), 0777))
+	require.NoError(t, os.Chmod(filepath.Join(base, "krmTransformer.sh"), 0777))
 	th.WriteF(filepath.Join(base, "krm-transformer.yaml"), `
 apiVersion: examples.config.kubernetes.io/v1beta1
 kind: MyPlugin
@@ -366,7 +368,7 @@ metadata:
 
 	m := th.Run(base, o)
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 kind: Secret
 metadata:
@@ -375,7 +377,7 @@ stringData:
   foo: bar
 type: Opaque
 `, string(yml))
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
 func TestFnExecTransformerInBaseWithOverlay(t *testing.T) {
@@ -386,11 +388,11 @@ func TestFnExecTransformerInBaseWithOverlay(t *testing.T) {
 	o.PluginConfig.FnpLoadingOptions.EnableExec = true
 
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	base := filepath.Join(tmpDir.String(), "base")
 	prod := filepath.Join(tmpDir.String(), "prod")
-	assert.NoError(t, fSys.Mkdir(base))
-	assert.NoError(t, fSys.Mkdir(prod))
+	require.NoError(t, fSys.Mkdir(base))
+	require.NoError(t, fSys.Mkdir(prod))
 	th.WriteK(base, `
 resources:
 - secret.yaml
@@ -413,7 +415,7 @@ stringData:
 `)
 	th.WriteF(filepath.Join(base, "krmTransformer.sh"), krmTransformerDotSh)
 
-	assert.NoError(t, os.Chmod(filepath.Join(base, "krmTransformer.sh"), 0777))
+	require.NoError(t, os.Chmod(filepath.Join(base, "krmTransformer.sh"), 0777))
 	th.WriteF(filepath.Join(base, "krm-transformer.yaml"), `
 apiVersion: examples.config.kubernetes.io/v1beta1
 kind: MyPlugin
@@ -427,7 +429,7 @@ metadata:
 
 	m := th.Run(prod, o)
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 kind: Secret
 metadata:
@@ -436,7 +438,7 @@ stringData:
   foo: bar
 type: Opaque
 `, string(yml))
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
 func TestFnExecTransformerInOverlay(t *testing.T) {
@@ -447,11 +449,11 @@ func TestFnExecTransformerInOverlay(t *testing.T) {
 	o.PluginConfig.FnpLoadingOptions.EnableExec = true
 
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	base := filepath.Join(tmpDir.String(), "base")
 	prod := filepath.Join(tmpDir.String(), "prod")
-	assert.NoError(t, fSys.Mkdir(base))
-	assert.NoError(t, fSys.Mkdir(prod))
+	require.NoError(t, fSys.Mkdir(base))
+	require.NoError(t, fSys.Mkdir(prod))
 	th.WriteK(base, `
 resources:
 - secret.yaml
@@ -474,7 +476,7 @@ stringData:
 `)
 	th.WriteF(filepath.Join(prod, "krmTransformer.sh"), krmTransformerDotSh)
 
-	assert.NoError(t, os.Chmod(filepath.Join(prod, "krmTransformer.sh"), 0777))
+	require.NoError(t, os.Chmod(filepath.Join(prod, "krmTransformer.sh"), 0777))
 	th.WriteF(filepath.Join(prod, "krm-transformer.yaml"), `
 apiVersion: examples.config.kubernetes.io/v1beta1
 kind: MyPlugin
@@ -488,7 +490,7 @@ metadata:
 
 	m := th.Run(prod, o)
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 kind: Secret
 metadata:
@@ -497,7 +499,7 @@ stringData:
   foo: bar
 type: Opaque
 `, string(yml))
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
 func skipIfNoDocker(t *testing.T) {
@@ -512,7 +514,7 @@ func TestFnContainerGenerator(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
 	o := th.MakeOptionsPluginsEnabled()
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	th.WriteK(tmpDir.String(), `
 resources:
 - deployment.yaml
@@ -545,12 +547,12 @@ metadata:
 		"-t", "gcr.io/kustomize-functions/e2econtainersimplegenerator",
 	)
 	build.Dir = repoRootDir
-	assert.NoError(t, build.Run())
+	require.NoError(t, run(build))
 
 	m := th.Run(tmpDir.String(), o)
 	actual, err := m.AsYaml()
-	assert.NoError(t, err)
-	assert.Equal(t, `apiVersion: apps/v1
+	require.NoError(t, err)
+	require.Equal(t, `apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: simplegenerator
@@ -577,7 +579,7 @@ func TestFnContainerTransformer(t *testing.T) {
 	th := kusttest_test.MakeHarness(t)
 	o := th.MakeOptionsPluginsEnabled()
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	th.WriteK(tmpDir.String(), `
 resources:
 - deployment.yaml
@@ -605,10 +607,10 @@ metadata:
 		"-t", "gcr.io/kustomize-functions/e2econtainerconfig",
 	)
 	build.Dir = repoRootDir
-	assert.NoError(t, build.Run())
+	require.NoError(t, run(build))
 	m := th.Run(tmpDir.String(), o)
 	actual, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -627,33 +629,33 @@ func TestFnContainerTransformerWithConfig(t *testing.T) {
 		"-f", "build/label_namespace.Dockerfile",
 		"-t", "gcr.io/kpt-functions/label-namespace:go-sdk-v0.0.1",
 	)
-	assert.NoError(t, build.Run())
+	require.NoError(t, run(build))
 	th := kusttest_test.MakeHarness(t)
 	o := th.MakeOptionsPluginsEnabled()
 	fSys := filesys.MakeFsOnDisk()
 	b := MakeKustomizer(&o)
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
-	assert.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "kustomization.yaml"), []byte(`
+	require.NoError(t, err)
+	require.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "kustomization.yaml"), []byte(`
 resources:
 - data1.yaml
 - data2.yaml
 transformers:
 - label_namespace.yaml
 `)))
-	assert.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "data1.yaml"), []byte(`
+	require.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "data1.yaml"), []byte(`
 apiVersion: v1
 kind: Namespace
 metadata:
   name: my-namespace
 `)))
-	assert.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "data2.yaml"), []byte(`
+	require.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "data2.yaml"), []byte(`
 apiVersion: v1
 kind: Namespace
 metadata:
   name: another-namespace
 `)))
-	assert.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "label_namespace.yaml"), []byte(`
+	require.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "label_namespace.yaml"), []byte(`
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -669,9 +671,9 @@ data:
 	m, err := b.Run(
 		fSys,
 		tmpDir.String())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	actual, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 kind: Namespace
 metadata:
@@ -695,12 +697,12 @@ func TestFnContainerEnvVars(t *testing.T) {
 	fSys := filesys.MakeFsOnDisk()
 	b := MakeKustomizer(&o)
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
-	assert.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "kustomization.yaml"), []byte(`
+	require.NoError(t, err)
+	require.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "kustomization.yaml"), []byte(`
 generators:
 - gener.yaml
 `)))
-	assert.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "gener.yaml"), []byte(`
+	require.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "gener.yaml"), []byte(`
 apiVersion: kustomize.sigs.k8s.io/v1alpha1
 kind: EnvTemplateGenerator
 metadata:
@@ -724,14 +726,14 @@ template: |
 		"-t", "gcr.io/kustomize-functions/e2econtainerenvgenerator",
 	)
 	build.Dir = repoRootDir
-	assert.NoError(t, build.Run())
+	require.NoError(t, run(build))
 
 	m, err := b.Run(
 		fSys,
 		tmpDir.String())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	actual, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 data:
   value: value
@@ -748,12 +750,12 @@ func TestFnContainerFnMounts(t *testing.T) {
 	fSys := filesys.MakeFsOnDisk()
 	b := MakeKustomizer(&o)
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
-	assert.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "kustomization.yaml"), []byte(`
+	require.NoError(t, err)
+	require.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "kustomization.yaml"), []byte(`
 generators:
 - gener.yaml
 `)))
-	assert.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "gener.yaml"), []byte(`
+	require.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "gener.yaml"), []byte(`
 apiVersion: kustomize.sigs.k8s.io/v1alpha1
 kind: RenderHelmChart
 metadata:
@@ -768,8 +770,8 @@ metadata:
           dst: "/tmp/yaml"
 path: /tmp/yaml/resources.yaml
 `)))
-	assert.NoError(t, fSys.MkdirAll(filepath.Join(tmpDir.String(), "yaml", "tmp")))
-	assert.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "yaml", "resources.yaml"), []byte(`
+	require.NoError(t, fSys.MkdirAll(filepath.Join(tmpDir.String(), "yaml", "tmp")))
+	require.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "yaml", "resources.yaml"), []byte(`
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -782,14 +784,14 @@ spec:
 		"-t", "gcr.io/kustomize-functions/e2econtainermountbind",
 	)
 	build.Dir = repoRootDir
-	assert.NoError(t, build.Run())
+	require.NoError(t, run(build))
 
 	m, err := b.Run(
 		fSys,
 		tmpDir.String())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	actual, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -806,8 +808,8 @@ func TestFnContainerMountsLoadRestrictions_absolute(t *testing.T) {
 	fSys := filesys.MakeFsOnDisk()
 	b := MakeKustomizer(&o)
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
-	assert.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "kustomization.yaml"), []byte(`
+	require.NoError(t, err)
+	require.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "kustomization.yaml"), []byte(`
 generators:
   - |-
     apiVersion: v1alpha1
@@ -826,7 +828,7 @@ generators:
 	_, err = b.Run(
 		fSys,
 		tmpDir.String())
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "loading generator plugins: failed to load generator: plugin RenderHelmChart."+
 		"v1alpha1.[noGrp]/demo.[noNs] with mount path '/tmp/dir' is not permitted; mount paths must"+
 		" be relative to the current kustomization directory")
@@ -839,8 +841,8 @@ func TestFnContainerMountsLoadRestrictions_outsideCurrentDir(t *testing.T) {
 	fSys := filesys.MakeFsOnDisk()
 	b := MakeKustomizer(&o)
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
-	assert.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "kustomization.yaml"), []byte(`
+	require.NoError(t, err)
+	require.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "kustomization.yaml"), []byte(`
 generators:
   - |-
     apiVersion: v1alpha1
@@ -859,7 +861,7 @@ generators:
 	_, err = b.Run(
 		fSys,
 		tmpDir.String())
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "loading generator plugins: failed to load generator: plugin RenderHelmChart."+
 		"v1alpha1.[noGrp]/demo.[noNs] with mount path './tmp/../../dir' is not permitted; mount paths must "+
 		"be under the current kustomization directory")
@@ -887,6 +889,15 @@ spec:
   replicas: 3
 `)
 	err := th.RunWithErr(".", th.MakeOptionsPluginsEnabled())
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.EqualError(t, err, "couldn't execute function: root working directory '/' not allowed")
 }
+
+// run calls Cmd.Run and wraps the error to include the output to make debugging
+// easier. Not safe for real code, but fine for tests.
+func run(cmd *exec.Cmd) error {
+	if out, err := cmd.CombinedOutput(); err != nil {
+		return fmt.Errorf("%w\n--- COMMAND OUTPUT ---\n%s", err, string(out))
+	}
+	return nil
+}

api/krusty/gvknpatch_test.go

@@ -6,7 +6,7 @@ package krusty_test
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 )
 
@@ -496,7 +496,7 @@ spec:
 	options := th.MakeDefaultOptions()
 	// depPatch cannot find target with kind `Deployment` and name `new-name`
 	// because the resource never had this GVKN
-	assert.Error(t, th.RunWithErr("overlay", options))
+	require.Error(t, th.RunWithErr("overlay", options))
 }
 
 // Here is a structure of a kustomization of two components, component1

api/krusty/intermediateresourceid_test.go

@@ -6,7 +6,7 @@ package krusty_test
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 )
 
@@ -209,7 +209,7 @@ spec:
       - image: whatever
 `)
 	err := th.RunWithErr("gcp", th.MakeDefaultOptions())
-	assert.Error(t, err)
+	require.Error(t, err)
 }
 
 // Test for issue #3228

api/krusty/openapicustomschema_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 	"sigs.k8s.io/kustomize/kyaml/openapi"
 	"sigs.k8s.io/kustomize/kyaml/openapi/kubernetesapi"
@@ -264,7 +265,7 @@ openapi:
 		writeCustomResource(th, "mycrd.yaml")
 		writeTestSchema(th, "./")
 		err := th.RunWithErr(".", th.MakeDefaultOptions())
-		assert.Error(t, err)
+		require.Error(t, err)
 		assert.Equal(t,
 			"builtin version and custom schema provided, cannot use both",
 			err.Error())
@@ -284,7 +285,7 @@ openapi:
 `+customSchemaPatch)
 		writeCustomResource(th, "mycrd.yaml")
 		err := th.RunWithErr(".", th.MakeDefaultOptions())
-		assert.Error(t, err)
+		require.Error(t, err)
 		assert.Equal(t,
 			"'/mycrd_schema.json' doesn't exist",
 			err.Error())

api/krusty/originannotation_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/api/internal/utils"
 	"sigs.k8s.io/kustomize/api/krusty"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
@@ -417,7 +418,7 @@ func TestAnnoOriginCustomExecGenerator(t *testing.T) {
 	o.PluginConfig.FnpLoadingOptions.EnableExec = true
 
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	th.WriteK(tmpDir.String(), `
 resources:
 - short_secret.yaml
@@ -443,7 +444,7 @@ stringData:
 `)
 	th.WriteF(filepath.Join(tmpDir.String(), "generateDeployment.sh"), generateDeploymentDotSh)
 
-	assert.NoError(t, os.Chmod(filepath.Join(tmpDir.String(), "generateDeployment.sh"), 0777))
+	require.NoError(t, os.Chmod(filepath.Join(tmpDir.String(), "generateDeployment.sh"), 0777))
 	th.WriteF(filepath.Join(tmpDir.String(), "gener.yaml"), `
 kind: executable
 metadata:
@@ -456,9 +457,9 @@ spec:
 `)
 
 	m := th.Run(tmpDir.String(), o)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 kind: Secret
 metadata:
@@ -500,7 +501,7 @@ spec:
       - image: nginx
         name: nginx
 `, string(yml))
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
 func TestAnnoOriginCustomInlineExecGenerator(t *testing.T) {
@@ -511,7 +512,7 @@ func TestAnnoOriginCustomInlineExecGenerator(t *testing.T) {
 	o.PluginConfig.FnpLoadingOptions.EnableExec = true
 
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	th.WriteK(tmpDir.String(), `
 resources:
 - short_secret.yaml
@@ -544,11 +545,11 @@ stringData:
     - mkdir /mnt/vda
 `)
 	th.WriteF(filepath.Join(tmpDir.String(), "generateDeployment.sh"), generateDeploymentDotSh)
-	assert.NoError(t, os.Chmod(filepath.Join(tmpDir.String(), "generateDeployment.sh"), 0777))
+	require.NoError(t, os.Chmod(filepath.Join(tmpDir.String(), "generateDeployment.sh"), 0777))
 	m := th.Run(tmpDir.String(), o)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 kind: Secret
 metadata:
@@ -590,7 +591,7 @@ spec:
       - image: nginx
         name: nginx
 `, string(yml))
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
 func TestAnnoOriginCustomExecGeneratorWithOverlay(t *testing.T) {
@@ -601,11 +602,11 @@ func TestAnnoOriginCustomExecGeneratorWithOverlay(t *testing.T) {
 	o.PluginConfig.FnpLoadingOptions.EnableExec = true
 
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	base := filepath.Join(tmpDir.String(), "base")
 	prod := filepath.Join(tmpDir.String(), "prod")
-	assert.NoError(t, fSys.Mkdir(base))
-	assert.NoError(t, fSys.Mkdir(prod))
+	require.NoError(t, fSys.Mkdir(base))
+	require.NoError(t, fSys.Mkdir(prod))
 	th.WriteK(base, `
 resources:
 - short_secret.yaml
@@ -633,7 +634,7 @@ stringData:
 `)
 	th.WriteF(filepath.Join(base, "generateDeployment.sh"), generateDeploymentDotSh)
 
-	assert.NoError(t, os.Chmod(filepath.Join(base, "generateDeployment.sh"), 0777))
+	require.NoError(t, os.Chmod(filepath.Join(base, "generateDeployment.sh"), 0777))
 	th.WriteF(filepath.Join(base, "gener.yaml"), `
 kind: executable
 metadata:
@@ -646,9 +647,9 @@ spec:
 `)
 
 	m := th.Run(prod, o)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 kind: Secret
 metadata:
@@ -690,7 +691,7 @@ spec:
       - image: nginx
         name: nginx
 `, string(yml))
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
 func TestAnnoOriginCustomInlineExecGeneratorWithOverlay(t *testing.T) {
@@ -701,11 +702,11 @@ func TestAnnoOriginCustomInlineExecGeneratorWithOverlay(t *testing.T) {
 	o.PluginConfig.FnpLoadingOptions.EnableExec = true
 
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	base := filepath.Join(tmpDir.String(), "base")
 	prod := filepath.Join(tmpDir.String(), "prod")
-	assert.NoError(t, fSys.Mkdir(base))
-	assert.NoError(t, fSys.Mkdir(prod))
+	require.NoError(t, fSys.Mkdir(base))
+	require.NoError(t, fSys.Mkdir(prod))
 	th.WriteK(base, `
 resources:
 - short_secret.yaml
@@ -740,11 +741,11 @@ stringData:
     - mkdir /mnt/vda
 `)
 	th.WriteF(filepath.Join(base, "generateDeployment.sh"), generateDeploymentDotSh)
-	assert.NoError(t, os.Chmod(filepath.Join(base, "generateDeployment.sh"), 0777))
+	require.NoError(t, os.Chmod(filepath.Join(base, "generateDeployment.sh"), 0777))
 	m := th.Run(prod, o)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 kind: Secret
 metadata:
@@ -786,15 +787,15 @@ spec:
       - image: nginx
         name: nginx
 `, string(yml))
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
 func TestAnnoOriginRemoteBuiltinGenerator(t *testing.T) {
 	fSys := filesys.MakeFsOnDisk()
 	b := krusty.MakeKustomizer(krusty.MakeDefaultOptions())
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
-	assert.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "kustomization.yaml"), []byte(`
+	require.NoError(t, err)
+	require.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "kustomization.yaml"), []byte(`
 resources:
 - github.com/kubernetes-sigs/kustomize/examples/ldap/base/?ref=v1.0.6
 buildMetadata: [originAnnotations]
@@ -810,7 +811,7 @@ buildMetadata: [originAnnotations]
 		t.FailNow()
 	}
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Contains(t, string(yml), `kind: ConfigMap
 metadata:
   annotations:
@@ -822,7 +823,7 @@ metadata:
         apiVersion: builtin
         kind: ConfigMapGenerator
   name: ldap-configmap-4d7m6k5b42`)
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
 func TestAnnoOriginInlineBuiltinGenerator(t *testing.T) {
@@ -1011,7 +1012,7 @@ func TestAnnoOriginGeneratorInTransformersField(t *testing.T) {
 	o.PluginConfig.FnpLoadingOptions.EnableExec = true
 
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	th.WriteK(tmpDir.String(), `
 transformers:
 - gener.yaml
@@ -1020,7 +1021,7 @@ buildMetadata: [originAnnotations]
 
 	th.WriteF(filepath.Join(tmpDir.String(), "generateDeployment.sh"), generateDeploymentDotSh)
 
-	assert.NoError(t, os.Chmod(filepath.Join(tmpDir.String(), "generateDeployment.sh"), 0777))
+	require.NoError(t, os.Chmod(filepath.Join(tmpDir.String(), "generateDeployment.sh"), 0777))
 	th.WriteF(filepath.Join(tmpDir.String(), "gener.yaml"), `
 kind: executable
 metadata:
@@ -1033,9 +1034,9 @@ spec:
 `)
 
 	m := th.Run(tmpDir.String(), o)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -1062,7 +1063,7 @@ spec:
       - image: nginx
         name: nginx
 `, string(yml))
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
 func TestAnnoOriginGeneratorInTransformersFieldWithOverlay(t *testing.T) {
@@ -1073,11 +1074,11 @@ func TestAnnoOriginGeneratorInTransformersFieldWithOverlay(t *testing.T) {
 	o.PluginConfig.FnpLoadingOptions.EnableExec = true
 
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	base := filepath.Join(tmpDir.String(), "base")
 	prod := filepath.Join(tmpDir.String(), "prod")
-	assert.NoError(t, fSys.Mkdir(base))
-	assert.NoError(t, fSys.Mkdir(prod))
+	require.NoError(t, fSys.Mkdir(base))
+	require.NoError(t, fSys.Mkdir(prod))
 
 	th.WriteK(base, `
 transformers:
@@ -1086,7 +1087,7 @@ transformers:
 
 	th.WriteF(filepath.Join(base, "generateDeployment.sh"), generateDeploymentDotSh)
 
-	assert.NoError(t, os.Chmod(filepath.Join(base, "generateDeployment.sh"), 0777))
+	require.NoError(t, os.Chmod(filepath.Join(base, "generateDeployment.sh"), 0777))
 	th.WriteF(filepath.Join(base, "gener.yaml"), `
 kind: executable
 metadata:
@@ -1105,9 +1106,9 @@ buildMetadata: [originAnnotations, transformerAnnotations]
 `)
 
 	m := th.Run(prod, o)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -1139,5 +1140,5 @@ spec:
       - image: nginx
         name: nginx
 `, string(yml))
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }

api/krusty/remoteloader_test.go

@@ -404,7 +404,7 @@ resources:
 				require.Error(t, err)
 				assert.Contains(t, err.Error(), test.err)
 				if test.errT != nil {
-					assert.ErrorIs(t, err, test.errT)
+					require.ErrorIs(t, err, test.errT)
 				}
 			} else {
 				require.NoError(t, err)
@@ -453,6 +453,6 @@ func checkYaml(t *testing.T, actual resmap.ResMap, expected string) {
 	t.Helper()
 
 	yml, err := actual.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expected, string(yml))
 }

api/krusty/transformerannotation_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/api/internal/utils"
 	"sigs.k8s.io/kustomize/api/krusty"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
@@ -261,8 +262,8 @@ func TestAnnoOriginRemoteBuiltinTransformer(t *testing.T) {
 	fSys := filesys.MakeFsOnDisk()
 	b := krusty.MakeKustomizer(krusty.MakeDefaultOptions())
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
-	assert.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "kustomization.yaml"), []byte(`
+	require.NoError(t, err)
+	require.NoError(t, fSys.WriteFile(filepath.Join(tmpDir.String(), "kustomization.yaml"), []byte(`
 resources:
 - github.com/kubernetes-sigs/kustomize/examples/multibases/production/?ref=v1.0.6
 buildMetadata: [transformerAnnotations]
@@ -278,7 +279,7 @@ buildMetadata: [transformerAnnotations]
 		t.FailNow()
 	}
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 kind: Pod
 metadata:
@@ -298,7 +299,7 @@ spec:
   - image: nginx:1.7.9
     name: nginx
 `, string(yml))
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
 func TestAnnoTransformerBuiltinInline(t *testing.T) {
@@ -356,7 +357,7 @@ func TestAnnoOriginCustomInlineTransformer(t *testing.T) {
 	o.PluginConfig.FnpLoadingOptions.EnableExec = true
 
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	th.WriteK(tmpDir.String(), `
 transformers:
 - |-
@@ -375,7 +376,7 @@ buildMetadata: [transformerAnnotations]
 	// which will cause kustomize to record the plugin origin data as a transformation
 	th.WriteF(filepath.Join(tmpDir.String(), "generateDeployment.sh"), generateDeploymentWithOriginDotSh)
 
-	assert.NoError(t, os.Chmod(filepath.Join(tmpDir.String(), "generateDeployment.sh"), 0777))
+	require.NoError(t, os.Chmod(filepath.Join(tmpDir.String(), "generateDeployment.sh"), 0777))
 	th.WriteF(filepath.Join(tmpDir.String(), "gener.yaml"), `
 kind: executable
 metadata:
@@ -388,9 +389,9 @@ spec:
 `)
 
 	m := th.Run(tmpDir.String(), o)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -417,7 +418,7 @@ spec:
       - image: nginx
         name: nginx
 `, string(yml))
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }
 
 func TestAnnoOriginCustomExecTransformerWithOverlay(t *testing.T) {
@@ -428,11 +429,11 @@ func TestAnnoOriginCustomExecTransformerWithOverlay(t *testing.T) {
 	o.PluginConfig.FnpLoadingOptions.EnableExec = true
 
 	tmpDir, err := filesys.NewTmpConfirmedDir()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	base := filepath.Join(tmpDir.String(), "base")
 	prod := filepath.Join(tmpDir.String(), "prod")
-	assert.NoError(t, fSys.Mkdir(base))
-	assert.NoError(t, fSys.Mkdir(prod))
+	require.NoError(t, fSys.Mkdir(base))
+	require.NoError(t, fSys.Mkdir(prod))
 	th.WriteK(base, `
 transformers:
 - gener.yaml
@@ -455,12 +456,12 @@ spec:
 	// generateDeploymentWithOriginDotSh creates a resource that already has an origin annotation,
 	// which will cause kustomize to record the plugin origin data as a transformation
 	th.WriteF(filepath.Join(base, "generateDeployment.sh"), generateDeploymentWithOriginDotSh)
-	assert.NoError(t, os.Chmod(filepath.Join(base, "generateDeployment.sh"), 0777))
+	require.NoError(t, os.Chmod(filepath.Join(base, "generateDeployment.sh"), 0777))
 
 	m := th.Run(prod, o)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	yml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -487,5 +488,5 @@ spec:
       - image: nginx
         name: nginx
 `, string(yml))
-	assert.NoError(t, fSys.RemoveAll(tmpDir.String()))
+	require.NoError(t, fSys.RemoveAll(tmpDir.String()))
 }

api/resmap/factory_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/api/ifc"
 	loader "sigs.k8s.io/kustomize/api/internal/loader"
 	"sigs.k8s.io/kustomize/api/kv"
@@ -61,19 +62,19 @@ metadata:
 				"namespace": "test",
 			}}).ResMap()
 	expYaml, err := expected.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	fSys := filesys.MakeFsInMemory()
-	assert.NoError(t, fSys.WriteFile("deployment.yaml", []byte(resourceStr)))
+	require.NoError(t, fSys.WriteFile("deployment.yaml", []byte(resourceStr)))
 
 	ldr, err := loader.NewLoader(
 		loader.RestrictionRootOnly, filesys.Separator, fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	m, err := rmF.FromFile(ldr, "deployment.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	mYaml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expYaml, mYaml)
 }
 
@@ -102,11 +103,11 @@ metadata:
 				"name": "cm2",
 			}}).ResMap()
 	expYaml, err := expected.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	m, err := rmF.NewResMapFromBytes(encoded)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	mYaml, err := m.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expYaml, mYaml)
 }
 
@@ -219,13 +220,13 @@ BAR=baz
 			}
 		}
 		r, err := rmF.NewResMapFromConfigMapArgs(kvLdr, tc.input)
-		assert.NoError(t, err, tc.description)
+		require.NoError(t, err, tc.description)
 		r.RemoveBuildAnnotations()
 		rYaml, err := r.AsYaml()
-		assert.NoError(t, err, tc.description)
+		require.NoError(t, err, tc.description)
 		tc.expected.RemoveBuildAnnotations()
 		expYaml, err := tc.expected.AsYaml()
-		assert.NoError(t, err, tc.description)
+		require.NoError(t, err, tc.description)
 		assert.Equal(t, expYaml, rYaml)
 	}
 }
@@ -257,7 +258,7 @@ func TestNewResMapFromSecretArgs(t *testing.T) {
 	}
 	actual.RemoveBuildAnnotations()
 	actYaml, err := actual.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	expected := resmaptest_test.NewRmBuilder(t, rf).Add(
 		map[string]interface{}{
@@ -273,7 +274,7 @@ func TestNewResMapFromSecretArgs(t *testing.T) {
 			},
 		}).ResMap()
 	expYaml, err := expected.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, string(expYaml), string(actYaml))
 }

api/resmap/reswrangler_test.go

@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/api/filters/labels"
 	"sigs.k8s.io/kustomize/api/provider"
 	. "sigs.k8s.io/kustomize/api/resmap"
@@ -891,21 +892,21 @@ func TestAbsorbAll(t *testing.T) {
 	}
 	expected := rmF.FromResource(r)
 	w := makeMap1(t)
-	assert.NoError(t, w.AbsorbAll(makeMap2(t, types.BehaviorMerge)))
+	require.NoError(t, w.AbsorbAll(makeMap2(t, types.BehaviorMerge)))
 	expected.RemoveBuildAnnotations()
 	w.RemoveBuildAnnotations()
-	assert.NoError(t, expected.ErrorIfNotEqualLists(w))
+	require.NoError(t, expected.ErrorIfNotEqualLists(w))
 	w = makeMap1(t)
-	assert.NoError(t, w.AbsorbAll(nil))
-	assert.NoError(t, w.ErrorIfNotEqualLists(makeMap1(t)))
+	require.NoError(t, w.AbsorbAll(nil))
+	require.NoError(t, w.ErrorIfNotEqualLists(makeMap1(t)))
 
 	w = makeMap1(t)
 	w2 := makeMap2(t, types.BehaviorReplace)
-	assert.NoError(t, w.AbsorbAll(w2))
+	require.NoError(t, w.AbsorbAll(w2))
 	w2.RemoveBuildAnnotations()
-	assert.NoError(t, w2.ErrorIfNotEqualLists(w))
+	require.NoError(t, w2.ErrorIfNotEqualLists(w))
 	err = makeMap1(t).AbsorbAll(makeMap2(t, types.BehaviorUnspecified))
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.True(
 		t, strings.Contains(err.Error(), "behavior must be merge or replace"))
 }
@@ -957,10 +958,10 @@ data:
   feeling: *color-used
 `
 	rm, err := rmF.NewResMapFromBytes([]byte(input))
-	assert.NoError(t, err)
-	assert.NoError(t, rm.DeAnchor())
+	require.NoError(t, err)
+	require.NoError(t, rm.DeAnchor())
 	yaml, err := rm.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, strings.TrimSpace(`
 apiVersion: v1
 data:
@@ -991,10 +992,10 @@ spec:
         <<: *probe
 `
 	rm, err := rmF.NewResMapFromBytes([]byte(input))
-	assert.NoError(t, err)
-	assert.NoError(t, rm.DeAnchor())
+	require.NoError(t, err)
+	require.NoError(t, rm.DeAnchor())
 	yaml, err := rm.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, strings.TrimSpace(`apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -1038,7 +1039,7 @@ data:
   feeling: *color-used
 `
 	_, err := rmF.NewResMapFromBytes([]byte(input))
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "unknown anchor 'color-used' referenced")
 }
 
@@ -1065,10 +1066,10 @@ items:
     feeling: *color-used
 `
 	rm, err := rmF.NewResMapFromBytes([]byte(input))
-	assert.NoError(t, err)
-	assert.NoError(t, rm.DeAnchor())
+	require.NoError(t, err)
+	require.NoError(t, rm.DeAnchor())
 	yaml, err := rm.AsYaml()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, strings.TrimSpace(`
 apiVersion: v1
 data:
@@ -1301,11 +1302,11 @@ spec:
 		tc := tests[n]
 		t.Run(n, func(t *testing.T) {
 			m, err := rmF.NewResMapFromBytes([]byte(strings.Join(tc.base, "\n---\n")))
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			foundError := false
 			for _, patch := range tc.patches {
 				rp, err := rf.FromBytes([]byte(patch))
-				assert.NoError(t, err)
+				require.NoError(t, err)
 				idSet := resource.MakeIdSet([]*resource.Resource{rp})
 				if err = m.ApplySmPatch(idSet, rp); err != nil {
 					foundError = true
@@ -1320,7 +1321,7 @@ spec:
 			assert.False(t, tc.errorExpected)
 			m.RemoveBuildAnnotations()
 			yml, err := m.AsYaml()
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, strings.Join(tc.expected, "---\n"), string(yml))
 		})
 	}
@@ -1509,8 +1510,8 @@ metadata:
 		tc := tests[name]
 		t.Run(name, func(t *testing.T) {
 			m, err := rmF.NewResMapFromBytes([]byte(tc.input))
-			assert.NoError(t, err)
-			assert.NoError(t, m.ApplyFilter(tc.f))
+			require.NoError(t, err)
+			require.NoError(t, m.ApplyFilter(tc.f))
 			kusttest_test.AssertActualEqualsExpectedWithTweak(
 				t, m, nil, tc.expected)
 		})
@@ -1604,16 +1605,16 @@ $patch: delete
 		tc := tests[name]
 		t.Run(name, func(t *testing.T) {
 			m, err := rmF.NewResMapFromBytes([]byte(target))
-			assert.NoError(t, err, name)
+			require.NoError(t, err, name)
 			idSet := resource.MakeIdSet(m.Resources())
 			assert.Equal(t, 1, idSet.Size(), name)
 			p, err := rf.FromBytes([]byte(tc.patch))
-			assert.NoError(t, err, name)
-			assert.NoError(t, m.ApplySmPatch(idSet, p), name)
+			require.NoError(t, err, name)
+			require.NoError(t, m.ApplySmPatch(idSet, p), name)
 			assert.Equal(t, tc.finalMapSize, m.Size(), name)
 			m.RemoveBuildAnnotations()
 			yml, err := m.AsYaml()
-			assert.NoError(t, err, name)
+			require.NoError(t, err, name)
 			assert.Equal(t, tc.expected, string(yml), name)
 		})
 	}
@@ -1622,28 +1623,28 @@ $patch: delete
 func TestOriginAnnotations(t *testing.T) {
 	w := New()
 	for i := 0; i < 3; i++ {
-		assert.NoError(t, w.Append(makeCm(i)))
+		require.NoError(t, w.Append(makeCm(i)))
 	}
 	// this should add an origin annotation to every resource
-	assert.NoError(t, w.AddOriginAnnotation(origin1))
+	require.NoError(t, w.AddOriginAnnotation(origin1))
 	resources := w.Resources()
 	for _, res := range resources {
 		or, err := res.GetOrigin()
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, origin1, or)
 	}
 	// this should not overwrite the existing origin annotations
-	assert.NoError(t, w.AddOriginAnnotation(origin2))
+	require.NoError(t, w.AddOriginAnnotation(origin2))
 	for _, res := range resources {
 		or, err := res.GetOrigin()
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, origin1, or)
 	}
 	// this should remove origin annotations from all resources
-	assert.NoError(t, w.RemoveOriginAnnotations())
+	require.NoError(t, w.RemoveOriginAnnotations())
 	for _, res := range resources {
 		or, err := res.GetOrigin()
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Nil(t, or)
 	}
 }
@@ -1651,31 +1652,31 @@ func TestOriginAnnotations(t *testing.T) {
 func TestTransformerAnnotations(t *testing.T) {
 	w := New()
 	for i := 0; i < 3; i++ {
-		assert.NoError(t, w.Append(makeCm(i)))
+		require.NoError(t, w.Append(makeCm(i)))
 	}
 	// this should add an origin annotation to every resource
-	assert.NoError(t, w.AddTransformerAnnotation(origin1))
+	require.NoError(t, w.AddTransformerAnnotation(origin1))
 	resources := w.Resources()
 	for _, res := range resources {
 		or, err := res.GetOrigin()
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, origin1, or)
 	}
 	// this should add a transformer annotation to every resource
-	assert.NoError(t, w.AddTransformerAnnotation(origin2))
+	require.NoError(t, w.AddTransformerAnnotation(origin2))
 	for _, res := range resources {
 		or, err := res.GetOrigin()
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, origin1, or)
 		tr, err := res.GetTransformations()
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, resource.Transformations{origin2}, tr)
 	}
 	// remove transformer annotations from all resources
-	assert.NoError(t, w.RemoveTransformerAnnotations())
+	require.NoError(t, w.RemoveTransformerAnnotations())
 	for _, res := range resources {
 		tr, err := res.GetTransformations()
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Nil(t, tr)
 	}
 }

api/resmap/selector_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	. "sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kyaml/resid"
@@ -50,7 +51,7 @@ metadata:
   name: x-name1
   namespace: x-default
 `))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	return result
 }
 
@@ -183,7 +184,7 @@ func TestFindPatchTargets(t *testing.T) {
 	}
 	for n, testcase := range testcases {
 		actual, err := rm.Select(testcase.target)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equalf(
 			t, testcase.count, len(actual), "test=%s target=%v", n, testcase.target)
 	}

api/resource/factory_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/api/internal/loader"
 	. "sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
@@ -360,9 +361,9 @@ kind: List
 			assert.Equal(t, len(test.expectedOut), len(rs))
 			for i := range rs {
 				expYaml, err := test.expectedOut[i].AsYAML()
-				assert.NoError(t, err)
+				require.NoError(t, err)
 				actYaml, err := rs[i].AsYAML()
-				assert.NoError(t, err)
+				require.NoError(t, err)
 				assert.Equal(t, expYaml, actYaml)
 			}
 		})
@@ -634,7 +635,7 @@ data:
 			assert.Equal(t, len(tc.exp.out), len(rs))
 			for i := range rs {
 				actual, err := rs[i].String()
-				assert.NoError(t, err)
+				require.NoError(t, err)
 				assert.Equal(
 					t, strings.TrimSpace(tc.exp.out[i]), strings.TrimSpace(actual))
 			}
@@ -721,7 +722,7 @@ metadata:
 		t.Run(n, func(t *testing.T) {
 			nin, _ := kio.FromBytes(tc.input)
 			res, err := factory.DropLocalNodes(nin)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			if tc.expected == nil {
 				assert.Equal(t, 0, len(res))
 			} else {

api/resource/origin_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	. "sigs.k8s.io/kustomize/api/resource"
 	kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
 )
@@ -37,7 +38,7 @@ repo: https://github.com/kubernetes-sigs/kustomize
 	}
 	for _, test := range tests {
 		actual, err := test.in.Append(test.path).String()
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, test.expected, actual)
 	}
 }
@@ -78,7 +79,7 @@ repo: github.com/kubernetes-sigs/kustomize/examples/multibases/dev/
 
 	for _, test := range tests {
 		actual, err := test.in.String()
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, test.expected, actual)
 	}
 }
@@ -154,7 +155,7 @@ func TestTransformationsString(t *testing.T) {
 	}
 	for _, test := range tests {
 		actual, err := test.in.String()
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, test.expected, actual)
 	}
 }

api/resource/resource_test.go

@@ -157,7 +157,7 @@ spec:
         ports:
         - containerPort: 80
 `))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	patch, err := factory.FromBytes([]byte(`
 apiVersion: apps/v1
 kind: Deployment
@@ -172,11 +172,11 @@ spec:
         ports:
         - containerPort: 777
 `))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
-	assert.NoError(t, resource.ApplySmPatch(patch))
+	require.NoError(t, resource.ApplySmPatch(patch))
 	bytes, err := resource.AsYAML()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -219,7 +219,7 @@ spec:
     A: X
     B: Y
 `))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	patch, err := factory.FromBytes([]byte(`
 apiVersion: example.com/v1
 kind: Foo
@@ -233,10 +233,10 @@ spec:
   baz:
     hello: world
 `))
-	assert.NoError(t, err)
-	assert.NoError(t, resource.ApplySmPatch(patch))
+	require.NoError(t, err)
+	require.NoError(t, resource.ApplySmPatch(patch))
 	bytes, err := resource.AsYAML()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: example.com/v1
 kind: Foo
 metadata:
@@ -260,7 +260,7 @@ metadata:
 spec:
   numReplicas: 1
 `))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	patch, err := factory.FromBytes([]byte(`
 apiVersion: v1
 kind: Deployment
@@ -269,10 +269,10 @@ metadata:
 spec:
   numReplicas: 999
 `))
-	assert.NoError(t, err)
-	assert.NoError(t, resource.ApplySmPatch(patch))
+	require.NoError(t, err)
+	require.NoError(t, resource.ApplySmPatch(patch))
 	bytes, err := resource.AsYAML()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 kind: Deployment
 metadata:
@@ -448,13 +448,13 @@ spec:
     - name: foo
     - name: bar
 `))
-			assert.NoError(t, err)
+			require.NoError(t, err)
 
 			patch, err := factory.FromBytes([]byte(tc.patch))
-			assert.NoError(t, err)
-			assert.NoError(t, resource.ApplySmPatch(patch))
+			require.NoError(t, err)
+			require.NoError(t, resource.ApplySmPatch(patch))
 			bytes, err := resource.AsYAML()
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, tc.expectedOutput, string(bytes))
 		})
 	}
@@ -567,13 +567,13 @@ metadata:
   name: test
   finalizers: ["foo", "bar"]
 `))
-			assert.NoError(t, err)
+			require.NoError(t, err)
 
 			patch, err := factory.FromBytes([]byte(tc.patch))
-			assert.NoError(t, err)
-			assert.NoError(t, resource.ApplySmPatch(patch))
+			require.NoError(t, err)
+			require.NoError(t, resource.ApplySmPatch(patch))
 			bytes, err := resource.AsYAML()
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, tc.expectedOutput, string(bytes))
 		})
 	}
@@ -604,7 +604,7 @@ data:
 	}
 	resource.MergeDataMapFrom(patch)
 	bytes, err := resource.AsYAML()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: v1
 data:
   fruit: pear
@@ -650,19 +650,19 @@ spec:
     hello: world
 `
 	r1, err := factory.FromBytes([]byte(s1))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	r2, err := factory.FromBytes([]byte(s2))
-	assert.NoError(t, err)
-	assert.NoError(t, r1.ApplySmPatch(r2))
+	require.NoError(t, err)
+	require.NoError(t, r1.ApplySmPatch(r2))
 	bytes, err := r1.AsYAML()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expected, string(bytes))
 
 	r1, _ = factory.FromBytes([]byte(s1))
 	r2, _ = factory.FromBytes([]byte(s2))
-	assert.NoError(t, r2.ApplySmPatch(r1))
+	require.NoError(t, r2.ApplySmPatch(r1))
 	bytes, err = r2.AsYAML()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expected, string(bytes))
 }
 
@@ -977,17 +977,17 @@ spec:
 
 	for name, test := range tests {
 		resource, err := factory.FromBytes([]byte(test.base))
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		for _, p := range test.patch {
 			patch, err := factory.FromBytes([]byte(p))
-			assert.NoError(t, err, name)
-			assert.NoError(t, resource.ApplySmPatch(patch), name)
+			require.NoError(t, err, name)
+			require.NoError(t, resource.ApplySmPatch(patch), name)
 		}
 		bytes, err := resource.AsYAML()
 		if test.errorExpected {
-			assert.Error(t, err, name)
+			require.Error(t, err, name)
 		} else {
-			assert.NoError(t, err, name)
+			require.NoError(t, err, name)
 			assert.Equal(t, test.expected, string(bytes), name)
 		}
 	}
@@ -1387,7 +1387,7 @@ metadata:
 spec:
   numReplicas: 1
 `))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	gvk := r.GetGvk()
 	expected := "apps"
@@ -1415,7 +1415,7 @@ metadata:
 spec:
   numReplicas: 1
 `))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	r.SetGvk(resid.GvkFromString("knd.ver.grp"))
 	gvk := r.GetGvk()
 	if expected, actual := "grp", gvk.Group; expected != actual {
@@ -1438,7 +1438,7 @@ metadata:
 spec:
   numReplicas: 1
 `))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	r.AppendRefBy(resid.FromString("knd1.ver1.gr1/name1.ns1"))
 	assert.Equal(t, `apiVersion: v1
 kind: Deployment
@@ -1476,13 +1476,13 @@ metadata:
 spec:
   numReplicas: 1
 `))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	origin := &Origin{
 		Path: "deployment.yaml",
 		Repo: "github.com/myrepo",
 		Ref:  "master",
 	}
-	assert.NoError(t, r.SetOrigin(origin))
+	require.NoError(t, r.SetOrigin(origin))
 	assert.Equal(t, `apiVersion: v1
 kind: Deployment
 metadata:
@@ -1496,7 +1496,7 @@ spec:
   numReplicas: 1
 `, r.MustString())
 	or, err := r.GetOrigin()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, origin, or)
 }
 
@@ -1509,7 +1509,7 @@ metadata:
 spec:
   numReplicas: 1
 `))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	origin1 := &Origin{
 		Repo:         "github.com/myrepo",
 		Ref:          "master",
@@ -1538,7 +1538,7 @@ spec:
 			},
 		},
 	}
-	assert.NoError(t, r.AddTransformation(origin1))
+	require.NoError(t, r.AddTransformation(origin1))
 	assert.Equal(t, `apiVersion: v1
 kind: Deployment
 metadata:
@@ -1556,7 +1556,7 @@ metadata:
 spec:
   numReplicas: 1
 `, r.MustString())
-	assert.NoError(t, r.AddTransformation(origin2))
+	require.NoError(t, r.AddTransformation(origin2))
 	assert.Equal(t, `apiVersion: v1
 kind: Deployment
 metadata:
@@ -1581,9 +1581,9 @@ spec:
   numReplicas: 1
 `, r.MustString())
 	transformations, err := r.GetTransformations()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, Transformations{origin1, origin2}, transformations)
-	assert.NoError(t, r.ClearTransformations())
+	require.NoError(t, r.ClearTransformations())
 	assert.Equal(t, `apiVersion: v1
 kind: Deployment
 metadata:

cmd/config/internal/commands/cat_test.go

@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/cmd/config/internal/commands"
 	"sigs.k8s.io/kustomize/kyaml/copyutil"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
@@ -615,7 +616,7 @@ spec:
 			defer openapi.ResetOpenAPI()
 			sourceDir := filepath.Join("test", "testdata", test.dataset)
 			baseDir := t.TempDir()
-			assert.NoError(t, copyutil.CopyDir(filesys.MakeFsOnDisk(), sourceDir, baseDir))
+			require.NoError(t, copyutil.CopyDir(filesys.MakeFsOnDisk(), sourceDir, baseDir))
 			runner := commands.GetCatRunner("")
 			actual := &bytes.Buffer{}
 			runner.Command.SetOut(actual)

cmd/config/internal/commands/count_test.go

@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/cmd/config/internal/commands"
 	"sigs.k8s.io/kustomize/kyaml/copyutil"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
@@ -118,7 +119,7 @@ Deployment: 1
 			defer openapi.ResetOpenAPI()
 			sourceDir := filepath.Join("test", "testdata", test.dataset)
 			baseDir := t.TempDir()
-			assert.NoError(t, copyutil.CopyDir(filesys.MakeFsOnDisk(), sourceDir, baseDir))
+			require.NoError(t, copyutil.CopyDir(filesys.MakeFsOnDisk(), sourceDir, baseDir))
 			runner := commands.GetCountRunner("")
 			actual := &bytes.Buffer{}
 			runner.Command.SetOut(actual)

cmd/config/internal/commands/grep_test.go

@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/cmd/config/internal/commands"
 	"sigs.k8s.io/kustomize/kyaml/copyutil"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
@@ -397,7 +398,7 @@ spec:
 		t.Run(test.name, func(t *testing.T) {
 			sourceDir := filepath.Join("test", "testdata", test.dataset)
 			baseDir := t.TempDir()
-			assert.NoError(t, copyutil.CopyDir(filesys.MakeFsOnDisk(), sourceDir, baseDir))
+			require.NoError(t, copyutil.CopyDir(filesys.MakeFsOnDisk(), sourceDir, baseDir))
 			runner := commands.GetGrepRunner("")
 			actual := &bytes.Buffer{}
 			runner.Command.SetOut(actual)

cmd/config/internal/commands/run_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/kyaml/runfn"
 )
 
@@ -18,7 +19,7 @@ import (
 // flags and arguments into the RunFns structure to be executed.
 func TestRunFnCommand_preRunE(t *testing.T) {
 	wd, err := os.Getwd()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	tests := []struct {
 		name           string
 		args           []string

cmd/gorepomod/gorepomod_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestListCommand(t *testing.T) {
@@ -42,7 +43,7 @@ func TestListCommand(t *testing.T) {
 		}
 		out, err := exec.Command(bash, "-c", tc.cmd).Output()
 		if err != nil {
-			assert.Error(t, err, "exit status 1")
+			require.Error(t, err, "exit status 1")
 		}
 		assert.Greater(t, len(string(out)), 1)
 	}
@@ -79,7 +80,7 @@ func TestPinCommand(t *testing.T) {
 		}
 		out, err := exec.Command(bash, "-c", tc.cmd).Output()
 		if err != nil {
-			assert.Error(t, err, "exit status 1")
+			require.Error(t, err, "exit status 1")
 		}
 		assert.Greater(t, len(string(out)), 1)
 	}

cmd/pluginator/internal/krmfunction/converter_test.go

@@ -126,7 +126,7 @@ func TestTransformerConverter(t *testing.T) {
 		filepath.Join(dir, "Plugin.go"))
 
 	err = c.Convert()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	output := runKrmFunction(t, getTransformerInputResource(), filepath.Join(dir, "output"))
 	assert.Equal(t, `apiVersion: config.kubernetes.io/v1
@@ -222,7 +222,7 @@ func TestGeneratorConverter(t *testing.T) {
 		filepath.Join(dir, "Plugin.go"))
 
 	err = c.Convert()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	output := runKrmFunction(t, getGeneratorInputResource(), filepath.Join(dir, "output"))
 	assert.Equal(t, `apiVersion: config.kubernetes.io/v1
 kind: ResourceList

go.work.sum

@@ -214,7 +214,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrp
 github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
 github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
 github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
 github.com/flowstack/go-jsonschema v0.1.1 h1:dCrjGJRXIlbDsLAgTJZTjhwUJnnxVWl1OgNyYh5nyDc=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
@@ -249,7 +248,6 @@ github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA
 github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
 github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/enterprise-certificate-proxy v0.3.1/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
@@ -303,9 +301,6 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj
 github.com/kr/pty v1.1.5 h1:hyz3dwM5QLc1Rfoz4FuWJQG5BN7tc6K1MndAUnGpQr4=
 github.com/lyft/protoc-gen-star/v2 v2.0.3/go.mod h1:amey7yeodaJhXSbf/TlLvWiqQfLOSpEk//mLlc+axEk=
 github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-runewidth v0.0.2 h1:UnlwIPBGaTZfPQ6T1IGzPI0EkYAQmT9fAEJ/poFC63o=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/miekg/dns v1.0.14 h1:9jZdLNd/P4+SfEJ0TNyxYpsK8N4GtfylBLqtbYN1sbA=
@@ -334,7 +329,7 @@ github.com/onsi/gomega v1.27.3/go.mod h1:5vG284IBtfDAmDyrK+eGyZmUgUlmi+Wngqo557c
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=
 github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/posener/complete v1.1.1 h1:ccV59UEOTzVDnDUEFdT95ZzHVZ+5+158q8+SJb2QV5w=
 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 h1:0XM1XL/OFFJjXsYXlG30spTkV/E9+gmd5GD1w2HE8xM=
 github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM=
@@ -401,7 +396,6 @@ golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
@@ -412,7 +406,6 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
 golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
-golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -436,7 +429,6 @@ golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=

kustomize/commands/create/create_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/api/provider"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile"
@@ -56,7 +57,7 @@ func TestCreateWithResources(t *testing.T) {
 
 func TestCreateWithResourcesWithFileNotFound(t *testing.T) {
 	fSys := filesys.MakeEmptyDirInMemory()
-	assert.NoError(t, fSys.WriteFile("foo.yaml", []byte("")))
+	require.NoError(t, fSys.WriteFile("foo.yaml", []byte("")))
 	opts := createFlags{resources: "foo.yaml,bar.yaml"}
 	err := runCreate(opts, fSys, factory)
 	assert.EqualError(t, err, "bar.yaml has no match: must build at directory: not a valid directory: 'bar.yaml' doesn't exist")

kustomize/commands/edit/add/addbase_test.go

@@ -29,9 +29,9 @@ func TestAddBaseHappyPath(t *testing.T) {
 
 	cmd := newCmdAddBase(fSys)
 	args := []string{baseDirectoryPaths}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	for _, base := range bases {
 		assert.Contains(t, string(content), base)
@@ -50,9 +50,9 @@ func TestAddBaseAlreadyThere(t *testing.T) {
 
 	cmd := newCmdAddBase(fSys)
 	args := []string{baseDirectoryPaths}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	// adding an existing base should return an error
-	assert.Error(t, cmd.RunE(cmd, args))
+	require.Error(t, cmd.RunE(cmd, args))
 	var expectedErrors []string
 	for _, base := range bases {
 		msg := "base " + base + " already in kustomization file"
@@ -66,6 +66,6 @@ func TestAddBaseNoArgs(t *testing.T) {
 
 	cmd := newCmdAddBase(fSys)
 	err := cmd.Execute()
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Equal(t, "must specify a base directory", err.Error())
 }

kustomize/commands/edit/add/addbuildmetadata_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/api/types"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
@@ -49,12 +50,12 @@ buildMetadata: [originAnnotations]`,
 		cmd := newCmdAddBuildMetadata(fSys)
 		err := cmd.RunE(cmd, tc.args)
 		if tc.expectedErr != "" {
-			assert.Error(t, err)
+			require.Error(t, err)
 			assert.Contains(t, err.Error(), tc.expectedErr)
 		} else {
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			content, err := testutils_test.ReadTestKustomization(fSys)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			for _, opt := range strings.Split(tc.args[0], ",") {
 				assert.Contains(t, string(content), opt)
 			}

kustomize/commands/edit/add/addcomponent_test.go

@@ -31,9 +31,9 @@ func TestAddComponentHappyPath(t *testing.T) {
 
 	cmd := newCmdAddComponent(fSys)
 	args := []string{componentFileName + "*"}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Contains(t, string(content), componentFileName)
 	assert.Contains(t, string(content), componentFileName+"another")
 }
@@ -46,10 +46,10 @@ func TestAddComponentAlreadyThere(t *testing.T) {
 
 	cmd := newCmdAddComponent(fSys)
 	args := []string{componentFileName}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 
 	// adding an existing component doesn't return an error
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 }
 
 // Test for trying to add the kustomization.yaml file itself for resources.

kustomize/commands/edit/add/addgenerator_test.go

@@ -31,9 +31,9 @@ func TestAddGeneratorHappyPath(t *testing.T) {
 
 	cmd := newCmdAddGenerator(fSys)
 	args := []string{generatorFileName + "*"}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Contains(t, string(content), generatorFileName)
 	assert.Contains(t, string(content), generatorFileName+"another")
 }
@@ -46,16 +46,16 @@ func TestAddGeneratorAlreadyThere(t *testing.T) {
 
 	cmd := newCmdAddGenerator(fSys)
 	args := []string{generatorFileName}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 
 	// adding an existing generator shouldn't return an error
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 
 	// There can be only one. May it be the...
 	mf, err := kustfile.NewKustomizationFile(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	m, err := mf.Read()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, 1, len(m.Generators))
 	assert.Equal(t, generatorFileName, m.Generators[0])
 }

kustomize/commands/edit/add/addmetadata_test.go

@@ -20,9 +20,9 @@ func makeKustomization(t *testing.T) *types.Kustomization {
 	fSys := filesys.MakeFsInMemory()
 	testutils_test.WriteTestKustomization(fSys)
 	kf, err := kustfile.NewKustomizationFile(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	m, err := kf.Read()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	return m
 }
 
@@ -31,13 +31,13 @@ func TestRunAddAnnotation(t *testing.T) {
 	o.metadata = map[string]string{"owls": "cute", "otters": "adorable"}
 
 	m := makeKustomization(t)
-	assert.NoError(t, o.addAnnotations(m))
+	require.NoError(t, o.addAnnotations(m))
 	// adding the same test input should not work
-	assert.Error(t, o.addAnnotations(m))
+	require.Error(t, o.addAnnotations(m))
 
 	// adding new annotations should work
 	o.metadata = map[string]string{"new": "annotation"}
-	assert.NoError(t, o.addAnnotations(m))
+	require.NoError(t, o.addAnnotations(m))
 }
 
 func TestAddAnnotationNoArgs(t *testing.T) {
@@ -46,7 +46,7 @@ func TestAddAnnotationNoArgs(t *testing.T) {
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	err := cmd.Execute()
 	v.VerifyNoCall()
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Equal(t, "must specify annotation", err.Error())
 }
 
@@ -57,7 +57,7 @@ func TestAddAnnotationInvalidFormat(t *testing.T) {
 	args := []string{"whatever:whatever"}
 	err := cmd.RunE(cmd, args)
 	v.VerifyCall()
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Equal(t, valtest_test.SAD, err.Error())
 }
 
@@ -67,7 +67,7 @@ func TestAddAnnotationManyArgs(t *testing.T) {
 	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{"k1:v1,k2:v2,k3:v3,k4:v5"}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	v.VerifyCall()
 }
 
@@ -77,7 +77,7 @@ func TestAddAnnotationValueQuoted(t *testing.T) {
 	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{"k1:\"v1\""}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	v.VerifyCall()
 }
 
@@ -87,7 +87,7 @@ func TestAddAnnotationValueWithColon(t *testing.T) {
 	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{"k1:\"v1:v2\""}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	v.VerifyCall()
 }
 
@@ -98,10 +98,10 @@ func TestAddAnnotationValueWithComma(t *testing.T) {
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	value := "{\"k1\":\"v1\",\"k2\":\"v2\"}"
 	args := []string{"test:" + value}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	v.VerifyCall()
 	b, err := fSys.ReadFile("/kustomization.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Contains(t, string(b), value)
 }
 
@@ -112,7 +112,7 @@ func TestAddAnnotationNoKey(t *testing.T) {
 	args := []string{":nokey"}
 	err := cmd.RunE(cmd, args)
 	v.VerifyNoCall()
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Equal(t, "invalid annotation: ':nokey' (need k:v pair where v may be quoted)", err.Error())
 }
 
@@ -122,7 +122,7 @@ func TestAddAnnotationTooManyColons(t *testing.T) {
 	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{"key:v1:v2"}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	v.VerifyCall()
 }
 
@@ -132,7 +132,7 @@ func TestAddAnnotationNoValue(t *testing.T) {
 	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{"no:,value"}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	v.VerifyCall()
 }
 
@@ -142,7 +142,7 @@ func TestAddAnnotationMultipleArgs(t *testing.T) {
 	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{"this:annotation", "has:spaces"}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	v.VerifyCall()
 }
 
@@ -152,7 +152,7 @@ func TestAddAnnotationForce(t *testing.T) {
 	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{"key:foo"}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	v.VerifyCall()
 	// trying to add the same annotation again should not work
 	args = []string{"key:bar"}
@@ -160,7 +160,7 @@ func TestAddAnnotationForce(t *testing.T) {
 	cmd = newCmdAddAnnotation(fSys, v.Validator)
 	err := cmd.RunE(cmd, args)
 	v.VerifyCall()
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Equal(t, "annotation key already in kustomization file", err.Error())
 	// but trying to add it with --force should
 	v = valtest_test.MakeHappyMapValidator(t)
@@ -176,12 +176,12 @@ func TestRunAddLabel(t *testing.T) {
 	o.metadata = map[string]string{"owls": "cute", "otters": "adorable"}
 
 	m := makeKustomization(t)
-	assert.NoError(t, o.addLabels(m))
+	require.NoError(t, o.addLabels(m))
 	// adding the same test input should not work
-	assert.Error(t, o.addLabels(m))
+	require.Error(t, o.addLabels(m))
 	// adding new labels should work
 	o.metadata = map[string]string{"new": "label"}
-	assert.NoError(t, o.addLabels(m))
+	require.NoError(t, o.addLabels(m))
 }
 
 func TestAddLabelNoArgs(t *testing.T) {
@@ -190,7 +190,7 @@ func TestAddLabelNoArgs(t *testing.T) {
 	cmd := newCmdAddLabel(fSys, v.Validator)
 	err := cmd.Execute()
 	v.VerifyNoCall()
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Equal(t, "must specify label", err.Error())
 }
 
@@ -201,7 +201,7 @@ func TestAddLabelInvalidFormat(t *testing.T) {
 	args := []string{"exclamation!:point"}
 	err := cmd.RunE(cmd, args)
 	v.VerifyCall()
-	assert.Error(t, err)
+	require.Error(t, err)
 	if err.Error() != valtest_test.SAD {
 		t.Errorf("incorrect error: %v", err.Error())
 	}
@@ -214,7 +214,7 @@ func TestAddLabelNoKey(t *testing.T) {
 	args := []string{":nokey"}
 	err := cmd.RunE(cmd, args)
 	v.VerifyNoCall()
-	assert.Error(t, err)
+	require.Error(t, err)
 	if err.Error() != "invalid label: ':nokey' (need k:v pair where v may be quoted)" {
 		t.Errorf("incorrect error: %v", err.Error())
 	}
@@ -226,7 +226,7 @@ func TestAddLabelTooManyColons(t *testing.T) {
 	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddLabel(fSys, v.Validator)
 	args := []string{"key:v1:v2"}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	v.VerifyCall()
 }
 
@@ -236,7 +236,7 @@ func TestAddLabelNoValue(t *testing.T) {
 	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddLabel(fSys, v.Validator)
 	args := []string{"no,value:"}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	v.VerifyCall()
 }
 
@@ -246,7 +246,7 @@ func TestAddLabelMultipleArgs(t *testing.T) {
 	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddLabel(fSys, v.Validator)
 	args := []string{"this:input", "has:spaces"}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	v.VerifyCall()
 }
 
@@ -256,7 +256,7 @@ func TestAddLabelForce(t *testing.T) {
 	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddLabel(fSys, v.Validator)
 	args := []string{"key:foo"}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	v.VerifyCall()
 	// trying to add the same label again should not work
 	args = []string{"key:bar"}
@@ -264,14 +264,14 @@ func TestAddLabelForce(t *testing.T) {
 	cmd = newCmdAddLabel(fSys, v.Validator)
 	err := cmd.RunE(cmd, args)
 	v.VerifyCall()
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Equal(t, "label key already in kustomization file", err.Error())
 	// but trying to add it with --force should
 	v = valtest_test.MakeHappyMapValidator(t)
 	cmd = newCmdAddLabel(fSys, v.Validator)
 	err = cmd.Flag("force").Value.Set("true")
 	require.NoError(t, err)
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	v.VerifyCall()
 }
 
@@ -280,7 +280,7 @@ func TestAddLabelWithoutSelector(t *testing.T) {
 	o.labelsWithoutSelector = true
 	m := makeKustomization(t)
 	o.metadata = map[string]string{"new": "label"}
-	assert.NoError(t, o.addLabels(m))
+	require.NoError(t, o.addLabels(m))
 	assert.Equal(t, m.Labels[0], types.Label{Pairs: map[string]string{"new": "label"}})
 }
 
@@ -290,10 +290,10 @@ func TestAddLabelWithoutSelectorAddLabel(t *testing.T) {
 	o.labelsWithoutSelector = true
 
 	m := makeKustomization(t)
-	assert.NoError(t, o.addLabels(m))
+	require.NoError(t, o.addLabels(m))
 	// adding new labels should work
 	o.metadata = map[string]string{"new": "label"}
-	assert.NoError(t, o.addLabels(m))
+	require.NoError(t, o.addLabels(m))
 
 	assert.Equal(t, m.Labels[0], types.Label{Pairs: map[string]string{"owls": "cute", "otters": "adorable"}})
 	assert.Equal(t, m.Labels[1], types.Label{Pairs: map[string]string{"new": "label"}})

kustomize/commands/edit/add/addpatch_test.go

@@ -45,9 +45,9 @@ func TestAddPatchWithFilePath(t *testing.T) {
 		"--label-selector", labelSelector,
 	}
 	cmd.SetArgs(args)
-	assert.NoError(t, cmd.Execute())
+	require.NoError(t, cmd.Execute())
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	for i := 1; i < len(args); i += 2 {
 		assert.Contains(t, string(content), args[i])
 	}
@@ -71,9 +71,9 @@ func TestAddPatchWithPatchContent(t *testing.T) {
 		"--label-selector", labelSelector,
 	}
 	cmd.SetArgs(args)
-	assert.NoError(t, cmd.Execute())
+	require.NoError(t, cmd.Execute())
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	for i := 1; i < len(args); i += 2 {
 		assert.Contains(t, string(content), strings.Trim(args[i], " \n"))
 	}
@@ -97,10 +97,10 @@ func TestAddPatchAlreadyThere(t *testing.T) {
 		"--label-selector", labelSelector,
 	}
 	cmd.SetArgs(args)
-	assert.NoError(t, cmd.Execute())
+	require.NoError(t, cmd.Execute())
 
 	// adding an existing patch shouldn't return an error
-	assert.NoError(t, cmd.Execute())
+	require.NoError(t, cmd.Execute())
 }
 
 func TestAddPatchNoArgs(t *testing.T) {
@@ -108,6 +108,6 @@ func TestAddPatchNoArgs(t *testing.T) {
 
 	cmd := newCmdAddPatch(fSys)
 	err := cmd.Execute()
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Equal(t, "must provide either patch or path", err.Error())
 }

kustomize/commands/edit/add/addresource_test.go

@@ -31,9 +31,9 @@ func TestAddResourceHappyPath(t *testing.T) {
 
 	cmd := newCmdAddResource(fSys)
 	args := []string{resourceFileName + "*"}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, string(content), `apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namePrefix: some-prefix
@@ -65,10 +65,10 @@ func TestAddResourceAlreadyThere(t *testing.T) {
 
 	cmd := newCmdAddResource(fSys)
 	args := []string{resourceFileName}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 
 	// adding an existing resource doesn't return an error
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 }
 
 // Test for trying to add the kustomization.yaml file itself for resources.
@@ -79,10 +79,10 @@ func TestAddKustomizationFileAsResource(t *testing.T) {
 
 	cmd := newCmdAddResource(fSys)
 	args := []string{konfig.DefaultKustomizationFileName()}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.NotContains(t, string(content), konfig.DefaultKustomizationFileName())
 }
@@ -92,7 +92,7 @@ func TestAddResourceNoArgs(t *testing.T) {
 
 	cmd := newCmdAddResource(fSys)
 	err := cmd.Execute()
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Equal(t, "must specify a resource file", err.Error())
 }
 

kustomize/commands/edit/add/addtransformer_test.go

@@ -31,9 +31,9 @@ func TestAddTransformerHappyPath(t *testing.T) {
 
 	cmd := newCmdAddTransformer(fSys)
 	args := []string{transformerFileName + "*"}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Contains(t, string(content), transformerFileName)
 	assert.Contains(t, string(content), transformerFileName+"another")
 }
@@ -46,16 +46,16 @@ func TestAddTransformerAlreadyThere(t *testing.T) {
 
 	cmd := newCmdAddTransformer(fSys)
 	args := []string{transformerFileName}
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 
 	// adding an existing transformer shouldn't return an error
-	assert.NoError(t, cmd.RunE(cmd, args))
+	require.NoError(t, cmd.RunE(cmd, args))
 
 	// There can be only one. May it be the...
 	mf, err := kustfile.NewKustomizationFile(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	m, err := mf.Read()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, 1, len(m.Transformers))
 	assert.Equal(t, transformerFileName, m.Transformers[0])
 }

kustomize/commands/edit/fix/convert_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
 )
@@ -43,12 +44,12 @@ spec:
 
 	fSys := filesys.MakeFsInMemory()
 	testutils_test.WriteTestKustomizationWith(fSys, kustomization)
-	assert.NoError(t, fSys.WriteFile("pod.yaml", pod))
+	require.NoError(t, fSys.WriteFile("pod.yaml", pod))
 	cmd := NewCmdFix(fSys, os.Stdout)
-	assert.NoError(t, cmd.Flags().Set("vars", "true"))
-	assert.NoError(t, cmd.RunE(cmd, nil))
+	require.NoError(t, cmd.Flags().Set("vars", "true"))
+	require.NoError(t, cmd.RunE(cmd, nil))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, `
 apiVersion: kustomize.config.k8s.io/v1beta1
@@ -72,7 +73,7 @@ replacements:
 `, string(content))
 
 	content, err = fSys.ReadFile("pod.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Pod
@@ -119,12 +120,12 @@ spec:
 
 	fSys := filesys.MakeFsInMemory()
 	testutils_test.WriteTestKustomizationWith(fSys, kustomization)
-	assert.NoError(t, fSys.WriteFile("pod.yaml", pod))
+	require.NoError(t, fSys.WriteFile("pod.yaml", pod))
 	cmd := NewCmdFix(fSys, os.Stdout)
-	assert.NoError(t, cmd.Flags().Set("vars", "true"))
-	assert.NoError(t, cmd.RunE(cmd, nil))
+	require.NoError(t, cmd.Flags().Set("vars", "true"))
+	require.NoError(t, cmd.RunE(cmd, nil))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, `
 apiVersion: kustomize.config.k8s.io/v1beta1
@@ -150,7 +151,7 @@ replacements:
 `, string(content))
 
 	content, err = fSys.ReadFile("pod.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Pod
@@ -197,12 +198,12 @@ spec:
 
 	fSys := filesys.MakeFsInMemory()
 	testutils_test.WriteTestKustomizationWith(fSys, kustomization)
-	assert.NoError(t, fSys.WriteFile("pod.yaml", pod))
+	require.NoError(t, fSys.WriteFile("pod.yaml", pod))
 	cmd := NewCmdFix(fSys, os.Stdout)
-	assert.NoError(t, cmd.Flags().Set("vars", "true"))
-	assert.NoError(t, cmd.RunE(cmd, nil))
+	require.NoError(t, cmd.Flags().Set("vars", "true"))
+	require.NoError(t, cmd.RunE(cmd, nil))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, `
 apiVersion: kustomize.config.k8s.io/v1beta1
@@ -229,7 +230,7 @@ replacements:
 `, string(content))
 
 	content, err = fSys.ReadFile("pod.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Pod
@@ -276,12 +277,12 @@ spec:
 
 	fSys := filesys.MakeFsInMemory()
 	testutils_test.WriteTestKustomizationWith(fSys, kustomization)
-	assert.NoError(t, fSys.WriteFile("pod.yaml", pod))
+	require.NoError(t, fSys.WriteFile("pod.yaml", pod))
 	cmd := NewCmdFix(fSys, os.Stdout)
-	assert.NoError(t, cmd.Flags().Set("vars", "true"))
-	assert.NoError(t, cmd.RunE(cmd, nil))
+	require.NoError(t, cmd.Flags().Set("vars", "true"))
+	require.NoError(t, cmd.RunE(cmd, nil))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, `
 apiVersion: kustomize.config.k8s.io/v1beta1
@@ -308,7 +309,7 @@ replacements:
 `, string(content))
 
 	content, err = fSys.ReadFile("pod.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Pod
@@ -355,11 +356,11 @@ spec:
 
 	fSys := filesys.MakeFsInMemory()
 	testutils_test.WriteTestKustomizationWith(fSys, kustomization)
-	assert.NoError(t, fSys.WriteFile("pod.yaml", pod))
+	require.NoError(t, fSys.WriteFile("pod.yaml", pod))
 	cmd := NewCmdFix(fSys, os.Stdout)
-	assert.NoError(t, cmd.Flags().Set("vars", "true"))
+	require.NoError(t, cmd.Flags().Set("vars", "true"))
 	err := cmd.RunE(cmd, nil)
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "error with pod.yaml: cannot convert all vars to replacements; $(SOME_SECRET_NAME) is not delimited")
 }
 
@@ -412,13 +413,13 @@ spec:
 
 	fSys := filesys.MakeFsInMemory()
 	testutils_test.WriteTestKustomizationWith(fSys, kustomization)
-	assert.NoError(t, fSys.WriteFile("pod.yaml", pod))
-	assert.NoError(t, fSys.WriteFile("patch.yaml", patch))
+	require.NoError(t, fSys.WriteFile("pod.yaml", pod))
+	require.NoError(t, fSys.WriteFile("patch.yaml", patch))
 	cmd := NewCmdFix(fSys, os.Stdout)
-	assert.NoError(t, cmd.Flags().Set("vars", "true"))
-	assert.NoError(t, cmd.RunE(cmd, nil))
+	require.NoError(t, cmd.Flags().Set("vars", "true"))
+	require.NoError(t, cmd.RunE(cmd, nil))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, `
 apiVersion: kustomize.config.k8s.io/v1beta1
@@ -453,7 +454,7 @@ replacements:
 `, string(content))
 
 	content, err = fSys.ReadFile("pod.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Pod
@@ -468,7 +469,7 @@ spec:
 `, string(content))
 
 	content, err = fSys.ReadFile("patch.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Pod
@@ -533,13 +534,13 @@ spec:
 
 	fSys := filesys.MakeFsInMemory()
 	testutils_test.WriteTestKustomizationWith(fSys, kustomization)
-	assert.NoError(t, fSys.WriteFile("pod.yaml", pod))
-	assert.NoError(t, fSys.WriteFile("patch.yaml", patch))
+	require.NoError(t, fSys.WriteFile("pod.yaml", pod))
+	require.NoError(t, fSys.WriteFile("patch.yaml", patch))
 	cmd := NewCmdFix(fSys, os.Stdout)
-	assert.NoError(t, cmd.Flags().Set("vars", "true"))
-	assert.NoError(t, cmd.RunE(cmd, nil))
+	require.NoError(t, cmd.Flags().Set("vars", "true"))
+	require.NoError(t, cmd.RunE(cmd, nil))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// the second replacement target is from the patch, and used the patch's target selector
 	// as the replacement's target selector. Note that the replacement target uses the pod
@@ -577,7 +578,7 @@ replacements:
 `, string(content))
 
 	content, err = fSys.ReadFile("pod.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Pod
@@ -592,7 +593,7 @@ spec:
 `, string(content))
 
 	content, err = fSys.ReadFile("patch.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Pod
@@ -657,13 +658,13 @@ spec:
 
 	fSys := filesys.MakeFsInMemory()
 	testutils_test.WriteTestKustomizationWith(fSys, kustomization)
-	assert.NoError(t, fSys.WriteFile("pod.yaml", pod))
-	assert.NoError(t, fSys.WriteFile("patch.yaml", patch))
+	require.NoError(t, fSys.WriteFile("pod.yaml", pod))
+	require.NoError(t, fSys.WriteFile("patch.yaml", patch))
 	cmd := NewCmdFix(fSys, os.Stdout)
-	assert.NoError(t, cmd.Flags().Set("vars", "true"))
-	assert.NoError(t, cmd.RunE(cmd, nil))
+	require.NoError(t, cmd.Flags().Set("vars", "true"))
+	require.NoError(t, cmd.RunE(cmd, nil))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// The replacement target from the patch uses the patch's name because
 	// allowNameChange is set to true.
@@ -696,7 +697,7 @@ replacements:
 `, string(content))
 
 	content, err = fSys.ReadFile("pod.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Pod
@@ -709,7 +710,7 @@ spec:
 `, string(content))
 
 	content, err = fSys.ReadFile("patch.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Pod
@@ -780,13 +781,13 @@ spec:
 
 	fSys := filesys.MakeFsInMemory()
 	testutils_test.WriteTestKustomizationWith(fSys, kustomization)
-	assert.NoError(t, fSys.WriteFile("pod.yaml", pod))
-	assert.NoError(t, fSys.WriteFile("patch.yaml", patch))
+	require.NoError(t, fSys.WriteFile("pod.yaml", pod))
+	require.NoError(t, fSys.WriteFile("patch.yaml", patch))
 	cmd := NewCmdFix(fSys, os.Stdout)
-	assert.NoError(t, cmd.Flags().Set("vars", "true"))
-	assert.NoError(t, cmd.RunE(cmd, nil))
+	require.NoError(t, cmd.Flags().Set("vars", "true"))
+	require.NoError(t, cmd.RunE(cmd, nil))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// The replacement target targets all resources of type `Pod` because the
 	// patch targets all resources of type `Pod`.
@@ -815,7 +816,7 @@ replacements:
 `, string(content))
 
 	content, err = fSys.ReadFile("pod.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Pod
@@ -837,7 +838,7 @@ spec:
 `, string(content))
 
 	content, err = fSys.ReadFile("patch.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Pod
@@ -910,13 +911,13 @@ spec:
 
 	fSys := filesys.MakeFsInMemory()
 	testutils_test.WriteTestKustomizationWith(fSys, kustomization)
-	assert.NoError(t, fSys.WriteFile("pod.yaml", pod))
-	assert.NoError(t, fSys.WriteFile("patch.yaml", patch))
+	require.NoError(t, fSys.WriteFile("pod.yaml", pod))
+	require.NoError(t, fSys.WriteFile("patch.yaml", patch))
 	cmd := NewCmdFix(fSys, os.Stdout)
-	assert.NoError(t, cmd.Flags().Set("vars", "true"))
-	assert.NoError(t, cmd.RunE(cmd, nil))
+	require.NoError(t, cmd.Flags().Set("vars", "true"))
+	require.NoError(t, cmd.RunE(cmd, nil))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// The replacement target from the patch uses the patch's Kind because
 	// allowKindChange is set to true.
@@ -947,7 +948,7 @@ replacements:
 `, string(content))
 
 	content, err = fSys.ReadFile("pod.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Pod
@@ -969,7 +970,7 @@ spec:
 `, string(content))
 
 	content, err = fSys.ReadFile("patch.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Custom
@@ -1023,13 +1024,13 @@ spec:
 
 	fSys := filesys.MakeFsInMemory()
 	testutils_test.WriteTestKustomizationWith(fSys, kustomizationOverlay)
-	assert.NoError(t, fSys.WriteFile("base/pod.yaml", pod))
-	assert.NoError(t, fSys.WriteFile("base/kustomization.yaml", kustomizationBase))
+	require.NoError(t, fSys.WriteFile("base/pod.yaml", pod))
+	require.NoError(t, fSys.WriteFile("base/kustomization.yaml", kustomizationBase))
 	cmd := NewCmdFix(fSys, os.Stdout)
-	assert.NoError(t, cmd.Flags().Set("vars", "true"))
-	assert.NoError(t, cmd.RunE(cmd, nil))
+	require.NoError(t, cmd.Flags().Set("vars", "true"))
+	require.NoError(t, cmd.RunE(cmd, nil))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -1052,7 +1053,7 @@ replacements:
 `, string(content))
 
 	content, err = fSys.ReadFile("base/kustomization.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -1062,7 +1063,7 @@ resources:
 `, string(content))
 
 	content, err = fSys.ReadFile("base/pod.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Pod
@@ -1104,12 +1105,12 @@ metadata:
 
 	fSys := filesys.MakeFsInMemory()
 	testutils_test.WriteTestKustomizationWith(fSys, kustomization)
-	assert.NoError(t, fSys.WriteFile("pod.yaml", pod))
+	require.NoError(t, fSys.WriteFile("pod.yaml", pod))
 	cmd := NewCmdFix(fSys, os.Stdout)
-	assert.NoError(t, cmd.Flags().Set("vars", "true"))
-	assert.NoError(t, cmd.RunE(cmd, nil))
+	require.NoError(t, cmd.Flags().Set("vars", "true"))
+	require.NoError(t, cmd.RunE(cmd, nil))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, `
 apiVersion: kustomize.config.k8s.io/v1beta1
@@ -1133,7 +1134,7 @@ replacements:
 `, string(content))
 
 	content, err = fSys.ReadFile("pod.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: v1
 kind: Pod
@@ -1174,12 +1175,12 @@ spec:
 
 	fSys := filesys.MakeFsInMemory()
 	testutils_test.WriteTestKustomizationWith(fSys, kustomization)
-	assert.NoError(t, fSys.WriteFile("patch.yaml", patch))
+	require.NoError(t, fSys.WriteFile("patch.yaml", patch))
 	cmd := NewCmdFix(fSys, os.Stdout)
-	assert.NoError(t, cmd.Flags().Set("vars", "true"))
-	assert.NoError(t, cmd.RunE(cmd, nil))
+	require.NoError(t, cmd.Flags().Set("vars", "true"))
+	require.NoError(t, cmd.RunE(cmd, nil))
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, `
 apiVersion: kustomize.config.k8s.io/v1beta1
@@ -1200,7 +1201,7 @@ replacements:
 `, string(content))
 
 	content, err = fSys.ReadFile("patch.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `
 apiVersion: apps/v1
 kind: Deployment

kustomize/commands/edit/fix/fix_test.go

@@ -19,10 +19,10 @@ func TestFix(t *testing.T) {
 	testutils_test.WriteTestKustomizationWith(fSys, []byte(`nameprefix: some-prefix-`))
 
 	cmd := NewCmdFix(fSys, os.Stdout)
-	assert.NoError(t, cmd.RunE(cmd, nil))
+	require.NoError(t, cmd.RunE(cmd, nil))
 
 	content, err := testutils_test.ReadTestKustomization(fSys)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.Contains(t, string(content), "apiVersion: ")
 	assert.Contains(t, string(content), "kind: Kustomization")
@@ -402,6 +402,6 @@ labels:
 	testutils_test.WriteTestKustomizationWith(fSys, kustomizationContentWithOutdatedCommonLabels)
 	cmd := NewCmdFix(fSys, os.Stdout)
 	err := cmd.RunE(cmd, nil)
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Equal(t, err.Error(), "label name 'foo' exists in both commonLabels and labels")
 }

kustomize/commands/edit/remove/removebuildmetadata_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/api/types"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
@@ -51,12 +52,12 @@ buildMetadata: [originAnnotations]`,
 		cmd := newCmdRemoveBuildMetadata(fSys)
 		err := cmd.RunE(cmd, tc.args)
 		if tc.expectedErr != "" {
-			assert.Error(t, err)
+			require.Error(t, err)
 			assert.Contains(t, err.Error(), tc.expectedErr)
 		} else {
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			content, err := testutils_test.ReadTestKustomization(fSys)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			for _, opt := range strings.Split(tc.args[0], ",") {
 				assert.NotContains(t, string(content), opt)
 			}

kustomize/commands/edit/set/setbuildmetadata_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kustomize/v5/commands/internal/kustfile"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v5/commands/internal/testutils"
@@ -56,20 +57,20 @@ buildMetadata: [originAnnotations, transformerAnnotations, managedByLabel]`,
 		cmd := newCmdSetBuildMetadata(fSys)
 		err := cmd.RunE(cmd, tc.args)
 		if tc.expectedErr != "" {
-			assert.Error(t, err)
+			require.Error(t, err)
 			assert.Contains(t, err.Error(), tc.expectedErr)
 		} else {
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			content, err := testutils_test.ReadTestKustomization(fSys)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			args := strings.Split(tc.args[0], ",")
 			for _, opt := range args {
 				assert.Contains(t, string(content), opt)
 			}
 			mf, err := kustfile.NewKustomizationFile(fSys)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			m, err := mf.Read()
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, len(m.BuildMetadata), len(args))
 		}
 	}

kyaml/copyutil/copyutil_test.go

@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	. "sigs.k8s.io/kustomize/kyaml/copyutil"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
 )
@@ -20,19 +21,19 @@ func TestDiff_identical(t *testing.T) {
 	d := t.TempDir()
 
 	err := os.Mkdir(filepath.Join(s, "a1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(
 		filepath.Join(s, "a1", "f.yaml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = os.Mkdir(filepath.Join(d, "a1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(
 		filepath.Join(d, "a1", "f.yaml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	diff, err := Diff(s, d)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, diff.List())
 }
 
@@ -43,16 +44,16 @@ func TestDiff_additionalSourceFiles(t *testing.T) {
 	d := t.TempDir()
 
 	err := os.Mkdir(filepath.Join(s, "a1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = os.Mkdir(filepath.Join(s, "a2"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = os.Mkdir(filepath.Join(d, "a1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	diff, err := Diff(s, d)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.ElementsMatch(t, diff.List(), []string{"a2"})
 }
 
@@ -63,16 +64,16 @@ func TestDiff_additionalDestFiles(t *testing.T) {
 	d := t.TempDir()
 
 	err := os.Mkdir(filepath.Join(s, "a1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = os.Mkdir(filepath.Join(d, "a1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = os.Mkdir(filepath.Join(d, "a2"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	diff, err := Diff(s, d)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.ElementsMatch(t, diff.List(), []string{"a2"})
 }
 
@@ -84,19 +85,19 @@ func TestDiff_srcDestContentsDiffer(t *testing.T) {
 	d := t.TempDir()
 
 	err := os.Mkdir(filepath.Join(s, "a1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(
 		filepath.Join(s, "a1", "f.yaml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = os.Mkdir(filepath.Join(d, "a1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(
 		filepath.Join(d, "a1", "f.yaml"), []byte(`b`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	diff, err := Diff(s, d)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.ElementsMatch(t, diff.List(), []string{
 		fmt.Sprintf("a1%sf.yaml", string(filepath.Separator)),
 	})
@@ -109,19 +110,19 @@ func TestDiff_srcDestContentsDifferInDirs(t *testing.T) {
 	d := t.TempDir()
 
 	err := os.Mkdir(filepath.Join(s, "a1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(
 		filepath.Join(s, "a1", "f.yaml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = os.Mkdir(filepath.Join(d, "b1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(
 		filepath.Join(d, "b1", "f.yaml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	diff, err := Diff(s, d)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.ElementsMatch(t, diff.List(), []string{
 		"a1",
 		fmt.Sprintf("a1%sf.yaml", string(filepath.Separator)),
@@ -137,35 +138,35 @@ func TestDiff_skipGitSrc(t *testing.T) {
 	d := t.TempDir()
 
 	err := os.Mkdir(filepath.Join(s, "a1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(
 		filepath.Join(s, "a1", "f.yaml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// files that just happen to start with .git should not be ignored.
 	err = os.WriteFile(
 		filepath.Join(s, ".gitlab-ci.yml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// git should be ignored
 	err = os.Mkdir(filepath.Join(s, ".git"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(
 		filepath.Join(s, ".git", "f.yaml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = os.Mkdir(filepath.Join(d, "a1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(
 		filepath.Join(d, "a1", "f.yaml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = os.WriteFile(
 		filepath.Join(d, ".gitlab-ci.yml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	diff, err := Diff(s, d)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, diff.List())
 }
 
@@ -176,26 +177,26 @@ func TestDiff_skipGitDest(t *testing.T) {
 	d := t.TempDir()
 
 	err := os.Mkdir(filepath.Join(s, "a1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(
 		filepath.Join(s, "a1", "f.yaml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = os.Mkdir(filepath.Join(d, "a1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(
 		filepath.Join(d, "a1", "f.yaml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// git should be ignored
 	err = os.Mkdir(filepath.Join(d, ".git"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(
 		filepath.Join(d, ".git", "f.yaml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	diff, err := Diff(s, d)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, diff.List())
 }
 
@@ -206,14 +207,14 @@ func TestSyncFile(t *testing.T) {
 	f1Name := d1 + "/temp.txt"
 	f2Name := d2 + "/temp.txt"
 	err := os.WriteFile(f1Name, []byte("abc"), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(f2Name, []byte("def"), 0644)
 	expectedFileInfo, _ := os.Stat(f2Name)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = SyncFile(f1Name, f2Name)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	actual, err := os.ReadFile(f2Name)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "abc", string(actual))
 	dstFileInfo, _ := os.Stat(f2Name)
 	assert.Equal(t, expectedFileInfo.Mode().String(), dstFileInfo.Mode().String())
@@ -226,11 +227,11 @@ func TestSyncFileNoDestFile(t *testing.T) {
 	f1Name := d1 + "/temp.txt"
 	f2Name := d2 + "/temp.txt"
 	err := os.WriteFile(f1Name, []byte("abc"), 0644)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = SyncFile(f1Name, f2Name)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	actual, err := os.ReadFile(f2Name)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "abc", string(actual))
 	dstFileInfo, _ := os.Stat(f2Name)
 	srcFileInfo, _ := os.Stat(f1Name)
@@ -244,11 +245,11 @@ func TestSyncFileNoSrcFile(t *testing.T) {
 	f1Name := d1 + "/temp.txt"
 	f2Name := d2 + "/temp.txt"
 	err := os.WriteFile(f2Name, []byte("abc"), 0644)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = SyncFile(f1Name, f2Name)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	_, err = os.ReadFile(f2Name)
-	assert.Error(t, err)
+	require.Error(t, err)
 }
 
 func TestPrettyFileDiff(t *testing.T) {
@@ -278,40 +279,40 @@ func TestCopyDir(t *testing.T) {
 	v := t.TempDir()
 
 	err := os.Mkdir(filepath.Join(s, "a1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(
 		filepath.Join(s, "a1", "f.yaml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// files that just happen to start with .git should not be ignored.
 	err = os.WriteFile(
 		filepath.Join(s, ".gitlab-ci.yml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// git should be ignored
 	err = os.Mkdir(filepath.Join(s, ".git"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(
 		filepath.Join(s, ".git", "f.yaml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = os.Mkdir(filepath.Join(v, "a1"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	err = os.WriteFile(
 		filepath.Join(v, "a1", "f.yaml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = os.WriteFile(
 		filepath.Join(v, ".gitlab-ci.yml"), []byte(`a`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	d := t.TempDir()
 
 	err = CopyDir(filesys.MakeFsOnDisk(), s, d)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	diff, err := Diff(d, v)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, diff.List())
 }
 

kyaml/fn/framework/framework_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/kyaml/fn/framework"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
@@ -55,7 +56,7 @@ items:
     replicas: 0
 `), Writer: out}
 	err := framework.Execute(p, source)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `apiVersion: config.kubernetes.io/v1
 kind: ResourceList
 items:

kyaml/fn/runtime/container/container_test.go

@@ -132,7 +132,7 @@ metadata:
 			instance := NewContainer(tt.containerSpec, tt.UIDGID)
 			instance.Exec.FunctionConfig = cfg
 			instance.Env = append(instance.Env, "KYAML_TEST=FOO")
-			assert.NoError(t, instance.setupExec())
+			require.NoError(t, instance.setupExec())
 
 			tt.expectedArgs = append(tt.expectedArgs,
 				runtimeutil.NewContainerEnvFromStringSlice(instance.Env).GetDockerFlags()...)

kyaml/kio/byteio_reader_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	. "sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/kio/kioutil"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
@@ -862,7 +863,7 @@ items:
 			assert.Equal(t, len(tc.exp.sOut), len(rNodes))
 			for i, n := range rNodes {
 				json, err := n.String()
-				assert.NoError(t, err)
+				require.NoError(t, err)
 				assert.Equal(
 					t, strings.TrimSpace(tc.exp.sOut[i]),
 					strings.TrimSpace(json), n)
@@ -886,7 +887,7 @@ data:
 			AnchorsAweigh:         false,
 			Reader:                bytes.NewBuffer([]byte(input)),
 		}).Read()
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, 1, len(rNodes))
 		rNode = rNodes[0]
 	}
@@ -937,7 +938,7 @@ data:
 	}
 
 	str, err := rNode.String()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	// The string version matches the input (it still has anchors and aliases).
 	assert.Equal(t, strings.TrimSpace(input), strings.TrimSpace(str))
 
@@ -948,7 +949,7 @@ data:
 			AnchorsAweigh:         true,
 			Reader:                bytes.NewBuffer([]byte(input)),
 		}).Read()
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, 1, len(rNodes))
 		rNode = rNodes[0]
 	}
@@ -995,7 +996,7 @@ data:
 	}
 
 	str, err = rNode.String()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	// This time, the alias has been replaced with the anchor definition.
 	assert.Equal(t, strings.TrimSpace(`
 data:
@@ -1092,11 +1093,11 @@ env:
 				Reader:                bytes.NewBuffer([]byte(tc.input)),
 			}).Read()
 			if tc.err != "" {
-				assert.Error(t, err)
+				require.Error(t, err)
 				assert.Equal(t, tc.err, err.Error())
 				return
 			}
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			actual := rNodes[0].GetAnnotations()[kioutil.SeqIndentAnnotation]
 			assert.Equal(t, tc.expectedAnnoValue, actual)
 		})

kyaml/kio/byteio_readwriter_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
 )
@@ -857,10 +858,10 @@ results:
 			}
 
 			rnodes, err := rw.Read()
-			assert.NoError(t, err)
+			require.NoError(t, err)
 
 			err = rw.Write(rnodes)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 
 			assert.Equal(t, tc.want, strings.TrimSpace(got.String()))
 		})

kyaml/kio/filters/fmtr_test.go

@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	. "sigs.k8s.io/kustomize/kyaml/kio/filters"
 	"sigs.k8s.io/kustomize/kyaml/kio/filters/testyaml"
@@ -81,7 +82,7 @@ spec:
 		}},
 		Outputs: []kio.Writer{kio.ByteWriter{Writer: buff}},
 	}.Execute()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expected, buff.String())
 }
 
@@ -146,7 +147,7 @@ spec:
 		Filters: []kio.Filter{FormatFilter{}},
 		Outputs: []kio.Writer{kio.ByteWriter{Writer: buff}},
 	}.Execute()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expected, buff.String())
 }
 
@@ -200,7 +201,7 @@ spec:
 			}}},
 		Outputs: []kio.Writer{kio.ByteWriter{Writer: buff}},
 	}.Execute()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expected, buff.String())
 
 	y = `
@@ -268,7 +269,7 @@ spec:
 			}}},
 		Outputs: []kio.Writer{kio.ByteWriter{Writer: buff}},
 	}.Execute()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expected, buff.String())
 }
 
@@ -297,7 +298,7 @@ spec:
 `
 
 	s, err := FormatInput(strings.NewReader(y))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expected, s.String())
 }
 
@@ -357,7 +358,7 @@ data:
 `
 
 	s, err := FormatInput(strings.NewReader(y))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expected, s.String())
 }
 
@@ -423,7 +424,7 @@ spec:
         - containerPort: 80
 `
 	s, err := FormatInput(strings.NewReader(y))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expected, s.String())
 }
 
@@ -455,7 +456,7 @@ spec:
     targetPort: 9376
 `
 	s, err := FormatInput(strings.NewReader(y))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expected, s.String())
 }
 
@@ -517,7 +518,7 @@ webhooks:
   timeoutSeconds: 1
 `
 	s, err := FormatInput(strings.NewReader(y))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expected, s.String())
 }
 
@@ -564,7 +565,7 @@ other:
   b: a1
 `
 	s, err := FormatInput(strings.NewReader(y))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expected, s.String())
 }
 
@@ -572,34 +573,33 @@ other:
 func TestFormatInput_resources(t *testing.T) {
 	input := &bytes.Buffer{}
 	_, err := io.Copy(input, bytes.NewReader(testyaml.UnformattedYaml1))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	_, err = io.Copy(input, strings.NewReader("---\n"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	_, err = io.Copy(input, bytes.NewReader(testyaml.UnformattedYaml2))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	_, err = io.Copy(input, strings.NewReader("---\n"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	_, err = io.Copy(input, bytes.NewReader(testyaml.UnformattedYaml3))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	expectedOutput := &bytes.Buffer{}
 	_, err = io.Copy(expectedOutput, bytes.NewReader(testyaml.FormattedYaml1))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	_, err = io.Copy(expectedOutput, strings.NewReader("---\n"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	_, err = io.Copy(expectedOutput, bytes.NewReader(testyaml.FormattedYaml2))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	_, err = io.Copy(expectedOutput, strings.NewReader("---\n"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	_, err = io.Copy(expectedOutput, bytes.NewReader(testyaml.FormattedYaml3))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	s, err := FormatInput(input)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expectedOutput.String(), s.String())
 }
 
-//
 func TestFormatInput_failMissingKind(t *testing.T) {
 	y := `
 spec:
@@ -621,7 +621,7 @@ apiVersion: example.com/v1beta1
 `
 
 	b, err := FormatInput(strings.NewReader(y))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, strings.TrimLeft(y, "\n"), b.String())
 }
 
@@ -646,7 +646,7 @@ kind: MyKind
 `
 
 	b, err := FormatInput(strings.NewReader(y))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, strings.TrimLeft(y, "\n"), b.String())
 }
 
@@ -706,19 +706,19 @@ func TestFormatFileOrDirectory_yamlExtFile(t *testing.T) {
 func TestFormatFileOrDirectory_multipleYamlEntries(t *testing.T) {
 	// write the unformatted file
 	f, err := os.CreateTemp("", "yamlfmt*.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	defer os.Remove(f.Name())
 	err = os.WriteFile(f.Name(),
 		[]byte(string(testyaml.UnformattedYaml1)+"---\n"+string(testyaml.UnformattedYaml2)), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// format the file
 	err = FormatFileOrDirectory(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// check the result is formatted
 	b, err := os.ReadFile(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, string(testyaml.FormattedYaml1)+"---\n"+string(testyaml.FormattedYaml2), string(b))
 }
 
@@ -727,18 +727,18 @@ func TestFormatFileOrDirectory_multipleYamlEntries(t *testing.T) {
 func TestFormatFileOrDirectory_ymlExtFile(t *testing.T) {
 	// write the unformatted file
 	f, err := os.CreateTemp("", "yamlfmt*.yml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	defer os.Remove(f.Name())
 	err = os.WriteFile(f.Name(), testyaml.UnformattedYaml1, 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// format the file
 	err = FormatFileOrDirectory(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// check the result is formatted
 	b, err := os.ReadFile(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, string(testyaml.FormattedYaml1), string(b))
 }
 
@@ -747,18 +747,18 @@ func TestFormatFileOrDirectory_ymlExtFile(t *testing.T) {
 func TestFormatFileOrDirectory_YamlExtFileWithJson(t *testing.T) {
 	// write the unformatted JSON file contents
 	f, err := os.CreateTemp("", "yamlfmt*.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	defer os.Remove(f.Name())
 	err = os.WriteFile(f.Name(), testyaml.UnformattedJSON1, 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// format the file
 	err = FormatFileOrDirectory(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// check the result is formatted as yaml
 	b, err := os.ReadFile(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, string(testyaml.FormattedFlowYAML1), string(b))
 }
 
@@ -767,18 +767,18 @@ func TestFormatFileOrDirectory_YamlExtFileWithJson(t *testing.T) {
 func TestFormatFileOrDirectory_JsonExtFileWithNotModified(t *testing.T) {
 	// write the unformatted JSON file contents
 	f, err := os.CreateTemp("", "yamlfmt*.json")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	defer os.Remove(f.Name())
 	err = os.WriteFile(f.Name(), testyaml.UnformattedJSON1, 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// format the file
 	err = FormatFileOrDirectory(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// check the result is formatted as yaml
 	b, err := os.ReadFile(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, string(testyaml.UnformattedJSON1), string(b))
 }
 
@@ -787,7 +787,7 @@ func TestFormatFileOrDirectory_JsonExtFileWithNotModified(t *testing.T) {
 func TestFormatFileOrDirectory_partialKubernetesYamlFile(t *testing.T) {
 	// write the unformatted file
 	f, err := os.CreateTemp("", "yamlfmt*.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	defer os.Remove(f.Name())
 	err = os.WriteFile(f.Name(), []byte(string(testyaml.UnformattedYaml1)+`---
 status:
@@ -798,15 +798,15 @@ status:
 spec: a
 ---
 `+string(testyaml.UnformattedYaml2)), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// format the file
 	err = FormatFileOrDirectory(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// check the result is  NOT formatted
 	b, err := os.ReadFile(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, string(testyaml.FormattedYaml1)+`---
 status:
   conditions:
@@ -823,7 +823,7 @@ spec: a
 func TestFormatFileOrDirectory_skipNonKubernetesYamlFile(t *testing.T) {
 	// write the unformatted JSON file contents
 	f, err := os.CreateTemp("", "yamlfmt*.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	defer os.Remove(f.Name())
 	err = os.WriteFile(f.Name(), []byte(`
 status:
@@ -833,15 +833,15 @@ status:
   - 2
 spec: a
 `), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// format the file
 	err = FormatFileOrDirectory(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// check the result is formatted as yaml
 	b, err := os.ReadFile(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `status:
   conditions:
   - 3
@@ -854,16 +854,16 @@ spec: a
 // TestFormatFileOrDirectory_jsonFile should not fmt the file even though it contains yaml.
 func TestFormatFileOrDirectory_skipJsonExtFile(t *testing.T) {
 	f, err := os.CreateTemp("", "yamlfmt*.json")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	defer os.Remove(f.Name())
 	err = os.WriteFile(f.Name(), testyaml.UnformattedYaml1, 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = FormatFileOrDirectory(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	b, err := os.ReadFile(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, string(testyaml.UnformattedYaml1), string(b))
 }
@@ -874,59 +874,59 @@ func TestFormatFileOrDirectory_directory(t *testing.T) {
 	d := t.TempDir()
 
 	err := os.Mkdir(filepath.Join(d, "config"), 0700)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = os.WriteFile(filepath.Join(d, "c1.yaml"), testyaml.UnformattedYaml1, 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = os.WriteFile(filepath.Join(d, "config", "c2.yaml"), testyaml.UnformattedYaml2, 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = os.WriteFile(filepath.Join(d, "README.md"), []byte(`# Markdown`), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = FormatFileOrDirectory(d)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	b, err := os.ReadFile(filepath.Join(d, "c1.yaml"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, string(testyaml.FormattedYaml1), string(b))
 
 	b, err = os.ReadFile(filepath.Join(d, "config", "c2.yaml"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, string(testyaml.FormattedYaml2), string(b))
 
 	b, err = os.ReadFile(filepath.Join(d, "README.md"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `# Markdown`, string(b))
 
 	// verify no additional files were created
 	files := []string{
 		".", "c1.yaml", "README.md", "config", filepath.Join("config", "c2.yaml")}
 	err = filepath.Walk(d, func(path string, info os.FileInfo, err error) error {
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		path, err = filepath.Rel(d, path)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Contains(t, files, path)
 		return nil
 	})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 }
 
 // TestFormatFileOrDirectory_trimWhiteSpace verifies that trailling and leading whitespace is
 // trimmed
 func TestFormatFileOrDirectory_trimWhiteSpace(t *testing.T) {
 	f, err := os.CreateTemp("", "yamlfmt*.yaml")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	defer os.Remove(f.Name())
 	err = os.WriteFile(f.Name(), []byte("\n\n"+string(testyaml.UnformattedYaml1)+"\n\n"), 0600)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = FormatFileOrDirectory(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	b, err := os.ReadFile(f.Name())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, string(testyaml.FormattedYaml1), string(b))
 }
@@ -1024,21 +1024,21 @@ metadata:
 		test := testCases[i]
 		t.Run(test.name, func(t *testing.T) {
 			f, err := os.CreateTemp("", "yamlfmt*.yaml")
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			defer os.Remove(f.Name())
 
 			err = os.WriteFile(f.Name(), test.input, 0600)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 
 			err = FormatFileOrDirectory(f.Name())
 			if test.expectError {
-				assert.Error(t, err)
+				require.Error(t, err)
 				return
 			}
-			assert.NoError(t, err)
+			require.NoError(t, err)
 
 			b, err := os.ReadFile(f.Name())
-			assert.NoError(t, err)
+			require.NoError(t, err)
 
 			assert.Equal(t, strings.TrimSpace(string(test.expectedOutput)),
 				strings.TrimSpace(string(b)))
@@ -1091,6 +1091,6 @@ spec:
 		}},
 		Outputs: []kio.Writer{kio.ByteWriter{Writer: buff}},
 	}.Execute()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expected, buff.String())
 }

kyaml/kio/ignorefilesmatcher_test.go

@@ -258,7 +258,7 @@ a
 
 			for i, node := range nodes {
 				val, err := node.String()
-				assert.NoError(t, err)
+				require.NoError(t, err)
 				want := strings.ReplaceAll(test.expected[i], "${SEP}", string(filepath.Separator))
 				assert.Equal(t, strings.TrimSpace(want), strings.TrimSpace(val))
 			}

kyaml/kio/kio_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/kyaml/kio/kioutil"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
 
@@ -875,10 +876,10 @@ data:
 
 			err := p.Execute()
 			if tc.expectedErr == "" {
-				assert.NoError(t, err)
+				require.NoError(t, err)
 				assert.Equal(t, tc.expected, out.String())
 			} else {
-				assert.Error(t, err)
+				require.Error(t, err)
 				assert.Equal(t, tc.expectedErr, err.Error())
 			}
 		})

kyaml/kio/kioutil/kioutil_test.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/kio/kioutil"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
@@ -446,8 +447,8 @@ metadata:
 			OmitReaderAnnotations: true,
 		}
 		nodes, err := rw.Read()
-		assert.NoError(t, err)
-		assert.NoError(t, kioutil.CopyLegacyAnnotations(nodes[0]))
+		require.NoError(t, err)
+		require.NoError(t, kioutil.CopyLegacyAnnotations(nodes[0]))
 		assert.Equal(t, tc.expected, nodes[0].MustString())
 	}
 }
@@ -527,8 +528,8 @@ metadata:
 			OmitReaderAnnotations: true,
 		}
 		nodes, err := rw.Read()
-		assert.NoError(t, err)
-		assert.NoError(t, kioutil.CopyInternalAnnotations(nodes[0], nodes[1], tc.exclusions...))
+		require.NoError(t, err)
+		require.NoError(t, kioutil.CopyInternalAnnotations(nodes[0], nodes[1], tc.exclusions...))
 		assert.Equal(t, tc.expected, nodes[1].MustString())
 	}
 }
@@ -656,10 +657,10 @@ metadata:
 			OmitReaderAnnotations: true,
 		}
 		nodes, err := rw.Read()
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		err = kioutil.ConfirmInternalAnnotationUnchanged(nodes[0], nodes[1], tc.exclusions...)
 		if tc.expectedErr == "" {
-			assert.NoError(t, err)
+			require.NoError(t, err)
 		} else {
 			if err == nil {
 				t.Fatalf("expected error: %s\n", tc.expectedErr)
@@ -699,7 +700,7 @@ metadata:
 			OmitReaderAnnotations: true,
 		}
 		nodes, err := rw.Read()
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, tc.expected, kioutil.GetInternalAnnotations(nodes[0]))
 	}
 }

kyaml/kio/tree_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	. "sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
 )
@@ -574,6 +575,6 @@ metadata:
 		Inputs:  []Reader{&ByteReader{Reader: bytes.NewBufferString(in)}},
 		Outputs: []Writer{TreeWriter{Writer: out}},
 	}.Execute()
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Equal(t, "owner 'Application myapp-staging/nginx' not found in input, but found as an owner of input objects", err.Error())
 }

kyaml/openapi/openapi_test.go

@@ -311,7 +311,7 @@ func TestIsNamespaceScoped_custom(t *testing.T) {
   }
 }
 `))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	isNamespaceable, isFound := IsNamespaceScoped(yaml.TypeMeta{
 		APIVersion: "custom.io/v1",

kyaml/yaml/fns_test.go

@@ -42,7 +42,7 @@ func TestResourceNode_SetValue(t *testing.T) {
 
 func TestAppend(t *testing.T) {
 	node, err := Parse(NodeSampleData)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	rn, err := node.Pipe(Append(NewScalarRNode("").YNode()))
 	if assert.Error(t, err) {
 		assert.Contains(t, err.Error(), "wrong node kind")
@@ -53,9 +53,9 @@ func TestAppend(t *testing.T) {
 - b
 `
 	node, err = Parse(s)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	rn, err = node.Pipe(Append())
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Nil(t, rn)
 }
 
@@ -65,18 +65,18 @@ func TestGetElementByIndex(t *testing.T) {
 - 1
 - 2
 `)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	rn, err := node.Pipe(GetElementByIndex(0))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "0\n", assertNoErrorString(t)(rn.String()))
 
 	rn, err = node.Pipe(GetElementByIndex(2))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "2\n", assertNoErrorString(t)(rn.String()))
 
 	rn, err = node.Pipe(GetElementByIndex(-1))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "2\n", assertNoErrorString(t)(rn.String()))
 }
 
@@ -88,14 +88,14 @@ func TestGetElementByKey(t *testing.T) {
 - f: g
 - f: h
 `)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	rn, err := node.Pipe(GetElementByKey("b"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "b: c\n", assertNoErrorString(t)(rn.String()))
 
 	rn, err = node.Pipe(GetElementByKey("f"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "f: g\n", assertNoErrorString(t)(rn.String()))
 }
 
@@ -112,7 +112,7 @@ func TestElementSetter(t *testing.T) {
 	node := orig.Copy()
 	// Remove an element, because ElementSetter.Element is left nil.
 	rn, err := node.Pipe(ElementSetter{Keys: []string{"a"}, Values: []string{"b"}})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Nil(t, rn)
 	assert.Equal(t, `- scalarValue
 - c: d
@@ -121,7 +121,7 @@ func TestElementSetter(t *testing.T) {
 	node = orig.Copy()
 	// Nothing happens because no element is matched
 	rn, err = node.Pipe(ElementSetter{Keys: []string{"a"}, Values: []string{"zebra"}})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Nil(t, rn)
 	assert.Equal(t, `- a: b
 - scalarValue
@@ -131,12 +131,12 @@ func TestElementSetter(t *testing.T) {
 	node = orig.Copy()
 	// When the element is not found, return an empty ist
 	_, err = node.Pipe(ElementSetter{Keys: []string{"a"}})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `[]
 `, assertNoErrorString(t)(node.String()))
 
 	_, err = node.Pipe(ElementSetter{Values: []string{"b"}})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `[]
 `, assertNoErrorString(t)(node.String()))
 
@@ -147,7 +147,7 @@ func TestElementSetter(t *testing.T) {
 	// If given a key and no values, ElementSetter will
 	// change node to be an empty list
 	rn, err = node.Pipe(ElementSetter{Keys: []string{"a"}})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Nil(t, rn)
 	assert.Equal(t, `[]
 `, assertNoErrorString(t)(node.String()))
@@ -170,7 +170,7 @@ a: b
 	// b is removed since ElementSetter use the value "b" to match the
 	// scalar values.
 	rn, err = node.Pipe(ElementSetter{Values: []string{"b"}})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Nil(t, rn)
 	assert.Equal(t, `- a
 `, assertNoErrorString(t)(node.String()))
@@ -185,7 +185,7 @@ a: b
 		Values:  []string{"b"},
 		Element: newElement.YNode(),
 	})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, rn, newElement)
 	assert.Equal(t, `- e: f
 - scalarValue
@@ -200,7 +200,7 @@ a: b
 		Values:  []string{"b"},
 		Element: newElement.YNode(),
 	})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, rn, newElement)
 	assert.Equal(t, `- foo
 - scalarValue
@@ -218,7 +218,7 @@ a: b
 		Values:  []string{"y"},
 		Element: newElement.YNode(),
 	})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, rn, newElement)
 	assert.Equal(t, `- a: b
 - scalarValue
@@ -245,7 +245,7 @@ func TestElementSetterMultipleKeys(t *testing.T) {
 		Keys:   []string{"a"},
 		Values: []string{"b"},
 	})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Nil(t, rn)
 	assert.Equal(t, `- scalarValue
 - e: f
@@ -258,7 +258,7 @@ func TestElementSetterMultipleKeys(t *testing.T) {
 		Keys:   []string{"a", "c"},
 		Values: []string{"b", "d"},
 	})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Nil(t, rn)
 	assert.Equal(t, `- scalarValue
 - e: f
@@ -272,7 +272,7 @@ func TestElementSetterMultipleKeys(t *testing.T) {
 		Keys:   []string{"a", "c"},
 		Values: []string{"b", "wrong value"},
 	})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Nil(t, rn)
 	assert.Equal(t, `- a: b
   c: d
@@ -291,7 +291,7 @@ func TestElementSetterMultipleKeys(t *testing.T) {
 		Values:  []string{"b"},
 		Element: newElement.YNode(),
 	})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, rn, newElement)
 	assert.Equal(t, `- g: h
 - scalarValue
@@ -309,7 +309,7 @@ func TestElementSetterMultipleKeys(t *testing.T) {
 		Values:  []string{"b", "d"},
 		Element: newElement.YNode(),
 	})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, rn, newElement)
 	assert.Equal(t, `- g: h
 - scalarValue
@@ -325,7 +325,7 @@ func TestElementSetterMultipleKeys(t *testing.T) {
 		Values:  []string{"b", "d"},
 		Element: newElement.YNode(),
 	})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, rn, newElement)
 	assert.Equal(t, `- foo
 - scalarValue
@@ -344,7 +344,7 @@ func TestElementSetterMultipleKeys(t *testing.T) {
 		Values:  []string{"b", "wrong value"},
 		Element: newElement.YNode(),
 	})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, rn, newElement)
 	assert.Equal(t, `- a: b
   c: d
@@ -359,22 +359,22 @@ func TestElementMatcherWithNoValue(t *testing.T) {
 - a: c
 - b: ""
 `)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	rn, err := node.Pipe(ElementMatcher{Keys: []string{"b"}})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "b: \"\"\n", assertNoErrorString(t)(rn.String()))
 
 	rn, err = node.Pipe(ElementMatcher{Keys: []string{"a"}})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Nil(t, rn)
 
 	rn, err = node.Pipe(ElementMatcher{Keys: []string{"a"}, MatchAnyValue: true})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "a: c\n", assertNoErrorString(t)(rn.String()))
 
 	_, err = node.Pipe(ElementMatcher{Keys: []string{"a"}, Values: []string{"c"}, MatchAnyValue: true})
-	assert.Errorf(t, err, "Values must be empty when MatchAnyValue is set to true")
+	require.Errorf(t, err, "Values must be empty when MatchAnyValue is set to true")
 }
 
 func TestElementMatcherMultipleKeys(t *testing.T) {
@@ -383,14 +383,14 @@ func TestElementMatcherMultipleKeys(t *testing.T) {
   c: d
 - e: f
 `)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// matches all key-value pairs
 	rn, err := node.Pipe(MatchElementList(
 		[]string{"a", "c"}, // keys
 		[]string{"b", "d"}, // values
 	))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.NotEmpty(t, rn)
 
 	// matches one key value pair but not the other
@@ -398,7 +398,7 @@ func TestElementMatcherMultipleKeys(t *testing.T) {
 		[]string{"a", "c"}, // keys
 		[]string{"b", "f"}, // values
 	))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Nil(t, rn)
 
 	// matches single given key value pair
@@ -406,7 +406,7 @@ func TestElementMatcherMultipleKeys(t *testing.T) {
 		[]string{"e"}, // keys
 		[]string{"f"}, // values
 	))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.NotEmpty(t, rn)
 
 	// matching key, but value doesn't match
@@ -414,29 +414,29 @@ func TestElementMatcherMultipleKeys(t *testing.T) {
 		[]string{"e"}, // keys
 		[]string{"g"}, // values
 	))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Nil(t, rn)
 }
 
 func TestClearField_Fn(t *testing.T) {
 	node, err := Parse(NodeSampleData)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	rn, err := node.Pipe(FieldClearer{Name: "a"})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "n: o\nc: d\n", assertNoErrorString(t)(node.String()))
 	assert.Equal(t, "b\n", assertNoErrorString(t)(rn.String()))
 
 	node, err = Parse(NodeSampleData)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	rn, err = node.Pipe(FieldClearer{Name: "n"})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "a: b\nc: d\n", assertNoErrorString(t)(node.String()))
 	assert.Equal(t, "o\n", assertNoErrorString(t)(rn.String()))
 
 	node, err = Parse(NodeSampleData)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	rn, err = node.Pipe(FieldClearer{Name: "c"})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "n: o\na: b\n", assertNoErrorString(t)(node.String()))
 	assert.Equal(t, "d\n", assertNoErrorString(t)(rn.String()))
 
@@ -444,9 +444,9 @@ func TestClearField_Fn(t *testing.T) {
 a: b
 `
 	node, err = Parse(s)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	rn, err = node.Pipe(FieldClearer{Name: "o"})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Nil(t, rn)
 	assert.Equal(t, "n: o\na: b\n", assertNoErrorString(t)(node.String()))
 
@@ -454,7 +454,7 @@ a: b
 - b
 `
 	node, err = Parse(s)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	rn, err = node.Pipe(FieldClearer{Name: "a"})
 	if assert.Error(t, err) {
 		assert.Contains(t, err.Error(), "wrong node kind")
@@ -469,9 +469,9 @@ a: b
 c: d
 `
 	node, err = Parse(s)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	rn, err = node.Pipe(FieldClearer{Name: "n", IfEmpty: true})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "n:\n  k: v\na: b\nc: d\n", assertNoErrorString(t)(node.String()))
 	assert.Equal(t, "", assertNoErrorString(t)(rn.String()))
 
@@ -481,9 +481,9 @@ a: b
 c: d
 `
 	node, err = Parse(s)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	rn, err = node.Pipe(FieldClearer{Name: "n", IfEmpty: true})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "a: b\nc: d\n", assertNoErrorString(t)(node.String()))
 	assert.Equal(t, "{}\n", assertNoErrorString(t)(rn.String()))
 }
@@ -501,12 +501,12 @@ r: s
 func TestLookup_Fn_create(t *testing.T) {
 	// primitive
 	node, err := Parse(s)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	rn, err := node.Pipe(PathGetter{
 		Path:   []string{"a", "b", "[c=d]", "t", "f", "[=h]"},
 		Create: yaml.ScalarNode,
 	})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `n: o
 a:
   l: m
@@ -526,12 +526,12 @@ r: s
 
 func TestLookup_Fn_create2(t *testing.T) {
 	node, err := Parse(s)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	rn, err := node.Pipe(PathGetter{
 		Path:   []string{"a", "b", "[c=d]", "t", "f"},
 		Create: yaml.SequenceNode,
 	})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `n: o
 a:
   l: m
@@ -550,9 +550,9 @@ r: s
 
 func TestLookup_Fn_create3(t *testing.T) {
 	node, err := Parse(s)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	rn, err := node.Pipe(LookupCreate(yaml.MappingNode, "a", "b", "[c=d]", "t"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `n: o
 a:
   l: m
@@ -572,21 +572,21 @@ func TestLookupCreate_4(t *testing.T) {
 	node, err := Parse(`
 a: {}
 `)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	rn, err := node.Pipe(
 		LookupCreate(yaml.MappingNode, "a", "b", "[c=d]", "t", "f", "[=h]"))
 
 	node.YNode().Style = yaml.FlowStyle
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "{a: {b: [{c: d, t: {f: [h]}}]}}\n", assertNoErrorString(t)(node.String()))
 	assert.Equal(t, "h\n", assertNoErrorString(t)(rn.String()))
 }
 
 func TestLookup_Fn_create_with_wildcard_error(t *testing.T) {
 	node, err := Parse(s)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	_, err = node.Pipe(LookupCreate(yaml.MappingNode, "a", "b", "*", "t"))
-	assert.Error(t, err, "wildcard is not supported in PathGetter")
+	require.Error(t, err, "wildcard is not supported in PathGetter")
 }
 
 func TestLookup(t *testing.T) {
@@ -609,18 +609,18 @@ a:
 r: s
 `
 	node, err := Parse(s)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// primitive
 	rn, err := node.Pipe(Lookup("a", "b", "[c=d]", "t", "f", "[=h]"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Equal(t, `h
 `, assertNoErrorString(t)(rn.String()))
 
 	// seq
 	rn, err = node.Pipe(Lookup("a", "b", "[c=d]", "t", "f"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Equal(t, `- g
 - h
@@ -628,7 +628,7 @@ r: s
 `, assertNoErrorString(t)(rn.String()))
 
 	rn, err = node.Pipe(Lookup("a", "b", "[c=d]", "t"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Equal(t, `u: v
 f:
@@ -638,7 +638,7 @@ f:
 `, assertNoErrorString(t)(rn.String()))
 
 	rn, err = node.Pipe(Lookup("a", "b", "[c=d]"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Equal(t, `c: d
 t:
@@ -651,7 +651,7 @@ j: k
 `, assertNoErrorString(t)(rn.String()))
 
 	rn, err = node.Pipe(Lookup("a", "b"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Equal(t, `- f: g
 - c: e
@@ -668,69 +668,69 @@ j: k
 `, assertNoErrorString(t)(rn.String()))
 
 	rn, err = node.Pipe(Lookup("a", "b", "0"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Equal(t, `f: g
 `, assertNoErrorString(t)(rn.String()))
 
 	rn, err = node.Pipe(Lookup("a", "b", "-", "h"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Equal(t, `i
 `, assertNoErrorString(t)(rn.String()))
 
 	rn, err = node.Pipe(Lookup("l"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Nil(t, rn)
 
 	rn, err = node.Pipe(Lookup("zzz"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Nil(t, rn)
 
 	rn, err = node.Pipe(Lookup("[a=b]"))
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Nil(t, rn)
 
 	rn, err = node.Pipe(Lookup("a", "b", "f"))
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Nil(t, rn)
 
 	rn, err = node.Pipe(Lookup("a", "b", "c=zzz"))
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Nil(t, rn)
 
 	rn, err = node.Pipe(Lookup(" ", "a", "", "b", " ", "[c=d]", "\n", "t", "\t", "f", "  ", "[=h]", "  "))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Equal(t, `h
 `, assertNoErrorString(t)(rn.String()))
 
 	rn, err = node.Pipe(Lookup(" ", "a", "", "b", " ", "[]"))
-	assert.Error(t, err)
+	require.Error(t, err)
 	assert.Nil(t, rn)
 
 	rn, err = node.Pipe(Lookup("a", "b", "[c=d]", "t", "f", "[=c]"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Nil(t, rn)
 
 	rn, err = node.Pipe(Lookup("a", "b", "[z=z]"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Nil(t, rn)
 
 	rn, err = node.Pipe(Lookup("a", "b", "-1"))
-	assert.Errorf(t, err, "array index -1 cannot be negative")
+	require.Errorf(t, err, "array index -1 cannot be negative")
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Nil(t, rn)
 
 	rn, err = node.Pipe(Lookup("a", "b", "99"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, s, assertNoErrorString(t)(node.String()))
 	assert.Nil(t, rn)
 }
@@ -865,10 +865,10 @@ func TestMapEntrySetter(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.desc, func(t *testing.T) {
 			node, err := Parse(tc.input)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			k, err := tc.setter.Filter(node)
 			if tc.expectedErr == nil {
-				assert.NoError(t, err)
+				require.NoError(t, err)
 				assert.Equal(t, tc.expected, assertNoErrorString(t)(node.String()))
 				assert.Equal(t, tc.expected, assertNoErrorString(t)(k.String()))
 			} else {
@@ -884,13 +884,13 @@ func TestFieldSetter(t *testing.T) {
 	node, err := Parse(`
 foo: baz
 `)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	instance := FieldSetter{
 		Name:  "foo",
 		Value: NewScalarRNode("bar"),
 	}
 	k, err := instance.Filter(node)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `foo: bar
 `, assertNoErrorString(t)(node.String()))
 	assert.Equal(t, `bar
@@ -900,13 +900,13 @@ foo: baz
 	node, err = Parse(`
 foo: baz
 `)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	instance = FieldSetter{
 		Name:  "bar",
 		Value: NewScalarRNode("buz"),
 	}
 	k, err = instance.Filter(node)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `foo: baz
 bar: buz
 `, assertNoErrorString(t)(node.String()))
@@ -918,12 +918,12 @@ bar: buz
 foo: baz
 bar: buz
 `)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	instance = FieldSetter{
 		Name: "foo",
 	}
 	k, err = instance.Filter(node)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `bar: buz
 `, assertNoErrorString(t)(node.String()))
 	assert.Equal(t, `baz
@@ -933,10 +933,10 @@ bar: buz
 	node, err = Parse(`
 foo
 `)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	instance = FieldSetter{}
 	k, err = instance.Filter(node)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `foo
 `, assertNoErrorString(t)(node.String()))
 	assert.Equal(t, `foo
@@ -947,7 +947,7 @@ foo
 -a
 -b
 `)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	instance = FieldSetter{
 		Name:  "foo",
 		Value: NewScalarRNode("v"),
@@ -966,7 +966,7 @@ func TestFieldSetterNumberInKeyRegression(t *testing.T) {
 		Name:  "forty 2",
 		Value: NewScalarRNode("number key one"),
 	}.Filter(node)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `number key one
 `, assertNoErrorString(t)(k.String()))
 
@@ -974,7 +974,7 @@ func TestFieldSetterNumberInKeyRegression(t *testing.T) {
 		Name:  "fortytwo",
 		Value: NewScalarRNode("number key two"),
 	}.Filter(node)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `number key two
 `, assertNoErrorString(t)(k.String()))
 
@@ -982,7 +982,7 @@ func TestFieldSetterNumberInKeyRegression(t *testing.T) {
 		Name:  "42",
 		Value: NewScalarRNode("number key three"),
 	}.Filter(node)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `number key three
 `, assertNoErrorString(t)(k.String()))
 
@@ -997,9 +997,9 @@ func TestSet_Fn(t *testing.T) {
 	node, err := Parse(`
 foo: baz
 `)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	k, err := node.Pipe(Get("foo"), Set(NewScalarRNode("bar")))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, `foo: bar
 `, assertNoErrorString(t)(node.String()))
 	assert.Equal(t, `bar
@@ -1008,7 +1008,7 @@ foo: baz
 	node, err = Parse(`
 foo: baz
 `)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	_, err = node.Pipe(Set(NewScalarRNode("bar")))
 	if !assert.Error(t, err) {
 		return
@@ -1021,7 +1021,7 @@ foo: baz
 func TestErrorIfInvalid(t *testing.T) {
 	err := ErrorIfInvalid(
 		NewRNode(&yaml.Node{Kind: yaml.SequenceNode}), yaml.SequenceNode)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	// nil values should pass validation -- they were not specified
 	err = ErrorIfInvalid(&RNode{}, yaml.SequenceNode)
@@ -1048,7 +1048,7 @@ func TestErrorIfInvalid(t *testing.T) {
 		Kind:    yaml.MappingNode,
 		Content: []*yaml.Node{{}, {}},
 	}), yaml.MappingNode)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	err = ErrorIfInvalid(NewRNode(&yaml.Node{}), yaml.SequenceNode)
 	if assert.Error(t, err) {
@@ -1073,22 +1073,22 @@ func TestSplitIndexNameValue(t *testing.T) {
 	assert.Equal(t, "", v)
 
 	k, v, err = SplitIndexNameValue("a=b")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "a", k)
 	assert.Equal(t, "b", v)
 
 	k, v, err = SplitIndexNameValue("=b")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "", k)
 	assert.Equal(t, "b", v)
 
 	k, v, err = SplitIndexNameValue("a=b=c")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "a", k)
 	assert.Equal(t, "b=c", v)
 
 	k, v, err = SplitIndexNameValue("=-jar")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "", k)
 	assert.Equal(t, "-jar", v)
 }
@@ -1107,7 +1107,7 @@ func TestResourceNode_Pipe(t *testing.T) {
 
 	// check the nil value case
 	_, err := r0.Pipe(FieldMatcher{Name: "foo"})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	r0, r1, r2, r3 = &RNode{}, &RNode{}, &RNode{}, &RNode{}
 	// all filters successful
@@ -1292,7 +1292,7 @@ metadata:
 func assertNoError(t *testing.T) func(o *RNode, err error) *RNode {
 	t.Helper()
 	return func(o *RNode, err error) *RNode {
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		return o
 	}
 }
@@ -1300,7 +1300,7 @@ func assertNoError(t *testing.T) func(o *RNode, err error) *RNode {
 func assertNoErrorString(t *testing.T) func(string, error) string {
 	t.Helper()
 	return func(s string, err error) string {
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		return s
 	}
 }

kyaml/yaml/rnode_test.go

@@ -489,7 +489,7 @@ func TestRNodeGetValidatedMetadata(t *testing.T) {
 
 func TestRNodeMapEmpty(t *testing.T) {
 	newRNodeMap, err := NewRNode(nil).Map()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, 0, len(newRNodeMap))
 }
 
@@ -516,7 +516,7 @@ func TestRNodeMap(t *testing.T) {
 	}
 
 	actual, err := wn.Map()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	if diff := cmp.Diff(expected, actual); diff != "" {
 		t.Fatalf("actual map does not deep equal expected map:\n%v", diff)
 	}
@@ -706,10 +706,10 @@ data:
   color: &color-used blue
   feeling: *color-used
 `)
-	assert.NoError(t, err)
-	assert.NoError(t, rn.DeAnchor())
+	require.NoError(t, err)
+	require.NoError(t, rn.DeAnchor())
 	actual, err := rn.String()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, strings.TrimSpace(`
 apiVersion: v1
 kind: ConfigMap
@@ -1157,12 +1157,12 @@ items:
 		t.Run(tc.description, func(t *testing.T) {
 			rn, err := Parse(tc.input)
 
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			err = rn.DeAnchor()
 			if tc.expectedErr == nil {
-				assert.NoError(t, err)
+				require.NoError(t, err)
 				actual, err := rn.String()
-				assert.NoError(t, err)
+				require.NoError(t, err)
 				assert.Equal(t, strings.TrimSpace(tc.expected), strings.TrimSpace(actual))
 			} else {
 				assert.NotNil(t, err)
@@ -1535,19 +1535,19 @@ const deploymentJSON = `
 func TestRNodeSetNamespace(t *testing.T) {
 	n := NewRNode(nil)
 	assert.Equal(t, "", n.GetNamespace())
-	assert.NoError(t, n.SetNamespace(""))
+	require.NoError(t, n.SetNamespace(""))
 	assert.Equal(t, "", n.GetNamespace())
 	if err := n.UnmarshalJSON([]byte(deploymentJSON)); err != nil {
 		t.Fatalf("unexpected unmarshaljson err: %v", err)
 	}
-	assert.NoError(t, n.SetNamespace("flanders"))
+	require.NoError(t, n.SetNamespace("flanders"))
 	assert.Equal(t, "flanders", n.GetNamespace())
 }
 
 func TestRNodeSetLabels(t *testing.T) {
 	n := NewRNode(nil)
 	assert.Equal(t, 0, len(n.GetLabels()))
-	assert.NoError(t, n.SetLabels(map[string]string{}))
+	require.NoError(t, n.SetLabels(map[string]string{}))
 	assert.Equal(t, 0, len(n.GetLabels()))
 
 	n = NewRNode(nil)
@@ -1558,7 +1558,7 @@ func TestRNodeSetLabels(t *testing.T) {
 	assert.Equal(t, 2, len(labels))
 	assert.Equal(t, "apple", labels["fruit"])
 	assert.Equal(t, "carrot", labels["veggie"])
-	assert.NoError(t, n.SetLabels(map[string]string{
+	require.NoError(t, n.SetLabels(map[string]string{
 		"label1": "foo",
 		"label2": "bar",
 	}))
@@ -1566,14 +1566,14 @@ func TestRNodeSetLabels(t *testing.T) {
 	assert.Equal(t, 2, len(labels))
 	assert.Equal(t, "foo", labels["label1"])
 	assert.Equal(t, "bar", labels["label2"])
-	assert.NoError(t, n.SetLabels(map[string]string{}))
+	require.NoError(t, n.SetLabels(map[string]string{}))
 	assert.Equal(t, 0, len(n.GetLabels()))
 }
 
 func TestRNodeGetAnnotations(t *testing.T) {
 	n := NewRNode(nil)
 	assert.Equal(t, 0, len(n.GetAnnotations()))
-	assert.NoError(t, n.SetAnnotations(map[string]string{}))
+	require.NoError(t, n.SetAnnotations(map[string]string{}))
 	assert.Equal(t, 0, len(n.GetAnnotations()))
 
 	n = NewRNode(nil)
@@ -1584,7 +1584,7 @@ func TestRNodeGetAnnotations(t *testing.T) {
 	assert.Equal(t, 2, len(annotations))
 	assert.Equal(t, "51", annotations["area"])
 	assert.Equal(t, "Take me to your leader.", annotations["greeting"])
-	assert.NoError(t, n.SetAnnotations(map[string]string{
+	require.NoError(t, n.SetAnnotations(map[string]string{
 		"annotation1": "foo",
 		"annotation2": "bar",
 	}))
@@ -1592,13 +1592,13 @@ func TestRNodeGetAnnotations(t *testing.T) {
 	assert.Equal(t, 2, len(annotations))
 	assert.Equal(t, "foo", annotations["annotation1"])
 	assert.Equal(t, "bar", annotations["annotation2"])
-	assert.NoError(t, n.SetAnnotations(map[string]string{}))
+	require.NoError(t, n.SetAnnotations(map[string]string{}))
 	assert.Equal(t, 0, len(n.GetAnnotations()))
 }
 
 func TestRNodeMatchesAnnotationSelector(t *testing.T) {
 	rn := NewRNode(nil)
-	assert.NoError(t, rn.UnmarshalJSON([]byte(deploymentJSON)))
+	require.NoError(t, rn.UnmarshalJSON([]byte(deploymentJSON)))
 	testcases := map[string]struct {
 		selector string
 		matches  bool
@@ -1633,7 +1633,7 @@ func TestRNodeMatchesAnnotationSelector(t *testing.T) {
 	for n, tc := range testcases {
 		gotMatch, err := rn.MatchesAnnotationSelector(tc.selector)
 		if tc.errMsg == "" {
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equalf(
 				t, tc.matches, gotMatch, "test=%s selector=%v", n, tc.selector)
 		} else {
@@ -1646,7 +1646,7 @@ func TestRNodeMatchesAnnotationSelector(t *testing.T) {
 
 func TestRNodeMatchesLabelSelector(t *testing.T) {
 	rn := NewRNode(nil)
-	assert.NoError(t, rn.UnmarshalJSON([]byte(deploymentJSON)))
+	require.NoError(t, rn.UnmarshalJSON([]byte(deploymentJSON)))
 	testcases := map[string]struct {
 		selector string
 		matches  bool
@@ -1681,7 +1681,7 @@ func TestRNodeMatchesLabelSelector(t *testing.T) {
 	for n, tc := range testcases {
 		gotMatch, err := rn.MatchesLabelSelector(tc.selector)
 		if tc.errMsg == "" {
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equalf(
 				t, tc.matches, gotMatch, "test=%s selector=%v", n, tc.selector)
 		} else {
@@ -2217,7 +2217,7 @@ func TestGettingFields(t *testing.T) {
 
 func TestMapEmpty(t *testing.T) {
 	newNodeMap, err := NewRNode(nil).Map()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, 0, len(newNodeMap))
 }
 
@@ -2237,7 +2237,7 @@ func TestMap(t *testing.T) {
 	}
 
 	actual, err := rn.Map()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	if diff := cmp.Diff(expected, actual); diff != "" {
 		t.Fatalf("actual map does not deep equal expected map:\n%v", diff)
 	}
@@ -2274,7 +2274,7 @@ func TestSetLabels(t *testing.T) {
 	if err := rn.UnmarshalJSON([]byte(deploymentBiggerJson)); err != nil {
 		t.Fatalf("unexpected unmarshaljson err: %v", err)
 	}
-	assert.NoError(t, rn.SetLabels(map[string]string{
+	require.NoError(t, rn.SetLabels(map[string]string{
 		"label1": "foo",
 		"label2": "bar",
 	}))
@@ -2295,7 +2295,7 @@ func TestGetAnnotations(t *testing.T) {
 	if err := rn.UnmarshalJSON([]byte(deploymentBiggerJson)); err != nil {
 		t.Fatalf("unexpected unmarshaljson err: %v", err)
 	}
-	assert.NoError(t, rn.SetAnnotations(map[string]string{
+	require.NoError(t, rn.SetAnnotations(map[string]string{
 		"annotation1": "foo",
 		"annotation2": "bar",
 	}))
@@ -2324,7 +2324,7 @@ func BenchmarkGetAnnotations(b *testing.B) {
 		if err := rn.UnmarshalJSON([]byte(deploymentBiggerJson)); err != nil {
 			b.Fatalf("unexpected unmarshaljson err: %v", err)
 		}
-		assert.NoError(b, rn.SetAnnotations(appliedAnnotations))
+		require.NoError(b, rn.SetAnnotations(appliedAnnotations))
 		b.Run(fmt.Sprintf("%02d", count), func(b *testing.B) {
 			for i := 0; i < b.N; i++ {
 				_ = rn.GetAnnotations()

plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator_test.go

@@ -903,11 +903,11 @@ releaseName: podinfo2
 `)
 
 	podinfo1Img, err := podinfo1.Resources()[1].GetFieldValue("spec.template.spec.containers.0.image")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "ghcr.io/stefanprodan/podinfo:6.2.1", podinfo1Img)
 
 	podinfo2Img, err := podinfo2.Resources()[1].GetFieldValue("spec.template.spec.containers.0.image")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "ghcr.io/stefanprodan/podinfo:6.1.8", podinfo2Img)
 
 	podinfo1ChartsDir := filepath.Join(th.GetRoot(), "charts/podinfo-6.2.1/podinfo")
@@ -917,11 +917,11 @@ releaseName: podinfo2
 	assert.True(t, th.GetFSys().Exists(podinfo2ChartsDir))
 
 	podinfo1ChartContents, err := th.GetFSys().ReadFile(filepath.Join(podinfo1ChartsDir, "Chart.yaml"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Contains(t, string(podinfo1ChartContents), "version: 6.2.1")
 
 	podinfo2ChartContents, err := th.GetFSys().ReadFile(filepath.Join(podinfo2ChartsDir, "Chart.yaml"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Contains(t, string(podinfo2ChartContents), "version: 6.1.8")
 }
 
@@ -948,14 +948,14 @@ chartHome: ./charts
 `)
 
 	cm, err := rm.Resources()[0].GetFieldValue("metadata.name")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, "bar", cm)
 
 	chartDir := filepath.Join(th.GetRoot(), "charts/test-chart")
 	assert.True(t, th.GetFSys().Exists(chartDir))
 
 	chartYamlContent, err := th.GetFSys().ReadFile(filepath.Join(chartDir, "Chart.yaml"))
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Contains(t, string(chartYamlContent), "name: test-chart")
 	assert.Contains(t, string(chartYamlContent), "version: 1.0.0")
 }

plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 )
 
@@ -545,7 +546,7 @@ spec:
     A: X
     B: Y
 `)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	th.AssertActualEqualsExpectedNoIdAnnotations(
 		resMap, `
 apiVersion: example.com/v1
@@ -576,7 +577,7 @@ spec:
     A: X
     B: Y
 `)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	th.AssertActualEqualsExpectedNoIdAnnotations(
 		// This time only patch2 is applied.
 		resMap, `