Skip to content

Commit

Permalink
NOISSUE - Change mProxy naming to mGate (#69)
Browse files Browse the repository at this point in the history
* Change mProxy naming to mGate

Signed-off-by: Dusan Borovcanin <borovcanindusan1@gmail.com>

* Fix CI linter

Signed-off-by: Dusan Borovcanin <borovcanindusan1@gmail.com>

---------

Signed-off-by: Dusan Borovcanin <borovcanindusan1@gmail.com>
  • Loading branch information
dborovcanin authored Sep 30, 2024
1 parent 28f8858 commit a7c3fe9
Show file tree
Hide file tree
Showing 34 changed files with 289 additions and 296 deletions.
114 changes: 57 additions & 57 deletions .env
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
MPROXY_MQTT_WITHOUT_TLS_ADDRESS=:1884
MPROXY_MQTT_WITHOUT_TLS_TARGET=localhost:1883

MPROXY_MQTT_WITH_TLS_ADDRESS=:8883
MPROXY_MQTT_WITH_TLS_TARGET=localhost:1883
MPROXY_MQTT_WITH_TLS_CERT_FILE=ssl/certs/server.crt
MPROXY_MQTT_WITH_TLS_KEY_FILE=ssl/certs/server.key
MPROXY_MQTT_WITH_TLS_SERVER_CA_FILE=ssl/certs/ca.crt

MPROXY_MQTT_WITH_MTLS_ADDRESS=:8884
MPROXY_MQTT_WITH_MTLS_TARGET=localhost:1883
MPROXY_MQTT_WITH_MTLS_CERT_FILE=ssl/certs/server.crt
MPROXY_MQTT_WITH_MTLS_KEY_FILE=ssl/certs/server.key
MPROXY_MQTT_WITH_MTLS_SERVER_CA_FILE=ssl/certs/ca.crt
MPROXY_MQTT_WITH_MTLS_CLIENT_CA_FILE=ssl/certs/ca.crt
MPROXY_MQTT_WITH_MTLS_CERT_VERIFICATION_METHODS=ocsp
MPROXY_MQTT_WITH_MTLS_OCSP_RESPONDER_URL=http://localhost:8080/ocsp

MPROXY_MQTT_WS_WITHOUT_TLS_ADDRESS=:8083
MPROXY_MQTT_WS_WITHOUT_TLS_TARGET=ws://localhost:8000/

MPROXY_MQTT_WS_WITH_TLS_ADDRESS=:8084
MPROXY_MQTT_WS_WITH_TLS_TARGET=ws://localhost:8000/
MPROXY_MQTT_WS_WITH_TLS_CERT_FILE=ssl/certs/server.crt
MPROXY_MQTT_WS_WITH_TLS_KEY_FILE=ssl/certs/server.key
MPROXY_MQTT_WS_WITH_TLS_SERVER_CA_FILE=ssl/certs/ca.crt

MPROXY_MQTT_WS_WITH_MTLS_ADDRESS=:8085
MPROXY_MQTT_WS_WITH_MTLS_PATH_PREFIX=/mqtt
MPROXY_MQTT_WS_WITH_MTLS_TARGET=ws://localhost:8000/
MPROXY_MQTT_WS_WITH_MTLS_CERT_FILE=ssl/certs/server.crt
MPROXY_MQTT_WS_WITH_MTLS_KEY_FILE=ssl/certs/server.key
MPROXY_MQTT_WS_WITH_MTLS_SERVER_CA_FILE=ssl/certs/ca.crt
MPROXY_MQTT_WS_WITH_MTLS_CLIENT_CA_FILE=ssl/certs/ca.crt
MPROXY_MQTT_WS_WITH_MTLS_CERT_VERIFICATION_METHODS=ocsp
MPROXY_MQTT_WS_WITH_MTLS_OCSP_RESPONDER_URL=http://localhost:8080/ocsp

MPROXY_HTTP_WITHOUT_TLS_ADDRESS=:8086
MPROXY_HTTP_WITHOUT_TLS_PATH_PREFIX=/messages
MPROXY_HTTP_WITHOUT_TLS_TARGET=http://localhost:8888/

MPROXY_HTTP_WITH_TLS_ADDRESS=:8087
MPROXY_HTTP_WITH_TLS_PATH_PREFIX=/messages
MPROXY_HTTP_WITH_TLS_TARGET=http://localhost:8888/
MPROXY_HTTP_WITH_TLS_CERT_FILE=ssl/certs/server.crt
MPROXY_HTTP_WITH_TLS_KEY_FILE=ssl/certs/server.key
MPROXY_HTTP_WITH_TLS_SERVER_CA_FILE=ssl/certs/ca.crt

MPROXY_HTTP_WITH_MTLS_ADDRESS=:8088
MPROXY_HTTP_WITH_MTLS_PATH_PREFIX=/messages
MPROXY_HTTP_WITH_MTLS_TARGET=http://localhost:8888/
MPROXY_HTTP_WITH_MTLS_CERT_FILE=ssl/certs/server.crt
MPROXY_HTTP_WITH_MTLS_KEY_FILE=ssl/certs/server.key
MPROXY_HTTP_WITH_MTLS_SERVER_CA_FILE=ssl/certs/ca.crt
MPROXY_HTTP_WITH_MTLS_CLIENT_CA_FILE=ssl/certs/ca.crt
MPROXY_HTTP_WITH_MTLS_CERT_VERIFICATION_METHODS=ocsp
MPROXY_HTTP_WITH_MTLS_OCSP_RESPONDER_URL=http://localhost:8080/ocsp
MGATE_MQTT_WITHOUT_TLS_ADDRESS=:1884
MGATE_MQTT_WITHOUT_TLS_TARGET=localhost:1883

MGATE_MQTT_WITH_TLS_ADDRESS=:8883
MGATE_MQTT_WITH_TLS_TARGET=localhost:1883
MGATE_MQTT_WITH_TLS_CERT_FILE=ssl/certs/server.crt
MGATE_MQTT_WITH_TLS_KEY_FILE=ssl/certs/server.key
MGATE_MQTT_WITH_TLS_SERVER_CA_FILE=ssl/certs/ca.crt

MGATE_MQTT_WITH_MTLS_ADDRESS=:8884
MGATE_MQTT_WITH_MTLS_TARGET=localhost:1883
MGATE_MQTT_WITH_MTLS_CERT_FILE=ssl/certs/server.crt
MGATE_MQTT_WITH_MTLS_KEY_FILE=ssl/certs/server.key
MGATE_MQTT_WITH_MTLS_SERVER_CA_FILE=ssl/certs/ca.crt
MGATE_MQTT_WITH_MTLS_CLIENT_CA_FILE=ssl/certs/ca.crt
MGATE_MQTT_WITH_MTLS_CERT_VERIFICATION_METHODS=ocsp
MGATE_MQTT_WITH_MTLS_OCSP_RESPONDER_URL=http://localhost:8080/ocsp

MGATE_MQTT_WS_WITHOUT_TLS_ADDRESS=:8083
MGATE_MQTT_WS_WITHOUT_TLS_TARGET=ws://localhost:8000/

MGATE_MQTT_WS_WITH_TLS_ADDRESS=:8084
MGATE_MQTT_WS_WITH_TLS_TARGET=ws://localhost:8000/
MGATE_MQTT_WS_WITH_TLS_CERT_FILE=ssl/certs/server.crt
MGATE_MQTT_WS_WITH_TLS_KEY_FILE=ssl/certs/server.key
MGATE_MQTT_WS_WITH_TLS_SERVER_CA_FILE=ssl/certs/ca.crt

MGATE_MQTT_WS_WITH_MTLS_ADDRESS=:8085
MGATE_MQTT_WS_WITH_MTLS_PATH_PREFIX=/mqtt
MGATE_MQTT_WS_WITH_MTLS_TARGET=ws://localhost:8000/
MGATE_MQTT_WS_WITH_MTLS_CERT_FILE=ssl/certs/server.crt
MGATE_MQTT_WS_WITH_MTLS_KEY_FILE=ssl/certs/server.key
MGATE_MQTT_WS_WITH_MTLS_SERVER_CA_FILE=ssl/certs/ca.crt
MGATE_MQTT_WS_WITH_MTLS_CLIENT_CA_FILE=ssl/certs/ca.crt
MGATE_MQTT_WS_WITH_MTLS_CERT_VERIFICATION_METHODS=ocsp
MGATE_MQTT_WS_WITH_MTLS_OCSP_RESPONDER_URL=http://localhost:8080/ocsp

MGATE_HTTP_WITHOUT_TLS_ADDRESS=:8086
MGATE_HTTP_WITHOUT_TLS_PATH_PREFIX=/messages
MGATE_HTTP_WITHOUT_TLS_TARGET=http://localhost:8888/

MGATE_HTTP_WITH_TLS_ADDRESS=:8087
MGATE_HTTP_WITH_TLS_PATH_PREFIX=/messages
MGATE_HTTP_WITH_TLS_TARGET=http://localhost:8888/
MGATE_HTTP_WITH_TLS_CERT_FILE=ssl/certs/server.crt
MGATE_HTTP_WITH_TLS_KEY_FILE=ssl/certs/server.key
MGATE_HTTP_WITH_TLS_SERVER_CA_FILE=ssl/certs/ca.crt

MGATE_HTTP_WITH_MTLS_ADDRESS=:8088
MGATE_HTTP_WITH_MTLS_PATH_PREFIX=/messages
MGATE_HTTP_WITH_MTLS_TARGET=http://localhost:8888/
MGATE_HTTP_WITH_MTLS_CERT_FILE=ssl/certs/server.crt
MGATE_HTTP_WITH_MTLS_KEY_FILE=ssl/certs/server.key
MGATE_HTTP_WITH_MTLS_SERVER_CA_FILE=ssl/certs/ca.crt
MGATE_HTTP_WITH_MTLS_CLIENT_CA_FILE=ssl/certs/ca.crt
MGATE_HTTP_WITH_MTLS_CERT_VERIFICATION_METHODS=ocsp
MGATE_HTTP_WITH_MTLS_OCSP_RESPONDER_URL=http://localhost:8080/ocsp
5 changes: 3 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ jobs:
cache-dependency-path: "go.sum"

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v6
with:
version: latest
version: v1.61.0
args: --config .golangci.yml

- name: Build Binaries
run: |
Expand Down
6 changes: 1 addition & 5 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ issues:
max-same-issues: 100

linters-settings:
importas:
no-unaliased: true
no-extra-aliases: false
gocritic:
enabled-checks:
- importShadow
Expand Down Expand Up @@ -66,8 +63,7 @@ linters:
- dogsled
- errchkjson
- errname
- execinquery
- exportloopref
- copyloopvar
- ginkgolinter
- gocheckcompilerdirectives
- gofumpt
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Mainflux
# SPDX-License-Identifier: Apache-2.0

PROGRAM = mproxy
PROGRAM = mgate
SOURCES = $(wildcard *.go) cmd/main.go

all: $(PROGRAM)
Expand Down
Loading

0 comments on commit a7c3fe9

Please sign in to comment.