Skip to content

Commit ae04112

Browse files
fix: codegen and e2e tests (#17846)
Signed-off-by: pashakostohrys <[email protected]>
1 parent a5ae7bd commit ae04112

File tree

9 files changed

+1091
-910
lines changed

9 files changed

+1091
-910
lines changed

docs/operator-manual/server-commands/argocd-repo-server.md

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ argocd-repo-server [flags]
1919
--disable-helm-manifest-max-extracted-size Disable maximum size of helm manifest archives when extracted
2020
--disable-tls Disable TLS on the gRPC endpoint
2121
--helm-manifest-max-extracted-size string Maximum size of helm manifest archives when extracted (default "1G")
22+
--helm-registry-max-index-size string Maximum size of registry index file (default "1G")
2223
-h, --help help for argocd-repo-server
2324
--logformat string Set the logging format. One of: text|json (default "text")
2425
--loglevel string Set the logging level. One of: debug|info|warn|error (default "info")

pkg/apis/api-rules/violation_exceptions.list

+3
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/applicat
9595
API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSourcePluginParameter,String_
9696
API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ClusterCacheInfo,APIsCount
9797
API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ConnectionState,ModifiedAt
98+
API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ErrApplicationNotAllowedToUseProject,application
99+
API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ErrApplicationNotAllowedToUseProject,namespace
100+
API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ErrApplicationNotAllowedToUseProject,project
98101
API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,HelmOptions,ValuesFileSchemes
99102
API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,JWTToken,ExpiresAt
100103
API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,JWTToken,IssuedAt

pkg/apis/application/v1alpha1/generated.pb.go

+875-754
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/application/v1alpha1/generated.proto

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/application/v1alpha1/openapi_generated.go

+183-148
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/application/v1alpha1/zz_generated.deepcopy.go

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/e2e/app_management_ns_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ func TestNamespacedInvalidAppProject(t *testing.T) {
432432
Then().
433433
// We're not allowed to infer whether the project exists based on this error message. Instead, we get a generic
434434
// permission denied error.
435-
Expect(Error("", "permission denied"))
435+
Expect(Error("", "is not allowed"))
436436
}
437437

438438
func TestNamespacedAppDeletion(t *testing.T) {

test/e2e/app_management_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ func TestInvalidAppProject(t *testing.T) {
547547
Then().
548548
// We're not allowed to infer whether the project exists based on this error message. Instead, we get a generic
549549
// permission denied error.
550-
Expect(Error("", "permission denied"))
550+
Expect(Error("", "is not allowed"))
551551
}
552552

553553
func TestAppDeletion(t *testing.T) {

test/e2e/delarative_test.go

+8-6
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,14 @@ func TestDeclarativeInvalidProject(t *testing.T) {
5454
Expect(Success("")).
5555
Expect(HealthIs(health.HealthStatusUnknown)).
5656
Expect(SyncStatusIs(SyncStatusCodeUnknown)).
57-
Expect(Condition(ApplicationConditionInvalidSpecError, "Application referencing project garbage which does not exist")).
58-
When().
59-
Delete(false).
60-
Then().
61-
Expect(Success("")).
62-
Expect(DoesNotExist())
57+
Expect(Condition(ApplicationConditionInvalidSpecError, "Application referencing project garbage which does not exist"))
58+
// TODO: you can`t delete application with invalid project due to enforcment that was recently added,
59+
// in https://github.com/argoproj/argo-cd/security/advisories/GHSA-2gvw-w6fj-7m3c
60+
//When().
61+
//Delete(false).
62+
//Then().
63+
//Expect(Success("")).
64+
//Expect(DoesNotExist())
6365
}
6466

6567
func TestDeclarativeInvalidRepoURL(t *testing.T) {

0 commit comments

Comments
 (0)