go 1.19 (#10)

Signed-off-by: Maksim Paskal <paskal.maksim@gmail.com>

.github/workflows/release.yml

@@ -1,5 +1,4 @@
 on:
-  pull_request:
   push:
     tags:
     - v*
@@ -20,12 +19,14 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.19
     - name: Login to Docker Hub
       uses: docker/login-action@v1
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
+    - uses: docker/setup-qemu-action@v2
+    - uses: docker/setup-buildx-action@v2
     - name: Run GoReleaser
       uses: goreleaser/goreleaser-action@v2
       with:

.github/workflows/test.yml

@@ -14,5 +14,5 @@ jobs:
     - uses: actions/setup-go@v2
       with:
         stable: 'false'
-        go-version: '1.17'
+        go-version: '1.19'
     - run: go test -race ./cmd

.golangci.yml

@@ -9,5 +9,6 @@ linters:
   - funlen
   - cyclop
   - exhaustivestruct
+  - exhaustruct
   - wrapcheck
   - varnamelen

.goreleaser.yml

@@ -1,14 +1,34 @@
+project_name: telegram-gateway
 release:
   footer: |
     ## Docker Images
-    - `paskalmaksim/telegram-gateway:latest`
-    - `paskalmaksim/telegram-gateway:{{ .Tag }}`
+    - `paskalmaksim/{{.ProjectName}}:latest`
+    - `paskalmaksim/{{.ProjectName}}:{{.Tag}}`
 dockers:
-- goos: linux
+- use: buildx
+  goos: linux
   goarch: amd64
   image_templates:
-  - paskalmaksim/telegram-gateway:latest
-  - paskalmaksim/telegram-gateway:{{ .Tag }}
+  - paskalmaksim/{{.ProjectName}}:latest
+  - paskalmaksim/{{.ProjectName}}:{{.Tag}}
+  build_flag_templates:
+  - "--platform=linux/amd64"
+  - "--label=org.opencontainers.image.created={{.Date}}"
+  - "--label=org.opencontainers.image.title={{.ProjectName}}"
+  - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+  - "--label=org.opencontainers.image.version={{.Version}}"
+- use: buildx
+  goos: linux
+  goarch: arm64
+  image_templates:
+  - paskalmaksim/{{.ProjectName}}:latest
+  - paskalmaksim/{{.ProjectName}}:{{.Tag}}
+  build_flag_templates:
+  - "--platform=linux/arm64/v8"
+  - "--label=org.opencontainers.image.created={{.Date}}"
+  - "--label=org.opencontainers.image.title={{.ProjectName}}"
+  - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+  - "--label=org.opencontainers.image.version={{.Version}}"
 builds:
 - dir: ./cmd
   env:
@@ -21,6 +41,7 @@ builds:
   - linux
   goarch:
   - amd64
+  - arm64
 checksum:
   name_template: 'checksums.txt'
 snapshot:

Dockerfile

@@ -3,4 +3,6 @@ FROM alpine:latest
 COPY ./telegram-gateway /usr/local/bin/telegram-gateway
 RUN apk upgrade && apk add --no-cache ca-certificates
 
-CMD telegram-gateway
+USER 30001
+
+ENTRYPOINT [ "/usr/local/bin/telegram-gateway" ]

Makefile

@@ -1,5 +1,6 @@
 tag=dev
 image=paskalmaksim/telegram-gateway:$(tag)
+KUBECONFIG=$(HOME)/.kube/dev
 
 test:
 	@scripts/validate-license.sh
@@ -8,11 +9,13 @@ test:
 	go test -race ./cmd
 	go run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run -v
 test-release:
+	git tag -d `git tag -l "helm-chart-*"`
 	go run github.com/goreleaser/goreleaser@latest release --snapshot --skip-publish --rm-dist
 build:
+	git tag -d `git tag -l "helm-chart-*"`
 	go run github.com/goreleaser/goreleaser@latest build --rm-dist --skip-validate
-	mv ./dist/telegram-gateway_linux_amd64/telegram-gateway telegram-gateway
-	docker build --pull . -t $(image)
+	mv ./dist/telegram-gateway_linux_amd64_v1/telegram-gateway telegram-gateway
+	docker build --pull --push . -t $(image)
 push:
 	docker push $(image)
 run:
@@ -26,4 +29,13 @@ heap:
 scan:
 	@trivy image \
 	-ignore-unfixed --no-progress --severity HIGH,CRITICAL \
-	$(image)
+	$(image)
+deploy:
+	helm upgrade telegram-gateway ./charts/telegram-gateway \
+	--install \
+	--create-namespace \
+	--namespace telegram-gateway-test \
+	--set registry.image=$(image) \
+	--set registry.imagePullPolicy=Always
+clean:
+	kubectl delete namespace telegram-gateway-test

charts/telegram-gateway/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 icon: https://helm.sh/img/helm.svg
 name: telegram-gateway
-version: 1.0.2
+version: 1.0.3
 description: Telegram gateway for Prometheus and Sentry
 maintainers:
 - name: maksim-paskal  # Maksim Paskal

charts/telegram-gateway/templates/telegram-gateway.yaml

@@ -16,8 +16,6 @@ spec:
       labels:
         app: telegram-gateway
     spec:
-      topologySpreadConstraints:
-{{ toYaml .Values.topologySpreadConstraints | indent 7 }}
       affinity:
 {{ toYaml .Values.affinity | indent 7 }}
       volumes:
@@ -30,8 +28,17 @@ spec:
 {{ toYaml .Values.resources | indent 9 }}
         image: {{ .Values.registry.image }}
         imagePullPolicy: {{ .Values.registry.imagePullPolicy }}
-        command:
-        - /usr/local/bin/telegram-gateway
+        securityContext:
+          runAsNonRoot: true
+          runAsUser: 30001
+          runAsGroup: 30001
+          privileged: false
+          readOnlyRootFilesystem: true
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+        args:
         - -config=/config/telegram-gateway.yaml
 {{- if .Values.args }}
 {{ toYaml .Values.args | indent 8 }}

charts/telegram-gateway/values.yaml

@@ -23,17 +23,9 @@ config:
     - name: Info
       value: "https://test.com#{{ .alertname | ToLower }}"
 
-domains:
-- name: default
-  chatID: -479832859
-
-topologySpreadConstraints:
-- maxSkew: 1
-  topologyKey: topology.kubernetes.io/zone
-  whenUnsatisfiable: DoNotSchedule
-  labelSelector:
-    matchLabels:
-      app: telegram-gateway
+  domains:
+  - name: default
+    chatID: -479832859
 
 affinity:
   podAntiAffinity:

cmd/handleProm.go

@@ -16,7 +16,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 	"time"
@@ -49,7 +49,7 @@ func handleProm(w http.ResponseWriter, r *http.Request) {
 
 	var err error
 
-	bodyBytes, err := ioutil.ReadAll(r.Body)
+	bodyBytes, err := io.ReadAll(r.Body)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		log.WithError(err).Error()

cmd/handleSentry.go

@@ -16,7 +16,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 
@@ -60,7 +60,7 @@ func handleSentry(w http.ResponseWriter, r *http.Request) {
 
 	var err error
 
-	bodyBytes, err := ioutil.ReadAll(r.Body)
+	bodyBytes, err := io.ReadAll(r.Body)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		log.WithError(err).Error()

cmd/handleTest.go

@@ -14,7 +14,7 @@ limitations under the License.
 package main
 
 import (
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api"
@@ -50,7 +50,7 @@ func handleTest(w http.ResponseWriter, r *http.Request) {
 		log.WithError(err).Error()
 	}
 
-	bodyBytes, err := ioutil.ReadAll(r.Body)
+	bodyBytes, err := io.ReadAll(r.Body)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		log.WithError(err).Error()

cmd/main.go

@@ -16,10 +16,10 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	pprof "net/http/pprof"
 	"os"
+	"time"
 
 	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api"
 	"github.com/gorilla/mux"
@@ -34,6 +34,12 @@ var (
 	domains    map[string]ConfigDomains
 )
 
+const (
+	serverReadTimeout    = 5 * time.Second
+	serverRequestTimeout = 60 * time.Second
+	serverWriteTimeout   = 70 * time.Second
+)
+
 func main() {
 	flag.Parse()
 
@@ -72,7 +78,7 @@ func main() {
 	log.Infof("Starting telegram-gateway %s", appConfig.Version)
 
 	// load config file
-	yamlFile, err := ioutil.ReadFile(*appConfig.configFileName)
+	yamlFile, err := os.ReadFile(*appConfig.configFileName)
 	if err != nil {
 		log.WithError(err).Fatalf("error in reading config %s", *appConfig.configFileName)
 	}
@@ -154,7 +160,15 @@ func main() {
 
 	log.Printf("Staring server on port %d", *appConfig.port)
 
-	err = http.ListenAndServe(fmt.Sprintf(":%d", *appConfig.port), router)
+	timeoutMessage := fmt.Sprintf("Server timeout after %s", serverRequestTimeout)
+
+	server := &http.Server{
+		Addr:         fmt.Sprintf(":%d", *appConfig.port),
+		Handler:      http.TimeoutHandler(router, serverRequestTimeout, timeoutMessage),
+		ReadTimeout:  serverReadTimeout,
+		WriteTimeout: serverWriteTimeout,
+	}
+	err = server.ListenAndServe()
 
 	if err != nil {
 		log.WithError(err).Fatal("ListenAndServe")

go.mod

@@ -1,30 +1,30 @@
 module github.com/maksim-paskal/telegram-gateway
 
-go 1.17
+go 1.19
 
 require (
 	github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible
 	github.com/gorilla/mux v1.8.0
 	github.com/maksim-paskal/logrus-hook-sentry v0.0.9
-	github.com/prometheus/alertmanager v0.23.0
-	github.com/sirupsen/logrus v1.8.1
+	github.com/prometheus/alertmanager v0.24.0
+	github.com/sirupsen/logrus v1.9.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/getsentry/sentry-go v0.13.0 // indirect
-	github.com/golang/protobuf v1.4.3 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.11.0 // indirect
+	github.com/prometheus/client_golang v1.12.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.30.0 // indirect
-	github.com/prometheus/procfs v0.6.0 // indirect
+	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
 	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
 	github.com/technoweenie/multipartstreamer v1.0.1 // indirect
-	golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect
-	google.golang.org/protobuf v1.26.0-rc.1 // indirect
+	golang.org/x/sys v0.0.0-20220907062415-87db552b00fd // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
 )