Skip to content

Commit 6c52c7d

Browse files
sbylica-splunksbylica-splunk
authored
fix: resolve sonarqube reported issues (#2690)
* Refactoring and fixing sonarqube issues * Added custom marks to pytest.ini * Excluded tests from sonarqube scan
1 parent bf1eba8 commit 6c52c7d

File tree

106 files changed

+442
-361
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+442
-361
lines changed

‎.github/workflows/ci-lite.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
with:
6363
semantic_version: 18
6464
extra_plugins: |
65-
@semantic-release/exec
65+
@semantic-release/exec@v6.0.3
6666
@semantic-release/git
6767
semantic-release-helm
6868
@google/semantic-release-replace-plugin@1.2.0
@@ -430,7 +430,7 @@ jobs:
430430
with:
431431
semantic_version: 18
432432
extra_plugins: |
433-
@semantic-release/exec
433+
@semantic-release/exec@v6.0.3
434434
@semantic-release/git
435435
semantic-release-helm
436436
@google/semantic-release-replace-plugin@1.2.0

‎.github/workflows/ci-main.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
with:
6363
semantic_version: 18
6464
extra_plugins: |
65-
@semantic-release/exec
65+
@semantic-release/exec@v6.0.3
6666
@semantic-release/git
6767
semantic-release-helm
6868
@google/semantic-release-replace-plugin@1.2.0
@@ -456,7 +456,7 @@ jobs:
456456
with:
457457
semantic_version: 18
458458
extra_plugins: |
459-
@semantic-release/exec
459+
@semantic-release/exec@v6.0.3
460460
@semantic-release/git
461461
semantic-release-helm
462462
@google/semantic-release-replace-plugin@1.2.0

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ tags
304304
# Persistent undo
305305
[._]*.un~
306306

307-
<<<<<<< HEAD
308307
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
309308
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
310309

‎ansible/Dockerfile‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
# install requirements in venv
22
FROM python:3.10 AS venv_builder
3-
RUN pip install ansible~=6.1.0 --no-cache-dir
4-
RUN pip install pywinrm>=0.4.2 --no-cache-dir
5-
RUN pip install ansible-lint>=6.0.0 --no-cache-dir
3+
RUN pip install ansible~=6.1.0 --no-cache-dir \
4+
&& pip install pywinrm>=0.4.2 --no-cache-dir \
5+
&& pip install ansible-lint>=6.0.0 --no-cache-dir
66

77
WORKDIR /opt
88
COPY ./ansible .
99
COPY ./charts .
1010

11-
RUN apt-get update -y
12-
RUN apt-get install parallel -y
13-
RUN apt-get install sshpass
11+
RUN apt update -y \
12+
&& apt install --no-install-recommends -y build-essential parallel \
13+
&& apt install --no-install-recommends -y sshpass \
14+
&& apt clean
1415

1516
ENV ANSIBLE_CONFIG /opt/ansible.cfg
1617
ENV ANSIBLE_HOST_KEY_CHECKING False

‎ansible/app/docker-compose.yml‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
version: "3.7"
23
services:
34
sc4s:
@@ -7,18 +8,18 @@ services:
78
condition: on-failure
89
image: ghcr.io/splunk/splunk-connect-for-syslog/container3:latest
910
ports:
10-
- target: 514
11-
published: 514
12-
protocol: tcp
13-
- target: 514
14-
published: 514
15-
protocol: udp
16-
- target: 601
17-
published: 601
18-
protocol: tcp
19-
- target: 6514
20-
published: 6514
21-
protocol: tcp
11+
- target: 514
12+
published: 514
13+
protocol: tcp
14+
- target: 514
15+
published: 514
16+
protocol: udp
17+
- target: 601
18+
published: 601
19+
protocol: tcp
20+
- target: 6514
21+
published: 6514
22+
protocol: tcp
2223
env_file:
2324
- /opt/sc4s/env_file
2425
volumes:
@@ -30,4 +31,4 @@ services:
3031
# - /opt/sc4s/tls:/etc/syslog-ng/tls:z
3132

3233
volumes:
33-
splunk-sc4s-var:
34+
splunk-sc4s-var:

‎ansible/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
## SPDX-License-Identifier: LicenseRef-Splunk-8-2021
44
##
55
##
6+
---
67
version: "3.7"
78
services:
8-
99
ansible_sc4s:
1010
build:
1111
context: ../

‎ansible/inventory/inventory.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
---
12
all:
23
hosts:
34
children:
45
node:
56
hosts:
67
node_1:
7-
ansible_host:
8+
ansible_host:

‎ansible/inventory/inventory_microk8s.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
all:
23
hosts:
34
children:

‎ansible/inventory/inventory_microk8s_ha.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
all:
23
hosts:
34
children:

‎ansible/inventory/inventory_swarm.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
all:
23
hosts:
34
children:

0 commit comments

Comments
 (0)