Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Clivern committed Jun 12, 2023
1 parent dbb21e5 commit 52259b0
Show file tree
Hide file tree
Showing 52 changed files with 120 additions and 120 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go: ['1.17', '1.18', '1.19']
go: ['1.17', '1.18', '1.19', '1.20']
name: Go ${{ matrix.go }} run
steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .poodle.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Helmet API Definition

[Main]
id = "spacewalk_helmet"
name = "Cleven - Helmet"
id = "norwik_helmet"
name = "Norwik - Helmet"
description = "A Lightweight Cloud Native API Gateway"
timeout = "30s"
service_url = "{$serviceURL:http://127.0.0.1:8000}"
Expand Down
40 changes: 20 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<p align="center">
<img src="https://raw.githubusercontent.com/Clevenio/Helmet/main/assets/logo.png?v=1.0.26" width="200" />
<img src="https://raw.githubusercontent.com/Norwik/Helmet/main/assets/logo.png?v=1.0.27" width="200" />
<h3 align="center">Helmet</h3>
<p align="center">A Lightweight Cloud Native API Gateway.</p>
<p align="center">
<a href="https://github.com/clevenio/Helmet/actions/workflows/build.yml">
<img src="https://github.com/clevenio/Helmet/actions/workflows/build.yml/badge.svg">
<a href="https://github.com/norwik/Helmet/actions/workflows/build.yml">
<img src="https://github.com/norwik/Helmet/actions/workflows/build.yml/badge.svg">
</a>
<a href="https://github.com/clevenio/Helmet/actions">
<img src="https://github.com/clevenio/Helmet/workflows/Release/badge.svg">
<a href="https://github.com/norwik/Helmet/actions">
<img src="https://github.com/norwik/Helmet/workflows/Release/badge.svg">
</a>
<a href="https://github.com/clevenio/Helmet/releases">
<img src="https://img.shields.io/badge/Version-1.0.26-9B59B6.svg">
<a href="https://github.com/norwik/Helmet/releases">
<img src="https://img.shields.io/badge/Version-1.0.27-9B59B6.svg">
</a>
<a href="https://goreportcard.com/report/github.com/clevenio/Helmet">
<img src="https://goreportcard.com/badge/github.com/clevenio/Helmet?v=1.0.26">
<a href="https://goreportcard.com/report/github.com/norwik/Helmet">
<img src="https://goreportcard.com/badge/github.com/norwik/Helmet?v=1.0.27">
</a>
<a href="https://godoc.org/github.com/clevenio/helmet">
<img src="https://godoc.org/github.com/clevenio/helmet?status.svg">
<a href="https://godoc.org/github.com/norwik/helmet">
<img src="https://godoc.org/github.com/norwik/helmet?status.svg">
</a>
<a href="https://github.com/clevenio/Helmet/blob/master/LICENSE">
<a href="https://github.com/norwik/Helmet/blob/master/LICENSE">
<img src="https://img.shields.io/badge/LICENSE-MIT-E74C3C.svg">
</a>
</p>
</p>
<br/>
<p align="center">
<img src="https://raw.githubusercontent.com/Clevenio/Helmet/main/assets/chart.jpg?v=1.0.26" width="80%" />
<img src="https://raw.githubusercontent.com/Norwik/Helmet/main/assets/chart.jpg?v=1.0.27" width="80%" />
</p>

Helmet is Cloud Native API Gateway that control who accesses your API whether from customer or other internal services. It also collect metrics about service calls count, latency, success rate and much more!
Expand All @@ -49,12 +49,12 @@ Here is some of the key features:

#### Linux Deployment

Download [the latest helmet binary](https://github.com/clevenio/Helmet/releases). Make it executable from everywhere.
Download [the latest helmet binary](https://github.com/norwik/Helmet/releases). Make it executable from everywhere.

```zsh
$ export LATEST_VERSION=$(curl --silent "https://api.github.com/repos/clevenio/Helmet/releases/latest" | jq '.tag_name' | sed -E 's/.*"([^"]+)".*/\1/' | tr -d v)
$ export LATEST_VERSION=$(curl --silent "https://api.github.com/repos/norwik/Helmet/releases/latest" | jq '.tag_name' | sed -E 's/.*"([^"]+)".*/\1/' | tr -d v)

$ curl -sL https://github.com/clevenio/Helmet/releases/download/v{$LATEST_VERSION}/helmet_{$LATEST_VERSION}_Linux_x86_64.tar.gz | tar xz
$ curl -sL https://github.com/norwik/Helmet/releases/download/v{$LATEST_VERSION}/helmet_{$LATEST_VERSION}_Linux_x86_64.tar.gz | tar xz
```

Then install `MySQL` and `Redis` on the server or a separate one.
Expand Down Expand Up @@ -189,12 +189,12 @@ $ helmet server -c /path/to/config.yml

For transparency into our release cycle and in striving to maintain backward compatibility, Helmet is maintained under the [Semantic Versioning guidelines](https://semver.org/) and release process is predictable and business-friendly.

See the [Releases section of our GitHub project](https://github.com/clevenio/helmet/releases) for changelogs for each release version of Helmet. It contains summaries of the most noteworthy changes made in each release.
See the [Releases section of our GitHub project](https://github.com/norwik/helmet/releases) for changelogs for each release version of Helmet. It contains summaries of the most noteworthy changes made in each release.


## Bug tracker

If you have any suggestions, bug reports, or annoyances please report them to our issue tracker at https://github.com/clevenio/helmet/issues
If you have any suggestions, bug reports, or annoyances please report them to our issue tracker at https://github.com/norwik/helmet/issues


## Security Issues
Expand All @@ -209,6 +209,6 @@ We are an open source, community-driven project so please feel free to join us.

## License

© 2021, Cleven. Released under [MIT License](https://opensource.org/licenses/mit-license.php).
© 2021, Clivern. Released under [MIT License](https://opensource.org/licenses/mit-license.php).

**Helmet** is authored and maintained by [@Cleven](http://github.com/clevenio).
**Helmet** is authored and maintained by [@Clivern](http://github.com/Clivern).
4 changes: 2 additions & 2 deletions bin/release.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Fetch latest version
export LATEST_VERSION=$(curl --silent "https://api.github.com/repos/clevenio/helmet/releases/latest" | jq '.tag_name' | sed -E 's/.*"([^"]+)".*/\1/')
export LATEST_VERSION=$(curl --silent "https://api.github.com/repos/norwik/helmet/releases/latest" | jq '.tag_name' | sed -E 's/.*"([^"]+)".*/\1/')

# Update go checksum database (sum.golang.org) immediately after release
curl --silent https://sum.golang.org/lookup/github.com/clevenio/helmet@{$LATEST_VERSION}
curl --silent https://sum.golang.org/lookup/github.com/norwik/helmet@{$LATEST_VERSION}
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var rootCmd = &cobra.Command{
Short: `🐺 A Lightweight Cloud Native API Gateway
If you have any suggestions, bug reports, or annoyances please report
them to our issue tracker at <https://github.com/clevenio/helmet/issues>`,
them to our issue tracker at <https://github.com/norwik/helmet/issues>`,
}

// Execute runs cmd tool
Expand Down
10 changes: 5 additions & 5 deletions cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import (
"strings"
"time"

"github.com/clevenio/helmet/core/component"
"github.com/clevenio/helmet/core/controller"
m "github.com/clevenio/helmet/core/middleware"
"github.com/clevenio/helmet/core/module"
"github.com/clevenio/helmet/core/service"
"github.com/norwik/helmet/core/component"
"github.com/norwik/helmet/core/controller"
m "github.com/norwik/helmet/core/middleware"
"github.com/norwik/helmet/core/module"
"github.com/norwik/helmet/core/service"

"github.com/drone/envsubst"
"github.com/labstack/echo-contrib/prometheus"
Expand Down
6 changes: 3 additions & 3 deletions core/component/authentication.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"strings"
"time"

"github.com/clevenio/helmet/core/model"
"github.com/clevenio/helmet/core/module"
"github.com/clevenio/helmet/core/util"
"github.com/norwik/helmet/core/model"
"github.com/norwik/helmet/core/module"
"github.com/norwik/helmet/core/util"
)

// KeyBasedAuthMethod type
Expand Down
4 changes: 2 additions & 2 deletions core/component/authorization.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"fmt"
"strings"

"github.com/clevenio/helmet/core/model"
"github.com/clevenio/helmet/core/util"
"github.com/norwik/helmet/core/model"
"github.com/norwik/helmet/core/util"
)

// Authorization type
Expand Down
4 changes: 2 additions & 2 deletions core/component/authorization_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"fmt"
"testing"

"github.com/clevenio/helmet/core/model"
"github.com/clevenio/helmet/pkg"
"github.com/norwik/helmet/core/model"
"github.com/norwik/helmet/pkg"

"github.com/franela/goblin"
)
Expand Down
2 changes: 1 addition & 1 deletion core/component/circuit_breaker.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package component
import (
"sync"

"github.com/clevenio/helmet/core/service"
"github.com/norwik/helmet/core/service"
)

// CircuitBreaker struct
Expand Down
2 changes: 1 addition & 1 deletion core/component/correlation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"testing"

"github.com/clevenio/helmet/pkg"
"github.com/norwik/helmet/pkg"

"github.com/franela/goblin"
)
Expand Down
4 changes: 2 additions & 2 deletions core/component/rate_limiter.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"reflect"
"sync"

"github.com/clevenio/helmet/core/service"
"github.com/clevenio/helmet/core/util"
"github.com/norwik/helmet/core/service"
"github.com/norwik/helmet/core/util"
)

// RateLimiter struct
Expand Down
2 changes: 1 addition & 1 deletion core/component/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"regexp"
"strings"

"github.com/clevenio/helmet/core/model"
"github.com/norwik/helmet/core/model"
)

// Router type
Expand Down
8 changes: 4 additions & 4 deletions core/controller/api_auth_data.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"net/http"
"strconv"

"github.com/clevenio/helmet/core/component"
"github.com/clevenio/helmet/core/migration"
"github.com/clevenio/helmet/core/model"
"github.com/clevenio/helmet/core/util"
"github.com/norwik/helmet/core/component"
"github.com/norwik/helmet/core/migration"
"github.com/norwik/helmet/core/model"
"github.com/norwik/helmet/core/util"

"github.com/labstack/echo/v4"
log "github.com/sirupsen/logrus"
Expand Down
6 changes: 3 additions & 3 deletions core/controller/api_auth_data_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"strings"
"testing"

"github.com/clevenio/helmet/core/model"
"github.com/clevenio/helmet/core/module"
"github.com/clevenio/helmet/pkg"
"github.com/norwik/helmet/core/model"
"github.com/norwik/helmet/core/module"
"github.com/norwik/helmet/pkg"

"github.com/franela/goblin"
"github.com/labstack/echo/v4"
Expand Down
2 changes: 1 addition & 1 deletion core/controller/auth_methods.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"net/http"
"strconv"

"github.com/clevenio/helmet/core/model"
"github.com/norwik/helmet/core/model"

"github.com/labstack/echo/v4"
log "github.com/sirupsen/logrus"
Expand Down
6 changes: 3 additions & 3 deletions core/controller/auth_methods_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"strings"
"testing"

"github.com/clevenio/helmet/core/model"
"github.com/clevenio/helmet/core/module"
"github.com/clevenio/helmet/pkg"
"github.com/norwik/helmet/core/model"
"github.com/norwik/helmet/core/module"
"github.com/norwik/helmet/pkg"

"github.com/franela/goblin"
"github.com/labstack/echo/v4"
Expand Down
8 changes: 4 additions & 4 deletions core/controller/basic_auth_data.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"net/http"
"strconv"

"github.com/clevenio/helmet/core/component"
"github.com/clevenio/helmet/core/migration"
"github.com/clevenio/helmet/core/model"
"github.com/clevenio/helmet/core/util"
"github.com/norwik/helmet/core/component"
"github.com/norwik/helmet/core/migration"
"github.com/norwik/helmet/core/model"
"github.com/norwik/helmet/core/util"

"github.com/labstack/echo/v4"
log "github.com/sirupsen/logrus"
Expand Down
6 changes: 3 additions & 3 deletions core/controller/basic_auth_data_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"strings"
"testing"

"github.com/clevenio/helmet/core/model"
"github.com/clevenio/helmet/core/module"
"github.com/clevenio/helmet/pkg"
"github.com/norwik/helmet/core/model"
"github.com/norwik/helmet/core/module"
"github.com/norwik/helmet/pkg"

"github.com/franela/goblin"
"github.com/labstack/echo/v4"
Expand Down
4 changes: 2 additions & 2 deletions core/controller/endpoint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strings"
"testing"

"github.com/clevenio/helmet/core/module"
"github.com/clevenio/helmet/pkg"
"github.com/norwik/helmet/core/module"
"github.com/norwik/helmet/pkg"

"github.com/franela/goblin"
"github.com/labstack/echo/v4"
Expand Down
8 changes: 4 additions & 4 deletions core/controller/global_context.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ package controller
import (
"io/ioutil"

"github.com/clevenio/helmet/core/component"
"github.com/clevenio/helmet/core/model"
"github.com/clevenio/helmet/core/module"
"github.com/clevenio/helmet/core/service"
"github.com/norwik/helmet/core/component"
"github.com/norwik/helmet/core/model"
"github.com/norwik/helmet/core/module"
"github.com/norwik/helmet/core/service"

"github.com/spf13/viper"
)
Expand Down
4 changes: 2 additions & 2 deletions core/controller/health_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strings"
"testing"

"github.com/clevenio/helmet/core/module"
"github.com/clevenio/helmet/pkg"
"github.com/norwik/helmet/core/module"
"github.com/norwik/helmet/pkg"

"github.com/franela/goblin"
"github.com/labstack/echo/v4"
Expand Down
8 changes: 4 additions & 4 deletions core/controller/oauth_data.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"net/http"
"strconv"

"github.com/clevenio/helmet/core/component"
"github.com/clevenio/helmet/core/migration"
"github.com/clevenio/helmet/core/model"
"github.com/clevenio/helmet/core/util"
"github.com/norwik/helmet/core/component"
"github.com/norwik/helmet/core/migration"
"github.com/norwik/helmet/core/model"
"github.com/norwik/helmet/core/util"

"github.com/labstack/echo/v4"
log "github.com/sirupsen/logrus"
Expand Down
6 changes: 3 additions & 3 deletions core/controller/oauth_data_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"strings"
"testing"

"github.com/clevenio/helmet/core/model"
"github.com/clevenio/helmet/core/module"
"github.com/clevenio/helmet/pkg"
"github.com/norwik/helmet/core/model"
"github.com/norwik/helmet/core/module"
"github.com/norwik/helmet/pkg"

"github.com/franela/goblin"
"github.com/labstack/echo/v4"
Expand Down
4 changes: 2 additions & 2 deletions core/controller/ready_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strings"
"testing"

"github.com/clevenio/helmet/core/module"
"github.com/clevenio/helmet/pkg"
"github.com/norwik/helmet/core/module"
"github.com/norwik/helmet/pkg"

"github.com/franela/goblin"
"github.com/labstack/echo/v4"
Expand Down
2 changes: 1 addition & 1 deletion core/controller/reverse_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package controller
import (
"net/http"

"github.com/clevenio/helmet/core/component"
"github.com/norwik/helmet/core/component"

"github.com/labstack/echo/v4"
log "github.com/sirupsen/logrus"
Expand Down
4 changes: 2 additions & 2 deletions core/controller/token.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strings"
"time"

"github.com/clevenio/helmet/core/component"
"github.com/clevenio/helmet/core/model"
"github.com/norwik/helmet/core/component"
"github.com/norwik/helmet/core/model"

"github.com/labstack/echo/v4"
log "github.com/sirupsen/logrus"
Expand Down
4 changes: 2 additions & 2 deletions core/controller/token_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
_ "strings"
"testing"

"github.com/clevenio/helmet/core/module"
"github.com/clevenio/helmet/pkg"
"github.com/norwik/helmet/core/module"
"github.com/norwik/helmet/pkg"

"github.com/franela/goblin"
_ "github.com/labstack/echo/v4"
Expand Down
Loading

0 comments on commit 52259b0

Please sign in to comment.