Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Jul 11, 2023. It is now read-only.

Commit f8bf5e3

Browse files
jaelliojaellio
committed
Update tests from PR feedback
Signed-off-by: jaellio <[email protected]>
1 parent 89a64bb commit f8bf5e3

File tree

4 files changed

+19
-120
lines changed

4 files changed

+19
-120
lines changed

‎pkg/envoy/bootstrap/config_test.go‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -10,52 +10,6 @@ import (
1010
"github.com/openservicemesh/osm/pkg/utils"
1111
)
1212

13-
func TestBuildTLSSecret(t *testing.T) {
14-
assert := tassert.New(t)
15-
16-
tlsSecret, err := BuildTLSSecret()
17-
assert.Nil(err)
18-
assert.NotNil(tlsSecret)
19-
20-
actualYAML, err := utils.ProtoToYAML(tlsSecret)
21-
assert.Nil(err)
22-
23-
expectedYAML := `resources:
24-
- '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret
25-
name: tls_sds
26-
tls_certificate:
27-
certificate_chain:
28-
filename: /certs/current/sds_cert.pem
29-
private_key:
30-
filename: /certs/current/sds_key.pem
31-
watched_directory:
32-
path: /certs
33-
`
34-
assert.Equal(expectedYAML, string(actualYAML))
35-
}
36-
37-
func TestBuildValidationSecret(t *testing.T) {
38-
assert := tassert.New(t)
39-
40-
validationSecret, err := BuildValidationSecret()
41-
assert.Nil(err)
42-
assert.NotNil(validationSecret)
43-
44-
actualYAML, err := utils.ProtoToYAML(validationSecret)
45-
assert.Nil(err)
46-
47-
expectedYAML := `resources:
48-
- '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret
49-
name: validation_context_sds
50-
validation_context:
51-
trusted_ca:
52-
filename: /certs/current/cacert.pem
53-
watched_directory:
54-
path: /certs
55-
`
56-
assert.Equal(expectedYAML, string(actualYAML))
57-
}
58-
5913
func TestBuildFromConfig(t *testing.T) {
6014
assert := tassert.New(t)
6115
cert := tresor.NewFakeCertificate()

‎pkg/injector/envoy_config_test.go‎

Lines changed: 17 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,10 @@ var _ = Describe("Test functions creating Envoy bootstrap configuration", func()
3636
// to every new Pod that is being created in a namespace participating in the service mesh.
3737
// We deliberately leave this entire string literal here to document and visualize what the
3838
// generated YAML looks like!
39-
expectedEnvoyBootstrapConfigFileName = "expected_envoy_bootstrap_config.yaml"
40-
actualGeneratedEnvoyBootstrapConfigFileName = "actual_envoy_bootstrap_config.yaml"
41-
expectedEnvoyTLSCertificateSDSSecretFileName = "expected_tls_certificate_sds_secret.yaml" // #nosec G101: Potential hardcoded credentials
42-
actualGeneratedEnvoyTLSCertificateSDSSecretFileName = "actual_tls_certificate_sds_secret.yaml" // #nosec G101: Potential hardcoded credentials
43-
expectedEnvoyValidationContextSDSSecretFileName = "expected_validation_context_sds_secret.yaml"
44-
actualGeneratedEnvoyValidationContextSDSSecretFileName = "actual_validation_context_sds_secret.yaml"
39+
expectedEnvoyBootstrapConfigFileName = "expected_envoy_bootstrap_config.yaml"
40+
actualGeneratedEnvoyBootstrapConfigFileName = "actual_envoy_bootstrap_config.yaml"
41+
expectedEnvoyTLSCertificateSDSSecretFileName = "expected_tls_certificate_sds_secret.yaml" // #nosec G101: Potential hardcoded credentials
42+
expectedEnvoyValidationContextSDSSecretFileName = "expected_validation_context_sds_secret.yaml"
4543

4644
// All the YAML files listed above are in this sub-directory
4745
directoryForYAMLFiles = "test_fixtures"
@@ -151,31 +149,7 @@ var _ = Describe("Test functions creating Envoy bootstrap configuration", func()
151149
expectedEnvoyBootstrapConfigFileName, actualGeneratedEnvoyBootstrapConfigFileName, expectedEnvoyConfig, string(actual)))
152150
})
153151

154-
It("creates Envoy TLS Certificate SDS secret", func() {
155-
actual, err := getTLSSDSConfigYAML()
156-
Expect(err).ToNot(HaveOccurred())
157-
saveActualEnvoyYAML(actualGeneratedEnvoyTLSCertificateSDSSecretFileName, actual)
158-
159-
expectedTLSCertificateSDSSecret := getExpectedEnvoyYAML(expectedEnvoyTLSCertificateSDSSecretFileName)
160-
161-
Expect(string(actual)).To(Equal(expectedTLSCertificateSDSSecret),
162-
fmt.Sprintf("Compare files %s and %s\nExpected:\n%s\nActual:\n%s\n",
163-
expectedEnvoyTLSCertificateSDSSecretFileName, actualGeneratedEnvoyTLSCertificateSDSSecretFileName, expectedTLSCertificateSDSSecret, string(actual)))
164-
})
165-
166-
It("creates Envoy Validation Context SDS secret", func() {
167-
actual, err := getValidationContextSDSConfigYAML()
168-
Expect(err).ToNot(HaveOccurred())
169-
saveActualEnvoyYAML(actualGeneratedEnvoyValidationContextSDSSecretFileName, actual)
170-
171-
expectedValidationContextSDSSecret := getExpectedEnvoyYAML(expectedEnvoyValidationContextSDSSecretFileName)
172-
173-
Expect(string(actual)).To(Equal(expectedValidationContextSDSSecret),
174-
fmt.Sprintf("Compare files %s and %s\nExpected:\n%s\nActual:\n%s\n",
175-
expectedEnvoyValidationContextSDSSecretFileName, actualGeneratedEnvoyValidationContextSDSSecretFileName, expectedValidationContextSDSSecret, string(actual)))
176-
})
177-
178-
It("Creates bootstrap config for the Envoy proxy", func() {
152+
It("Creates Envoy bootstrap config for the Envoy proxy", func() {
179153
wh := &mutatingWebhook{
180154
kubeClient: fake.NewSimpleClientset(),
181155
kubeController: k8s.NewMockController(gomock.NewController(GinkgoT())),
@@ -210,14 +184,14 @@ var _ = Describe("Test functions creating Envoy bootstrap configuration", func()
210184
// Contains the "bootstrap.yaml", "tls_certificate_sds_secret.yaml", and "validation_context_sds_secret.yaml" keys
211185
Expect(len(configMap.BinaryData)).To(Equal(3))
212186

213-
Expect(configMap.Data[envoyBootstrapConfigFile]).To(Equal(expected.Data[envoyBootstrapConfigFile]),
214-
fmt.Sprintf("Expected YAML: %s;\nActual YAML: %s\n", expected.Data, configMap.Data))
187+
Expect(configMap.BinaryData[envoyBootstrapConfigFile]).To(Equal(expected.BinaryData[envoyBootstrapConfigFile]),
188+
fmt.Sprintf("Expected YAML: %s;\nActual YAML: %s\n", expected.BinaryData, configMap.BinaryData))
215189

216-
Expect(configMap.Data[envoyTLSCertificateSDSSecretFile]).To(Equal(expected.Data[envoyTLSCertificateSDSSecretFile]),
217-
fmt.Sprintf("Expected YAML: %s;\nActual YAML: %s\n", expected.Data, configMap.Data))
190+
Expect(configMap.BinaryData[envoyTLSCertificateSDSSecretFile]).To(Equal(expected.BinaryData[envoyTLSCertificateSDSSecretFile]),
191+
fmt.Sprintf("Expected YAML: %s;\nActual YAML: %s\n", expected.BinaryData, configMap.BinaryData))
218192

219-
Expect(configMap.Data[envoyValidationContextSDSSecretFile]).To(Equal(expected.Data[envoyValidationContextSDSSecretFile]),
220-
fmt.Sprintf("Expected YAML: %s;\nActual YAML: %s\n", expected.Data, configMap.Data))
193+
Expect(configMap.BinaryData[envoyValidationContextSDSSecretFile]).To(Equal(expected.BinaryData[envoyValidationContextSDSSecretFile]),
194+
fmt.Sprintf("Expected YAML: %s;\nActual YAML: %s\n", expected.BinaryData, configMap.BinaryData))
221195

222196
// Now check the entire struct
223197
Expect(*configMap).To(Equal(expected))
@@ -265,14 +239,14 @@ var _ = Describe("Test functions creating Envoy bootstrap configuration", func()
265239
// Contains the "bootstrap.yaml", "tls_certificate_sds_secret.yaml", and "validation_context_sds_secret.yaml" keys
266240
Expect(len(configMap.BinaryData)).To(Equal(3))
267241

268-
Expect(configMap.Data[envoyBootstrapConfigFile]).To(Equal(expected.Data[envoyBootstrapConfigFile]),
269-
fmt.Sprintf("Expected YAML: %s;\nActual YAML: %s\n", expected.Data, configMap.Data))
242+
Expect(configMap.BinaryData[envoyBootstrapConfigFile]).To(Equal(expected.BinaryData[envoyBootstrapConfigFile]),
243+
fmt.Sprintf("Expected YAML: %s;\nActual YAML: %s\n", expected.BinaryData, configMap.BinaryData))
270244

271-
Expect(configMap.Data[envoyTLSCertificateSDSSecretFile]).To(Equal(expected.Data[envoyTLSCertificateSDSSecretFile]),
272-
fmt.Sprintf("Expected YAML: %s;\nActual YAML: %s\n", expected.Data, configMap.Data))
245+
Expect(configMap.BinaryData[envoyTLSCertificateSDSSecretFile]).To(Equal(expected.BinaryData[envoyTLSCertificateSDSSecretFile]),
246+
fmt.Sprintf("Expected YAML: %s;\nActual YAML: %s\n", expected.BinaryData, configMap.BinaryData))
273247

274-
Expect(configMap.Data[envoyValidationContextSDSSecretFile]).To(Equal(expected.Data[envoyValidationContextSDSSecretFile]),
275-
fmt.Sprintf("Expected YAML: %s;\nActual YAML: %s\n", expected.Data, configMap.Data))
248+
Expect(configMap.BinaryData[envoyValidationContextSDSSecretFile]).To(Equal(expected.BinaryData[envoyValidationContextSDSSecretFile]),
249+
fmt.Sprintf("Expected YAML: %s;\nActual YAML: %s\n", expected.BinaryData, configMap.BinaryData))
276250

277251
// Now check the entire struct
278252
Expect(*configMap).To(Equal(expected))

‎pkg/injector/test_fixtures/.gitignore‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
actual_envoy_bootstrap_config.yaml
2-
actual_tls_certificate_sds_secret.yaml
3-
actual_validation_context_sds_secret.yaml
4-
actual_xds_cluster_without_probes.yaml
5-
actual_xds_cluster_with_probes.yaml
6-
actual_xds_static_resources_with_probes.yaml
1+
actual_*.yaml

‎pkg/k8s/announcement_handlers_test.go‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/openservicemesh/osm/pkg/messaging"
2424
)
2525

26-
func TestWatchAndUpdateProxyBootstrapSecret(t *testing.T) {
26+
func TestWatchAndUpdateProxyBootstrap(t *testing.T) {
2727
a := assert.New(t)
2828

2929
stop := make(chan struct{})
@@ -40,8 +40,6 @@ func TestWatchAndUpdateProxyBootstrapSecret(t *testing.T) {
4040

4141
podName := "app"
4242
namespace := "app"
43-
envoyBootstrapConfigVolume := "envoy-bootstrap-config-volume"
44-
envoyXDSSecretVolume := "envoy-xds-secret-volume"
4543
podUUID := uuid.New().String()
4644
podUID := uuid.New().String()
4745
configMapName := fmt.Sprintf("envoy-bootstrap-config-%s", podUUID)
@@ -66,28 +64,6 @@ func TestWatchAndUpdateProxyBootstrapSecret(t *testing.T) {
6664
Labels: map[string]string{constants.EnvoyUniqueIDLabelName: podUUID},
6765
UID: types.UID(podUID),
6866
},
69-
Spec: corev1.PodSpec{
70-
Volumes: []corev1.Volume{
71-
{
72-
Name: envoyBootstrapConfigVolume,
73-
VolumeSource: corev1.VolumeSource{
74-
Secret: &corev1.SecretVolumeSource{
75-
SecretName: secretName,
76-
},
77-
},
78-
},
79-
{
80-
Name: envoyXDSSecretVolume,
81-
VolumeSource: corev1.VolumeSource{
82-
ConfigMap: &corev1.ConfigMapVolumeSource{
83-
LocalObjectReference: corev1.LocalObjectReference{
84-
Name: configMapName,
85-
},
86-
},
87-
},
88-
},
89-
},
90-
},
9167
}
9268

9369
_, err := kubeClient.CoreV1().ConfigMaps(namespace).Create(context.Background(), &configMap, metav1.CreateOptions{})

0 commit comments

Comments
 (0)