Skip to content

Commit

Permalink
refactor: Move internal log package to PAM module
Browse files Browse the repository at this point in the history 
It's only used there now.
  • Loading branch information
@adombeck
adombeck committed Sep 25, 2024
1 parent 6d9f07f commit 8db41a2
Show file tree
Hide file tree
Showing 21 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion pam/integration-tests/cmd/exec-client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (

"github.com/godbus/dbus/v5"
"github.com/msteinert/pam/v2"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/dbusmodule"
"github.com/ubuntu/authd/pam/internal/log"
"github.com/ubuntu/authd/pam/internal/pam_test"
)

Expand Down
2 changes: 1 addition & 1 deletion pam/integration-tests/gdm-module-handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/msteinert/pam/v2"
"github.com/stretchr/testify/require"
"github.com/ubuntu/authd"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/gdm"
"github.com/ubuntu/authd/pam/internal/gdm_test"
"github.com/ubuntu/authd/pam/internal/log"
"github.com/ubuntu/authd/pam/internal/proto"
)

Expand Down
2 changes: 1 addition & 1 deletion pam/internal/adapter/authentication.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/msteinert/pam/v2"
"github.com/ubuntu/authd"
"github.com/ubuntu/authd/internal/brokers"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/log"
pam_proto "github.com/ubuntu/authd/pam/internal/proto"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
Expand Down
2 changes: 1 addition & 1 deletion pam/internal/adapter/authmodeselection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/charmbracelet/lipgloss"
"github.com/msteinert/pam/v2"
"github.com/ubuntu/authd"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/log"
)

// authModeSelectionModel is the model list to select supported authentication modes.
Expand Down
2 changes: 1 addition & 1 deletion pam/internal/adapter/brokerselection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/charmbracelet/lipgloss"
"github.com/msteinert/pam/v2"
"github.com/ubuntu/authd"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/log"
"github.com/ubuntu/authd/pam/internal/proto"
)

Expand Down
2 changes: 1 addition & 1 deletion pam/internal/adapter/commands.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/msteinert/pam/v2"
"github.com/ubuntu/authd"
"github.com/ubuntu/authd/internal/brokers"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/log"
)

// sendEvent sends an event msg to the main event loop.
Expand Down
2 changes: 1 addition & 1 deletion pam/internal/adapter/gdmmodel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/msteinert/pam/v2"
"github.com/ubuntu/authd"
"github.com/ubuntu/authd/internal/brokers"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/gdm"
"github.com/ubuntu/authd/pam/internal/log"
"github.com/ubuntu/authd/pam/internal/proto"
)

Expand Down
2 changes: 1 addition & 1 deletion pam/internal/adapter/gdmmodel_convhandler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/msteinert/pam/v2"
"github.com/ubuntu/authd"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/gdm"
"github.com/ubuntu/authd/pam/internal/log"
"github.com/ubuntu/authd/pam/internal/proto"
pam_proto "github.com/ubuntu/authd/pam/internal/proto"
)
Expand Down
2 changes: 1 addition & 1 deletion pam/internal/adapter/gdmmodel_uimodel_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (

tea "github.com/charmbracelet/bubbletea"
"github.com/ubuntu/authd"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/gdm"
"github.com/ubuntu/authd/pam/internal/gdm_test"
"github.com/ubuntu/authd/pam/internal/log"
"github.com/ubuntu/authd/pam/internal/proto"
)

Expand Down
2 changes: 1 addition & 1 deletion pam/internal/adapter/model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
tea "github.com/charmbracelet/bubbletea"
"github.com/msteinert/pam/v2"
"github.com/ubuntu/authd"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/log"
pam_proto "github.com/ubuntu/authd/pam/internal/proto"
)

Expand Down
2 changes: 1 addition & 1 deletion pam/internal/adapter/nativemodel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/skip2/go-qrcode"
"github.com/ubuntu/authd"
"github.com/ubuntu/authd/internal/brokers"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/log"
"github.com/ubuntu/authd/pam/internal/proto"
"golang.org/x/term"
)
Expand Down
2 changes: 1 addition & 1 deletion pam/internal/adapter/qrcodemodel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/muesli/termenv"
"github.com/skip2/go-qrcode"
"github.com/ubuntu/authd"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/log"
)

var centeredStyle = lipgloss.NewStyle().Align(lipgloss.Center, lipgloss.Top)
Expand Down
2 changes: 1 addition & 1 deletion pam/internal/adapter/userselection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/charmbracelet/bubbles/textinput"
tea "github.com/charmbracelet/bubbletea"
"github.com/msteinert/pam/v2"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/log"
"github.com/ubuntu/authd/pam/internal/proto"
)

Expand Down
2 changes: 1 addition & 1 deletion pam/internal/dbusmodule/transaction.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/godbus/dbus/v5"
"github.com/msteinert/pam/v2"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/log"
"github.com/ubuntu/decorate"
)

Expand Down
2 changes: 1 addition & 1 deletion pam/internal/dbusmodule/transaction_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/godbus/dbus/v5"
"github.com/msteinert/pam/v2"
"github.com/stretchr/testify/require"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/internal/testutils"
"github.com/ubuntu/authd/pam/internal/dbusmodule"
"github.com/ubuntu/authd/pam/internal/log"
)

const ifaceName = "com.ubuntu.authd.pam"
Expand Down
2 changes: 1 addition & 1 deletion pam/internal/gdm/conversation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"sync/atomic"

"github.com/msteinert/pam/v2"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/log"
)

var conversations atomic.Int32
Expand Down
0 internal/log/log.go → pam/internal/log/log.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/log/log_test.go → pam/internal/log/log_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"

"github.com/stretchr/testify/require"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/log"
)

var supportedLevels = []log.Level{
Expand Down
2 changes: 1 addition & 1 deletion pam/internal/pam_test/pam-client-dummy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/google/uuid"
"github.com/ubuntu/authd"
"github.com/ubuntu/authd/internal/brokers"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/log"
"golang.org/x/exp/maps"
"google.golang.org/grpc"
)
Expand Down
2 changes: 1 addition & 1 deletion pam/main-exec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"time"

"github.com/msteinert/pam/v2"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/pam/internal/dbusmodule"
"github.com/ubuntu/authd/pam/internal/log"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pam/pam.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (
"github.com/ubuntu/authd"
"github.com/ubuntu/authd/internal/brokers"
"github.com/ubuntu/authd/internal/consts"
"github.com/ubuntu/authd/internal/log"
"github.com/ubuntu/authd/internal/services/errmessages"
"github.com/ubuntu/authd/pam/internal/adapter"
"github.com/ubuntu/authd/pam/internal/gdm"
"github.com/ubuntu/authd/pam/internal/log"
"golang.org/x/term"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
Expand Down

0 comments on commit 8db41a2

Please sign in to comment.