fixed bug where deletion of an account would not work, if the it was …

…the first account in the slice

internal/group.go

@@ -66,17 +66,17 @@ func (g group) lookup(accountName string) (*account, error) {
 // delete deletes a given account from the group, returns an ErrNoSuchAccount
 // if account not present
 func (g *group) delete(account string) error {
-	var offset *int
+	var offset int = -1
 	for i, a := range g.Accounts {
 		if a.Name == account {
-			offset = &i
+			offset = i
 		}
 	}
-	if offset == nil {
+	if offset == -1 {
 		return ErrNoSuchAccount
 	}
 
-	g.Accounts = append(g.Accounts[:*offset], g.Accounts[*offset+1:]...)
+	g.Accounts = append(g.Accounts[:offset], g.Accounts[offset+1:]...)
 	return nil
 }
 

internal/group_test.go

@@ -109,3 +109,47 @@ func TestFilterByTag(t *testing.T) {
 		}
 	}
 }
+
+func TestDeleteAccount(t *testing.T) {
+	tt := []struct {
+		name        string
+		group       *group
+		toBeDeleted string
+		want        error
+	}{
+		{
+			name:        "deletion of account, no error",
+			toBeDeleted: "acc1",
+			group: &group{
+				GID:      "g1",
+				Accounts: []*account{{Name: "acc1"}, {Name: "acc2"}},
+			},
+			want: nil,
+		},
+		{
+			name:        "deletion of account, with error",
+			toBeDeleted: "acc3",
+			group: &group{
+				GID:      "g1",
+				Accounts: []*account{{Name: "acc1"}, {Name: "acc2"}},
+			},
+			want: ErrNoSuchAccount,
+		},
+	}
+
+	for _, tc := range tt {
+		err := tc.group.delete(tc.toBeDeleted)
+
+		if err != tc.want {
+			t.Fatalf("group.delete: %s: want: %v, have: %v", tc.name, tc.want, err)
+		}
+		// if no error is wanted, check if account got deleted
+		if tc.want == nil {
+			for _, acc := range tc.group.Accounts {
+				if acc.Name == tc.toBeDeleted {
+					t.Fatalf("group.delete: %s: account %q NOT delete", tc.name, tc.toBeDeleted)
+				}
+			}
+		}
+	}
+}

internal/sherlock.go

@@ -221,7 +221,7 @@ func (sh Sherlock) GetAccount(query string, groupKey string) (*account, error) {
 //
 // it allows to modify a group/account (adding accounts, changing account) through the passed StateOption.
 func (sh Sherlock) UpdateState(ctx context.Context, query, groupKey string, opt StateOption) error {
-	gid, name, err := SplitQuery(query)
+	gid, account, err := SplitQuery(query)
 	if err != nil {
 		return err
 	}
@@ -230,7 +230,7 @@ func (sh Sherlock) UpdateState(ctx context.Context, query, groupKey string, opt
 	if err != nil {
 		return err
 	}
-	if err := opt(group, name); err != nil {
+	if err := opt(group, account); err != nil {
 		return err
 	}
 	return sh.writeGroup(ctx, gid, groupKey, group)