Fix golangci-lint config

main 0.2.0
Jan Dittberner 10 months ago
parent 88770be967
commit 962dd30c6a

@ -23,7 +23,7 @@ linters-settings:
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
goimports: goimports:
local-prefixes: code.cacert.org/cacert/oidc_idp local-prefixes: code.cacert.org/cacert/oidc-idp
misspell: misspell:
locale: "US" locale: "US"
ignore-words: ignore-words:

@ -31,14 +31,15 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"code.cacert.org/cacert/oidc-idp/internal/handlers"
"code.cacert.org/cacert/oidc-idp/internal/services"
"code.cacert.org/cacert/oidc-idp/ui"
"github.com/go-openapi/runtime/client" "github.com/go-openapi/runtime/client"
"github.com/gorilla/csrf" "github.com/gorilla/csrf"
"github.com/knadh/koanf" "github.com/knadh/koanf"
hydra "github.com/ory/hydra-client-go/client" hydra "github.com/ory/hydra-client-go/client"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"code.cacert.org/cacert/oidc-idp/internal/handlers"
"code.cacert.org/cacert/oidc-idp/internal/services"
"code.cacert.org/cacert/oidc-idp/ui"
) )
const ( const (

@ -25,10 +25,11 @@ import (
"io/fs" "io/fs"
"net/http" "net/http"
"code.cacert.org/cacert/oidc-idp/internal/services"
"code.cacert.org/cacert/oidc-idp/ui"
"github.com/nicksnyder/go-i18n/v2/i18n" "github.com/nicksnyder/go-i18n/v2/i18n"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"code.cacert.org/cacert/oidc-idp/internal/services"
"code.cacert.org/cacert/oidc-idp/ui"
) )
type errorKey int type errorKey int
@ -193,8 +194,10 @@ func (h *ErrorHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
msgMarkdown := h.messageCatalog.LookupMarkdownMessage msgMarkdown := h.messageCatalog.LookupMarkdownMessage
err := h.template.Lookup("base").Execute(rendered, map[string]interface{}{ err := h.template.Lookup("base").Execute(rendered, map[string]interface{}{
"Title": msg("AuthServerErrorTitle", nil, localizer), "Title": msg("AuthServerErrorTitle", nil, localizer),
"Explanation": template.HTML(msgMarkdown("AuthServerErrorExplanation", nil, localizer)), "Explanation": template.HTML( //nolint:gosec
msgMarkdown("AuthServerErrorExplanation", nil, localizer),
),
"ErrorMessage": errorDescription, "ErrorMessage": errorDescription,
}) })
if err != nil { if err != nil {

@ -27,13 +27,14 @@ import (
"strconv" "strconv"
"time" "time"
"code.cacert.org/cacert/oidc-idp/internal/services"
"code.cacert.org/cacert/oidc-idp/ui"
"github.com/gorilla/csrf" "github.com/gorilla/csrf"
"github.com/nicksnyder/go-i18n/v2/i18n" "github.com/nicksnyder/go-i18n/v2/i18n"
"github.com/ory/hydra-client-go/client/admin" "github.com/ory/hydra-client-go/client/admin"
hydra "github.com/ory/hydra-client-go/models" hydra "github.com/ory/hydra-client-go/models"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"code.cacert.org/cacert/oidc-idp/internal/services"
"code.cacert.org/cacert/oidc-idp/ui"
) )
type acrType string type acrType string

@ -23,11 +23,12 @@ import (
"net/http" "net/http"
"time" "time"
"code.cacert.org/cacert/oidc-idp/internal/services"
"code.cacert.org/cacert/oidc-idp/ui"
"github.com/nicksnyder/go-i18n/v2/i18n" "github.com/nicksnyder/go-i18n/v2/i18n"
"github.com/ory/hydra-client-go/client/admin" "github.com/ory/hydra-client-go/client/admin"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"code.cacert.org/cacert/oidc-idp/internal/services"
"code.cacert.org/cacert/oidc-idp/ui"
) )
type LogoutHandler struct { type LogoutHandler struct {

@ -22,10 +22,11 @@ import (
"errors" "errors"
"fmt" "fmt"
"code.cacert.org/cacert/oidc-idp/translations"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/yuin/goldmark" "github.com/yuin/goldmark"
"code.cacert.org/cacert/oidc-idp/translations"
"github.com/BurntSushi/toml" "github.com/BurntSushi/toml"
"github.com/nicksnyder/go-i18n/v2/i18n" "github.com/nicksnyder/go-i18n/v2/i18n"
"golang.org/x/text/language" "golang.org/x/text/language"

Loading…
Cancel
Save