Skip to content
This repository was archived by the owner on Nov 7, 2025. It is now read-only.

Commit a65abfd

Browse files
authored
Extracting cmd module (#1269)
This PR is about extracting files needed to build `quesma-cli` executable into separate module. '/run-integration-tests' cc @mieciu
1 parent 8a32ac5 commit a65abfd

21 files changed

+390
-7
lines changed

.github/workflows/build-quesma-docker-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
build-quesma-docker-image:
3232
strategy:
3333
matrix:
34-
module: [ "platform" ]
34+
module: [ "cmd" ]
3535
runs-on: ubuntu-latest
3636
steps:
3737
- uses: actions/checkout@v4

.github/workflows/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
quesma-test-and-compile:
1717
strategy:
1818
matrix:
19-
module: [ "platform" ]
19+
module: [ "platform", "cmd" ]
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@v4

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
build-quesma-docker-image: # based on nightly-docker-build-and-push.yml, but heavily modified
1717
strategy:
1818
matrix:
19-
module: [ "platform" ]
19+
module: [ "cmd" ]
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Validate input - needs to match semver

bin/build-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ QUESMA_VERSION="development"
99

1010
export DOCKER_BUILDKIT=1
1111

12-
docker build --build-arg QUESMA_BUILD_DATE="$QUESMA_BUILD_DATE" --build-arg QUESMA_VERSION="$QUESMA_VERSION" --build-arg QUESMA_BUILD_SHA="$QUESMA_BUILD_SHA" -f platform/Dockerfile -t quesma/quesma:nightly platform
12+
docker build --build-arg QUESMA_BUILD_DATE="$QUESMA_BUILD_DATE" --build-arg QUESMA_VERSION="$QUESMA_VERSION" --build-arg QUESMA_BUILD_SHA="$QUESMA_BUILD_SHA" -f cmd/Dockerfile -t quesma/quesma:nightly cmd

ci/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "3.7"
22
services:
33
quesma:
4-
build: ../platform
4+
build: ../cmd
55
image: quesma:nightly
66
environment:
77
- QUESMA_CONFIG_FILE=/mnt/ci-config.yaml

platform/Dockerfile renamed to cmd/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM golang:alpine AS builder
22

33

4-
WORKDIR /platform
4+
WORKDIR /cmd
55

66
COPY go.mod go.sum ./
77

@@ -37,7 +37,7 @@ RUN --mount=type=cache,target="/root/.cache/go-build" \
3737
FROM scratch
3838

3939
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
40-
COPY --from=builder /platform/bin /platform/healthcheck ./
40+
COPY --from=builder /cmd/bin /cmd/healthcheck ./
4141

4242
ENTRYPOINT [ "/bin" ]
4343
HEALTHCHECK --interval=1s --timeout=1s --start-period=2s --retries=3 CMD [ "/healthcheck" ]
File renamed without changes.
File renamed without changes.

cmd/go.mod

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
module github.com/QuesmaOrg/quesma/quesma-cli
2+
3+
go 1.24.0
4+
5+
require (
6+
github.com/QuesmaOrg/quesma/platform v0.0.0-20250303135300-04f0a4897c30
7+
github.com/goccy/go-json v0.10.5
8+
github.com/stretchr/testify v1.10.0
9+
)
10+
11+
require (
12+
filippo.io/edwards25519 v1.1.0 // indirect
13+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
14+
github.com/ClickHouse/ch-go v0.65.1 // indirect
15+
github.com/ClickHouse/clickhouse-go/v2 v2.32.2 // indirect
16+
github.com/DATA-DOG/go-sqlmock v1.5.2 // indirect
17+
github.com/DataDog/go-sqllexer v0.0.21 // indirect
18+
github.com/H0llyW00dzZ/cidr v1.2.1 // indirect
19+
github.com/andybalholm/brotli v1.1.1 // indirect
20+
github.com/apparentlymart/go-cidr v1.1.0 // indirect
21+
github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df // indirect
22+
github.com/beorn7/perks v1.0.1 // indirect
23+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
24+
github.com/coreos/go-semver v0.3.1 // indirect
25+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
26+
github.com/fsnotify/fsnotify v1.8.0 // indirect
27+
github.com/go-faster/city v1.0.1 // indirect
28+
github.com/go-faster/errors v0.7.1 // indirect
29+
github.com/go-ole/go-ole v1.3.0 // indirect
30+
github.com/go-sql-driver/mysql v1.9.0 // indirect
31+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
32+
github.com/golang/glog v1.2.4 // indirect
33+
github.com/google/go-cmp v0.7.0 // indirect
34+
github.com/google/uuid v1.6.0 // indirect
35+
github.com/gorilla/mux v1.8.1 // indirect
36+
github.com/gorilla/securecookie v1.1.2 // indirect
37+
github.com/gorilla/sessions v1.4.0 // indirect
38+
github.com/hashicorp/errwrap v1.1.0 // indirect
39+
github.com/hashicorp/go-multierror v1.1.1 // indirect
40+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
41+
github.com/jackc/pgpassfile v1.0.0 // indirect
42+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
43+
github.com/jackc/pgx/v5 v5.7.2 // indirect
44+
github.com/jackc/puddle/v2 v2.2.2 // indirect
45+
github.com/k0kubun/pp v3.0.1+incompatible // indirect
46+
github.com/klauspost/compress v1.18.0 // indirect
47+
github.com/knadh/koanf/maps v0.1.1 // indirect
48+
github.com/knadh/koanf/parsers/json v0.1.0 // indirect
49+
github.com/knadh/koanf/parsers/yaml v0.1.0 // indirect
50+
github.com/knadh/koanf/providers/file v1.1.2 // indirect
51+
github.com/knadh/koanf/v2 v2.1.2 // indirect
52+
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
53+
github.com/markbates/goth v1.80.0 // indirect
54+
github.com/mattn/go-colorable v0.1.14 // indirect
55+
github.com/mattn/go-isatty v0.0.20 // indirect
56+
github.com/mitchellh/copystructure v1.2.0 // indirect
57+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
58+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
59+
github.com/paulmach/orb v0.11.1 // indirect
60+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
61+
github.com/pires/go-proxyproto v0.7.0 // indirect
62+
github.com/pkg/errors v0.9.1 // indirect
63+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
64+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
65+
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
66+
github.com/prometheus/client_golang v1.21.0 // indirect
67+
github.com/prometheus/client_model v0.6.1 // indirect
68+
github.com/prometheus/common v0.62.0 // indirect
69+
github.com/prometheus/procfs v0.15.1 // indirect
70+
github.com/rs/zerolog v1.33.0 // indirect
71+
github.com/segmentio/asm v1.2.0 // indirect
72+
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
73+
github.com/shoenig/go-m1cpu v0.1.6 // indirect
74+
github.com/shopspring/decimal v1.4.0 // indirect
75+
github.com/spf13/pflag v1.0.5 // indirect
76+
github.com/tailscale/hujson v0.0.0-20241010212012-29efb4a0184b // indirect
77+
github.com/tidwall/gjson v1.18.0 // indirect
78+
github.com/tidwall/match v1.1.1 // indirect
79+
github.com/tidwall/pretty v1.2.1 // indirect
80+
github.com/tidwall/sjson v1.2.5 // indirect
81+
github.com/tklauser/go-sysconf v0.3.14 // indirect
82+
github.com/tklauser/numcpus v0.9.0 // indirect
83+
github.com/ucarion/urlpath v0.0.0-20200424170820-7ccc79b76bbb // indirect
84+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
85+
go.opentelemetry.io/otel v1.34.0 // indirect
86+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
87+
golang.org/x/crypto v0.33.0 // indirect
88+
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
89+
golang.org/x/oauth2 v0.27.0 // indirect
90+
golang.org/x/sync v0.11.0 // indirect
91+
golang.org/x/sys v0.30.0 // indirect
92+
golang.org/x/text v0.22.0 // indirect
93+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
94+
google.golang.org/grpc v1.66.2 // indirect
95+
google.golang.org/protobuf v1.36.1 // indirect
96+
gopkg.in/yaml.v3 v3.0.1 // indirect
97+
vitess.io/vitess v0.21.2 // indirect
98+
)

0 commit comments

Comments
 (0)