Switch to User.Tag()

canonical · Sep 6, 2023 · 5a0b317 · 5a0b317
1 parent 494eef5
commit 5a0b317
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/internal/jimm/controller.go b/internal/jimm/controller.go
@@ -557,12 +557,12 @@ func (j *JIMM) ImportModel(ctx context.Context, u *dbmodel.User, controllerName
 
 	var usersExcludingLocalUsers []dbmodel.UserModelAccess
 	for _, userAccess := range model.Users {
-		username, err := names.ParseUserTag("user" + "-" + userAccess.User.Username)
-		if err != nil {
-			zapctx.Error(ctx, "failed to parse user tag", zap.String("username", userAccess.User.Username))
+		userTag, ok := userAccess.User.Tag().(names.UserTag)
+		if !ok {
+			zapctx.Error(ctx, "failed to extract user tag", zap.String("username", userAccess.User.Username))
 			continue
 		}
-		if username.IsLocal() {
+		if userTag.IsLocal() {
 			// Don't propogate local users into JIMM.
 			continue
 		}