chore: apply betteralign struct field optimizations

Run betteralign --apply ./... to reorder struct fields for optimal
memory alignment, saving between 8-24 bytes per struct across:

- internal/config/config.go
- internal/model/group.go, member.go, state.go, user.go
- internal/repository/s3.go
- internal/core/sync.go
- pkg/google/google.go, options.go
- pkg/aws/scim_errors.go, scim_model.go

Fix positional struct literal in pkg/aws/scim.go (HTTPResponseError)
that broke after field reordering — converted to named fields.

Update MarshalJSON test expectations in internal/model to match the
new JSON field serialization order produced by the reordered structs.

Author: christiangda

.vscode/settings.json

@@ -87,5 +87,8 @@
     "usrs",
     "vuln",
     "Warnf"
-  ]
+  ],
+  "chat.tools.terminal.autoApprove": {
+    "$(go": true
+  }
 }

internal/config/config.go

@@ -64,19 +64,14 @@ var (
 // Config represents the configuration of the application.
 type Config struct {
 	ConfigFile string `mapstructure:"config-file"`
-	IsLambda   bool
-	Debug      bool
 
 	LogLevel  string `mapstructure:"log_level" json:"log_level" yaml:"log_level"`
 	LogFormat string `mapstructure:"log_format" json:"log_format" yaml:"log_format"`
 
-	GWSServiceAccountFile           string   `mapstructure:"gws_service_account_file" json:"gws_service_account_file" yaml:"gws_service_account_file"`
-	GWSUserEmail                    string   `mapstructure:"gws_user_email" json:"gws_user_email" yaml:"gws_user_email"`
-	GWSServiceAccountFileSecretName string   `mapstructure:"gws_service_account_file_secret_name" json:"gws_service_account_file_secret_name" yaml:"gws_service_account_file_secret_name"`
-	GWSUserEmailSecretName          string   `mapstructure:"gws_user_email_secret_name" json:"gws_user_email_secret_name" yaml:"gws_user_email_secret_name"`
-	GWSGroupsFilter                 []string `mapstructure:"gws_groups_filter" json:"gws_groups_filter" yaml:"gws_groups_filter"`
-	GWSUsersFilter                  []string `mapstructure:"gws_users_filter" json:"gws_users_filter" yaml:"gws_users_filter"`
-	GWSServiceAccountScopes         []string `mapstructure:"gws_service_account_scopes" json:"gws_service_account_scopes" yaml:"gws_service_account_scopes"`
+	GWSServiceAccountFile           string `mapstructure:"gws_service_account_file" json:"gws_service_account_file" yaml:"gws_service_account_file"`
+	GWSUserEmail                    string `mapstructure:"gws_user_email" json:"gws_user_email" yaml:"gws_user_email"`
+	GWSServiceAccountFileSecretName string `mapstructure:"gws_service_account_file_secret_name" json:"gws_service_account_file_secret_name" yaml:"gws_service_account_file_secret_name"`
+	GWSUserEmailSecretName          string `mapstructure:"gws_user_email_secret_name" json:"gws_user_email_secret_name" yaml:"gws_user_email_secret_name"`
 
 	AWSSCIMEndpoint              string `mapstructure:"aws_scim_endpoint" json:"aws_scim_endpoint" yaml:"aws_scim_endpoint"`
 	AWSSCIMAccessToken           string `mapstructure:"aws_scim_access_token" json:"aws_scim_access_token" yaml:"aws_scim_access_token"`
@@ -89,6 +84,13 @@ type Config struct {
 	// SyncMethod allow to defined the sync method used to get the user and groups from Google Workspace
 	SyncMethod string `mapstructure:"sync_method" json:"sync_method" yaml:"sync_method"`
 
+	GWSGroupsFilter         []string `mapstructure:"gws_groups_filter" json:"gws_groups_filter" yaml:"gws_groups_filter"`
+	GWSUsersFilter          []string `mapstructure:"gws_users_filter" json:"gws_users_filter" yaml:"gws_users_filter"`
+	GWSServiceAccountScopes []string `mapstructure:"gws_service_account_scopes" json:"gws_service_account_scopes" yaml:"gws_service_account_scopes"`
+
+	IsLambda bool
+	Debug    bool
+
 	// UseSecretsManager determines if we will use the AWS Secrets Manager secrets or program parameter values
 	UseSecretsManager bool `mapstructure:"use_secrets_manager" json:"use_secrets_manager" yaml:"use_secrets_manager"`
 }

internal/core/sync.go

@@ -26,11 +26,11 @@ var (
 
 // SyncService represent the sync service and the core of the sync process
 type SyncService struct {
-	provGroupsFilter []string
-	provUsersFilter  []string
 	prov             IdentityProviderService
 	scim             SCIMService
 	repo             StateRepository
+	provGroupsFilter []string
+	provUsersFilter  []string
 }
 
 // NewSyncService creates a new sync service.

internal/model/group.go

@@ -66,9 +66,9 @@ func (g *Group) SetHashCode() {
 
 // GroupsResult represents a group result list entity.
 type GroupsResult struct {
-	Items     int      `json:"items"`
 	HashCode  string   `json:"hashCode,omitempty"`
 	Resources []*Group `json:"resources"`
+	Items     int      `json:"items"`
 }
 
 // MarshalBinary implements the encoding.BinaryMarshaler interface for GroupsResult entity.

internal/model/group_test.go

@@ -268,8 +268,8 @@ func TestGroupsResult_MarshalJSON(t *testing.T) {
 			name:   "empty",
 			fields: fields{},
 			want: []byte(`{
-  "items": 0,
-  "resources": []
+  "resources": [],
+  "items": 0
 }`),
 			wantErr: false,
 		},
@@ -288,7 +288,6 @@ func TestGroupsResult_MarshalJSON(t *testing.T) {
 				},
 			},
 			want: []byte(`{
-  "items": 1,
   "hashCode": "test",
   "resources": [
     {
@@ -297,7 +296,8 @@ func TestGroupsResult_MarshalJSON(t *testing.T) {
       "name": "group",
       "hashCode": "1111"
     }
-  ]
+  ],
+  "items": 1
 }`),
 			wantErr: false,
 		},

internal/model/member.go

@@ -73,9 +73,9 @@ func (m *Member) SetHashCode() {
 
 // MembersResult represents a member result list entity.
 type MembersResult struct {
-	Items     int       `json:"items"`
 	HashCode  string    `json:"hashCode,omitempty"`
 	Resources []*Member `json:"resources"`
+	Items     int       `json:"items"`
 }
 
 // MarshalBinary implements the encoding.BinaryMarshaler interface for MembersResult entity.
@@ -142,10 +142,10 @@ func (mr *MembersResult) SetHashCode() {
 
 // GroupMembers represents a group members entity.
 type GroupMembers struct {
-	Items     int       `json:"items"`
-	HashCode  string    `json:"hashCode,omitempty"`
 	Group     *Group    `json:"group"`
+	HashCode  string    `json:"hashCode,omitempty"`
 	Resources []*Member `json:"resources"`
+	Items     int       `json:"items"`
 }
 
 // MarshalBinary implements the encoding.BinaryMarshaler interface for GroupMembers entity.
@@ -226,9 +226,9 @@ func (gm *GroupMembers) SetHashCode() {
 
 // GroupsMembersResult represents a group members result list entity.
 type GroupsMembersResult struct {
-	Items     int             `json:"items"`
 	HashCode  string          `json:"hashCode,omitempty"`
 	Resources []*GroupMembers `json:"resources"`
+	Items     int             `json:"items"`
 }
 
 // MarshalBinary implements the encoding.BinaryMarshaler interface for GroupsMembersResult entity.

internal/model/member_test.go

@@ -537,8 +537,8 @@ func TestGroupsMembersResult_MarshalJSON(t *testing.T) {
 			name:   "empty",
 			fields: fields{},
 			want: []byte(`{
-  "items": 0,
-  "resources": []
+  "resources": [],
+  "items": 0
 }`),
 			wantErr: false,
 		},
@@ -560,20 +560,20 @@ func TestGroupsMembersResult_MarshalJSON(t *testing.T) {
 				},
 			},
 			want: []byte(`{
-  "items": 1,
   "hashCode": "test",
   "resources": [
     {
-      "items": 1,
       "group": {
         "ipid": "1",
         "scimid": "1",
         "name": "group 1",
         "email": "group.1@mai.com"
       },
-      "resources": null
+      "resources": null,
+      "items": 1
     }
-  ]
+  ],
+  "items": 1
 }`),
 			wantErr: false,
 		},

internal/model/state.go

@@ -71,11 +71,11 @@ func (s *StateResources) UnmarshalBinary(data []byte) error {
 
 // State is the state of the system.
 type State struct {
+	Resources     *StateResources `json:"resources"`
 	SchemaVersion string          `json:"schemaVersion"`
 	CodeVersion   string          `json:"codeVersion"`
 	LastSync      string          `json:"lastSync"`
 	HashCode      string          `json:"hashCode,omitempty"`
-	Resources     *StateResources `json:"resources"`
 }
 
 // MarshalBinary implements the encoding.BinaryMarshaler interface for State entity.

internal/model/state_test.go

@@ -432,23 +432,23 @@ func TestState_MarshalJSON(t *testing.T) {
 			name:   "empty",
 			fields: fields{},
 			want: []byte(`{
-  "schemaVersion": "",
-  "codeVersion": "",
-  "lastSync": "",
   "resources": {
     "groups": {
-      "items": 0,
-      "resources": []
+      "resources": [],
+      "items": 0
     },
     "users": {
-      "items": 0,
-      "resources": []
+      "resources": [],
+      "items": 0
     },
     "groupsMembers": {
-      "items": 0,
-      "resources": []
+      "resources": [],
+      "items": 0
     }
-  }
+  },
+  "schemaVersion": "",
+  "codeVersion": "",
+  "lastSync": ""
 }`),
 			wantErr: false,
 		},
@@ -487,12 +487,8 @@ func TestState_MarshalJSON(t *testing.T) {
 				},
 			},
 			want: []byte(`{
-  "schemaVersion": "",
-  "codeVersion": "",
-  "lastSync": "2020-01-01T00:00:00Z",
   "resources": {
     "groups": {
-      "items": 1,
       "hashCode": "hashCode",
       "resources": [
         {
@@ -502,13 +498,17 @@ func TestState_MarshalJSON(t *testing.T) {
           "email": "email",
           "hashCode": "hashCode"
         }
-      ]
+      ],
+      "items": 1
     },
     "users": {
-      "items": 1,
       "hashCode": "hashCode",
       "resources": [
         {
+          "name": {
+            "familyName": "lastName",
+            "givenName": "name"
+          },
           "hashCode": "hashCode",
           "ipid": "ipid",
           "scimid": "scimid",
@@ -518,19 +518,19 @@ func TestState_MarshalJSON(t *testing.T) {
               "type": "work",
               "primary": true
             }
-          ],
-          "name": {
-            "familyName": "lastName",
-            "givenName": "name"
-          }
+          ]
         }
-      ]
+      ],
+      "items": 1
     },
     "groupsMembers": {
-      "items": 0,
-      "resources": []
+      "resources": [],
+      "items": 0
     }
-  }
+  },
+  "schemaVersion": "",
+  "codeVersion": "",
+  "lastSync": "2020-01-01T00:00:00Z"
 }`),
 			wantErr: false,
 		},

internal/model/user.go

@@ -246,12 +246,12 @@ func (m *Manager) UnmarshalBinary(data []byte) error {
 }
 
 type EnterpriseData struct {
+	Manager        *Manager `json:"manager,omitempty"`
 	EmployeeNumber string   `json:"employeeNumber,omitempty"`
 	CostCenter     string   `json:"costCenter,omitempty"`
 	Organization   string   `json:"organization,omitempty"`
 	Division       string   `json:"division,omitempty"`
 	Department     string   `json:"department,omitempty"`
-	Manager        *Manager `json:"manager,omitempty"`
 }
 
 // MarshalBinary implements the gob.GobEncoder interface for EnterpriseData entity.
@@ -315,18 +315,20 @@ func (ed *EnterpriseData) UnmarshalBinary(data []byte) error {
 
 // User represents a user entity.
 type User struct {
-	HashCode          string `json:"hashCode,omitempty"`
-	IPID              string `json:"ipid,omitempty"`
-	SCIMID            string `json:"scimid,omitempty"`
-	UserName          string `json:"userName,omitempty"`
-	DisplayName       string `json:"displayName,omitempty"`
-	NickName          string `json:"nickName,omitempty"`
-	ProfileURL        string `json:"profileURL,omitempty"`
-	Title             string `json:"title,omitempty"`
-	UserType          string `json:"userType,omitempty"`
-	PreferredLanguage string `json:"preferredLanguage,omitempty"`
-	Locale            string `json:"locale,omitempty"`
-	Timezone          string `json:"timezone,omitempty"`
+	Name              *Name           `json:"name,omitempty"`
+	EnterpriseData    *EnterpriseData `json:"enterpriseData,omitempty"`
+	HashCode          string          `json:"hashCode,omitempty"`
+	IPID              string          `json:"ipid,omitempty"`
+	SCIMID            string          `json:"scimid,omitempty"`
+	UserName          string          `json:"userName,omitempty"`
+	DisplayName       string          `json:"displayName,omitempty"`
+	NickName          string          `json:"nickName,omitempty"`
+	ProfileURL        string          `json:"profileURL,omitempty"`
+	Title             string          `json:"title,omitempty"`
+	UserType          string          `json:"userType,omitempty"`
+	PreferredLanguage string          `json:"preferredLanguage,omitempty"`
+	Locale            string          `json:"locale,omitempty"`
+	Timezone          string          `json:"timezone,omitempty"`
 
 	// this field is to have compatibility with the old version of the application <= v0.0.19
 	// and will be removed in the future maybe after >= v0.1.1
@@ -336,11 +338,9 @@ type User struct {
 	// this is implemented in the new version of the application > v0.0.19
 	Emails []Email `json:"emails,omitempty"`
 
-	Addresses      []Address       `json:"addresses,omitempty"`
-	PhoneNumbers   []PhoneNumber   `json:"phoneNumbers,omitempty"`
-	Name           *Name           `json:"name,omitempty"`
-	EnterpriseData *EnterpriseData `json:"enterpriseData,omitempty"`
-	Active         bool            `json:"active,omitempty"`
+	Addresses    []Address     `json:"addresses,omitempty"`
+	PhoneNumbers []PhoneNumber `json:"phoneNumbers,omitempty"`
+	Active       bool          `json:"active,omitempty"`
 }
 
 // MarshalBinary implements the gob.GobEncoder interface for User entity.
@@ -509,9 +509,9 @@ func (u *User) GetPrimaryEmailAddress() string {
 
 // UsersResult represents a user result list entity.
 type UsersResult struct {
-	Items     int     `json:"items"`
 	HashCode  string  `json:"hashCode,omitempty"`
 	Resources []*User `json:"resources"`
+	Items     int     `json:"items"`
 }
 
 // MarshalBinary implements the gob.GobEncoder interface for UsersResult entity.