diff --git a/pam/integration-tests/cmd/exec-client/client.go b/pam/integration-tests/cmd/exec-client/client.go index 050ebc892..7b25a0ca5 100644 --- a/pam/integration-tests/cmd/exec-client/client.go +++ b/pam/integration-tests/cmd/exec-client/client.go @@ -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" ) diff --git a/pam/integration-tests/gdm-module-handler_test.go b/pam/integration-tests/gdm-module-handler_test.go index 31b8587cc..6ef0269cf 100644 --- a/pam/integration-tests/gdm-module-handler_test.go +++ b/pam/integration-tests/gdm-module-handler_test.go @@ -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" ) diff --git a/pam/internal/adapter/authentication.go b/pam/internal/adapter/authentication.go index 7a3a6749f..80dcaf20a 100644 --- a/pam/internal/adapter/authentication.go +++ b/pam/internal/adapter/authentication.go @@ -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" diff --git a/pam/internal/adapter/authmodeselection.go b/pam/internal/adapter/authmodeselection.go index 25419f677..d6f0d2c2f 100644 --- a/pam/internal/adapter/authmodeselection.go +++ b/pam/internal/adapter/authmodeselection.go @@ -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. diff --git a/pam/internal/adapter/brokerselection.go b/pam/internal/adapter/brokerselection.go index 41acc1365..1a2d81951 100644 --- a/pam/internal/adapter/brokerselection.go +++ b/pam/internal/adapter/brokerselection.go @@ -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" ) diff --git a/pam/internal/adapter/commands.go b/pam/internal/adapter/commands.go index 46a7142d2..9e77b9666 100644 --- a/pam/internal/adapter/commands.go +++ b/pam/internal/adapter/commands.go @@ -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. diff --git a/pam/internal/adapter/gdmmodel.go b/pam/internal/adapter/gdmmodel.go index 0c1b49d8b..52d12ab1b 100644 --- a/pam/internal/adapter/gdmmodel.go +++ b/pam/internal/adapter/gdmmodel.go @@ -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" ) diff --git a/pam/internal/adapter/gdmmodel_convhandler_test.go b/pam/internal/adapter/gdmmodel_convhandler_test.go index 29249cc7f..24e20b096 100644 --- a/pam/internal/adapter/gdmmodel_convhandler_test.go +++ b/pam/internal/adapter/gdmmodel_convhandler_test.go @@ -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" ) diff --git a/pam/internal/adapter/gdmmodel_uimodel_test.go b/pam/internal/adapter/gdmmodel_uimodel_test.go index 8860fbda1..830940e57 100644 --- a/pam/internal/adapter/gdmmodel_uimodel_test.go +++ b/pam/internal/adapter/gdmmodel_uimodel_test.go @@ -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" ) diff --git a/pam/internal/adapter/model.go b/pam/internal/adapter/model.go index fea959de8..397348dd7 100644 --- a/pam/internal/adapter/model.go +++ b/pam/internal/adapter/model.go @@ -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" ) diff --git a/pam/internal/adapter/nativemodel.go b/pam/internal/adapter/nativemodel.go index a0565358c..6154b970c 100644 --- a/pam/internal/adapter/nativemodel.go +++ b/pam/internal/adapter/nativemodel.go @@ -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" ) diff --git a/pam/internal/adapter/qrcodemodel.go b/pam/internal/adapter/qrcodemodel.go index 8d861b45f..3f270386d 100644 --- a/pam/internal/adapter/qrcodemodel.go +++ b/pam/internal/adapter/qrcodemodel.go @@ -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) diff --git a/pam/internal/adapter/userselection.go b/pam/internal/adapter/userselection.go index 8965b9dda..c0c10a790 100644 --- a/pam/internal/adapter/userselection.go +++ b/pam/internal/adapter/userselection.go @@ -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" ) diff --git a/pam/internal/dbusmodule/transaction.go b/pam/internal/dbusmodule/transaction.go index ee1ad2bcc..6960bda57 100644 --- a/pam/internal/dbusmodule/transaction.go +++ b/pam/internal/dbusmodule/transaction.go @@ -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" ) diff --git a/pam/internal/dbusmodule/transaction_test.go b/pam/internal/dbusmodule/transaction_test.go index 4c0d7499a..3b745ce08 100644 --- a/pam/internal/dbusmodule/transaction_test.go +++ b/pam/internal/dbusmodule/transaction_test.go @@ -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" diff --git a/pam/internal/gdm/conversation.go b/pam/internal/gdm/conversation.go index b675d3d17..c1aa953d2 100644 --- a/pam/internal/gdm/conversation.go +++ b/pam/internal/gdm/conversation.go @@ -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 diff --git a/internal/log/log.go b/pam/internal/log/log.go similarity index 100% rename from internal/log/log.go rename to pam/internal/log/log.go diff --git a/internal/log/log_test.go b/pam/internal/log/log_test.go similarity index 99% rename from internal/log/log_test.go rename to pam/internal/log/log_test.go index 02753866c..81ca21dfc 100644 --- a/internal/log/log_test.go +++ b/pam/internal/log/log_test.go @@ -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{ diff --git a/pam/internal/pam_test/pam-client-dummy.go b/pam/internal/pam_test/pam-client-dummy.go index a10f7b22b..a7f59c09a 100644 --- a/pam/internal/pam_test/pam-client-dummy.go +++ b/pam/internal/pam_test/pam-client-dummy.go @@ -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" ) diff --git a/pam/main-exec.go b/pam/main-exec.go index 42855f92c..38379f631 100644 --- a/pam/main-exec.go +++ b/pam/main-exec.go @@ -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 ( diff --git a/pam/pam.go b/pam/pam.go index bc163abae..68ae5085c 100644 --- a/pam/pam.go +++ b/pam/pam.go @@ -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"