Skip to content

Commit 10909d3

Browse files
patrick-stephenscubic-dev-ai[bot]
patrick-stephens
and
cubic-dev-ai[bot]
authored
Apply suggestions from code review
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com> Signed-off-by: Pat <patrick.j.k.stephens@gmail.com>
1 parent bd5994f commit 10909d3

12 files changed

+28
-28
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
# Look for the default line in the Dockerfile
6363
id: set-version
6464
run: |
65-
VERSION=$(grep "ARG TELEMETRY_FORGE_AGENT_VERSION=" Dockerfile.ubi | cut -d '=' -s -f 2 -)
65+
VERSION=$(grep "ARG FLUENTDO_AGENT_VERSION=" Dockerfile.ubi | cut -d '=' -s -f 2 -)
6666
# For releases we use the tag
6767
if [[ '${{ steps.set-build-type.outputs.build-type }}' == 'release' ]]; then
6868
TAG_NAME=${GITHUB_REF#refs/tags/}

‎.github/workflows/call-build-containers.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
run: ./scripts/setup-code.sh
8585
shell: bash
8686
env:
87-
TELEMETRY_FORGE_AGENT_VERSION: ${{ inputs.version }}
87+
FLUENTDO_AGENT_VERSION: ${{ inputs.version }}
8888

8989
- name: Deltas
9090
run: git diff
@@ -143,7 +143,7 @@ jobs:
143143
# Make sure we push our custom labels to the image
144144
labels: ${{ steps.meta.outputs.labels }}
145145
build-args: |
146-
TELEMETRY_FORGE_AGENT_VERSION=${{ inputs.version }}
146+
FLUENTDO_AGENT_VERSION=${{ inputs.version }}
147147
provenance: false
148148

149149
- name: Export ${{ matrix.target }} digest
@@ -198,7 +198,7 @@ jobs:
198198
# We only build for amd64 as the test image is only used for running BATS tests
199199
platforms: linux/amd64
200200
target: test
201-
build-args: |
201+
FLUENTDO_AGENT_VERSION=${{ inputs.version }}
202202
TELEMETRY_FORGE_AGENT_VERSION=${{ inputs.version }}
203203
provenance: false
204204
push: true

‎.github/workflows/call-build-linux-packages.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
run: ./scripts/setup-code.sh
7575
shell: bash
7676
env:
77-
TELEMETRY_FORGE_AGENT_VERSION: ${{ inputs.version }}
77+
FLUENTDO_AGENT_VERSION: ${{ inputs.version }}
7878

7979
- name: Deltas
8080
run: git diff

‎.github/workflows/call-build-macos-packages.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
run: ./scripts/setup-code.sh
6666
shell: bash
6767
env:
68-
TELEMETRY_FORGE_AGENT_VERSION: ${{ inputs.version }}
68+
FLUENTDO_AGENT_VERSION: ${{ inputs.version }}
6969

7070
- name: Ensure we have a build directory
7171
run: mkdir -p source/build
@@ -93,13 +93,13 @@ jobs:
9393
- name: Check linkage
9494
continue-on-error: true
9595
run: |
96-
DYLD_PRINT_LIBRARIES=1 DYLD_PRINT_LIBRARIES_POST_LAUNCH=1 DYLD_PRINT_RPATHS=1 bin/telemetryforge-agent --dry-run
96+
DYLD_PRINT_LIBRARIES=1 DYLD_PRINT_LIBRARIES_POST_LAUNCH=1 DYLD_PRINT_RPATHS=1 bin/fluentdo-agent --dry-run
9797
working-directory: source/build
9898

9999
- name: Upload build packages
100100
uses: actions/upload-artifact@v6
101101
with:
102102
name: package-macos-${{ matrix.config.package }}
103103
path: |
104-
source/build/telemetryforge-agent-*.pkg
104+
source/build/fluentdo-agent-*.pkg
105105
if-no-files-found: error

‎.github/workflows/call-build-windows-packages.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
run: ./scripts/setup-code.sh
4949
shell: bash
5050
env:
51-
TELEMETRY_FORGE_AGENT_VERSION: ${{ inputs.version }}
51+
FLUENTDO_AGENT_VERSION: ${{ inputs.version }}
5252

5353
- name: Deltas
5454
run: git diff
@@ -144,8 +144,8 @@ jobs:
144144
-DFLB_LIBYAML_DIR='C:\vcpkg\installed\${{ matrix.config.vcpkg_triplet }}' `
145145
-DLIBGIT2_INCLUDE_DIR='C:\vcpkg\installed\${{ matrix.config.vcpkg_triplet }}\include' `
146146
-DLIBGIT2_LIBRARY='C:\vcpkg\installed\${{ matrix.config.vcpkg_triplet }}\lib\git2.lib' `
147-
-DTELEMETRY_FORGE_AGENT_DISTRO=${{ matrix.config.distro }} `
148-
-DTELEMETRY_FORGE_AGENT_PACKAGE_TYPE=PACKAGE `
147+
-DFLUENTDO_AGENT_DISTRO=${{ matrix.config.distro }} `
148+
-DFLUENTDO_AGENT_PACKAGE_TYPE=PACKAGE `
149149
-DFLB_IN_CALYPTIA_FLEET=Off `
150150
-DFLB_IN_DOCKER=Off `
151151
-DFLB_IN_DOCKER_EVENTS=Off `
@@ -185,7 +185,7 @@ jobs:
185185
with:
186186
name: package-windows-${{ matrix.config.arch }}
187187
path: |
188-
source/build/telemetryforge-agent-*.exe
189-
source/build/telemetryforge-agent-*.msi
190-
source/build/telemetryforge-agent-*.zip
188+
source/build/fluentdo-agent-*.exe
189+
source/build/fluentdo-agent-*.msi
190+
source/build/fluentdo-agent-*.zip
191191
if-no-files-found: error

‎.github/workflows/call-test-containers-k8s.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
name: Test K8S version ${{ inputs.kind-version }} with ${{ inputs.image }}:${{ inputs.image-tag }}
3030
runs-on: ubuntu-latest
3131
env:
32-
TELEMETRY_FORGE_AGENT_IMAGE: ${{ inputs.image }}
33-
TELEMETRY_FORGE_AGENT_TAG: ${{ inputs.image-tag }}
32+
FLUENTDO_AGENT_IMAGE: ${{ inputs.image }}
33+
FLUENTDO_AGENT_TAG: ${{ inputs.image-tag }}
3434
KIND_VERSION: ${{ inputs.kind-version }}
3535
steps:
3636
- name: Checkout code

‎.github/workflows/call-test-containers.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
name: Run BATS tests for ${{ inputs.image }}/test:${{ inputs.image-tag }}
5050
runs-on: ubuntu-latest
5151
env:
52-
TELEMETRY_FORGE_AGENT_TAG: ${{ inputs.image-tag }}
52+
FLUENTDO_AGENT_TAG: ${{ inputs.image-tag }}
5353
permissions:
5454
packages: read
5555
steps:
@@ -68,11 +68,11 @@ jobs:
6868
password: ${{ secrets.github-token }}
6969

7070
- name: Run all functional BATS tests
71-
run: docker run --rm -t "${TELEMETRY_FORGE_AGENT_IMAGE}:${TELEMETRY_FORGE_AGENT_TAG}"
71+
run: docker run --rm -t "${FLUENTDO_AGENT_IMAGE}:${FLUENTDO_AGENT_TAG}"
7272
shell: bash
7373
env:
7474
# Use the BATS functional test image here
75-
TELEMETRY_FORGE_AGENT_IMAGE: ${{ inputs.image }}/test
75+
FLUENTDO_AGENT_IMAGE: ${{ inputs.image }}/test
7676

7777
- name: Install BATS
7878
uses: bats-core/bats-action@3.0.1
@@ -91,7 +91,7 @@ jobs:
9191
shell: bash
9292
env:
9393
# We use the actual image here for testing against
94-
TELEMETRY_FORGE_AGENT_IMAGE: ${{ inputs.image }}
94+
FLUENTDO_AGENT_IMAGE: ${{ inputs.image }}
9595
# allow for some parallelity without GNU parallel, since it is not installed by default
9696
BATS_NO_PARALLELIZE_ACROSS_FILES: 1
9797
BATS_NUMBER_OF_PARALLEL_JOBS: 4

‎.github/workflows/call-test-packages.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ on:
3333
description: The Dockerhub token to use for authenticated pulls (not pushes).
3434
required: true
3535
env:
36-
TELEMETRY_FORGE_AGENT_VERSION: ${{ inputs.version }}
36+
FLUENTDO_AGENT_VERSION: ${{ inputs.version }}
3737
jobs:
3838
# This job converts the JSON build-matrix coming in to a matrix of test jobs.
3939
# We convert using the following rules:
@@ -175,7 +175,7 @@ jobs:
175175
package-type: deb
176176
package: package-ubuntu-24.04
177177
name: ubuntu
178-
binary: /opt/telemetryforge-agent/bin/fluent-bit
178+
binary: /opt/fluentdo-agent/bin/fluent-bit
179179
# - runner: windows-latest
180180
# package-type: msi
181181
# package: package-windows

‎.github/workflows/lint-packages.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ jobs:
4242

4343
- name: List contents
4444
continue-on-error: true
45-
run: find "downloads/" -name 'telemetryforge-agent_*_amd64.deb' -exec dpkg -c {} \;
45+
run: find "downloads/" -name 'fluentdo-agent_*_amd64.deb' -exec dpkg -c {} \;
4646
shell: bash
4747

4848
- name: List control files
4949
continue-on-error: true
5050
run: |
51-
find "downloads/" -name 'telemetryforge-agent_*_amd64.deb' -exec dpkg -e {} \;
51+
find "downloads/" -name 'fluentdo-agent_*_amd64.deb' -exec dpkg -e {} \;
5252
ls -lRh DEBIAN/
5353
shell: bash
5454

@@ -59,5 +59,5 @@ jobs:
5959
shell: bash
6060

6161
- name: Run Lintian
62-
run: find "downloads/" -name 'telemetryforge-agent_*_amd64.deb' -exec lintian --fail-on=error --cfg $PWD/.lintian -c {} \;
62+
run: find "downloads/" -name 'fluentdo-agent_*_amd64.deb' -exec lintian --fail-on=error --cfg $PWD/.lintian -c {} \;
6363
shell: bash

‎.github/workflows/pr-comment-build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
id: set-version
116116
run: |
117117
set -euo pipefail
118-
VERSION=$(grep "ARG TELEMETRY_FORGE_AGENT_VERSION=" Dockerfile.ubi | cut -d '=' -s -f 2 -)
118+
VERSION=$(grep "ARG FLUENTDO_AGENT_VERSION=" Dockerfile.ubi | cut -d '=' -s -f 2 -)
119119
echo "Using version: $VERSION"
120120
echo "version=$VERSION" >> $GITHUB_OUTPUT
121121
shell: bash

0 commit comments

Comments
 (0)