mirror of
https://github.com/hanzoai/deploy.git
synced 2026-10-07 08:44:50 +00:00
zeekayandHanzo Dev
1ab6e799c1
go.mod still declared `module github.com/hanzoai/deploy` after the repo was renamed. A Go module path is not cosmetic — it is the resolvable location. So `go get github.com/hanzoai/cd` could not work, and anything importing this module had to spell a name that no longer exists at that address. The build log of v3.6.0 is where it surfaced: the compiler was still emitting github.com/hanzoai/deploy/cmd/cd/commands. 3541 import paths across 690 .go, 19 .proto, 4 .yaml, 3 .sh, 2 .mod, Procfile and Makefile. Plus the 62 ghcr.io/hanzoai/deploy image references, moved to ghcr.io/hanzoai/cd to match hanzo.yml's build target — a distinct string from the module path, replaced separately so neither could clobber the other. go mod tidy clean, CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ./... clean. Co-authored-by: Hanzo Dev <[email protected]>
239 lines
5.8 KiB
Go
239 lines
5.8 KiB
Go
package utils
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"go.yaml.in/yaml/v3"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
|
|
"github.com/hanzoai/cd/pkg/apis/application/v1alpha1"
|
|
"github.com/hanzoai/cd/util/cd/normalizers"
|
|
)
|
|
|
|
func Test_applyIgnoreDifferences(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
appMeta := metav1.TypeMeta{
|
|
APIVersion: v1alpha1.ApplicationSchemaGroupVersionKind.GroupVersion().String(),
|
|
Kind: v1alpha1.ApplicationSchemaGroupVersionKind.Kind,
|
|
}
|
|
testCases := []struct {
|
|
name string
|
|
ignoreDifferences v1alpha1.ApplicationSetIgnoreDifferences
|
|
foundApp string
|
|
generatedApp string
|
|
expectedApp string
|
|
}{
|
|
{
|
|
name: "empty ignoreDifferences",
|
|
foundApp: `
|
|
spec: {}`,
|
|
generatedApp: `
|
|
spec: {}`,
|
|
expectedApp: `
|
|
spec: {}`,
|
|
},
|
|
{
|
|
// For this use case: https://github.com/argoproj/argo-cd/issues/9101#issuecomment-1191138278
|
|
name: "ignore target revision with jq",
|
|
ignoreDifferences: v1alpha1.ApplicationSetIgnoreDifferences{
|
|
{JQPathExpressions: []string{".spec.source.targetRevision"}},
|
|
},
|
|
foundApp: `
|
|
spec:
|
|
source:
|
|
targetRevision: foo`,
|
|
generatedApp: `
|
|
spec:
|
|
source:
|
|
targetRevision: bar`,
|
|
expectedApp: `
|
|
spec:
|
|
source:
|
|
targetRevision: foo`,
|
|
},
|
|
{
|
|
// For this use case: https://github.com/argoproj/argo-cd/issues/9101#issuecomment-1103593714
|
|
name: "ignore helm parameter with jq",
|
|
ignoreDifferences: v1alpha1.ApplicationSetIgnoreDifferences{
|
|
{JQPathExpressions: []string{`.spec.source.helm.parameters | select(.name == "image.tag")`}},
|
|
},
|
|
foundApp: `
|
|
spec:
|
|
source:
|
|
helm:
|
|
parameters:
|
|
- name: image.tag
|
|
value: test
|
|
- name: another
|
|
value: value`,
|
|
generatedApp: `
|
|
spec:
|
|
source:
|
|
helm:
|
|
parameters:
|
|
- name: image.tag
|
|
value: v1.0.0
|
|
- name: another
|
|
value: value`,
|
|
expectedApp: `
|
|
spec:
|
|
source:
|
|
helm:
|
|
parameters:
|
|
- name: image.tag
|
|
value: test
|
|
- name: another
|
|
value: value`,
|
|
},
|
|
{
|
|
// For this use case: https://github.com/argoproj/argo-cd/issues/9101#issuecomment-1191138278
|
|
name: "ignore auto-sync in appset when it's not in the cluster with jq",
|
|
ignoreDifferences: v1alpha1.ApplicationSetIgnoreDifferences{
|
|
{JQPathExpressions: []string{".spec.syncPolicy.automated"}},
|
|
},
|
|
foundApp: `
|
|
spec:
|
|
syncPolicy:
|
|
retry:
|
|
limit: 5`,
|
|
generatedApp: `
|
|
spec:
|
|
syncPolicy:
|
|
automated:
|
|
selfHeal: true
|
|
retry:
|
|
limit: 5`,
|
|
expectedApp: `
|
|
spec:
|
|
syncPolicy:
|
|
retry:
|
|
limit: 5`,
|
|
},
|
|
{
|
|
name: "ignore auto-sync in the cluster when it's not in the appset with jq",
|
|
ignoreDifferences: v1alpha1.ApplicationSetIgnoreDifferences{
|
|
{JQPathExpressions: []string{".spec.syncPolicy.automated"}},
|
|
},
|
|
foundApp: `
|
|
spec:
|
|
syncPolicy:
|
|
automated:
|
|
selfHeal: true
|
|
retry:
|
|
limit: 5`,
|
|
generatedApp: `
|
|
spec:
|
|
syncPolicy:
|
|
retry:
|
|
limit: 5`,
|
|
expectedApp: `
|
|
spec:
|
|
syncPolicy:
|
|
automated:
|
|
selfHeal: true
|
|
retry:
|
|
limit: 5`,
|
|
},
|
|
{
|
|
// For this use case: https://github.com/argoproj/argo-cd/issues/9101#issuecomment-1420656537
|
|
name: "ignore a one-off annotation with jq",
|
|
ignoreDifferences: v1alpha1.ApplicationSetIgnoreDifferences{
|
|
{JQPathExpressions: []string{`.metadata.annotations | select(.["foo.bar"] == "baz")`}},
|
|
},
|
|
foundApp: `
|
|
metadata:
|
|
annotations:
|
|
foo.bar: baz
|
|
some.other: annotation`,
|
|
generatedApp: `
|
|
metadata:
|
|
annotations:
|
|
some.other: annotation`,
|
|
expectedApp: `
|
|
metadata:
|
|
annotations:
|
|
foo.bar: baz
|
|
some.other: annotation`,
|
|
},
|
|
{
|
|
// For this use case: https://github.com/argoproj/argo-cd/issues/9101#issuecomment-1515672638
|
|
name: "ignore the source.plugin field with a json pointer",
|
|
ignoreDifferences: v1alpha1.ApplicationSetIgnoreDifferences{
|
|
{JSONPointers: []string{"/spec/source/plugin"}},
|
|
},
|
|
foundApp: `
|
|
spec:
|
|
source:
|
|
plugin:
|
|
parameters:
|
|
- name: url
|
|
string: https://example.com`,
|
|
generatedApp: `
|
|
spec:
|
|
source:
|
|
plugin:
|
|
parameters:
|
|
- name: url
|
|
string: https://example.com/wrong`,
|
|
expectedApp: `
|
|
spec:
|
|
source:
|
|
plugin:
|
|
parameters:
|
|
- name: url
|
|
string: https://example.com`,
|
|
},
|
|
{
|
|
// For this use case: https://github.com/hanzoai/cd/pull/14743#issuecomment-1761954799
|
|
name: "ignore parameters added to a multi-source app in the cluster",
|
|
ignoreDifferences: v1alpha1.ApplicationSetIgnoreDifferences{
|
|
{JQPathExpressions: []string{`.spec.sources[] | select(.repoURL | contains("test-repo")).helm.parameters`}},
|
|
},
|
|
foundApp: `
|
|
spec:
|
|
sources:
|
|
- repoURL: https://git.example.com/test-org/test-repo
|
|
helm:
|
|
parameters:
|
|
- name: test
|
|
value: hi`,
|
|
generatedApp: `
|
|
spec:
|
|
sources:
|
|
- repoURL: https://git.example.com/test-org/test-repo`,
|
|
expectedApp: `
|
|
spec:
|
|
sources:
|
|
- repoURL: https://git.example.com/test-org/test-repo
|
|
helm:
|
|
parameters:
|
|
- name: test
|
|
value: hi`,
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
foundApp := v1alpha1.Application{TypeMeta: appMeta}
|
|
err := yaml.Unmarshal([]byte(tc.foundApp), &foundApp)
|
|
require.NoError(t, err, tc.foundApp)
|
|
generatedApp := v1alpha1.Application{TypeMeta: appMeta}
|
|
err = yaml.Unmarshal([]byte(tc.generatedApp), &generatedApp)
|
|
require.NoError(t, err, tc.generatedApp)
|
|
diffConfig, err := BuildIgnoreDiffConfig(tc.ignoreDifferences, normalizers.IgnoreNormalizerOpts{})
|
|
require.NoError(t, err)
|
|
err = applyIgnoreDifferences(diffConfig, &foundApp, &generatedApp)
|
|
require.NoError(t, err)
|
|
yamlFound, err := yaml.Marshal(tc.foundApp)
|
|
require.NoError(t, err)
|
|
yamlExpected, err := yaml.Marshal(tc.expectedApp)
|
|
require.NoError(t, err)
|
|
assert.YAMLEq(t, string(yamlExpected), string(yamlFound))
|
|
})
|
|
}
|
|
}
|