Skip to content

Commit 21eabf6

Browse files
author
Dominik Rosiek
committed
feat: release Sumo Logic Mock as replacement for Receiver Mock
Signed-off-by: Dominik Rosiek <[email protected]>
1 parent 0b14e06 commit 21eabf6

33 files changed

+137
-70
lines changed

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/src/rust/receiver-mock/target/
1+
/src/rust/sumologic-mock/target/
22
.github/
33
/src/go/stress-tester
44
/src/go/k8s-api-test

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ updates:
1515
timezone: "Europe/Warsaw"
1616

1717
- package-ecosystem: "cargo"
18-
directory: "src/rust/receiver-mock"
18+
directory: "src/rust/sumologic-mock"
1919
schedule:
2020
interval: "daily"
2121
time: "06:00"

.github/workflows/dev_builds.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,16 @@ jobs:
4545
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
4646
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_KUBECTL }}
4747
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_KUBECTL }}
48+
build-and-push-image-sumologic-mock:
49+
uses: ./.github/workflows/build_and_push_image.yml
50+
needs: extract-image-tag
51+
with:
52+
build_tag: ${{ needs.extract-image-tag.outputs.build_tag }}
53+
sufffix: sumologic-mock
54+
secrets:
55+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
56+
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
57+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_SUMOLOGIC_MOCK }}
58+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_SUMOLOGIC_MOCK }}
4859
build-binaries:
4960
uses: ./.github/workflows/build_binaries.yml

.github/workflows/pre_release_builds.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,14 @@ jobs:
4141
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
4242
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_KUBECTL }}
4343
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_KUBECTL }}
44+
build-and-push-image-sumologic-mock:
45+
uses: ./.github/workflows/build_and_push_image.yml
46+
needs: extract-image-tag
47+
with:
48+
build_tag: ${{ needs.extract-image-tag.outputs.build_tag }}
49+
suffix: sumologic-mock
50+
secrets:
51+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
52+
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
53+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_SUMOLOGIC_MOCK }}
54+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_SUMOLOGIC_MOCK }}

.github/workflows/pull_requests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Check markdown files with markdownlint
1818
run: make markdownlint
1919

20-
test-receiver-mock:
20+
test-sumologic-mock:
2121
runs-on: ubuntu-20.04
2222
steps:
2323
- uses: actions/checkout@v4
@@ -26,14 +26,14 @@ jobs:
2626
toolchain: stable
2727
- name: Install Protoc
2828
uses: arduino/setup-protoc@v2
29-
- name: Build receiver-mock
30-
working-directory: src/rust/receiver-mock/
29+
- name: Build Sumo Logic Mock
30+
working-directory: src/rust/sumologic-mock/
3131
run: cargo rustc -- -D warnings
32-
- name: Check receiver-mock formatting
33-
working-directory: src/rust/receiver-mock/
32+
- name: Check sumologic-mock formatting
33+
working-directory: src/rust/sumologic-mock/
3434
run: make check-rustfmt
35-
- name: Test receiver-mock
36-
working-directory: src/rust/receiver-mock/
35+
- name: Test sumologic-mock
36+
working-directory: src/rust/sumologic-mock/
3737
run: make test
3838

3939
build-image:

.github/workflows/release_builds.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,18 @@ jobs:
4141
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
4242
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_KUBECTL }}
4343
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_KUBECTL }}
44+
build-and-push-image-sumologic-mock:
45+
uses: ./.github/workflows/build_and_push_image.yml
46+
needs: extract-image-tag
47+
with:
48+
build_tag: ${{ needs.extract-image-tag.outputs.build_tag }}
49+
tag_latest: true
50+
suffix: sumologic-mock
51+
secrets:
52+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
53+
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
54+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_SUMOLOGIC_MOCK }}
55+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_SUMOLOGIC_MOCK }}
4456
build-binaries:
4557
uses: ./.github/workflows/build_binaries.yml
4658
create-release:

Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ RUN apk update \
3131
# Protoc is needed to build opentelemetry-proto Rust dependency.
3232
&& apk add protoc
3333

34-
WORKDIR /receiver-mock
35-
COPY ./src/rust/receiver-mock .
36-
RUN cargo build --release
37-
3834
WORKDIR /logs-generator
3935
COPY ./src/rust/logs-generator .
4036
RUN cargo build --release
@@ -95,7 +91,6 @@ COPY --from=go-builder \
9591
/usr/bin/
9692

9793
COPY --from=rust-builder \
98-
/receiver-mock/target/release/receiver-mock \
9994
/logs-generator/target/release/logs-generator \
10095
/usr/bin/
10196

Dockerfile.sumologic-mock

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
FROM rust:1.68.2-alpine3.16 as rust-builder
2+
RUN apk update \
3+
&& apk upgrade \
4+
&& apk add g++ git \
5+
# Cmake and make are needed to build proto-build Rust dependency.
6+
&& apk add cmake make \
7+
# Protoc is needed to build opentelemetry-proto Rust dependency.
8+
&& apk add protoc
9+
10+
WORKDIR /sumologic-mock
11+
COPY ./src/rust/sumologic-mock .
12+
RUN cargo build --release
13+
14+
FROM alpine:3.17.3
15+
ARG TARGETARCH
16+
ARG TARGETOS
17+
18+
COPY --from=rust-builder \
19+
/sumologic-mock/target/release/sumologic-mock \
20+
/usr/bin/
21+
22+
CMD ["/usr/bin/sumologic-mock"]

Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,19 @@ build-image-tools:
4242
build-image-kubectl:
4343
TAG=$(BUILD_TAG) docker buildx bake kubectl
4444

45+
build-image-sumologic-mock:
46+
TAG=$(BUILD_TAG) docker buildx bake sumologic-mock
47+
4548
build-image-multiplatform: build-image-multiplatform-tools build-image-multiplatform-kubectl
4649

4750
build-image-multiplatform-tools:
48-
TAG=$(BUILD_TAG) docker buildx bake tools-multiplatform
51+
TAG=$(BUILD_TAG) docker buildx bake tools-multiplatform
4952

5053
build-image-multiplatform-kubectl:
51-
TAG=$(BUILD_TAG) docker buildx bake kubectl-multiplatform
54+
TAG=$(BUILD_TAG) docker buildx bake kubectl-multiplatform
55+
56+
build-image-multiplatform-sumologic-mock:
57+
TAG=$(BUILD_TAG) docker buildx bake sumologic-mock-multiplatform
5258

5359
tag-release-image-with-latest-tools:
5460
make push-image-tools BUILD_TAG=latest

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,19 +156,19 @@ You can configure this tool by setting the following env variables:
156156
2021/07/09 00:33:10 Expected number of spans for all traces: 40
157157
```
158158

159-
### Receiver-mock
159+
### Sumo Logic Mock
160160

161-
Small tool for mocking sumologic receiver to avoid sending data outside of cluster.
161+
Small tool for mocking Sumo Logic receiver to avoid sending data outside of cluster.
162162

163163
```bash
164-
$ kubectl run receiver-mock \
164+
$ kubectl run sumologic-mock \
165165
-it --rm \
166166
--restart=Never \
167167
--image sumologic/kubernetes-tools \
168-
-- receiver-mock --help
168+
-- sumologic-mock --help
169169
```
170170

171-
[More information](src/rust/receiver-mock/README.md)
171+
[More information](src/rust/sumologic-mock/README.md)
172172

173173
### Template dependency configuration
174174

0 commit comments

Comments
 (0)