Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-04-21 17:07:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

chore: enable require-error rule from errorlint linter on cmd folder (#18683)

Browse source 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
Matthieu MOREL 2024-06-15 19:52:21 +02:00 committed by GitHub
parent eac08dcf79
commit 38d6db6e69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 114 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.golangci.yaml
View file

@ -3,7 +3,7 @@ issues:
- SA1019
- SA5011
exclude-rules:
- path: "(applicationset|cmd|cmpserver|controller|pkg|reposerver|server|test)/"
- path: "(applicationset|cmpserver|controller|pkg|reposerver|server|test)/"
text: "require-error:"
linters:
- testifylint

7
cmd/argocd-k8s-auth/commands/aws_test.go
View file

@ -7,6 +7,7 @@ import (
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestGetSignedRequestWithRetry(t *testing.T) {
@ -25,7 +26,7 @@ func TestGetSignedRequestWithRetry(t *testing.T) {
signed, err := getSignedRequestWithRetry(ctx, time.Second, time.Millisecond, "cluster-name", "", "", mock.getSignedRequestMock)
// then
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "token", signed)
})
t.Run("will return signed request on third attempt", func(t *testing.T) {
@ -44,7 +45,7 @@ func TestGetSignedRequestWithRetry(t *testing.T) {
signed, err := getSignedRequestWithRetry(ctx, time.Second, time.Millisecond, "cluster-name", "", "", mock.getSignedRequestMock)
// then
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "token", signed)
})
t.Run("will return error on timeout", func(t *testing.T) {
@ -60,7 +61,7 @@ func TestGetSignedRequestWithRetry(t *testing.T) {
signed, err := getSignedRequestWithRetry(ctx, time.Second, time.Millisecond, "cluster-name", "", "", mock.getSignedRequestMock)
// then
assert.Error(t, err)
require.Error(t, err)
assert.Equal(t, "", signed)
})
}

17
cmd/argocd/commands/admin/app_test.go
View file

@ -9,6 +9,7 @@ import (
"github.com/argoproj/gitops-engine/pkg/utils/kube"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@ -43,9 +44,7 @@ func TestGetReconcileResults(t *testing.T) {
})
result, err := getReconcileResults(ctx, appClientset, "default", "")
if !assert.NoError(t, err) {
return
}
require.NoError(t, err)
expectedResults := []appReconcileResult{{
Name: "test",
@ -118,9 +117,7 @@ func TestGetReconcileResults_Refresh(t *testing.T) {
normalizers.IgnoreNormalizerOpts{},
)
if !assert.NoError(t, err) {
return
}
require.NoError(t, err)
assert.Equal(t, health.HealthStatusMissing, result[0].Health.Status)
assert.Equal(t, v1alpha1.SyncStatusCodeOutOfSync, result[0].Sync.Status)
@ -128,7 +125,7 @@ func TestGetReconcileResults_Refresh(t *testing.T) {
func TestDiffReconcileResults_NoDifferences(t *testing.T) {
logs, err := captureStdout(func() {
assert.NoError(t, diffReconcileResults(
require.NoError(t, diffReconcileResults(
reconcileResults{Applications: []appReconcileResult{{
Name: "app1",
Sync: &v1alpha1.SyncStatus{Status: v1alpha1.SyncStatusCodeOutOfSync},
@ -139,13 +136,13 @@ func TestDiffReconcileResults_NoDifferences(t *testing.T) {
}}},
))
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "app1\n", logs)
}
func TestDiffReconcileResults_DifferentApps(t *testing.T) {
logs, err := captureStdout(func() {
assert.NoError(t, diffReconcileResults(
require.NoError(t, diffReconcileResults(
reconcileResults{Applications: []appReconcileResult{{
Name: "app1",
Sync: &v1alpha1.SyncStatus{Status: v1alpha1.SyncStatusCodeOutOfSync},
@ -162,7 +159,7 @@ func TestDiffReconcileResults_DifferentApps(t *testing.T) {
}}},
))
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, `app1
app2
1,9d0

4
cmd/argocd/commands/admin/generatespec_utils_test.go
View file

@ -34,7 +34,7 @@ func TestGetOutWriter_InlineOn(t *testing.T) {
assert.Equal(t, tmpFile, out.(*os.File).Name())
_, err = os.Stat(fmt.Sprintf("%s.back", tmpFile))
assert.NoError(t, err, "Back file must be created")
require.NoError(t, err, "Back file must be created")
}
func TestPrintResources_Secret_YAML(t *testing.T) {
@ -43,7 +43,7 @@ func TestPrintResources_Secret_YAML(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{Name: "my-secret"},
Data: map[string][]byte{"my-secret-key": []byte("my-secret-data")},
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, `apiVersion: v1
kind: Secret

3
cmd/argocd/commands/admin/project_allowlist_test.go
View file

@ -4,6 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
@ -15,6 +16,6 @@ func TestProjectAllowListGen(t *testing.T) {
resourceList := []*metav1.APIResourceList{{APIResources: []metav1.APIResource{res}}}
globalProj, err := generateProjectAllowList(resourceList, "testdata/test_clusterrole.yaml", "testproj")
assert.NoError(t, err)
require.NoError(t, err)
assert.Positive(t, len(globalProj.Spec.NamespaceResourceWhitelist))
}

19
cmd/argocd/commands/admin/project_test.go
View file

@ -5,6 +5,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
@ -34,16 +35,16 @@ func TestUpdateProjects_FindMatchingProject(t *testing.T) {
clientset := fake.NewSimpleClientset(newProj("foo", "test"), newProj("bar", "test"))
modification, err := getModification("set", "*", "*", "allow")
assert.NoError(t, err)
require.NoError(t, err)
err = updateProjects(ctx, clientset.ArgoprojV1alpha1().AppProjects(namespace), "ba*", "*", "set", modification, false)
assert.NoError(t, err)
require.NoError(t, err)
fooProj, err := clientset.ArgoprojV1alpha1().AppProjects(namespace).Get(ctx, "foo", v1.GetOptions{})
assert.NoError(t, err)
require.NoError(t, err)
assert.Empty(t, fooProj.Spec.Roles[0].Policies)
barProj, err := clientset.ArgoprojV1alpha1().AppProjects(namespace).Get(ctx, "bar", v1.GetOptions{})
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualValues(t, []string{"p, proj:bar:test, *, set, bar/*, allow"}, barProj.Spec.Roles[0].Policies)
}
@ -53,26 +54,26 @@ func TestUpdateProjects_FindMatchingRole(t *testing.T) {
clientset := fake.NewSimpleClientset(newProj("proj", "foo", "bar"))
modification, err := getModification("set", "*", "*", "allow")
assert.NoError(t, err)
require.NoError(t, err)
err = updateProjects(ctx, clientset.ArgoprojV1alpha1().AppProjects(namespace), "*", "fo*", "set", modification, false)
assert.NoError(t, err)
require.NoError(t, err)
proj, err := clientset.ArgoprojV1alpha1().AppProjects(namespace).Get(ctx, "proj", v1.GetOptions{})
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualValues(t, []string{"p, proj:proj:foo, *, set, proj/*, allow"}, proj.Spec.Roles[0].Policies)
assert.Empty(t, proj.Spec.Roles[1].Policies)
}
func TestGetModification_SetPolicy(t *testing.T) {
modification, err := getModification("set", "*", "*", "allow")
assert.NoError(t, err)
require.NoError(t, err)
policy := modification("proj", "myaction")
assert.Equal(t, "*, myaction, proj/*, allow", policy)
}
func TestGetModification_RemovePolicy(t *testing.T) {
modification, err := getModification("remove", "*", "*", "allow")
assert.NoError(t, err)
require.NoError(t, err)
policy := modification("proj", "myaction")
assert.Equal(t, "", policy)
}

80
cmd/argocd/commands/admin/settings_test.go
View file

@ -13,6 +13,7 @@ import (
"github.com/argoproj/argo-cd/v2/util/settings"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/fake"
@ -96,22 +97,16 @@ metadata:
name: argocd-cm
data:
url: https://myargocd.com`)
if !assert.NoError(t, err) {
return
}
require.NoError(t, err)
defer utils.Close(closer)
opts := settingsOpts{argocdCMPath: f}
settingsManager, err := opts.createSettingsManager(ctx)
if !assert.NoError(t, err) {
return
}
require.NoError(t, err)
argoCDSettings, err := settingsManager.GetSettings()
if !assert.NoError(t, err) {
return
}
require.NoError(t, err)
assert.Equal(t, "https://myargocd.com", argoCDSettings.URL)
}
@ -202,12 +197,11 @@ admissionregistration.k8s.io/MutatingWebhookConfiguration:
}
summary, err := validator(newSettingsManager(tc.data))
if tc.containsSummary != "" {
assert.NoError(t, err)
require.NoError(t, err)
assert.Contains(t, summary, tc.containsSummary)
} else if tc.containsError != "" {
if assert.Error(t, err) {
assert.Contains(t, err.Error(), tc.containsError)
}
require.Error(t, err)
assert.Contains(t, err.Error(), tc.containsError)
}
})
}
@ -272,10 +266,10 @@ func TestValidateSettingsCommand_NoErrors(t *testing.T) {
cmd := NewValidateSettingsCommand(newCmdContext(map[string]string{}))
out, err := captureStdout(func() {
err := cmd.Execute()
assert.NoError(t, err)
require.NoError(t, err)
})
assert.NoError(t, err)
require.NoError(t, err)
for k := range validatorsByGroup {
assert.Contains(t, out, fmt.Sprintf("✅ %s", k))
}
@ -283,9 +277,7 @@ func TestValidateSettingsCommand_NoErrors(t *testing.T) {
func TestResourceOverrideIgnoreDifferences(t *testing.T) {
f, closer, err := tempFile(testDeploymentYAML)
if !assert.NoError(t, err) {
return
}
require.NoError(t, err)
defer utils.Close(closer)
t.Run("NoOverridesConfigured", func(t *testing.T) {
@ -293,9 +285,9 @@ func TestResourceOverrideIgnoreDifferences(t *testing.T) {
out, err := captureStdout(func() {
cmd.SetArgs([]string{"ignore-differences", f})
err := cmd.Execute()
assert.NoError(t, err)
require.NoError(t, err)
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Contains(t, out, "Ignore differences are not configured for 'apps/Deployment'\n")
})
@ -309,18 +301,16 @@ func TestResourceOverrideIgnoreDifferences(t *testing.T) {
out, err := captureStdout(func() {
cmd.SetArgs([]string{"ignore-differences", f})
err := cmd.Execute()
assert.NoError(t, err)
require.NoError(t, err)
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Contains(t, out, "< spec:")
})
}
func TestResourceOverrideHealth(t *testing.T) {
f, closer, err := tempFile(testCustomResourceYAML)
if !assert.NoError(t, err) {
return
}
require.NoError(t, err)
defer utils.Close(closer)
t.Run("NoHealthAssessment", func(t *testing.T) {
@ -330,9 +320,9 @@ func TestResourceOverrideHealth(t *testing.T) {
out, err := captureStdout(func() {
cmd.SetArgs([]string{"health", f})
err := cmd.Execute()
assert.NoError(t, err)
require.NoError(t, err)
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Contains(t, out, "Health script is not configured for 'example.com/ExampleResource'\n")
})
@ -346,9 +336,9 @@ func TestResourceOverrideHealth(t *testing.T) {
out, err := captureStdout(func() {
cmd.SetArgs([]string{"health", f})
err := cmd.Execute()
assert.NoError(t, err)
require.NoError(t, err)
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Contains(t, out, "Progressing")
})
@ -362,24 +352,20 @@ func TestResourceOverrideHealth(t *testing.T) {
out, err := captureStdout(func() {
cmd.SetArgs([]string{"health", f})
err := cmd.Execute()
assert.NoError(t, err)
require.NoError(t, err)
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Contains(t, out, "Progressing")
})
}
func TestResourceOverrideAction(t *testing.T) {
f, closer, err := tempFile(testDeploymentYAML)
if !assert.NoError(t, err) {
return
}
require.NoError(t, err)
defer utils.Close(closer)
cronJobFile, closer, err := tempFile(testCronJobYAML)
if !assert.NoError(t, err) {
return
}
require.NoError(t, err)
defer utils.Close(closer)
t.Run("NoActions", func(t *testing.T) {
@ -389,9 +375,9 @@ func TestResourceOverrideAction(t *testing.T) {
out, err := captureStdout(func() {
cmd.SetArgs([]string{"run-action", f, "test"})
err := cmd.Execute()
assert.NoError(t, err)
require.NoError(t, err)
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Contains(t, out, "Actions are not configured")
})
@ -414,17 +400,17 @@ func TestResourceOverrideAction(t *testing.T) {
out, err := captureStdout(func() {
cmd.SetArgs([]string{"run-action", f, "test"})
err := cmd.Execute()
assert.NoError(t, err)
require.NoError(t, err)
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Contains(t, out, "test: updated")
out, err = captureStdout(func() {
cmd.SetArgs([]string{"list-actions", f})
err := cmd.Execute()
assert.NoError(t, err)
require.NoError(t, err)
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Contains(t, out, `NAME DISABLED
restart false
resume false
@ -459,19 +445,19 @@ resume false
out, err := captureStdout(func() {
cmd.SetArgs([]string{"run-action", cronJobFile, "test"})
err := cmd.Execute()
assert.NoError(t, err)
require.NoError(t, err)
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Contains(t, out, "resource was created:")
assert.Contains(t, out, "hello-1")
out, err = captureStdout(func() {
cmd.SetArgs([]string{"list-actions", cronJobFile})
err := cmd.Execute()
assert.NoError(t, err)
require.NoError(t, err)
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Contains(t, out, "NAME")
assert.Contains(t, out, "DISABLED")
assert.Contains(t, out, "create-a-job")

9
cmd/argocd/commands/app_test.go
View file

@ -32,6 +32,7 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.org/x/oauth2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@ -1467,7 +1468,7 @@ func TestParseSelectedResources(t *testing.T) {
"!*:*:*",
}
operationResources, err := parseSelectedResources(resources)
assert.NoError(t, err)
require.NoError(t, err)
assert.Len(t, operationResources, 5)
assert.Equal(t, v1alpha1.SyncOperationResource{
Namespace: "",
@ -1519,7 +1520,7 @@ func TestParseSelectedResourcesIncorrectNamespace(t *testing.T) {
func TestParseSelectedResourcesEmptyList(t *testing.T) {
var resources []string
operationResources, err := parseSelectedResources(resources)
assert.NoError(t, err)
require.NoError(t, err)
assert.Empty(t, operationResources)
}
@ -1549,7 +1550,7 @@ func TestPrintApplicationTableNotWide(t *testing.T) {
printApplicationTable([]v1alpha1.Application{*app, *app}, &output)
return nil
})
assert.NoError(t, err)
require.NoError(t, err)
expectation := "NAME CLUSTER NAMESPACE PROJECT STATUS HEALTH SYNCPOLICY CONDITIONS\napp-name http://localhost:8080 default prj OutOfSync Healthy Manual <none>\napp-name http://localhost:8080 default prj OutOfSync Healthy Manual <none>\n"
assert.Equal(t, output, expectation)
}
@ -1585,7 +1586,7 @@ func TestPrintApplicationTableWide(t *testing.T) {
printApplicationTable([]v1alpha1.Application{*app, *app}, &output)
return nil
})
assert.NoError(t, err)
require.NoError(t, err)
expectation := "NAME CLUSTER NAMESPACE PROJECT STATUS HEALTH SYNCPOLICY CONDITIONS REPO PATH TARGET\napp-name http://localhost:8080 default prj OutOfSync Healthy Manual <none> https://github.com/argoproj/argocd-example-apps guestbook 123\napp-name http://localhost:8080 default prj OutOfSync Healthy Manual <none> https://github.com/argoproj/argocd-example-apps guestbook 123\n"
assert.Equal(t, output, expectation)
}

5
cmd/argocd/commands/applicationset_test.go
View file

@ -6,6 +6,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
@ -107,7 +108,7 @@ func TestPrintApplicationSetTable(t *testing.T) {
printApplicationSetTable([]v1alpha1.ApplicationSet{*app, *app2}, &output)
return nil
})
assert.NoError(t, err)
require.NoError(t, err)
expectation := "NAME PROJECT SYNCPOLICY CONDITIONS\napp-name default nil [{ResourcesUpToDate <nil> True }]\nteam-two/app-name default nil [{ResourcesUpToDate <nil> True }]\n"
assert.Equal(t, expectation, output)
}
@ -227,7 +228,7 @@ SyncPolicy: Automated
w.Close()
out, err := io.ReadAll(r)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, tt.expectedOutput, string(out))
})
}

17
cmd/argocd/commands/common_test.go
View file

@ -6,6 +6,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
// Be careful with tabs vs. spaces in the following expected formats. Indents
@ -79,18 +80,18 @@ func Test_PrintResource(t *testing.T) {
err := PrintResource(testResource, "yaml")
return err
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, expectYamlSingle, str)
str, err = captureOutput(func() error {
err := PrintResource(testResource, "json")
return err
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, expectJsonSingle, str)
err = PrintResource(testResource, "unknown")
assert.Error(t, err)
require.Error(t, err)
}
func Test_PrintResourceList(t *testing.T) {
@ -114,30 +115,30 @@ func Test_PrintResourceList(t *testing.T) {
err := PrintResourceList(testResource, "yaml", false)
return err
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, expectYamlList, str)
str, err = captureOutput(func() error {
err := PrintResourceList(testResource, "json", false)
return err
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, expectJsonList, str)
str, err = captureOutput(func() error {
err := PrintResourceList(testResource2, "yaml", true)
return err
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, expectYamlSingle, str)
str, err = captureOutput(func() error {
err := PrintResourceList(testResource2, "json", true)
return err
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, expectJsonSingle, str)
err = PrintResourceList(testResource, "unknown", false)
assert.Error(t, err)
require.Error(t, err)
}

12
cmd/argocd/commands/context_test.go
View file

@ -41,22 +41,22 @@ const testConfigFilePath = "./testdata/local.config"
func TestContextDelete(t *testing.T) {
// Write the test config file
err := os.WriteFile(testConfigFilePath, []byte(testConfig), os.ModePerm)
assert.NoError(t, err)
require.NoError(t, err)
defer os.Remove(testConfigFilePath)
err = os.Chmod(testConfigFilePath, 0o600)
require.NoError(t, err, "Could not change the file permission to 0600 %v", err)
localConfig, err := localconfig.ReadLocalConfig(testConfigFilePath)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "localhost:8080", localConfig.CurrentContext)
assert.Contains(t, localConfig.Contexts, localconfig.ContextRef{Name: "localhost:8080", Server: "localhost:8080", User: "localhost:8080"})
// Delete a non-current context
err = deleteContext("argocd1.example.com:443", testConfigFilePath)
assert.NoError(t, err)
require.NoError(t, err)
localConfig, err = localconfig.ReadLocalConfig(testConfigFilePath)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "localhost:8080", localConfig.CurrentContext)
assert.NotContains(t, localConfig.Contexts, localconfig.ContextRef{Name: "argocd1.example.com:443", Server: "argocd1.example.com:443", User: "argocd1.example.com:443"})
assert.NotContains(t, localConfig.Servers, localconfig.Server{Server: "argocd1.example.com:443"})
@ -66,10 +66,10 @@ func TestContextDelete(t *testing.T) {
// Delete the current context
err = deleteContext("localhost:8080", testConfigFilePath)
assert.NoError(t, err)
require.NoError(t, err)
localConfig, err = localconfig.ReadLocalConfig(testConfigFilePath)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "", localConfig.CurrentContext)
assert.NotContains(t, localConfig.Contexts, localconfig.ContextRef{Name: "localhost:8080", Server: "localhost:8080", User: "localhost:8080"})
assert.NotContains(t, localConfig.Servers, localconfig.Server{PlainText: true, Server: "localhost:8080"})

6
cmd/argocd/commands/logout_test.go
View file

@ -14,14 +14,14 @@ import (
func TestLogout(t *testing.T) {
// Write the test config file
err := os.WriteFile(testConfigFilePath, []byte(testConfig), os.ModePerm)
assert.NoError(t, err)
require.NoError(t, err)
defer os.Remove(testConfigFilePath)
err = os.Chmod(testConfigFilePath, 0o600)
require.NoError(t, err)
localConfig, err := localconfig.ReadLocalConfig(testConfigFilePath)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "localhost:8080", localConfig.CurrentContext)
assert.Contains(t, localConfig.Contexts, localconfig.ContextRef{Name: "localhost:8080", Server: "localhost:8080", User: "localhost:8080"})
@ -29,7 +29,7 @@ func TestLogout(t *testing.T) {
command.Run(nil, []string{"localhost:8080"})
localConfig, err = localconfig.ReadLocalConfig(testConfigFilePath)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "localhost:8080", localConfig.CurrentContext)
assert.NotContains(t, localConfig.Users, localconfig.User{AuthToken: "vErrYS3c3tReFRe$hToken", Name: "localhost:8080"})
assert.Contains(t, localConfig.Contexts, localconfig.ContextRef{Name: "argocd1.example.com:443", Server: "argocd1.example.com:443", User: "argocd1.example.com:443"})

5
cmd/argocd/commands/relogin_test.go
View file

@ -5,6 +5,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
)
@ -28,7 +29,7 @@ func TestNewReloginCommand(t *testing.T) {
ssoPortFlag := cmd.Flags().Lookup("sso-port")
port, err := strconv.Atoi(ssoPortFlag.Value.String())
assert.NotNil(t, ssoPortFlag, "Expected flag --sso-port to be defined")
assert.NoError(t, err, "Failed to convert sso-port flag value to integer")
require.NoError(t, err, "Failed to convert sso-port flag value to integer")
assert.Equal(t, 8085, port, "Unexpected default value for --sso-port flag")
}
@ -59,6 +60,6 @@ func TestNewReloginCommandWithGlobalClientOptions(t *testing.T) {
ssoPortFlag := cmd.Flags().Lookup("sso-port")
port, err := strconv.Atoi(ssoPortFlag.Value.String())
assert.NotNil(t, ssoPortFlag, "Expected flag --sso-port to be defined")
assert.NoError(t, err, "Failed to convert sso-port flag value to integer")
require.NoError(t, err, "Failed to convert sso-port flag value to integer")
assert.Equal(t, 8085, port, "Unexpected default value for --sso-port flag")
}

51
cmd/util/app_test.go
View file

@ -7,6 +7,7 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
@ -198,38 +199,38 @@ func newAppOptionsFixture() *appOptionsFixture {
func Test_setAppSpecOptions(t *testing.T) {
f := newAppOptionsFixture()
t.Run("SyncPolicy", func(t *testing.T) {
assert.NoError(t, f.SetFlag("sync-policy", "automated"))
require.NoError(t, f.SetFlag("sync-policy", "automated"))
assert.NotNil(t, f.spec.SyncPolicy.Automated)
f.spec.SyncPolicy = nil
assert.NoError(t, f.SetFlag("sync-policy", "automatic"))
require.NoError(t, f.SetFlag("sync-policy", "automatic"))
assert.NotNil(t, f.spec.SyncPolicy.Automated)
f.spec.SyncPolicy = nil
assert.NoError(t, f.SetFlag("sync-policy", "auto"))
require.NoError(t, f.SetFlag("sync-policy", "auto"))
assert.NotNil(t, f.spec.SyncPolicy.Automated)
assert.NoError(t, f.SetFlag("sync-policy", "none"))
require.NoError(t, f.SetFlag("sync-policy", "none"))
assert.Nil(t, f.spec.SyncPolicy)
})
t.Run("SyncOptions", func(t *testing.T) {
assert.NoError(t, f.SetFlag("sync-option", "a=1"))
require.NoError(t, f.SetFlag("sync-option", "a=1"))
assert.True(t, f.spec.SyncPolicy.SyncOptions.HasOption("a=1"))
// remove the options using !
assert.NoError(t, f.SetFlag("sync-option", "!a=1"))
require.NoError(t, f.SetFlag("sync-option", "!a=1"))
assert.Nil(t, f.spec.SyncPolicy)
})
t.Run("RetryLimit", func(t *testing.T) {
assert.NoError(t, f.SetFlag("sync-retry-limit", "5"))
require.NoError(t, f.SetFlag("sync-retry-limit", "5"))
assert.Equal(t, int64(5), f.spec.SyncPolicy.Retry.Limit)
assert.NoError(t, f.SetFlag("sync-retry-limit", "0"))
require.NoError(t, f.SetFlag("sync-retry-limit", "0"))
assert.Nil(t, f.spec.SyncPolicy.Retry)
})
t.Run("Kustomize", func(t *testing.T) {
assert.NoError(t, f.SetFlag("kustomize-replica", "my-deployment=2"))
assert.NoError(t, f.SetFlag("kustomize-replica", "my-statefulset=4"))
require.NoError(t, f.SetFlag("kustomize-replica", "my-deployment=2"))
require.NoError(t, f.SetFlag("kustomize-replica", "my-statefulset=4"))
assert.Equal(t, v1alpha1.KustomizeReplicas{{Name: "my-deployment", Count: intstr.FromInt(2)}, {Name: "my-statefulset", Count: intstr.FromInt(4)}}, f.spec.Source.Kustomize.Replicas)
})
}
@ -255,27 +256,27 @@ func Test_setAppSpecOptionsMultiSourceApp(t *testing.T) {
sourcePosition1 := 1
sourcePosition2 := 2
t.Run("SyncPolicy", func(t *testing.T) {
assert.NoError(t, f.SetFlagWithSourcePosition("sync-policy", "automated", sourcePosition1))
require.NoError(t, f.SetFlagWithSourcePosition("sync-policy", "automated", sourcePosition1))
assert.NotNil(t, f.spec.SyncPolicy.Automated)
f.spec.SyncPolicy = nil
assert.NoError(t, f.SetFlagWithSourcePosition("sync-policy", "automatic", sourcePosition1))
require.NoError(t, f.SetFlagWithSourcePosition("sync-policy", "automatic", sourcePosition1))
assert.NotNil(t, f.spec.SyncPolicy.Automated)
})
t.Run("Helm - SourcePosition 0", func(t *testing.T) {
assert.NoError(t, f.SetFlagWithSourcePosition("helm-version", "v2", sourcePosition))
require.NoError(t, f.SetFlagWithSourcePosition("helm-version", "v2", sourcePosition))
assert.Len(t, f.spec.GetSources(), 2)
assert.Equal(t, "v2", f.spec.GetSources()[sourcePosition].Helm.Version)
})
t.Run("Kustomize", func(t *testing.T) {
assert.NoError(t, f.SetFlagWithSourcePosition("kustomize-replica", "my-deployment=2", sourcePosition1))
require.NoError(t, f.SetFlagWithSourcePosition("kustomize-replica", "my-deployment=2", sourcePosition1))
assert.Equal(t, v1alpha1.KustomizeReplicas{{Name: "my-deployment", Count: intstr.FromInt(2)}}, f.spec.Sources[sourcePosition1-1].Kustomize.Replicas)
assert.NoError(t, f.SetFlagWithSourcePosition("kustomize-replica", "my-deployment=4", sourcePosition2))
require.NoError(t, f.SetFlagWithSourcePosition("kustomize-replica", "my-deployment=4", sourcePosition2))
assert.Equal(t, v1alpha1.KustomizeReplicas{{Name: "my-deployment", Count: intstr.FromInt(4)}}, f.spec.Sources[sourcePosition2-1].Kustomize.Replicas)
})
t.Run("Helm", func(t *testing.T) {
assert.NoError(t, f.SetFlagWithSourcePosition("helm-version", "v2", sourcePosition1))
assert.NoError(t, f.SetFlagWithSourcePosition("helm-version", "v3", sourcePosition2))
require.NoError(t, f.SetFlagWithSourcePosition("helm-version", "v2", sourcePosition1))
require.NoError(t, f.SetFlagWithSourcePosition("helm-version", "v3", sourcePosition2))
assert.Len(t, f.spec.GetSources(), 2)
assert.Equal(t, "v2", f.spec.GetSources()[sourcePosition1-1].Helm.Version)
assert.Equal(t, "v3", f.spec.GetSources()[sourcePosition2-1].Helm.Version)
@ -357,7 +358,7 @@ func TestReadAppsFromURI(t *testing.T) {
apps := make([]*v1alpha1.Application, 0)
err = readAppsFromURI(file.Name(), &apps)
assert.NoError(t, err)
require.NoError(t, err)
assert.Len(t, apps, 2)
assert.Equal(t, "sth1", apps[0].Name)
@ -387,7 +388,7 @@ func TestConstructAppFromStdin(t *testing.T) {
if err := file.Close(); err != nil {
log.Fatal(err)
}
assert.NoError(t, err)
require.NoError(t, err)
assert.Len(t, apps, 2)
assert.Equal(t, "sth1", apps[0].Name)
assert.Equal(t, "sth2", apps[1].Name)
@ -396,7 +397,7 @@ func TestConstructAppFromStdin(t *testing.T) {
func TestConstructBasedOnName(t *testing.T) {
apps, err := ConstructApps("", "test", []string{}, []string{}, []string{}, AppOptions{}, nil)
assert.NoError(t, err)
require.NoError(t, err)
assert.Len(t, apps, 1)
assert.Equal(t, "test", apps[0].Name)
}
@ -413,7 +414,7 @@ func TestFilterResources(t *testing.T) {
}
filteredResources, err := FilterResources(false, resources, "g", "Service", "ns", "test-helm-guestbook", true)
assert.NoError(t, err)
require.NoError(t, err)
assert.Len(t, filteredResources, 1)
})
@ -428,7 +429,7 @@ func TestFilterResources(t *testing.T) {
}
filteredResources, err := FilterResources(false, resources, "g", "Deployment", "argocd", "test-helm-guestbook", true)
assert.NoError(t, err)
require.NoError(t, err)
assert.Len(t, filteredResources, 1)
})
@ -443,7 +444,7 @@ func TestFilterResources(t *testing.T) {
}
filteredResources, err := FilterResources(false, resources, "g", "Service", "argocd", "test-helm", true)
assert.NoError(t, err)
require.NoError(t, err)
assert.Len(t, filteredResources, 1)
})
@ -458,7 +459,7 @@ func TestFilterResources(t *testing.T) {
}
filteredResources, err := FilterResources(false, resources, "g", "Service", "argocd-unknown", "test-helm", true)
assert.ErrorContains(t, err, "No matching resource found")
require.ErrorContains(t, err, "No matching resource found")
assert.Nil(t, filteredResources)
})
@ -473,7 +474,7 @@ func TestFilterResources(t *testing.T) {
}
filteredResources, err := FilterResources(false, resources, "g", "Service", "argocd", "test-helm", false)
assert.ErrorContains(t, err, "Use the --all flag")
require.ErrorContains(t, err, "Use the --all flag")
assert.Nil(t, filteredResources)
})
}