Skip to content

Commit ad4dc44

Browse files
committed
Update secrets for wildcard tls tests
1 parent 07c7366 commit ad4dc44

File tree

3 files changed

+42
-2
lines changed

3 files changed

+42
-2
lines changed

hack/tls-cert-gen/certs.go

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ var yamlSecrets = []yamlSecret{
8686
"/tests/data/virtual-server-grpc/tls-secret.yaml",
8787
"/tests/data/virtual-server-route-grpc/tls-secret.yaml",
8888
"/tests/data/watch-secret-namespace/tls-secret.yaml",
89-
"/tests/data/wildcard-tls-secret/gb-wildcard-tls-secret.yaml",
9089
},
9190
},
9291

@@ -219,6 +218,28 @@ var yamlSecrets = []yamlSecret{
219218
},
220219
},
221220

221+
{
222+
secretName: "wildcard-tls-secret",
223+
fileName: "tls-secret-invalid-type.yaml",
224+
templateData: templateData{
225+
country: []string{"IE"},
226+
organization: []string{"F5 NGINX"},
227+
organizationalUnit: []string{"NGINX Ingress Controller"},
228+
locality: []string{"Cork"},
229+
province: []string{"Cork"},
230+
commonName: "example.com",
231+
dnsNames: []string{"*.example.com"},
232+
},
233+
valid: secretShouldHaveValidTLSCrt,
234+
symlinks: []string{
235+
"/tests/data/wildcard-tls-secret/invalid-wildcard-tls-secret.yaml",
236+
},
237+
secretType: "broken",
238+
usedIn: []string{
239+
"tests/suite/test_wildcard_tls_secret.py - needed for the secret name and secret type",
240+
},
241+
},
242+
222243
{
223244
secretName: "wildcard-tls-secret",
224245
fileName: "wildcard-tls-secret.yaml",
@@ -240,6 +261,25 @@ var yamlSecrets = []yamlSecret{
240261
},
241262
},
242263

264+
{
265+
secretName: "wildcard-tls-secret",
266+
fileName: "wildcard-tls-secret-gb.yaml",
267+
templateData: templateData{
268+
country: []string{"GB"},
269+
organization: []string{"nginx"},
270+
province: []string{"Cambridgeshire"},
271+
commonName: "example.com",
272+
dnsNames: []string{"*.example.com"},
273+
},
274+
valid: secretShouldHaveValidTLSCrt,
275+
symlinks: []string{
276+
"/tests/data/wildcard-tls-secret/gb-wildcard-tls-secret.yaml",
277+
},
278+
usedIn: []string{
279+
"tests/suite/test_wildcard_tls_secret.py - subject info",
280+
},
281+
},
282+
243283
{
244284
secretName: "egress-tls-secret",
245285
fileName: "egress-tls-secret.yaml",

tests/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,4 @@ data/virtual-server-tls/tls-secret.yaml
5151
data/watch-secret-namespace/tls-secret.yaml
5252
data/wildcard-tls-secret/gb-wildcard-tls-secret.yaml
5353
data/wildcard-tls-secret/wildcard-tls-secret.yaml
54+
data/wildcard-tls-secret/invalid-wildcard-tls-secret.yaml

tests/data/wildcard-tls-secret/invalid-wildcard-tls-secret.yaml

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)