Skip to content

Commit c5007ce

Browse files
brulibruli
committed
Update to 1.24.2
1 parent 7fa2fba commit c5007ce

16 files changed

Lines changed: 1201 additions & 56 deletions

File tree

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ RUN mkdir /app
44
WORKDIR /app
55

66
RUN apt update && apt upgrade -y
7-
RUN apt install -y git make gcc gcc-arm-linux-gnueabi
8-
COPY --from=golang:1.21-bullseye /usr/local/go/ /usr/local/go/
7+
RUN apt install -y git make gcc
8+
COPY --from=golang:1.24.2-bullseye /usr/local/go/ /usr/local/go/
99
RUN echo "export PATH=\$PATH:/usr/local/go/bin" >> ~/.bashrc

‎Dockerfile-dev‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21-bullseye
1+
FROM golang:1.24.2-bullseye
22

33
RUN mkdir /app
44
WORKDIR /app

‎Makefile‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,41 @@ export help
1717
help:
1818
@echo "$$help"
1919

20+
.PHONY: test
2021
test:
2122
go test -race ./...
2223

24+
.PHONY: build
2325
build:
24-
CC=arm-linux-gnueabi-gcc CGO_ENABLED=1 GOOS=linux GOARCH=arm GOARM=6 go build -o devops/ansible/assets/telegram cmd/telegram/main.go
26+
CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 go build -o devops/ansible/assets/telegram cmd/telegram/main.go
2527

28+
.PHONY: coverage
2629
coverage:
2730
go test -coverprofile=coverage.out ./...
2831
go tool cover -html=coverage.out
2932

33+
.PHONY: encryptVault
3034
encryptVault:
3135
ansible-vault encrypt --vault-id raspberry_telegram@devops/ansible/password devops/ansible/inventories/production/group_vars/raspberry_telegram/vault.yml
36+
37+
.PHONY: decryptVault
3238
decryptVault:
3339
ansible-vault decrypt --vault-id raspberry_telegram@devops/ansible/password devops/ansible/inventories/production/group_vars/raspberry_telegram/vault.yml
3440

41+
.PHONY: deploy
3542
deploy:
3643
devops/scripts/deploy.sh
3744

45+
.PHONY: fumpt
46+
fumpt:
47+
go tool gofumpt -w -l .
48+
49+
.PHONY: lint
3850
lint:
39-
golangci-lint run
51+
go tool golangci-lint run
4052
go mod tidy -v && git --no-pager diff --quiet go.mod go.sum
4153

54+
.PHONY: docker-exec-builder
4255
docker-exec-builder:
4356
docker build -t builder .
4457
docker run -it --rm -v $(shell pwd):/app builder bash

‎cmd/telegram/main.go‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ import (
1616
"github.com/bruli/rasberryTelegram/internal/infra/api"
1717
telegram2 "github.com/bruli/rasberryTelegram/internal/infra/telegram"
1818
"github.com/bruli/raspberryRainSensor/pkg/common/cqs"
19-
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api"
19+
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
2020
"github.com/rs/zerolog"
2121
)
2222

2323
const (
24-
helpCommand = "help"
2524
statusCommand = "status"
2625
weatherCommand = "weather"
2726
logCommand = "log"
@@ -58,11 +57,7 @@ func main() {
5857
u := tgbotapi.NewUpdate(0)
5958
u.Timeout = 60
6059

61-
updates, err := bot.GetUpdatesChan(u)
62-
if err != nil {
63-
log.Fatal().Err(err).Msg("error updating telegram channel")
64-
}
65-
60+
updates := bot.GetUpdatesChan(u)
6661
/* signal handling */
6762
go func() {
6863
done := make(chan os.Signal, 1)
@@ -92,7 +87,7 @@ func execute(
9287
chatID := update.Message.Chat.ID
9388
if update.Message.IsCommand() {
9489
switch update.Message.Command() {
95-
case helpCommand:
90+
default:
9691
telegram2.Help(ctx, chatID, &msgs)
9792
case statusCommand:
9893
telegram2.Status(ctx, statusQh, chatID, &msgs)

‎devops/ansible/inventories/production/group_vars/raspberry_telegram/vault.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
$ANSIBLE_VAULT;1.2;AES256;raspberry_telegram
2-
64303364323666343837666562643266653764666533636636633837666333653636366665396439
3-
3264663532353562383239393962376265386639616131640a313466613666336462373266656362
4-
61303139393833653133396265643432313463383261373165323638616434333461333663306636
5-
6138393666396239340a636631666635646532626161623932623531633861333237353136613932
6-
64613165613366616339316235663736663731323566346332663837626661393834316233353433
7-
63353831366536383462323632363930626661623634613366633066323332313839383135313238
8-
31633637613763313331373064363364656130383165343034303965313736323031623462316435
9-
32626365643733653234376132663666353066363130313330653663386535303232626139363763
10-
39383163386439393961613832303432616533303264633732386432363630323430626233643464
11-
34343535313130333131373835326432306331356331666265343932656135666634633863656561
12-
36363631343565323031383930646264316137336531376238393636353433623930643732643666
13-
39663232353463333932
2+
64353431613161326366396232386266666161666332396138303362363834653030313064306563
3+
3033373633626236616132333838613765323832333865310a333063366335383735663936333531
4+
64653531343265306666383230316264363830626263393937323963653636666135313430623135
5+
6133646363323730330a303561393064646663326530383765373830653535313733633234336230
6+
61346238626639363666633238383339346232303263646364306232373432333831653566623231
7+
35306163306535393464356231393230363736393335373063386536643437353537323163353662
8+
66666665653235386231376437396430386631373264326336393266616563306363323666616262
9+
35383433653661326331616363373837646266366130643265653231646264303539616635303161
10+
34643834383636633862366235646431383634653732346434396632393739643566373963366432
11+
63646161613136303662643736343530316564363863616631323231353939643230663232373536
12+
33363931313563373865653263646163373137373434383238323762303365356164323136353234
13+
64323630643138303539

‎docker-compose.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "3.3"
2-
31
services:
42
telegram:
53
build:
@@ -11,7 +9,7 @@ services:
119
volumes:
1210
- .:/app
1311
environment:
14-
TELEGRAM_TOKEN: ${TELEGRAM_TOKEN:-:token}
12+
TELEGRAM_TOKEN: ${TELEGRAM_TOKEN:-token}
1513
TELEGRAM_WS_URL: ${TELEGRAM_WS_URL:-http://water_system:8080}
1614
TELEGRAM_WS_TOKEN: ${TELEGRAM_WS_TOKEN:-WT7*P6Yn^2-Y*V*C-h&K6*b!@=HCzhd+}
1715
networks:

‎go.mod‎

Lines changed: 190 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,208 @@
11
module github.com/bruli/rasberryTelegram
22

3-
go 1.21
3+
go 1.24.2
44

55
require (
66
github.com/bruli/raspberryRainSensor v0.0.0-20240323154628-890ec8a3de3e
77
github.com/bruli/raspberryWaterSystem v0.0.0-20240323154742-e995cac3bfe1
8-
github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible
8+
github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
99
github.com/rs/zerolog v1.32.0
10-
github.com/stretchr/testify v1.9.0
10+
github.com/stretchr/testify v1.10.0
1111
)
1212

1313
require (
14+
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
15+
4d63.com/gochecknoglobals v0.2.2 // indirect
16+
github.com/4meepo/tagalign v1.4.2 // indirect
17+
github.com/Abirdcfly/dupword v0.1.3 // indirect
18+
github.com/Antonboom/errname v1.0.0 // indirect
19+
github.com/Antonboom/nilnil v1.0.1 // indirect
20+
github.com/Antonboom/testifylint v1.5.2 // indirect
21+
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
22+
github.com/Crocmagnon/fatcontext v0.7.1 // indirect
23+
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
24+
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.1 // indirect
25+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
26+
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
27+
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
28+
github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
29+
github.com/alexkohler/prealloc v1.0.0 // indirect
30+
github.com/alingse/asasalint v0.0.11 // indirect
31+
github.com/alingse/nilnesserr v0.1.2 // indirect
32+
github.com/ashanbrown/forbidigo v1.6.0 // indirect
33+
github.com/ashanbrown/makezero v1.2.0 // indirect
34+
github.com/beorn7/perks v1.0.1 // indirect
35+
github.com/bkielbasa/cyclop v1.2.3 // indirect
36+
github.com/blizzy78/varnamelen v0.8.0 // indirect
37+
github.com/bombsimon/wsl/v4 v4.5.0 // indirect
38+
github.com/breml/bidichk v0.3.2 // indirect
39+
github.com/breml/errchkjson v0.4.0 // indirect
40+
github.com/butuzov/ireturn v0.3.1 // indirect
41+
github.com/butuzov/mirror v1.3.0 // indirect
42+
github.com/catenacyber/perfsprint v0.8.2 // indirect
43+
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
44+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
45+
github.com/charithe/durationcheck v0.0.10 // indirect
46+
github.com/chavacava/garif v0.1.0 // indirect
47+
github.com/ckaznocha/intrange v0.3.0 // indirect
48+
github.com/curioswitch/go-reassign v0.3.0 // indirect
49+
github.com/daixiang0/gci v0.13.5 // indirect
1450
github.com/davecgh/go-spew v1.1.1 // indirect
51+
github.com/denis-tingaikin/go-header v0.5.0 // indirect
52+
github.com/ettle/strcase v0.2.0 // indirect
53+
github.com/fatih/color v1.18.0 // indirect
54+
github.com/fatih/structtag v1.2.0 // indirect
55+
github.com/firefart/nonamedreturns v1.0.5 // indirect
56+
github.com/fsnotify/fsnotify v1.5.4 // indirect
57+
github.com/fzipp/gocyclo v0.6.0 // indirect
58+
github.com/ghostiam/protogetter v0.3.9 // indirect
1559
github.com/go-chi/chi/v5 v5.0.12 // indirect
60+
github.com/go-critic/go-critic v0.12.0 // indirect
61+
github.com/go-toolsmith/astcast v1.1.0 // indirect
62+
github.com/go-toolsmith/astcopy v1.1.0 // indirect
63+
github.com/go-toolsmith/astequal v1.2.0 // indirect
64+
github.com/go-toolsmith/astfmt v1.1.0 // indirect
65+
github.com/go-toolsmith/astp v1.1.0 // indirect
66+
github.com/go-toolsmith/strparse v1.1.0 // indirect
67+
github.com/go-toolsmith/typep v1.1.0 // indirect
68+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
69+
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
70+
github.com/gobwas/glob v0.2.3 // indirect
71+
github.com/gofrs/flock v0.12.1 // indirect
72+
github.com/golang/protobuf v1.5.3 // indirect
73+
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
74+
github.com/golangci/go-printf-func-name v0.1.0 // indirect
75+
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
76+
github.com/golangci/golangci-lint v1.64.8 // indirect
77+
github.com/golangci/misspell v0.6.0 // indirect
78+
github.com/golangci/plugin-module-register v0.1.1 // indirect
79+
github.com/golangci/revgrep v0.8.0 // indirect
80+
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
81+
github.com/google/go-cmp v0.7.0 // indirect
1682
github.com/google/uuid v1.6.0 // indirect
17-
github.com/mattn/go-colorable v0.1.13 // indirect
83+
github.com/gordonklaus/ineffassign v0.1.0 // indirect
84+
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
85+
github.com/gostaticanalysis/comment v1.5.0 // indirect
86+
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
87+
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
88+
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
89+
github.com/hashicorp/go-version v1.7.0 // indirect
90+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
91+
github.com/hashicorp/hcl v1.0.0 // indirect
92+
github.com/hexops/gotextdiff v1.0.3 // indirect
93+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
94+
github.com/jgautheron/goconst v1.7.1 // indirect
95+
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
96+
github.com/jjti/go-spancheck v0.6.4 // indirect
97+
github.com/julz/importas v0.2.0 // indirect
98+
github.com/karamaru-alpha/copyloopvar v1.2.1 // indirect
99+
github.com/kisielk/errcheck v1.9.0 // indirect
100+
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
101+
github.com/kulti/thelper v0.6.3 // indirect
102+
github.com/kunwardeep/paralleltest v1.0.10 // indirect
103+
github.com/lasiar/canonicalheader v1.1.2 // indirect
104+
github.com/ldez/exptostd v0.4.2 // indirect
105+
github.com/ldez/gomoddirectives v0.6.1 // indirect
106+
github.com/ldez/grignotin v0.9.0 // indirect
107+
github.com/ldez/tagliatelle v0.7.1 // indirect
108+
github.com/ldez/usetesting v0.4.2 // indirect
109+
github.com/leonklingele/grouper v1.1.2 // indirect
110+
github.com/macabu/inamedparam v0.1.3 // indirect
111+
github.com/magiconair/properties v1.8.6 // indirect
112+
github.com/maratori/testableexamples v1.0.0 // indirect
113+
github.com/maratori/testpackage v1.1.1 // indirect
114+
github.com/matoous/godox v1.1.0 // indirect
115+
github.com/matryer/moq v0.5.3 // indirect
116+
github.com/mattn/go-colorable v0.1.14 // indirect
18117
github.com/mattn/go-isatty v0.0.20 // indirect
118+
github.com/mattn/go-runewidth v0.0.16 // indirect
119+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
120+
github.com/mgechev/revive v1.7.0 // indirect
121+
github.com/mitchellh/go-homedir v1.1.0 // indirect
122+
github.com/mitchellh/mapstructure v1.5.0 // indirect
123+
github.com/moricho/tparallel v0.3.2 // indirect
124+
github.com/nakabonne/nestif v0.3.1 // indirect
125+
github.com/nishanths/exhaustive v0.12.0 // indirect
126+
github.com/nishanths/predeclared v0.2.2 // indirect
127+
github.com/nunnatsa/ginkgolinter v0.19.1 // indirect
128+
github.com/olekukonko/tablewriter v0.0.5 // indirect
129+
github.com/pelletier/go-toml v1.9.5 // indirect
130+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
19131
github.com/pmezard/go-difflib v1.0.0 // indirect
132+
github.com/polyfloyd/go-errorlint v1.7.1 // indirect
133+
github.com/prometheus/client_golang v1.12.1 // indirect
134+
github.com/prometheus/client_model v0.2.0 // indirect
135+
github.com/prometheus/common v0.32.1 // indirect
136+
github.com/prometheus/procfs v0.7.3 // indirect
137+
github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1 // indirect
138+
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
139+
github.com/quasilyte/gogrep v0.5.0 // indirect
140+
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
141+
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
142+
github.com/raeperd/recvcheck v0.2.0 // indirect
143+
github.com/rivo/uniseg v0.4.7 // indirect
144+
github.com/rogpeppe/go-internal v1.14.1 // indirect
20145
github.com/rs/cors v1.10.1 // indirect
21-
github.com/technoweenie/multipartstreamer v1.0.1 // indirect
22-
golang.org/x/sys v0.18.0 // indirect
146+
github.com/ryancurrah/gomodguard v1.3.5 // indirect
147+
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
148+
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
149+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
150+
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
151+
github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
152+
github.com/securego/gosec/v2 v2.22.2 // indirect
153+
github.com/sirupsen/logrus v1.9.3 // indirect
154+
github.com/sivchari/containedctx v1.0.3 // indirect
155+
github.com/sivchari/tenv v1.12.1 // indirect
156+
github.com/sonatard/noctx v0.1.0 // indirect
157+
github.com/sourcegraph/go-diff v0.7.0 // indirect
158+
github.com/spf13/afero v1.12.0 // indirect
159+
github.com/spf13/cast v1.5.0 // indirect
160+
github.com/spf13/cobra v1.9.1 // indirect
161+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
162+
github.com/spf13/pflag v1.0.6 // indirect
163+
github.com/spf13/viper v1.12.0 // indirect
164+
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
165+
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
166+
github.com/stretchr/objx v0.5.2 // indirect
167+
github.com/subosito/gotenv v1.4.1 // indirect
168+
github.com/tdakkota/asciicheck v0.4.1 // indirect
169+
github.com/tetafro/godot v1.5.0 // indirect
170+
github.com/timakin/bodyclose v0.0.0-20241017074812-ed6a65f985e3 // indirect
171+
github.com/timonwong/loggercheck v0.10.1 // indirect
172+
github.com/tomarrell/wrapcheck/v2 v2.10.0 // indirect
173+
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
174+
github.com/ultraware/funlen v0.2.0 // indirect
175+
github.com/ultraware/whitespace v0.2.0 // indirect
176+
github.com/uudashr/gocognit v1.2.0 // indirect
177+
github.com/uudashr/iface v1.3.1 // indirect
178+
github.com/xen0n/gosmopolitan v1.2.2 // indirect
179+
github.com/yagipy/maintidx v1.0.0 // indirect
180+
github.com/yeya24/promlinter v0.3.0 // indirect
181+
github.com/ykadowak/zerologlint v0.1.5 // indirect
182+
gitlab.com/bosi/decorder v0.4.2 // indirect
183+
go-simpler.org/musttag v0.13.0 // indirect
184+
go-simpler.org/sloglint v0.9.0 // indirect
185+
go.uber.org/atomic v1.7.0 // indirect
186+
go.uber.org/automaxprocs v1.6.0 // indirect
187+
go.uber.org/multierr v1.6.0 // indirect
188+
go.uber.org/zap v1.24.0 // indirect
189+
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
190+
golang.org/x/mod v0.24.0 // indirect
191+
golang.org/x/sync v0.13.0 // indirect
192+
golang.org/x/sys v0.32.0 // indirect
193+
golang.org/x/text v0.22.0 // indirect
194+
golang.org/x/tools v0.32.0 // indirect
195+
google.golang.org/protobuf v1.36.5 // indirect
196+
gopkg.in/ini.v1 v1.67.0 // indirect
197+
gopkg.in/yaml.v2 v2.4.0 // indirect
23198
gopkg.in/yaml.v3 v3.0.1 // indirect
199+
honnef.co/go/tools v0.6.1 // indirect
200+
mvdan.cc/gofumpt v0.8.0 // indirect
201+
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
202+
)
203+
204+
tool (
205+
github.com/golangci/golangci-lint/cmd/golangci-lint
206+
github.com/matryer/moq
207+
mvdan.cc/gofumpt
24208
)

0 commit comments

Comments
 (0)