fixup! Export test-specific functions without go:linkname

ubuntu · Dec 5, 2024 · 978d4d8 · 978d4d8
1 parent 7d8f2e3
commit 978d4d8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/internal/services/pam/pam_test.go b/internal/services/pam/pam_test.go
@@ -299,7 +299,7 @@ func TestGetAuthenticationModes(t *testing.T) {
 			}
 
 			// Now, set tests permissions for this use case
-			pm.Z_ForTests_SetCurrentUserAsRoot(!tc.currentUserNotRoot)
+			permissions.Z_ForTests_SetCurrentUserAsRoot(&pm, !tc.currentUserNotRoot)
 
 			if tc.supportedUILayouts == nil {
 				tc.supportedUILayouts = []*authd.UILayout{requiredEntry}
@@ -393,7 +393,7 @@ func TestSelectAuthenticationMode(t *testing.T) {
 			}
 
 			// Now, set tests permissions for this use case
-			pm.Z_ForTests_SetCurrentUserAsRoot(!tc.currentUserNotRoot)
+			permissions.Z_ForTests_SetCurrentUserAsRoot(&pm, !tc.currentUserNotRoot)
 
 			samReq := &authd.SAMRequest{
 				SessionId:            tc.sessionID,
@@ -484,7 +484,7 @@ func TestIsAuthenticated(t *testing.T) {
 			}
 
 			// Now, set tests permissions for this use case
-			pm.Z_ForTests_SetCurrentUserAsRoot(!tc.currentUserNotRoot)
+			permissions.Z_ForTests_SetCurrentUserAsRoot(&pm, !tc.currentUserNotRoot)
 
 			var firstCall, secondCall string
 			ctx, cancel := context.WithCancel(context.Background())
@@ -532,7 +532,7 @@ func TestIsAuthenticated(t *testing.T) {
 			require.Equal(t, want, got, "IsAuthenticated should return the expected combined data, but did not")
 
 			// Check that cache has been updated too.
-			gotDB, err := userstestutils.GetManagerCache(m).Z_ForTests_DumpNormalizedYAML()
+			gotDB, err := cache.Z_ForTests_DumpNormalizedYAML(userstestutils.GetManagerCache(m))
 			require.NoError(t, err, "Setup: failed to dump database for comparing")
 			wantDB := golden.LoadWithUpdate(t, gotDB, golden.WithPath("cache.db"))
 			require.Equal(t, wantDB, gotDB, "IsAuthenticated should update the cache database as expected")
@@ -573,7 +573,7 @@ func TestIDGeneration(t *testing.T) {
 			require.NoError(t, err, "Setup: could not authenticate user")
 			require.Equal(t, "granted", resp.GetAccess(), "Setup: authentication should be granted")
 
-			gotDB, err := userstestutils.GetManagerCache(m).Z_ForTests_DumpNormalizedYAML()
+			gotDB, err := cache.Z_ForTests_DumpNormalizedYAML(userstestutils.GetManagerCache(m))
 			require.NoError(t, err, "Setup: failed to dump database for comparing")
 			wantDB := golden.LoadWithUpdate(t, gotDB, golden.WithPath("cache.db"))
 			require.Equal(t, wantDB, gotDB, "IsAuthenticated should update the cache database as expected")
@@ -633,7 +633,7 @@ func TestSetDefaultBrokerForUser(t *testing.T) {
 			require.Equal(t, tc.brokerID, gpbResp.GetPreviousBroker(), "SetDefaultBrokerForUser should set the default broker as expected")
 
 			// Check that cache has been updated too.
-			gotDB, err := userstestutils.GetManagerCache(m).Z_ForTests_DumpNormalizedYAML()
+			gotDB, err := cache.Z_ForTests_DumpNormalizedYAML(userstestutils.GetManagerCache(m))
 			require.NoError(t, err, "Setup: failed to dump database for comparing")
 			wantDB := golden.LoadWithUpdate(t, gotDB, golden.WithPath("cache.db"))
 			require.Equal(t, wantDB, gotDB, "SetDefaultBrokerForUser should update the cache database as expected")
@@ -678,7 +678,7 @@ func TestEndSession(t *testing.T) {
 			}
 
 			// Now, set tests permissions for this use case
-			pm.Z_ForTests_SetCurrentUserAsRoot(!tc.currentUserNotRoot)
+			permissions.Z_ForTests_SetCurrentUserAsRoot(&pm, !tc.currentUserNotRoot)
 
 			esReq := &authd.ESRequest{
 				SessionId: tc.sessionID,

diff --git a/internal/services/permissions/testutils.go b/internal/services/permissions/testutils.go
@@ -44,7 +44,7 @@ func currentUserUID() uint32 {
 // Z_ForTests_SetCurrentUserAsRoot mutates a default permission to the current user's UID if currentUserAsRoot is true.
 //
 // nolint:revive,nolintlint // We want to use underscores in the function name here.
-func (m *Manager) Z_ForTests_SetCurrentUserAsRoot(currentUserAsRoot bool) {
+func Z_ForTests_SetCurrentUserAsRoot(m *Manager, currentUserAsRoot bool) {
 	testsdetection.MustBeTesting()
 
 	if !currentUserAsRoot {

diff --git a/internal/users/cache/db_test.go b/internal/users/cache/db_test.go
@@ -74,7 +74,7 @@ func TestNew(t *testing.T) {
 			require.NoError(t, err)
 			defer c.Close()
 
-			got, err := c.Z_ForTests_DumpNormalizedYAML()
+			got, err := cache.Z_ForTests_DumpNormalizedYAML(c)
 			require.NoError(t, err, "Created database should be valid yaml content")
 
 			want := golden.LoadWithUpdate(t, got)
@@ -225,7 +225,7 @@ func TestUpdateUserEntry(t *testing.T) {
 			}
 			require.NoError(t, err)
 
-			got, err := c.Z_ForTests_DumpNormalizedYAML()
+			got, err := cache.Z_ForTests_DumpNormalizedYAML(c)
 			require.NoError(t, err, "Created database should be valid yaml content")
 
 			want := golden.LoadWithUpdate(t, got)
@@ -479,7 +479,7 @@ func TestDeleteUser(t *testing.T) {
 			}
 			require.NoError(t, err)
 
-			got, err := c.Z_ForTests_DumpNormalizedYAML()
+			got, err := cache.Z_ForTests_DumpNormalizedYAML(c)
 			require.NoError(t, err, "Created database should be valid yaml content")
 			want := golden.LoadWithUpdate(t, got)
 			require.Equal(t, want, got, "Did not get expected database content")

diff --git a/internal/users/cache/testutils.go b/internal/users/cache/testutils.go
@@ -64,7 +64,7 @@ func redactTime(line string) string {
 // (so that it can be compared with a golden file) and returns it as a YAML string.
 //
 // nolint:revive,nolintlint // We want to use underscores in the function name here.
-func (c *Cache) Z_ForTests_DumpNormalizedYAML() (string, error) {
+func Z_ForTests_DumpNormalizedYAML(c *Cache) (string, error) {
 	testsdetection.MustBeTesting()
 
 	d := make(map[string]map[string]string)

diff --git a/internal/users/manager_test.go b/internal/users/manager_test.go
@@ -75,7 +75,7 @@ func TestNewManager(t *testing.T) {
 			}
 			require.NoError(t, err, "NewManager should not return an error, but did")
 
-			got, err := userstestutils.GetManagerCache(m).Z_ForTests_DumpNormalizedYAML()
+			got, err := cache.Z_ForTests_DumpNormalizedYAML(userstestutils.GetManagerCache(m))
 			require.NoError(t, err, "Created database should be valid yaml content")
 
 			want := golden.LoadWithUpdate(t, got)
@@ -230,7 +230,7 @@ func TestUpdateUser(t *testing.T) {
 				require.Equal(t, oldUID, newUser.UID, "UID should not have changed")
 			}
 
-			got, err := userstestutils.GetManagerCache(m).Z_ForTests_DumpNormalizedYAML()
+			got, err := cache.Z_ForTests_DumpNormalizedYAML(userstestutils.GetManagerCache(m))
 			require.NoError(t, err, "Created database should be valid yaml content")
 
 			want := golden.LoadWithUpdateYAML(t, got)
@@ -314,7 +314,7 @@ func TestUpdateBrokerForUser(t *testing.T) {
 				return
 			}
 
-			got, err := userstestutils.GetManagerCache(m).Z_ForTests_DumpNormalizedYAML()
+			got, err := cache.Z_ForTests_DumpNormalizedYAML(userstestutils.GetManagerCache(m))
 			require.NoError(t, err, "Created database should be valid yaml content")
 
 			want := golden.LoadWithUpdateYAML(t, got)