Skip to content

Commit 7fa8698

Browse files
Fix app_tel_for_sok app.conf install stanza header (#1724)
* Fixes the app.conf within the app_tel_for_sok app which has -e [install] on its first line instead of just [install] * skipping code coverage for PRs from forks (as the secrets for COVERALLS_TOKEN is not available in these workflow runs for GitHub security reasons) * adding similar fix due to secret for FOSSA_API_TOKEN not being available --------- Co-authored-by: Gabriel J Mendoza <gabrielm@splunk.com>
1 parent 76f6658 commit 7fa8698

6 files changed

Lines changed: 7 additions & 2 deletions

.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ jobs:
4949
- name: Run Unit Tests
5050
run: make test
5151
- name: Run Code Coverage
52+
if: ${{ secrets.COVERALLS_TOKEN != '' }}
5253
run: goveralls -coverprofile=coverage.out -service=circle-ci -repotoken ${{ secrets.COVERALLS_TOKEN }}
5354
- name: Upload Coverage artifacts
5455
uses: actions/upload-artifact@v4.4.0

.github/workflows/arm-Ubuntu-build-test-push-workflow.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ jobs:
4949
- name: Run Unit Tests
5050
run: make test
5151
- name: Run Code Coverage
52+
if: ${{ secrets.COVERALLS_TOKEN != '' }}
5253
run: goveralls -coverprofile=coverage.out -service=circle-ci -repotoken ${{ secrets.COVERALLS_TOKEN }}
5354
- name: Upload Coverage artifacts
5455
uses: actions/upload-artifact@v4.4.0

.github/workflows/build-test-push-workflow.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
run: |
6262
make test
6363
- name: Run Code Coverage
64+
if: ${{ secrets.COVERALLS_TOKEN != '' }}
6465
run: goveralls -shallow -coverprofile=coverage.out -service=circle-ci -repotoken ${{ secrets.COVERALLS_TOKEN }}
6566
- name: Upload Coverage artifacts
6667
uses: actions/upload-artifact@v4.4.0

.github/workflows/distroless-build-test-push-workflow.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ jobs:
5555
- name: Run Unit Tests
5656
run: make test
5757
- name: Run Code Coverage
58+
if: ${{ secrets.COVERALLS_TOKEN != '' }}
5859
run: goveralls -shallow -coverprofile=coverage.out -service=circle-ci -repotoken ${{ secrets.COVERALLS_TOKEN }}
5960
- name: Upload Coverage artifacts
6061
uses: actions/upload-artifact@v4.4.0

.github/workflows/prodsec-workflow.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
id: dotenv
4040
uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
4141
- name: Run FOSSA Test
42+
if: ${{ secrets.FOSSA_API_TOKEN != '' }}
4243
uses: fossas/fossa-action@main
4344
with:
4445
api-key: ${{secrets.FOSSA_API_TOKEN}}

pkg/splunk/enterprise/names.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ access = read : [ * ], write : [ admin ]
201201
`
202202

203203
// Command to create telemetry app on non SHC scenarios
204-
createTelAppNonShcString = "mkdir -p /opt/splunk/etc/apps/app_tel_for_sok/default/; mkdir -p /opt/splunk/etc/apps/app_tel_for_sok/metadata/; echo -e \"%s\" > /opt/splunk/etc/apps/app_tel_for_sok/default/app.conf; echo -e \"%s\" > /opt/splunk/etc/apps/app_tel_for_sok/metadata/default.meta"
204+
createTelAppNonShcString = "mkdir -p /opt/splunk/etc/apps/app_tel_for_sok/default/; mkdir -p /opt/splunk/etc/apps/app_tel_for_sok/metadata/; printf '%%s' \"%s\" > /opt/splunk/etc/apps/app_tel_for_sok/default/app.conf; printf '%%s' \"%s\" > /opt/splunk/etc/apps/app_tel_for_sok/metadata/default.meta"
205205

206206
// Command to create telemetry app on SHC scenarios
207-
createTelAppShcString = "mkdir -p %s/app_tel_for_sok/default/; mkdir -p %s/app_tel_for_sok/metadata/; echo -e \"%s\" > %s/app_tel_for_sok/default/app.conf; echo -e \"%s\" > %s/app_tel_for_sok/metadata/default.meta"
207+
createTelAppShcString = "mkdir -p %s/app_tel_for_sok/default/; mkdir -p %s/app_tel_for_sok/metadata/; printf '%%s' \"%s\" > %s/app_tel_for_sok/default/app.conf; printf '%%s' \"%s\" > %s/app_tel_for_sok/metadata/default.meta"
208208

209209
// Command to reload app configuration
210210
telAppReloadString = "curl -k -u admin:`cat /mnt/splunk-secrets/password` https://localhost:8089/services/apps/local/_reload"

0 commit comments

Comments
 (0)