Skip to content

Commit 187153e

Browse files
mkilchhofermkilchhofer
authored
ci: Update outdated external testing deps (#650)
Signed-off-by: Marco Maurer <[email protected]>
1 parent 7a9fb60 commit 187153e

File tree

4 files changed

+85
-57
lines changed

4 files changed

+85
-57
lines changed

‎argocd/resource_argocd_application_set_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,9 +1089,9 @@ resource "argocd_application_set" "clusters" {
10891089
10901090
spec {
10911091
source {
1092-
repo_url = "https://github.com/argoproj/argocd-example-apps/"
1092+
repo_url = "https://github.com/argoproj/argo-cd/"
10931093
target_revision = "HEAD"
1094-
path = "guestbook"
1094+
path = "test/e2e/testdata/guestbook"
10951095
}
10961096
10971097
destination {
@@ -1129,9 +1129,9 @@ resource "argocd_application_set" "clusters_selector" {
11291129
11301130
spec {
11311131
source {
1132-
repo_url = "https://github.com/argoproj/argocd-example-apps/"
1132+
repo_url = "https://github.com/argoproj/argo-cd/"
11331133
target_revision = "HEAD"
1134-
path = "guestbook"
1134+
path = "test/e2e/testdata/guestbook"
11351135
}
11361136
11371137
destination {
@@ -1182,9 +1182,9 @@ resource "argocd_application_set" "cluster_decision_resource" {
11821182
11831183
spec {
11841184
source {
1185-
repo_url = "https://github.com/argoproj/argocd-example-apps/"
1185+
repo_url = "https://github.com/argoproj/argo-cd/"
11861186
target_revision = "HEAD"
1187-
path = "guestbook"
1187+
path = "test/e2e/testdata/guestbook"
11881188
}
11891189
11901190
destination {
@@ -2983,9 +2983,9 @@ resource "argocd_application_set" "go_template" {
29832983
29842984
spec {
29852985
source {
2986-
repo_url = "https://github.com/argoproj/argocd-example-apps/"
2986+
repo_url = "https://github.com/argoproj/argo-cd/"
29872987
target_revision = "HEAD"
2988-
path = "guestbook"
2988+
path = "test/e2e/testdata/guestbook"
29892989
}
29902990
29912991
destination {
@@ -3021,9 +3021,9 @@ resource "argocd_application_set" "sync_policy" {
30213021
30223022
spec {
30233023
source {
3024-
repo_url = "https://github.com/argoproj/argocd-example-apps/"
3024+
repo_url = "https://github.com/argoproj/argo-cd/"
30253025
target_revision = "HEAD"
3026-
path = "guestbook"
3026+
path = "test/e2e/testdata/guestbook"
30273027
}
30283028
30293029
destination {
@@ -3060,9 +3060,9 @@ resource "argocd_application_set" "applications_sync_policy" {
30603060
30613061
spec {
30623062
source {
3063-
repo_url = "https://github.com/argoproj/argocd-example-apps/"
3063+
repo_url = "https://github.com/argoproj/argo-cd/"
30643064
target_revision = "HEAD"
3065-
path = "guestbook"
3065+
path = "test/e2e/testdata/guestbook"
30663066
}
30673067
30683068
destination {

‎argocd/resource_argocd_application_test.go‎

Lines changed: 45 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,12 +1075,12 @@ func TestAccArgoCDApplication_MultipleSources(t *testing.T) {
10751075
resource.TestCheckResourceAttr(
10761076
"argocd_application.multiple_sources",
10771077
"spec.0.source.0.chart",
1078-
"elasticsearch",
1078+
"opensearch",
10791079
),
10801080
resource.TestCheckResourceAttr(
10811081
"argocd_application.multiple_sources",
10821082
"spec.0.source.1.path",
1083-
"guestbook",
1083+
"test/e2e/testdata/guestbook",
10841084
),
10851085
),
10861086
},
@@ -1627,8 +1627,8 @@ resource "argocd_application" "directory" {
16271627
16281628
spec {
16291629
source {
1630-
repo_url = "https://github.com/argoproj/argocd-example-apps"
1631-
path = "guestbook"
1630+
repo_url = "https://github.com/argoproj/argo-cd"
1631+
path = "test/e2e/testdata/guestbook"
16321632
target_revision = "HEAD"
16331633
directory {
16341634
recurse = %s
@@ -1657,8 +1657,8 @@ resource "argocd_application" "directory" {
16571657
16581658
spec {
16591659
source {
1660-
repo_url = "https://github.com/argoproj/argocd-example-apps"
1661-
path = "guestbook"
1660+
repo_url = "https://github.com/argoproj/argo-cd"
1661+
path = "test/e2e/testdata/guestbook"
16621662
target_revision = "HEAD"
16631663
directory {}
16641664
}
@@ -1685,8 +1685,8 @@ resource "argocd_application" "directory" {
16851685
16861686
spec {
16871687
source {
1688-
repo_url = "https://github.com/argoproj/argocd-example-apps"
1689-
path = "guestbook"
1688+
repo_url = "https://github.com/argoproj/argo-cd"
1689+
path = "test/e2e/testdata/guestbook"
16901690
target_revision = "HEAD"
16911691
directory {
16921692
recurse = true
@@ -2076,8 +2076,8 @@ resource "argocd_application" "info" {
20762076
value = "%s"
20772077
}
20782078
source {
2079-
repo_url = "https://github.com/argoproj/argocd-example-apps"
2080-
path = "guestbook"
2079+
repo_url = "https://github.com/argoproj/argo-cd"
2080+
path = "test/e2e/testdata/guestbook"
20812081
target_revision = "HEAD"
20822082
}
20832083
@@ -2106,8 +2106,8 @@ resource "argocd_application" "info" {
21062106
value = "%s"
21072107
}
21082108
source {
2109-
repo_url = "https://github.com/argoproj/argocd-example-apps"
2110-
path = "guestbook"
2109+
repo_url = "https://github.com/argoproj/argo-cd"
2110+
path = "test/e2e/testdata/guestbook"
21112111
target_revision = "HEAD"
21122112
}
21132113
@@ -2136,8 +2136,8 @@ resource "argocd_application" "info" {
21362136
name = "%s"
21372137
}
21382138
source {
2139-
repo_url = "https://github.com/argoproj/argocd-example-apps"
2140-
path = "guestbook"
2139+
repo_url = "https://github.com/argoproj/argo-cd"
2140+
path = "test/e2e/testdata/guestbook"
21412141
target_revision = "HEAD"
21422142
}
21432143
@@ -2165,8 +2165,8 @@ resource "argocd_application" "info" {
21652165
info {
21662166
}
21672167
source {
2168-
repo_url = "https://github.com/argoproj/argocd-example-apps"
2169-
path = "guestbook"
2168+
repo_url = "https://github.com/argoproj/argo-cd"
2169+
path = "test/e2e/testdata/guestbook"
21702170
target_revision = "HEAD"
21712171
}
21722172
@@ -2192,8 +2192,8 @@ resource "argocd_application" "info" {
21922192
21932193
spec {
21942194
source {
2195-
repo_url = "https://github.com/argoproj/argocd-example-apps"
2196-
path = "guestbook"
2195+
repo_url = "https://github.com/argoproj/argo-cd"
2196+
path = "test/e2e/testdata/guestbook"
21972197
target_revision = "HEAD"
21982198
}
21992199
@@ -2347,14 +2347,36 @@ resource "argocd_application" "multiple_sources" {
23472347
project = "default"
23482348
23492349
source {
2350-
repo_url = "https://helm.elastic.co"
2351-
chart = "elasticsearch"
2352-
target_revision = "8.5.1"
2350+
repo_url = "https://opensearch-project.github.io/helm-charts"
2351+
chart = "opensearch"
2352+
target_revision = "3.0.0"
2353+
helm {
2354+
parameter {
2355+
name = "replicas"
2356+
value = "1"
2357+
}
2358+
2359+
parameter {
2360+
name = "singleNode"
2361+
value = "true"
2362+
}
2363+
2364+
parameter {
2365+
name = "persistence.enabled"
2366+
value = "false"
2367+
}
2368+
2369+
values = <<-EOT
2370+
extraEnvs:
2371+
- name: "DISABLE_SECURITY_PLUGIN"
2372+
value: "true"
2373+
EOT
2374+
}
23532375
}
23542376
23552377
source {
2356-
repo_url = "https://github.com/argoproj/argocd-example-apps.git"
2357-
path = "guestbook"
2378+
repo_url = "https://github.com/argoproj/argo-cd.git"
2379+
path = "test/e2e/testdata/guestbook"
23582380
target_revision = "HEAD"
23592381
}
23602382

‎internal/provider/data_source_application_test.go‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ resource "argocd_application" "foo" {
6969
revision_history_limit = 1
7070
7171
source {
72-
repo_url = "https://helm.elastic.co"
73-
chart = "elasticsearch"
74-
target_revision = "8.5.1"
72+
repo_url = "https://opensearch-project.github.io/helm-charts"
73+
chart = "opensearch"
74+
target_revision = "3.0.0"
7575
7676
helm {
7777
parameter {
@@ -80,20 +80,26 @@ resource "argocd_application" "foo" {
8080
}
8181
8282
parameter {
83-
name = "minimumMasterNodes"
84-
value = "1"
83+
name = "singleNode"
84+
value = "true"
8585
}
86-
86+
8787
parameter {
8888
name = "persistence.enabled"
8989
value = "false"
9090
}
91+
92+
values = <<-EOT
93+
extraEnvs:
94+
- name: "DISABLE_SECURITY_PLUGIN"
95+
value: "true"
96+
EOT
9197
}
9298
}
9399
94100
source {
95-
repo_url = "https://github.com/argoproj/argocd-example-apps.git"
96-
path = "guestbook"
101+
repo_url = "https://github.com/argoproj/argo-cd.git"
102+
path = "test/e2e/testdata/guestbook"
97103
target_revision = "HEAD"
98104
}
99105
@@ -136,11 +142,11 @@ resource "argocd_application" "foo" {
136142
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.info.0.value", "foo"),
137143
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.project", "foo"),
138144
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.revision_history_limit", "1"),
139-
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.source.0.repo_url", "https://helm.elastic.co"),
140-
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.source.0.chart", "elasticsearch"),
141-
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.source.0.target_revision", "8.5.1"),
142-
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.source.1.repo_url", "https://github.com/argoproj/argocd-example-apps.git"),
143-
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.source.1.path", "guestbook"),
145+
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.source.0.repo_url", "https://opensearch-project.github.io/helm-charts"),
146+
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.source.0.chart", "opensearch"),
147+
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.source.0.target_revision", "3.0.0"),
148+
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.source.1.repo_url", "https://github.com/argoproj/argo-cd.git"),
149+
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.source.1.path", "test/e2e/testdata/guestbook"),
144150
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.source.1.target_revision", "HEAD"),
145151
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.sync_policy.0.automated.0.allow_empty", "true"),
146152
resource.TestCheckResourceAttr("argocd_application.foo", "spec.0.sync_policy.0.automated.0.prune", "true"),
@@ -177,11 +183,11 @@ data "argocd_application" "foo" {
177183
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.info.value", "foo"),
178184
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.project", "foo"),
179185
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.revision_history_limit", "1"),
180-
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.sources.0.repo_url", "https://helm.elastic.co"),
181-
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.sources.0.chart", "elasticsearch"),
182-
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.sources.0.target_revision", "8.5.1"),
183-
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.sources.1.repo_url", "https://github.com/argoproj/argocd-example-apps.git"),
184-
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.sources.1.path", "guestbook"),
186+
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.sources.0.repo_url", "https://opensearch-project.github.io/helm-charts"),
187+
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.sources.0.chart", "opensearch"),
188+
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.sources.0.target_revision", "3.0.0"),
189+
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.sources.1.repo_url", "https://github.com/argoproj/argo-cd.git"),
190+
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.sources.1.path", "test/e2e/testdata/guestbook"),
185191
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.sources.1.target_revision", "HEAD"),
186192
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.sync_policy.automated.allow_empty", "true"),
187193
resource.TestCheckResourceAttr("data.argocd_application.foo", "spec.sync_policy.automated.prune", "true"),

‎manifests/local-dev/application-set.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ resource "argocd_application_set" "clusters" {
1717
project = "default"
1818

1919
source {
20-
repo_url = "https://github.com/argoproj/argocd-example-apps/"
20+
repo_url = "https://github.com/argoproj/argo-cd/"
2121
target_revision = "HEAD"
22-
chart = "guestbook"
22+
chart = "test/e2e/testdata/guestbook"
2323
}
2424

2525
destination {
@@ -66,9 +66,9 @@ resource "argocd_application_set" "cluster_decision_resource" {
6666

6767
spec {
6868
source {
69-
repo_url = "https://github.com/argoproj/argocd-example-apps/"
69+
repo_url = "https://github.com/argoproj/argo-cd/"
7070
target_revision = "HEAD"
71-
path = "guestbook"
71+
path = "test/e2e/testdata/guestbook"
7272
}
7373

7474
destination {

0 commit comments

Comments
 (0)