fixup! Generate unique UIDs and GIDs

ubuntu · Jan 15, 2025 · 58cc388 · 58cc388
1 parent 6216aff
commit 58cc388
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/internal/services/nss/nss_test.go b/internal/services/nss/nss_test.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"github.com/ubuntu/authd/internal/brokers"
-	"github.com/ubuntu/authd/internal/log"
 	"github.com/ubuntu/authd/internal/proto/authd"
 	"github.com/ubuntu/authd/internal/services/errmessages"
 	"github.com/ubuntu/authd/internal/services/nss"
@@ -21,6 +20,7 @@ import (
 	"github.com/ubuntu/authd/internal/users/cache"
 	"github.com/ubuntu/authd/internal/users/idgenerator"
 	localgroupstestutils "github.com/ubuntu/authd/internal/users/localentries/testutils"
+	"github.com/ubuntu/authd/log"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials/insecure"

diff --git a/internal/services/pam/pam_test.go b/internal/services/pam/pam_test.go
@@ -18,7 +18,6 @@ import (
 	"github.com/ubuntu/authd/internal/brokers"
 	"github.com/ubuntu/authd/internal/brokers/auth"
 	"github.com/ubuntu/authd/internal/brokers/layouts"
-	"github.com/ubuntu/authd/internal/log"
 	"github.com/ubuntu/authd/internal/proto/authd"
 	"github.com/ubuntu/authd/internal/services/errmessages"
 	"github.com/ubuntu/authd/internal/services/pam"
@@ -30,6 +29,7 @@ import (
 	"github.com/ubuntu/authd/internal/users/idgenerator"
 	localgroupstestutils "github.com/ubuntu/authd/internal/users/localentries/testutils"
 	userstestutils "github.com/ubuntu/authd/internal/users/testutils"
+	"github.com/ubuntu/authd/log"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )

diff --git a/internal/users/manager_test.go b/internal/users/manager_test.go
@@ -6,14 +6,14 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"github.com/ubuntu/authd/internal/log"
 	"github.com/ubuntu/authd/internal/testutils/golden"
 	"github.com/ubuntu/authd/internal/users"
 	"github.com/ubuntu/authd/internal/users/cache"
 	"github.com/ubuntu/authd/internal/users/idgenerator"
 	localgroupstestutils "github.com/ubuntu/authd/internal/users/localentries/testutils"
 	userstestutils "github.com/ubuntu/authd/internal/users/testutils"
 	"github.com/ubuntu/authd/internal/users/types"
+	"github.com/ubuntu/authd/log"
 	"go.etcd.io/bbolt"
 )
 

diff --git a/internal/users/tempentries/groups.go b/internal/users/tempentries/groups.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/ubuntu/authd/internal/log"
 	"github.com/ubuntu/authd/internal/users/localentries"
 	"github.com/ubuntu/authd/internal/users/types"
+	"github.com/ubuntu/authd/log"
 )
 
 type groupRecord struct {

diff --git a/internal/users/tempentries/preauth.go b/internal/users/tempentries/preauth.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/ubuntu/authd/internal/log"
 	"github.com/ubuntu/authd/internal/users/localentries"
 	"github.com/ubuntu/authd/internal/users/types"
+	"github.com/ubuntu/authd/log"
 )
 
 const (

diff --git a/internal/users/tempentries/tempentries.go b/internal/users/tempentries/tempentries.go
@@ -6,9 +6,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ubuntu/authd/internal/log"
 	"github.com/ubuntu/authd/internal/users/cache"
 	"github.com/ubuntu/authd/internal/users/types"
+	"github.com/ubuntu/authd/log"
 )
 
 // NoDataFoundError is the error returned when no entry is found in the cache.

diff --git a/internal/users/tempentries/users.go b/internal/users/tempentries/users.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/ubuntu/authd/internal/log"
 	"github.com/ubuntu/authd/internal/users/localentries"
 	"github.com/ubuntu/authd/internal/users/types"
+	"github.com/ubuntu/authd/log"
 )
 
 type userRecord struct {