mirror of
https://github.com/hanzoai/deploy.git
synced 2026-10-07 08:44:50 +00:00
* feat(api): hard-fork CRD API group argoproj.io -> deploy.hanzo.ai
Hanzo CD hard-fork, phase 1.1. Single source of truth is
pkg/apis/application/register.go's Group constant (Application/AppProject/
ApplicationSet all derive their FullName from it); every other Go call-site
that hardcoded the literal group string is updated to match: the 3 generated
informer GVRs, the app-of-apps nested-Application detector in types.go, the
resource-tree Application-kind cache populator, the 3 NotFound error
constructors in server/application, and the applicationset-controller's
leader-election Lease name/ID (kept in lockstep across Go source + RBAC
resourceNames, or leader election would get RBAC-denied on startup).
CRD YAMLs (application/appproject/applicationset) and every RBAC apiGroups
rule that actually governs our 3 CRDs are repointed to deploy.hanzo.ai, across
both manifests/base/* (namespaced Roles) and manifests/cluster-rbac/* (cluster
scope). Two adjacent things that share the "argoproj.io" string but are NOT
ours are deliberately left untouched: gitops-engine's health-check dispatch
for Argo Workflows' `Workflow` kind, and argocd-server-clusterrole's second
apiGroups block granting read on Argo Workflows' `workflows` resource — both
belong to a separate, unrelated Argoproj-family project we are not forking.
Also untouched, per explicit scope: annotation/label keys (argocd.argoproj.io/*)
and finalizers (*.argoproj.io) that track already-applied live resources, and
argocd-cm.yaml's resource.customizations.ignoreResourceUpdates keys (a narrow
app-of-apps diffing nicety, not build- or RBAC-relevant).
CGO_ENABLED=0 go build ./... verified green.
* ci: wire canonical hanzo.yml + cicd.yml (Hanzo CD image build)
Phase 1.3. Follows the same one-way pattern every hanzo/lux/zoo repo uses:
hanzo.yml declares the image (root Dockerfile -> ghcr.io/hanzoai/deploy) and a
fast go-build sanity test (the multi-stage Dockerfile build is the slow, real
gate); cicd.yml is the ~10-line trigger shim importing hanzoai/ci's reusable
build workflow on the arc pool, secrets from KMS only.
No `deploy:` block yet, matching the hanzoai/cms build-only-first-cutover
pattern: this repo's own live hanzo-cd namespace runs the whole Hanzo fleet's
GitOps, so the prod image/CRD swap is a deliberate separate action (see the
[HELD] universe PR), never an automatic rollout on merge. Every PR/push still
builds and pushes an immutable ghcr.io/hanzoai/deploy:sha-<7>-amd64 image.
* feat(ui): rebrand Argo CD -> Hanzo CD (title, favicon, logo, sidebar)
Phase 1.2. User-facing "Argo CD"/"ArgoCD" text replaced with "Hanzo CD"
across the login page, help modal, settings screens, version-info panel,
sync-options warning, fullscreen-logs title, app.tsx page titles, and
index.html's <title>/noscript text (dropped the now-wrong upstream CLI
doc link rather than invent a hanzo.ai URL that doesn't exist).
Logo/favicon assets replaced with the canonical Hanzo mark (never
hand-drawn, copied from ~/work/hanzo/logo/dist): the two real usages of
Argo's logo collapse onto one Hanzo glyph (mono + white variants) at the
same 5 call sites (login icon + footer, login.scss $logoPath/
$logoNegativePath, sidebar text-logo), preserving the existing CSS
invert() filters so both the light login panel and dark sidebar still
render correctly. Old argologo.svg/argo_o.svg/argo.png deleted (no
longer referenced). favicon-{16x16,32x32}.png added at
ui/src/assets/favicon/ (index.html's links to that path were previously
dead - the directory didn't exist in this checkout). package.json name
argo-cd-ui -> hanzo-cd-ui.
Left alone, deliberately: the two Kubernetes resource-kind icon sets
under ui/src/assets/images/resources/ (unrelated to branding), and
upstream doc/project links (argoproj.io, argo-cd.readthedocs.io) since
we have no equivalent hanzo.ai docs to point to yet - except the login
footer logo's outbound link, which now points to hanzo.ai instead of
argoproj.io (a Hanzo-branded mark linking to the upstream project it
was forked from read as an obvious leftover).
* feat(module): rename Go module github.com/argoproj/argo-cd/v3 -> github.com/hanzoai/deploy
Phase 2. No version suffix on the new path (org policy: never publish our
own Go modules above v1.x.x / with a v2+ suffix) — this fork starts a fresh
v0/v1 module identity rather than carrying the v3 the upstream fork point
had reached.
Mechanical, symmetric rewrite: 704 .go files (import statements only; two
disjoint substitutions applied specific-first so the nested gitops-engine
module path never double-matches), plus go.mod (module line, the
gitops-engine require+replace pair, version reset to v0.0.0-... since a
suffix-less path can't carry a v3 semver), gitops-engine/go.mod, Makefile
(ldflags PACKAGE + 2 TEST_MODULE filters), .golangci.yaml, .goreleaser.yaml,
.mockery.yaml (+ gitops-engine's), Procfile, the codegen/proto generation
scripts (hack/generate-proto.sh, update-codegen.sh, update-openapi.sh), and
20 .proto files' go_package options. Also one OpenTelemetry tracer name
string in gitops-engine/pkg/sync/sync_context.go (a cosmestic label, not an
import, but worth keeping consistent).
CGO_ENABLED=0 go build ./... verified green for both the root module and
the nested gitops-engine module; go vet clean on both; go mod tidy run
(network available) to reconcile go.sum, dependency set unchanged.
Left alone, deliberately: doc-only mentions (docs/snyk/*.html scan reports,
gitops-engine/README.md), a comment-only reference in
.github/workflows/release.yaml, and one Renovate bot config line — none are
build- or codegen-load-bearing. Also left alone: comments citing upstream
GitHub issue URLs (github.com/argoproj/argo-cd/issues/NNNNN) and a handful
of test fixtures using "https://github.com/argoproj/argo-cd.git" as a
representative example repo URL — both are accurate historical/test-data
references, not stale self-references.
---------
Co-authored-by: Hanzo Dev <[email protected]>
624 lines
22 KiB
Go
Executable File
624 lines
22 KiB
Go
Executable File
package commands
|
|
|
|
import (
|
|
"bytes"
|
|
"errors"
|
|
"io"
|
|
"regexp"
|
|
"testing"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/mock"
|
|
"github.com/stretchr/testify/require"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
|
|
argocdclient "github.com/hanzoai/deploy/pkg/apiclient"
|
|
"github.com/hanzoai/deploy/pkg/apiclient/gpgkey"
|
|
gpgkeymocks "github.com/hanzoai/deploy/pkg/apiclient/gpgkey/mocks"
|
|
projectmocks "github.com/hanzoai/deploy/pkg/apiclient/project/mocks"
|
|
|
|
projectpkg "github.com/hanzoai/deploy/pkg/apiclient/project"
|
|
appsv1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
)
|
|
|
|
func dummySourceIntegrity() *appsv1.SourceIntegrity {
|
|
return &appsv1.SourceIntegrity{Git: &appsv1.SourceIntegrityGit{
|
|
Policies: []*appsv1.SourceIntegrityGitPolicy{
|
|
{
|
|
Repos: []appsv1.SourceIntegrityGitPolicyRepo{{
|
|
URL: "*",
|
|
}, {
|
|
URL: "!https://github.com/argoproj/argo-cd.git",
|
|
}},
|
|
GPG: &appsv1.SourceIntegrityGitPolicyGPG{
|
|
Mode: appsv1.SourceIntegrityGitPolicyGPGModeHead,
|
|
Keys: []string{"ABCD1234ABCD1234"},
|
|
},
|
|
},
|
|
{
|
|
Repos: []appsv1.SourceIntegrityGitPolicyRepo{{
|
|
URL: "https://github.com/argoproj/argo-cd.git",
|
|
}},
|
|
GPG: &appsv1.SourceIntegrityGitPolicyGPG{
|
|
Mode: appsv1.SourceIntegrityGitPolicyGPGModeStrict,
|
|
Keys: []string{"1234ABCD1234ABCD"},
|
|
},
|
|
},
|
|
},
|
|
}}
|
|
}
|
|
|
|
func dummyProject(projectName string, si *appsv1.SourceIntegrity) *appsv1.AppProject {
|
|
return &appsv1.AppProject{
|
|
ObjectMeta: metav1.ObjectMeta{Name: projectName},
|
|
Spec: appsv1.AppProjectSpec{
|
|
SourceIntegrity: si,
|
|
},
|
|
}
|
|
}
|
|
|
|
func mockProjectClient(t *testing.T) *projectmocks.ProjectServiceClient {
|
|
t.Helper()
|
|
mockClient := projectmocks.NewProjectServiceClient(t)
|
|
newProjectClient = func(_ *argocdclient.ClientOptions, _ *cobra.Command) (io.Closer, projectpkg.ProjectServiceClient) {
|
|
return io.NopCloser(nil), mockClient
|
|
}
|
|
return mockClient
|
|
}
|
|
|
|
func mockProjectGet(mockClient *projectmocks.ProjectServiceClient, name string, retProj *appsv1.AppProject, retErr error) *mock.Call {
|
|
return mockClient.On("Get", mock.Anything, mock.MatchedBy(func(q *projectpkg.ProjectQuery) bool {
|
|
return q.Name == name
|
|
})).Return(retProj, retErr)
|
|
}
|
|
|
|
func mockGpgKeysClient(t *testing.T) *gpgkeymocks.GPGKeyServiceClient {
|
|
t.Helper()
|
|
mockClient := gpgkeymocks.NewGPGKeyServiceClient(t)
|
|
newGpgKeyClient = func(_ *argocdclient.ClientOptions, _ *cobra.Command) (io.Closer, gpgkey.GPGKeyServiceClient) {
|
|
return io.NopCloser(nil), mockClient
|
|
}
|
|
return mockClient
|
|
}
|
|
|
|
// mockKeyring fakes that keys are added to a repo-server through `argocd gpg add`, so those do not show up in warnings.
|
|
func mockKeyring(mockClient *gpgkeymocks.GPGKeyServiceClient, keys ...string) *mock.Call {
|
|
items := make([]appsv1.GnuPGPublicKey, 0, len(keys))
|
|
for _, key := range keys {
|
|
items = append(items, appsv1.GnuPGPublicKey{KeyID: key})
|
|
}
|
|
keyring := &appsv1.GnuPGPublicKeyList{Items: items}
|
|
return mockClient.On("List", mock.Anything, mock.Anything).Return(keyring, nil).Maybe()
|
|
}
|
|
|
|
func runCmd(t *testing.T, cmd *cobra.Command, args ...string) (stdout string, stderr string, e error) {
|
|
t.Helper()
|
|
cmd.SilenceErrors = true
|
|
cmd.SilenceUsage = true
|
|
|
|
cmd.SetArgs(args)
|
|
|
|
var outbuf bytes.Buffer
|
|
cmd.SetOut(&outbuf)
|
|
var errbuf bytes.Buffer
|
|
cmd.SetErr(&errbuf)
|
|
|
|
err := cmd.ExecuteContext(t.Context())
|
|
// Make sure the messare from the error reported by Command.RunE() is appended to the errbuf for verification (same as in main.go)
|
|
if err != nil {
|
|
errMsg, _ := NewDefaultPluginHandler().HandleCommandExecutionError(err, true, args)
|
|
errbuf.WriteString(errMsg)
|
|
}
|
|
|
|
return outbuf.String(), errbuf.String(), err
|
|
}
|
|
|
|
func TestProjectSourceIntegrityAddCommand(t *testing.T) {
|
|
projectName := "test-project"
|
|
|
|
mockKeyring(mockGpgKeysClient(t), "ABCD1234ABCD1234")
|
|
|
|
t.Run("Add source integrity verification policy to empty", func(t *testing.T) {
|
|
projects := mockProjectClient(t)
|
|
projects.On("Update", mock.Anything, mock.Anything).Return(nil, nil)
|
|
mockProjectGet(projects, projectName, dummyProject(projectName, nil), nil).Maybe()
|
|
|
|
cmd := NewProjectSourceIntegrityGitPoliciesAddCommand(&argocdclient.ClientOptions{})
|
|
out, _, err := runCmd(t, cmd,
|
|
"--gpg-mode=strict",
|
|
"--gpg-key=0123456789ABCDEF",
|
|
"--repo-url=*",
|
|
"--gpg-key", "ABCDEF0123456789",
|
|
"--repo-url", "!*internal*",
|
|
projectName,
|
|
)
|
|
require.NoError(t, err)
|
|
|
|
expectedOut := `ID GPG-MODE GPG-KEYS REPO-URLS
|
|
0 strict 0123456789ABCDEF, ABCDEF0123456789 *, !*internal*
|
|
`
|
|
tabbedOut := regexp.MustCompile(" {2,}").ReplaceAllString(out, "\t")
|
|
assert.Equal(t, expectedOut, tabbedOut)
|
|
|
|
updatedProject := captureProjectUpdate(t, projects, projectName)
|
|
require.NotNil(t, updatedProject)
|
|
require.NotNil(t, updatedProject.Spec.SourceIntegrity)
|
|
si := updatedProject.Spec.SourceIntegrity
|
|
require.NotNil(t, si.Git)
|
|
assert.Len(t, si.Git.Policies, 1)
|
|
expected := []*appsv1.SourceIntegrityGitPolicy{{
|
|
Repos: []appsv1.SourceIntegrityGitPolicyRepo{{
|
|
URL: "*",
|
|
}, {
|
|
URL: "!*internal*",
|
|
}},
|
|
GPG: &appsv1.SourceIntegrityGitPolicyGPG{
|
|
Mode: appsv1.SourceIntegrityGitPolicyGPGModeStrict,
|
|
Keys: []string{"0123456789ABCDEF", "ABCDEF0123456789"},
|
|
},
|
|
}}
|
|
assert.Equal(t, expected, si.Git.Policies)
|
|
})
|
|
|
|
t.Run("Add source integrity verification policy to existing", func(t *testing.T) {
|
|
projects := mockProjectClient(t)
|
|
projects.On("Update", mock.Anything, mock.Anything).Return(nil, nil)
|
|
mockProjectGet(projects, projectName, dummyProject(projectName, dummySourceIntegrity()), nil).Maybe()
|
|
|
|
cmd := NewProjectSourceIntegrityGitPoliciesAddCommand(&argocdclient.ClientOptions{})
|
|
out, _, err := runCmd(t, cmd,
|
|
"--gpg-mode=head",
|
|
"--gpg-key=0123456789ABCDEF",
|
|
"--repo-url=*",
|
|
projectName,
|
|
)
|
|
require.NoError(t, err)
|
|
|
|
expectedOut := `ID GPG-MODE GPG-KEYS REPO-URLS
|
|
0 head ABCD1234ABCD1234 *, !https://github.com/argoproj/argo-cd.git
|
|
1 strict 1234ABCD1234ABCD https://github.com/argoproj/argo-cd.git
|
|
2 head 0123456789ABCDEF *
|
|
`
|
|
tabbedOut := regexp.MustCompile(" {2,}").ReplaceAllString(out, "\t")
|
|
assert.Equal(t, expectedOut, tabbedOut)
|
|
|
|
updatedProject := captureProjectUpdate(t, projects, projectName)
|
|
require.NotNil(t, updatedProject)
|
|
require.NotNil(t, updatedProject.Spec.SourceIntegrity)
|
|
si := updatedProject.Spec.SourceIntegrity
|
|
require.NotNil(t, si.Git)
|
|
assert.Len(t, si.Git.Policies, 3)
|
|
expected := &appsv1.SourceIntegrityGitPolicy{
|
|
Repos: []appsv1.SourceIntegrityGitPolicyRepo{{
|
|
URL: "*",
|
|
}},
|
|
GPG: &appsv1.SourceIntegrityGitPolicyGPG{
|
|
Mode: appsv1.SourceIntegrityGitPolicyGPGModeHead,
|
|
Keys: []string{"0123456789ABCDEF"},
|
|
},
|
|
}
|
|
assert.Equal(t, expected, si.Git.Policies[2])
|
|
})
|
|
|
|
t.Run("Add source integrity verification policy - warn existing", func(t *testing.T) {
|
|
projects := mockProjectClient(t)
|
|
projects.On("Update", mock.Anything, mock.Anything).Return(nil, nil)
|
|
mockProjectGet(projects, projectName, dummyProject(projectName, nil), nil).Maybe()
|
|
|
|
cmd := NewProjectSourceIntegrityGitPoliciesAddCommand(&argocdclient.ClientOptions{})
|
|
out, stderr, err := runCmd(t, cmd, projectName, "--gpg-mode=head")
|
|
require.NoError(t, err)
|
|
|
|
expectedOut := `ID GPG-MODE GPG-KEYS REPO-URLS
|
|
0 head <none> <none>
|
|
`
|
|
tabbedOut := regexp.MustCompile(" {2,}").ReplaceAllString(out, "\t")
|
|
assert.Equal(t, expectedOut, tabbedOut)
|
|
assert.Equal(t, "Warning: Policy has no repository URLs and will never be used\nWarning: Policy has no GPG keys and will never validate any revision\n", stderr)
|
|
})
|
|
|
|
t.Run("Add source integrity verification policy without gpg-mode", func(t *testing.T) {
|
|
projects := mockProjectClient(t)
|
|
mockProjectGet(projects, projectName, dummyProject(projectName, dummySourceIntegrity()), nil).Maybe()
|
|
|
|
cmd := NewProjectSourceIntegrityGitPoliciesAddCommand(&argocdclient.ClientOptions{})
|
|
_, stderr, err := runCmd(t, cmd,
|
|
"--gpg-key=0123456789ABCDEF",
|
|
"--repo-url=*",
|
|
projectName,
|
|
)
|
|
require.Error(t, err)
|
|
assert.Equal(t, "Error: gpg-mode must be set\n", stderr)
|
|
})
|
|
}
|
|
|
|
func TestProjectSourceIntegrityListCommand(t *testing.T) {
|
|
projectName := "test-project"
|
|
|
|
testCases := []struct {
|
|
name string
|
|
sourceIntegrity *appsv1.SourceIntegrity
|
|
projectName string
|
|
expectedStdout string
|
|
expectedStderr string
|
|
}{
|
|
{
|
|
name: "with policies",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
projectName: projectName,
|
|
expectedStdout: `ID GPG-MODE GPG-KEYS REPO-URLS
|
|
0 head ABCD1234ABCD1234 *, !https://github.com/argoproj/argo-cd.git
|
|
1 strict 1234ABCD1234ABCD https://github.com/argoproj/argo-cd.git
|
|
`,
|
|
expectedStderr: "",
|
|
},
|
|
{
|
|
name: "without policies",
|
|
sourceIntegrity: nil,
|
|
projectName: projectName,
|
|
expectedStdout: "",
|
|
expectedStderr: "Error: no source integrity git policies defined for project \"test-project\"\n",
|
|
},
|
|
{
|
|
name: "no project",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
projectName: "not-a-project",
|
|
expectedStdout: "",
|
|
expectedStderr: "Error: failed getting project \"not-a-project\": rpc error: code = NotFound desc = appprojects.argoproj.io \"not-a-project\" not found\n",
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
projects := mockProjectClient(t)
|
|
mockProjectGet(projects, projectName, dummyProject(projectName, tc.sourceIntegrity), nil).Maybe()
|
|
mockProjectGet(projects, "not-a-project", nil, errors.New(`rpc error: code = NotFound desc = appprojects.argoproj.io "not-a-project" not found`)).Maybe()
|
|
|
|
cmd := NewProjectSourceIntegrityGitPoliciesListCommand(&argocdclient.ClientOptions{})
|
|
out, stderr, _ := runCmd(t, cmd, tc.projectName)
|
|
|
|
tabbedOut := regexp.MustCompile(" {2,}").ReplaceAllString(out, "\t")
|
|
assert.Equal(t, tc.expectedStdout, tabbedOut)
|
|
assert.Equal(t, tc.expectedStderr, stderr)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestProjectSourceIntegrityUpdateCommand(t *testing.T) {
|
|
projectName := "test-project"
|
|
|
|
mockKeyring(mockGpgKeysClient(t), "ABCD1234ABCD1234")
|
|
|
|
testCases := []struct {
|
|
name string
|
|
sourceIntegrity *appsv1.SourceIntegrity
|
|
args []string
|
|
|
|
expectedStdout string
|
|
expectedStderr string
|
|
expectedPolicy *appsv1.SourceIntegrityGitPolicy
|
|
}{
|
|
{
|
|
name: "Set GPG mode",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{projectName, "0", "--gpg-mode=strict", "--yes"},
|
|
expectedStdout: `ID GPG-MODE GPG-KEYS REPO-URLS
|
|
0 strict ABCD1234ABCD1234 *, !https://github.com/argoproj/argo-cd.git
|
|
1 strict 1234ABCD1234ABCD https://github.com/argoproj/argo-cd.git
|
|
`,
|
|
expectedStderr: "",
|
|
expectedPolicy: &appsv1.SourceIntegrityGitPolicy{
|
|
Repos: []appsv1.SourceIntegrityGitPolicyRepo{{
|
|
URL: "*",
|
|
}, {
|
|
URL: "!https://github.com/argoproj/argo-cd.git",
|
|
}},
|
|
GPG: &appsv1.SourceIntegrityGitPolicyGPG{
|
|
Mode: appsv1.SourceIntegrityGitPolicyGPGModeStrict,
|
|
Keys: []string{"ABCD1234ABCD1234"},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Set GPG keys",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{projectName, "1", "--gpg-key=FEDCBA9876543210", "--gpg-key=FEDCBA9876543219", "--yes"},
|
|
expectedStdout: `ID GPG-MODE GPG-KEYS REPO-URLS
|
|
0 head ABCD1234ABCD1234 *, !https://github.com/argoproj/argo-cd.git
|
|
1 strict FEDCBA9876543210, FEDCBA9876543219 https://github.com/argoproj/argo-cd.git
|
|
`,
|
|
expectedStderr: "Warning: Following GPG keys are not in repo-server keyring: FEDCBA9876543210, FEDCBA9876543219\n",
|
|
expectedPolicy: &appsv1.SourceIntegrityGitPolicy{
|
|
Repos: []appsv1.SourceIntegrityGitPolicyRepo{{
|
|
URL: "https://github.com/argoproj/argo-cd.git",
|
|
}},
|
|
GPG: &appsv1.SourceIntegrityGitPolicyGPG{
|
|
Mode: appsv1.SourceIntegrityGitPolicyGPGModeStrict,
|
|
Keys: []string{"FEDCBA9876543210", "FEDCBA9876543219"},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Delete GPG key",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{projectName, "0", "--delete-gpg-key=ABCD1234ABCD1234", "-y"},
|
|
expectedStdout: `ID GPG-MODE GPG-KEYS REPO-URLS
|
|
0 head <none> *, !https://github.com/argoproj/argo-cd.git
|
|
1 strict 1234ABCD1234ABCD https://github.com/argoproj/argo-cd.git
|
|
`,
|
|
expectedStderr: "Warning: Policy has no GPG keys and will never validate any revision\n",
|
|
expectedPolicy: &appsv1.SourceIntegrityGitPolicy{
|
|
Repos: []appsv1.SourceIntegrityGitPolicyRepo{{
|
|
URL: "*",
|
|
}, {
|
|
URL: "!https://github.com/argoproj/argo-cd.git",
|
|
}},
|
|
GPG: &appsv1.SourceIntegrityGitPolicyGPG{
|
|
Mode: appsv1.SourceIntegrityGitPolicyGPGModeHead,
|
|
Keys: []string{},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Set repo URLs",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{projectName, "1", "--repo-url=https://github.com/example/repo.git", "--repo-url=https://github.com/example/other.git", "--yes"},
|
|
expectedStdout: `ID GPG-MODE GPG-KEYS REPO-URLS
|
|
0 head ABCD1234ABCD1234 *, !https://github.com/argoproj/argo-cd.git
|
|
1 strict 1234ABCD1234ABCD https://github.com/example/repo.git, https://github.com/example/other.git
|
|
`,
|
|
expectedStderr: "Warning: Following GPG keys are not in repo-server keyring: 1234ABCD1234ABCD\n",
|
|
expectedPolicy: &appsv1.SourceIntegrityGitPolicy{
|
|
Repos: []appsv1.SourceIntegrityGitPolicyRepo{{
|
|
URL: "https://github.com/example/repo.git",
|
|
}, {
|
|
URL: "https://github.com/example/other.git",
|
|
}},
|
|
GPG: &appsv1.SourceIntegrityGitPolicyGPG{
|
|
Mode: appsv1.SourceIntegrityGitPolicyGPGModeStrict,
|
|
Keys: []string{"1234ABCD1234ABCD"},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Remove repo URL",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{projectName, "0", "--delete-repo-url=*", "--delete-repo-url=not://present.is/ignored", "--yes"},
|
|
expectedStdout: `ID GPG-MODE GPG-KEYS REPO-URLS
|
|
0 head ABCD1234ABCD1234 !https://github.com/argoproj/argo-cd.git
|
|
1 strict 1234ABCD1234ABCD https://github.com/argoproj/argo-cd.git
|
|
`,
|
|
expectedStderr: "",
|
|
expectedPolicy: &appsv1.SourceIntegrityGitPolicy{
|
|
Repos: []appsv1.SourceIntegrityGitPolicyRepo{{
|
|
URL: "!https://github.com/argoproj/argo-cd.git",
|
|
}},
|
|
GPG: &appsv1.SourceIntegrityGitPolicyGPG{
|
|
Mode: appsv1.SourceIntegrityGitPolicyGPGModeHead,
|
|
Keys: []string{"ABCD1234ABCD1234"},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Update multiple attributes at once",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{
|
|
projectName, "0", "--gpg-mode=none",
|
|
"--add-gpg-key=9876543210FEDCBA",
|
|
"--add-repo-url=https://new-repo.com",
|
|
"--delete-gpg-key=ABCD1234ABCD1234",
|
|
"--delete-repo-url=!https://github.com/argoproj/argo-cd.git",
|
|
"--yes",
|
|
},
|
|
expectedStdout: `ID GPG-MODE GPG-KEYS REPO-URLS
|
|
0 none 9876543210FEDCBA *, https://new-repo.com
|
|
1 strict 1234ABCD1234ABCD https://github.com/argoproj/argo-cd.git
|
|
`,
|
|
expectedStderr: "Warning: Following GPG keys are not in repo-server keyring: 9876543210FEDCBA\n",
|
|
expectedPolicy: &appsv1.SourceIntegrityGitPolicy{
|
|
Repos: []appsv1.SourceIntegrityGitPolicyRepo{{
|
|
URL: "*",
|
|
}, {
|
|
URL: "https://new-repo.com",
|
|
}},
|
|
GPG: &appsv1.SourceIntegrityGitPolicyGPG{
|
|
Mode: appsv1.SourceIntegrityGitPolicyGPGModeNone,
|
|
Keys: []string{"9876543210FEDCBA"},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Update policy with invalid project name",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{"not-a-project", "0", "--gpg-mode=strict", "--yes"},
|
|
expectedStderr: "Error: failed getting project \"not-a-project\": rpc error: code = NotFound desc = appprojects.argoproj.io \"not-a-project\" not found\n",
|
|
},
|
|
{
|
|
name: "Update policy with invalid ID",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{projectName, "42", "--gpg-mode=strict", "--yes"},
|
|
expectedStderr: "Error: the POLICY_ID 42 is out of range (0-1)\n",
|
|
},
|
|
{
|
|
name: "Update policy with incorrect ID",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{projectName, "the first one, bro", "--gpg-mode=strict", "--yes"},
|
|
expectedStderr: "Error: invalid POLICY_ID 'the first one, bro'\n",
|
|
},
|
|
{
|
|
name: "Update policy when no Source Integrity",
|
|
sourceIntegrity: nil,
|
|
args: []string{projectName, "0", "--gpg-mode=strict", "--yes"},
|
|
expectedStderr: "Error: no source integrity git policies defined for project \"test-project\"\n",
|
|
},
|
|
{
|
|
name: "Set and add key",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{projectName, "0", "--gpg-key=FAKE", "--add-gpg-key=FAKE2", "--gpg-mode=strict", "--yes"},
|
|
expectedStderr: "Error: option --gpg-key, cannot be combined with --add-gpg-key or --delete-gpg-key\n",
|
|
},
|
|
{
|
|
name: "Set and add repo",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{projectName, "0", "--repo-url=FAKE", "--delete-repo-url=FAKE2", "--gpg-mode=strict", "--yes"},
|
|
expectedStderr: "Error: option --repo-url, cannot be combined with --add-repo-url or --delete-repo-url\n",
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
projects := mockProjectClient(t)
|
|
mockProjectGet(projects, projectName, dummyProject(projectName, tc.sourceIntegrity), nil).Maybe()
|
|
mockProjectGet(projects, "not-a-project", nil, errors.New(`rpc error: code = NotFound desc = appprojects.argoproj.io "not-a-project" not found`)).Maybe()
|
|
projects.On("Update", mock.Anything, mock.Anything).Return(nil, nil).Maybe()
|
|
|
|
cmd := NewProjectSourceIntegrityGitPoliciesUpdateCommand(&argocdclient.ClientOptions{})
|
|
out, stderr, _ := runCmd(t, cmd, tc.args...)
|
|
|
|
tabbedOut := regexp.MustCompile(" {2,}").ReplaceAllString(out, "\t")
|
|
assert.Equal(t, tc.expectedStdout, tabbedOut)
|
|
assert.Equal(t, tc.expectedStderr, stderr)
|
|
|
|
if tc.expectedPolicy != nil {
|
|
updatedProject := captureProjectUpdate(t, projects, projectName)
|
|
require.NotNil(t, updatedProject)
|
|
require.NotNil(t, updatedProject.Spec.SourceIntegrity)
|
|
si := updatedProject.Spec.SourceIntegrity
|
|
require.NotNil(t, si.Git)
|
|
|
|
// Extract the policy ID from args to verify the correct policy was updated
|
|
policyID := tc.args[1]
|
|
var idx int
|
|
if policyID == "0" {
|
|
idx = 0
|
|
} else {
|
|
idx = 1
|
|
}
|
|
|
|
assert.Equal(t, tc.expectedPolicy, si.Git.Policies[idx])
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestProjectSourceIntegrityDeleteCommand(t *testing.T) {
|
|
projectName := "test-project"
|
|
|
|
testCases := []struct {
|
|
name string
|
|
sourceIntegrity *appsv1.SourceIntegrity
|
|
args []string
|
|
|
|
expectedSI *appsv1.SourceIntegrity
|
|
expectedStderr string
|
|
}{
|
|
{
|
|
name: "Delete source integrity verification policy 0",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{projectName, "0", "--yes"},
|
|
expectedSI: &appsv1.SourceIntegrity{
|
|
Git: &appsv1.SourceIntegrityGit{
|
|
Policies: []*appsv1.SourceIntegrityGitPolicy{{
|
|
Repos: []appsv1.SourceIntegrityGitPolicyRepo{{
|
|
URL: "https://github.com/argoproj/argo-cd.git",
|
|
}},
|
|
GPG: &appsv1.SourceIntegrityGitPolicyGPG{
|
|
Mode: appsv1.SourceIntegrityGitPolicyGPGModeStrict,
|
|
Keys: []string{"1234ABCD1234ABCD"},
|
|
},
|
|
}},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Delete source integrity verification policy 1",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{projectName, "--yes", "1"},
|
|
expectedSI: &appsv1.SourceIntegrity{
|
|
Git: &appsv1.SourceIntegrityGit{
|
|
Policies: []*appsv1.SourceIntegrityGitPolicy{{
|
|
Repos: []appsv1.SourceIntegrityGitPolicyRepo{{
|
|
URL: "*",
|
|
}, {
|
|
URL: "!https://github.com/argoproj/argo-cd.git",
|
|
}},
|
|
GPG: &appsv1.SourceIntegrityGitPolicyGPG{
|
|
Mode: appsv1.SourceIntegrityGitPolicyGPGModeHead,
|
|
Keys: []string{"ABCD1234ABCD1234"},
|
|
},
|
|
}},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "Delete source integrity verification policies (asc)",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{projectName, "--yes", "0", "1"},
|
|
expectedSI: nil,
|
|
},
|
|
{
|
|
name: "Delete source integrity verification policies (desc)",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{projectName, "--yes", "1", "0"},
|
|
expectedSI: nil,
|
|
},
|
|
{
|
|
name: "Delete policy with invalid project name",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{"not-a-project", "--yes", "0"},
|
|
expectedStderr: "Error: failed getting project \"not-a-project\": rpc error: code = NotFound desc = appprojects.argoproj.io \"not-a-project\" not found\n",
|
|
},
|
|
{
|
|
name: "Delete policy with invalid ID",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{projectName, "--yes", "42"},
|
|
expectedStderr: "Error: the POLICY_ID 42 is out of range (0-1)\n",
|
|
},
|
|
{
|
|
name: "Delete policy with incorrect ID",
|
|
sourceIntegrity: dummySourceIntegrity(),
|
|
args: []string{projectName, "--yes", "the first one, bro"},
|
|
expectedStderr: "Error: invalid POLICY_ID 'the first one, bro'\n",
|
|
},
|
|
{
|
|
name: "Delete policy when there is no Source Integrity",
|
|
sourceIntegrity: nil,
|
|
args: []string{projectName, "--yes", "0"},
|
|
expectedStderr: "Error: no source integrity git policies defined for project \"test-project\"\n",
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
projects := mockProjectClient(t)
|
|
mockProjectGet(projects, projectName, dummyProject(projectName, tc.sourceIntegrity), nil).Maybe()
|
|
mockProjectGet(projects, "not-a-project", nil, errors.New(`rpc error: code = NotFound desc = appprojects.argoproj.io "not-a-project" not found`)).Maybe()
|
|
projects.On("Update", mock.Anything, mock.Anything).Return(nil, nil).Maybe()
|
|
|
|
cmd := NewProjectSourceIntegrityGitPoliciesDeleteCommand(&argocdclient.ClientOptions{})
|
|
stdout, stderr, err := runCmd(t, cmd, tc.args...)
|
|
assert.Equal(t, tc.expectedStderr, stderr, "Err: %w, Out: %s", err, stdout)
|
|
|
|
if tc.expectedSI != nil {
|
|
updatedProject := captureProjectUpdate(t, projects, projectName)
|
|
assert.Equal(t, tc.expectedSI, updatedProject.Spec.SourceIntegrity)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func captureProjectUpdate(t *testing.T, projects *projectmocks.ProjectServiceClient, name string) (updatedProject *appsv1.AppProject) {
|
|
t.Helper()
|
|
capture := mock.MatchedBy(func(q *projectpkg.ProjectUpdateRequest) bool {
|
|
if q.Project.Name != name {
|
|
return false
|
|
}
|
|
updatedProject = q.Project
|
|
return true
|
|
})
|
|
|
|
projects.AssertCalled(t, "Update", mock.Anything, capture)
|
|
return updatedProject
|
|
}
|