Rename energomonitor to energostack

energostack · Jun 11, 2024 · fca9b98 · fca9b98
1 parent 1a3138e
commit fca9b98
Show file tree

Hide file tree

Showing 92 changed files with 196 additions and 187 deletions.
diff --git a/.github/workflows/bisquitt-docker.yaml b/.github/workflows/bisquitt-docker.yaml
@@ -8,21 +8,27 @@ jobs:
   build-and-push-image:
     name: Build and push a Docker image
     runs-on: ubuntu-20.04
+    permissions:
+      packages: write
+      contents: read
+      attestations: write
+      id-token: write
     steps:
       - uses: actions/checkout@v2
         with:
-          path: "go/src/github.com/energomonitor/bisquitt"
+          path: "go/src/github.com/energostack/bisquitt"
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ghcr.io/energostack/bisquitt-psk
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build image
         run: "make docker/build"
-        working-directory: "go/src/github.com/energomonitor/bisquitt"
+        working-directory: "go/src/github.com/energostack/bisquitt"
 
       - name: Push image
         run: "make docker/push"
-        working-directory: "go/src/github.com/energomonitor/bisquitt"
+        working-directory: "go/src/github.com/energostack/bisquitt"
diff --git a/.github/workflows/bisquitt-tests.yaml b/.github/workflows/bisquitt-tests.yaml
@@ -23,19 +23,19 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          path: "go/src/github.com/energomonitor/bisquitt"
+          path: "go/src/github.com/energostack/bisquitt"
 
       - uses: actions/setup-go@v2
         with:
           go-version: "${{ matrix.go_version }}"
 
       - name: Download dependencies
         run: "make tidy"
-        working-directory: "go/src/github.com/energomonitor/bisquitt"
+        working-directory: "go/src/github.com/energostack/bisquitt"
 
       - name: Run tests
         run: "go version && make test"
-        working-directory: "go/src/github.com/energomonitor/bisquitt"
+        working-directory: "go/src/github.com/energostack/bisquitt"
 
   fmt-check:
     name: Code format - go ${{ matrix.go_version }}
@@ -46,19 +46,19 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          path: "go/src/github.com/energomonitor/bisquitt"
+          path: "go/src/github.com/energostack/bisquitt"
 
       - uses: actions/setup-go@v2
         with:
           go-version: "${{ matrix.go_version }}"
 
       - name: Install goimports
         run: "go get golang.org/x/tools/cmd/goimports"
-        working-directory: "go/src/github.com/energomonitor/bisquitt"
+        working-directory: "go/src/github.com/energostack/bisquitt"
 
       - name: Run format check
         run: "./tools/ci/run_fmt_check.bash"
-        working-directory: "go/src/github.com/energomonitor/bisquitt"
+        working-directory: "go/src/github.com/energostack/bisquitt"
 
   integration-tests:
     name: Integration tests - builder ${{ matrix.builder_version }}
@@ -70,10 +70,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          path: "go/src/github.com/energomonitor/bisquitt"
+          path: "go/src/github.com/energostack/bisquitt"
 
       - name: Run test
         run: "make docker/test"
         env:
           DOCKER_BUILDER_VERSION: "${{ matrix.builder_version }}"
-        working-directory: "go/src/github.com/energomonitor/bisquitt"
+        working-directory: "go/src/github.com/energostack/bisquitt"
diff --git a/Makefile b/Makefile
@@ -1,9 +1,9 @@
 VERSION := $(shell cat version.txt)
 
-DOCKER_REGISTRY ?= docker.io
+DOCKER_REGISTRY ?= ghcr.io
 DOCKER_BUILDER_VERSION ?= 1.17.8-bullseye
 DOCKER_RUNTIME_VERSION ?= bullseye-20220228-slim
-DOCKER_IMAGE = energomonitor/bisquitt
+DOCKER_IMAGE = energostack/bisquitt
 
 # Enable data race detection in the compiled binaries.
 ifeq ($(WITH_RACE_DETECTION), 1)

diff --git a/README.md b/README.md
@@ -3,9 +3,9 @@
 </p>
 
 <p align="center">
-  <a href="https://github.com/energomonitor/bisquitt/actions/workflows/bisquitt-tests.yaml"><img src="https://img.shields.io/github/workflow/status/energomonitor/bisquitt/bisquitt%20tests?style=flat-square" alt="Build status"></a>
-  <a href="https://pkg.go.dev/github.com/energomonitor/bisquitt"><img src="https://pkg.go.dev/badge/github.com/energomonitor/bisquitt.svg" alt="Go Reference"></a>
-  <a href="https://github.com/energomonitor/bisquitt#license"><img src="https://img.shields.io/github/license/energomonitor/bisquitt?style=flat-square" alt="License"></a>
+  <a href="https://github.com/energostack/bisquitt/actions/workflows/bisquitt-tests.yaml"><img src="https://img.shields.io/github/workflow/status/energostack/bisquitt/bisquitt%20tests?style=flat-square" alt="Build status"></a>
+  <a href="https://pkg.go.dev/github.com/energostack/bisquitt"><img src="https://pkg.go.dev/badge/github.com/energostack/bisquitt.svg" alt="Go Reference"></a>
+  <a href="https://github.com/energostack/bisquitt#license"><img src="https://img.shields.io/github/license/energostack/bisquitt?style=flat-square" alt="License"></a>
 </p>
 
 Bisquitt is a transparent MQTT-SN gateway. It provides a simple, secure, and
@@ -23,8 +23,11 @@ command-line MQTT-SN clients and can be used as a Go MQTT-SN library.
 
 The easiest way to install Bisquitt is to use its Docker image:
 
+### Deprecation warning
+Dockerhub registry images is now deprecated. Please use GitHub Container Registry (ghcr.io) instead.
+
 ```console
-$ docker pull energomonitor/bisquitt
+$ docker pull ghcr.io/energostack/bisquitt
 ```
 
 The image contains the gateway itself (`bisquitt`), which is started by default,
@@ -33,9 +36,9 @@ and the command-line MQTT-SN clients (`bisquitt-sub` and `bisquitt-pub`).
 Alternatively, you can install the gateway and clients using `go install`:
 
 ```console
-$ go install github.com/energomonitor/bisquitt/cmd/bisquitt@latest
-$ go install github.com/energomonitor/bisquitt/cmd/bisquitt-pub@latest
-$ go install github.com/energomonitor/bisquitt/cmd/bisquitt-sub@latest
+$ go install github.com/energostack/bisquitt/cmd/bisquitt@latest
+$ go install github.com/energostack/bisquitt/cmd/bisquitt-pub@latest
+$ go install github.com/energostack/bisquitt/cmd/bisquitt-sub@latest
 ```
 
 Note that Bisquitt requires Go 1.16 or higher.
@@ -61,7 +64,7 @@ open-source MQTT server) using Docker Compose:
 
      services:
        bisquitt:
-         image: energomonitor/bisquitt
+         image: energostack/bisquitt
          environment:
            MQTT_HOST: mosquitto
            BISQUITT_USER: bisquitt

diff --git a/client/broker_publish_qos2_transaction.go b/client/broker_publish_qos2_transaction.go
@@ -12,8 +12,8 @@ package client
 import (
 	"fmt"
 
-	pkts1 "github.com/energomonitor/bisquitt/packets1"
-	"github.com/energomonitor/bisquitt/transactions"
+	pkts1 "github.com/energostack/bisquitt/packets1"
+	"github.com/energostack/bisquitt/transactions"
 )
 
 type brokerPublishQOS2Transaction struct {

diff --git a/client/client.go b/client/client.go
@@ -9,8 +9,8 @@
 //		"fmt"
 //		"time"
 //
-//		"github.com/energomonitor/bisquitt/client"
-//		"github.com/energomonitor/bisquitt/util"
+//		"github.com/energostack/bisquitt/client"
+//		"github.com/energostack/bisquitt/util"
 //	)
 //
 //	func main() {
@@ -70,11 +70,11 @@ import (
 	"github.com/pion/dtls/v2/pkg/crypto/selfsign"
 	"golang.org/x/sync/errgroup"
 
-	pkts "github.com/energomonitor/bisquitt/packets"
-	pkts1 "github.com/energomonitor/bisquitt/packets1"
-	"github.com/energomonitor/bisquitt/topics"
-	"github.com/energomonitor/bisquitt/transactions"
-	"github.com/energomonitor/bisquitt/util"
+	pkts "github.com/energostack/bisquitt/packets"
+	pkts1 "github.com/energostack/bisquitt/packets1"
+	"github.com/energostack/bisquitt/topics"
+	"github.com/energostack/bisquitt/transactions"
+	"github.com/energostack/bisquitt/util"
 )
 
 type ClientConfig struct {

diff --git a/client/client_test.go b/client/client_test.go
@@ -14,11 +14,11 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	pkts "github.com/energomonitor/bisquitt/packets"
-	pkts1 "github.com/energomonitor/bisquitt/packets1"
-	"github.com/energomonitor/bisquitt/topics"
-	"github.com/energomonitor/bisquitt/transactions"
-	"github.com/energomonitor/bisquitt/util"
+	pkts "github.com/energostack/bisquitt/packets"
+	pkts1 "github.com/energostack/bisquitt/packets1"
+	"github.com/energostack/bisquitt/topics"
+	"github.com/energostack/bisquitt/transactions"
+	"github.com/energostack/bisquitt/util"
 )
 
 const (

diff --git a/client/connect_transaction.go b/client/connect_transaction.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	pkts "github.com/energomonitor/bisquitt/packets"
-	pkts1 "github.com/energomonitor/bisquitt/packets1"
-	"github.com/energomonitor/bisquitt/transactions"
-	"github.com/energomonitor/bisquitt/util"
+	pkts "github.com/energostack/bisquitt/packets"
+	pkts1 "github.com/energostack/bisquitt/packets1"
+	"github.com/energostack/bisquitt/transactions"
+	"github.com/energostack/bisquitt/util"
 )
 
 type connectTransaction struct {

diff --git a/client/disconnect_transaction.go b/client/disconnect_transaction.go
@@ -1,9 +1,9 @@
 package client
 
 import (
-	pkts "github.com/energomonitor/bisquitt/packets"
-	pkts1 "github.com/energomonitor/bisquitt/packets1"
-	"github.com/energomonitor/bisquitt/transactions"
+	pkts "github.com/energostack/bisquitt/packets"
+	pkts1 "github.com/energostack/bisquitt/packets1"
+	"github.com/energostack/bisquitt/transactions"
 )
 
 type disconnectTransaction struct {

diff --git a/client/message_handlers.go b/client/message_handlers.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"sync"
 
-	pkts1 "github.com/energomonitor/bisquitt/packets1"
+	pkts1 "github.com/energostack/bisquitt/packets1"
 )
 
 // Subscribed message handler callback type.

diff --git a/client/net.go b/client/net.go
@@ -8,9 +8,9 @@ import (
 
 	dtlsProtocol "github.com/pion/dtls/v2/pkg/protocol"
 
-	pkts "github.com/energomonitor/bisquitt/packets"
-	pkts1 "github.com/energomonitor/bisquitt/packets1"
-	"github.com/energomonitor/bisquitt/util"
+	pkts "github.com/energostack/bisquitt/packets"
+	pkts1 "github.com/energostack/bisquitt/packets1"
+	"github.com/energostack/bisquitt/util"
 )
 
 func (c *Client) send(pkt pkts.Packet) error {

diff --git a/client/ping_transaction.go b/client/ping_transaction.go
@@ -1,9 +1,9 @@
 package client
 
 import (
-	pkts "github.com/energomonitor/bisquitt/packets"
-	pkts1 "github.com/energomonitor/bisquitt/packets1"
-	"github.com/energomonitor/bisquitt/transactions"
+	pkts "github.com/energostack/bisquitt/packets"
+	pkts1 "github.com/energostack/bisquitt/packets1"
+	"github.com/energostack/bisquitt/transactions"
 )
 
 type pingTransaction struct {

diff --git a/client/publish_qos1_transaction.go b/client/publish_qos1_transaction.go
@@ -3,9 +3,9 @@ package client
 import (
 	"fmt"
 
-	pkts "github.com/energomonitor/bisquitt/packets"
-	pkts1 "github.com/energomonitor/bisquitt/packets1"
-	"github.com/energomonitor/bisquitt/transactions"
+	pkts "github.com/energostack/bisquitt/packets"
+	pkts1 "github.com/energostack/bisquitt/packets1"
+	"github.com/energostack/bisquitt/transactions"
 )
 
 type publishQOS1Transaction struct {

diff --git a/client/publish_qos2_transaction.go b/client/publish_qos2_transaction.go
@@ -3,9 +3,9 @@ package client
 import (
 	"fmt"
 
-	pkts "github.com/energomonitor/bisquitt/packets"
-	pkts1 "github.com/energomonitor/bisquitt/packets1"
-	"github.com/energomonitor/bisquitt/transactions"
+	pkts "github.com/energostack/bisquitt/packets"
+	pkts1 "github.com/energostack/bisquitt/packets1"
+	"github.com/energostack/bisquitt/transactions"
 )
 
 type publishQOS2Transaction struct {

diff --git a/client/register_transaction.go b/client/register_transaction.go
@@ -3,9 +3,9 @@ package client
 import (
 	"fmt"
 
-	pkts "github.com/energomonitor/bisquitt/packets"
-	pkts1 "github.com/energomonitor/bisquitt/packets1"
-	"github.com/energomonitor/bisquitt/transactions"
+	pkts "github.com/energostack/bisquitt/packets"
+	pkts1 "github.com/energostack/bisquitt/packets1"
+	"github.com/energostack/bisquitt/transactions"
 )
 
 type registerTransaction struct {

diff --git a/client/sleep_transaction.go b/client/sleep_transaction.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"time"
 
-	pkts "github.com/energomonitor/bisquitt/packets"
-	pkts1 "github.com/energomonitor/bisquitt/packets1"
-	"github.com/energomonitor/bisquitt/transactions"
-	"github.com/energomonitor/bisquitt/util"
+	pkts "github.com/energostack/bisquitt/packets"
+	pkts1 "github.com/energostack/bisquitt/packets1"
+	"github.com/energostack/bisquitt/transactions"
+	"github.com/energostack/bisquitt/util"
 )
 
 const maxPingrespWait = time.Minute

diff --git a/client/subscribe_transaction.go b/client/subscribe_transaction.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	pkts "github.com/energomonitor/bisquitt/packets"
-	pkts1 "github.com/energomonitor/bisquitt/packets1"
-	"github.com/energomonitor/bisquitt/transactions"
+	pkts "github.com/energostack/bisquitt/packets"
+	pkts1 "github.com/energostack/bisquitt/packets1"
+	"github.com/energostack/bisquitt/transactions"
 )
 
 type subscribeTransaction struct {

diff --git a/client/transaction.go b/client/transaction.go
@@ -1,9 +1,9 @@
 package client
 
 import (
-	pkts1 "github.com/energomonitor/bisquitt/packets1"
-	"github.com/energomonitor/bisquitt/transactions"
-	"github.com/energomonitor/bisquitt/util"
+	pkts1 "github.com/energostack/bisquitt/packets1"
+	"github.com/energostack/bisquitt/transactions"
+	"github.com/energostack/bisquitt/util"
 )
 
 // Transactions states constants type.

diff --git a/client/unsubscribe_transaction.go b/client/unsubscribe_transaction.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	pkts "github.com/energomonitor/bisquitt/packets"
-	pkts1 "github.com/energomonitor/bisquitt/packets1"
-	"github.com/energomonitor/bisquitt/transactions"
+	pkts "github.com/energostack/bisquitt/packets"
+	pkts1 "github.com/energostack/bisquitt/packets1"
+	"github.com/energostack/bisquitt/transactions"
 )
 
 type unsubscribeTransaction struct {

diff --git a/cmd/bisquitt-pub/actions.go b/cmd/bisquitt-pub/actions.go
@@ -16,10 +16,10 @@ import (
 	"github.com/patrickmn/go-cache"
 	"github.com/urfave/cli/v2"
 
-	snClient "github.com/energomonitor/bisquitt/client"
-	"github.com/energomonitor/bisquitt/topics"
-	"github.com/energomonitor/bisquitt/util"
-	cryptoutils "github.com/energomonitor/bisquitt/util/crypto"
+	snClient "github.com/energostack/bisquitt/client"
+	"github.com/energostack/bisquitt/topics"
+	"github.com/energostack/bisquitt/util"
+	cryptoutils "github.com/energostack/bisquitt/util/crypto"
 )
 
 func handleAction() cli.ActionFunc {

diff --git a/cmd/bisquitt-pub/application.go b/cmd/bisquitt-pub/application.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/energomonitor/bisquitt"
+	"github.com/energostack/bisquitt"
 )
 
 const (