Fix logging output of user.GID (#1466)

Follow up to comment here: #1449 (comment) cc @pnasrat Signed-off-by: Josh Dolitsky <[email protected]>
chainguard-dev · Jan 7, 2025 · d418457 · d418457
1 parent 1ef4f50
commit d418457
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/pkg/build/types/image_configuration.go b/pkg/build/types/image_configuration.go
@@ -258,7 +258,7 @@ func (ic *ImageConfiguration) Summarize(ctx context.Context) {
 		log.Infof("    runas:  %s", ic.Accounts.RunAs)
 		log.Infof("    users:")
 		for _, u := range ic.Accounts.Users {
-			log.Infof("      - uid=%d(%s) gid=%d", u.UID, u.UserName, u.GID)
+			log.Infof("      - uid=%d(%s) gid=%d", u.UID, u.UserName, gidToInt(u.GID))
 		}
 		log.Infof("    groups:")
 		for _, g := range ic.Accounts.Groups {
@@ -272,3 +272,10 @@ func (ic *ImageConfiguration) Summarize(ctx context.Context) {
 		}
 	}
 }
+
+func gidToInt(gid GID) uint32 {
+	if gid == nil {
+		return 0
+	}
+	return *gid
+}
diff --git a/pkg/build/types/image_configuration_test.go b/pkg/build/types/image_configuration_test.go
@@ -60,6 +60,9 @@ func TestUserContents(t *testing.T) {
 
 	require.Equal(t, "/not/home", ic.Accounts.Users[0].HomeDir)
 	require.Equal(t, "/home/user", ic.Accounts.Users[1].HomeDir)
+
+	// Ensure this does not cause panic when users[1].gid is empty (defaulting to 0)
+	ic.Summarize(ctx)
 }
 
 func TestMergeInto(t *testing.T) {

diff --git a/pkg/build/types/testdata/users.apko.yaml b/pkg/build/types/testdata/users.apko.yaml
@@ -12,6 +12,5 @@ accounts:
       uid: 2
       homedir: "/not/home"
       username: "something-else"
-    - gid: 2
-      uid: 3
+    - uid: 3
       username: "user"