Skip to content

Commit 118c91c

Browse files
IldarMinaevIldarMinaev
committed
Update Unit tests for nginxCloneScriptTemplate
1 parent a803ee4 commit 118c91c

File tree

4 files changed

+23
-7
lines changed

4 files changed

+23
-7
lines changed

‎.chloggen/patch-1.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: bug_fix
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
5+
component: auto-instrumentation
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Fix nginxCloneScriptTemplate for old shells
9+
10+
# One or more tracking issues related to the change
11+
issues: [3651]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext:

‎pkg/instrumentation/nginx_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestInjectNginxSDK(t *testing.T) {
8383
Name: nginxAgentCloneContainerName,
8484
Image: "",
8585
Command: []string{"/bin/sh", "-c"},
86-
Args: []string{"cp -r /etc/nginx/* /opt/opentelemetry-webserver/source-conf && export NGINX_VERSION=$( { nginx -v ; } 2>&1 ) && echo ${NGINX_VERSION##*/} > /opt/opentelemetry-webserver/source-conf/version.txt"},
86+
Args: []string{"cp -r /etc/nginx/* /opt/opentelemetry-webserver/source-conf && export NGINX_VERSION=\"$( { nginx -v ; } 2>&1 )\" && echo ${NGINX_VERSION##*/} > /opt/opentelemetry-webserver/source-conf/version.txt"},
8787
VolumeMounts: []corev1.VolumeMount{{
8888
Name: nginxAgentConfigVolume,
8989
MountPath: nginxAgentConfDirFull,
@@ -188,7 +188,7 @@ func TestInjectNginxSDK(t *testing.T) {
188188
Name: nginxAgentCloneContainerName,
189189
Image: "",
190190
Command: []string{"/bin/sh", "-c"},
191-
Args: []string{"cp -r /opt/nginx/* /opt/opentelemetry-webserver/source-conf && export NGINX_VERSION=$( { nginx -v ; } 2>&1 ) && echo ${NGINX_VERSION##*/} > /opt/opentelemetry-webserver/source-conf/version.txt"},
191+
Args: []string{"cp -r /opt/nginx/* /opt/opentelemetry-webserver/source-conf && export NGINX_VERSION=\"$( { nginx -v ; } 2>&1 )\" && echo ${NGINX_VERSION##*/} > /opt/opentelemetry-webserver/source-conf/version.txt"},
192192
VolumeMounts: []corev1.VolumeMount{{
193193
Name: nginxAgentConfigVolume,
194194
MountPath: nginxAgentConfDirFull,
@@ -296,7 +296,7 @@ func TestInjectNginxSDK(t *testing.T) {
296296
Name: nginxAgentCloneContainerName,
297297
Image: "",
298298
Command: []string{"/bin/sh", "-c"},
299-
Args: []string{"cp -r /etc/nginx/* /opt/opentelemetry-webserver/source-conf && export NGINX_VERSION=$( { nginx -v ; } 2>&1 ) && echo ${NGINX_VERSION##*/} > /opt/opentelemetry-webserver/source-conf/version.txt"},
299+
Args: []string{"cp -r /etc/nginx/* /opt/opentelemetry-webserver/source-conf && export NGINX_VERSION=\"$( { nginx -v ; } 2>&1 )\" && echo ${NGINX_VERSION##*/} > /opt/opentelemetry-webserver/source-conf/version.txt"},
300300
VolumeMounts: []corev1.VolumeMount{{
301301
Name: nginxAgentConfigVolume,
302302
MountPath: nginxAgentConfDirFull,
@@ -404,7 +404,7 @@ func TestInjectNginxSDK(t *testing.T) {
404404
Name: nginxAgentCloneContainerName,
405405
Image: "",
406406
Command: []string{"/bin/sh", "-c"},
407-
Args: []string{"cp -r /etc/nginx/* /opt/opentelemetry-webserver/source-conf && export NGINX_VERSION=$( { nginx -v ; } 2>&1 ) && echo ${NGINX_VERSION##*/} > /opt/opentelemetry-webserver/source-conf/version.txt"},
407+
Args: []string{"cp -r /etc/nginx/* /opt/opentelemetry-webserver/source-conf && export NGINX_VERSION=\"$( { nginx -v ; } 2>&1 )\" && echo ${NGINX_VERSION##*/} > /opt/opentelemetry-webserver/source-conf/version.txt"},
408408
VolumeMounts: []corev1.VolumeMount{{
409409
Name: nginxAgentConfigVolume,
410410
MountPath: nginxAgentConfDirFull,
@@ -528,7 +528,7 @@ func TestInjectNginxUnknownNamespace(t *testing.T) {
528528
Name: nginxAgentCloneContainerName,
529529
Image: "",
530530
Command: []string{"/bin/sh", "-c"},
531-
Args: []string{"cp -r /etc/nginx/* /opt/opentelemetry-webserver/source-conf && export NGINX_VERSION=$( { nginx -v ; } 2>&1 ) && echo ${NGINX_VERSION##*/} > /opt/opentelemetry-webserver/source-conf/version.txt"},
531+
Args: []string{"cp -r /etc/nginx/* /opt/opentelemetry-webserver/source-conf && export NGINX_VERSION=\"$( { nginx -v ; } 2>&1 )\" && echo ${NGINX_VERSION##*/} > /opt/opentelemetry-webserver/source-conf/version.txt"},
532532
VolumeMounts: []corev1.VolumeMount{{
533533
Name: nginxAgentConfigVolume,
534534
MountPath: nginxAgentConfDirFull,

‎pkg/instrumentation/podmutator_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3183,7 +3183,7 @@ func TestMutatePod(t *testing.T) {
31833183
Name: nginxAgentCloneContainerName,
31843184
Image: "",
31853185
Command: []string{"/bin/sh", "-c"},
3186-
Args: []string{"cp -r /etc/nginx/* /opt/opentelemetry-webserver/source-conf && export NGINX_VERSION=$( { nginx -v ; } 2>&1 ) && echo ${NGINX_VERSION##*/} > /opt/opentelemetry-webserver/source-conf/version.txt"},
3186+
Args: []string{"cp -r /etc/nginx/* /opt/opentelemetry-webserver/source-conf && export NGINX_VERSION=\"$( { nginx -v ; } 2>&1 )\" && echo ${NGINX_VERSION##*/} > /opt/opentelemetry-webserver/source-conf/version.txt"},
31873187
VolumeMounts: []corev1.VolumeMount{{
31883188
Name: nginxAgentConfigVolume,
31893189
MountPath: nginxAgentConfDirFull,

‎pkg/instrumentation/sdk_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2003,7 +2003,7 @@ func TestInjectNginx(t *testing.T) {
20032003
Name: nginxAgentCloneContainerName,
20042004
Image: "",
20052005
Command: []string{"/bin/sh", "-c"},
2006-
Args: []string{"cp -r /etc/nginx/* /opt/opentelemetry-webserver/source-conf && export NGINX_VERSION=$( { nginx -v ; } 2>&1 ) && echo ${NGINX_VERSION##*/} > /opt/opentelemetry-webserver/source-conf/version.txt"},
2006+
Args: []string{"cp -r /etc/nginx/* /opt/opentelemetry-webserver/source-conf && export NGINX_VERSION=\"$( { nginx -v ; } 2>&1 )\" && echo ${NGINX_VERSION##*/} > /opt/opentelemetry-webserver/source-conf/version.txt"},
20072007
VolumeMounts: []corev1.VolumeMount{{
20082008
Name: nginxAgentConfigVolume,
20092009
MountPath: nginxAgentConfDirFull,

0 commit comments

Comments
 (0)