a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configstore: fix changegroup names 

changegroup names are based on names that will contain slashes and could be very
long. So calculate the sha256 sum of the starting name and use it as the
changegroup name.
This commit is contained in:
Simone Gotti 2019-04-29 10:24:05 +02:00
parent da6aefa7e2
commit 159abffa06
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
internal/services/configstore/command/command.go
View File

@ -71,7 +71,7 @@ func (s *CommandHandler) CreateProjectGroup(ctx context.Context, projectGroup *t
} }
pp := path.Join(groupPath, projectGroup.Name) pp := path.Join(groupPath, projectGroup.Name)
cgNames := []string{pp} cgNames := []string{util.EncodeSha256Hex(pp)}
cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames) cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames)
if err != nil { if err != nil {
return err return err
@ -147,7 +147,7 @@ func (s *CommandHandler) CreateProject(ctx context.Context, project *types.Proje
} }
pp := path.Join(groupPath, project.Name) pp := path.Join(groupPath, project.Name)
cgNames := []string{pp} cgNames := []string{util.EncodeSha256Hex(pp)}
cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames) cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames)
if err != nil { if err != nil {
return err return err
@ -217,7 +217,7 @@ func (s *CommandHandler) DeleteProject(ctx context.Context, projectRef string) e
return err return err
} }
cgNames := []string{group.ID} cgNames := []string{util.EncodeSha256Hex(group.ID)}
cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames) cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames)
if err != nil { if err != nil {
return err return err
@ -254,7 +254,7 @@ func (s *CommandHandler) CreateUser(ctx context.Context, req *CreateUserRequest)
} }
var cgt *datamanager.ChangeGroupsUpdateToken var cgt *datamanager.ChangeGroupsUpdateToken
cgNames := []string{req.UserName} cgNames := []string{util.EncodeSha256Hex(req.UserName)}
var rs *types.RemoteSource var rs *types.RemoteSource
// must do all the check in a single transaction to avoid concurrent changes // must do all the check in a single transaction to avoid concurrent changes
@ -358,7 +358,7 @@ func (s *CommandHandler) DeleteUser(ctx context.Context, userName string) error
var user *types.User var user *types.User
var cgt *datamanager.ChangeGroupsUpdateToken var cgt *datamanager.ChangeGroupsUpdateToken
cgNames := []string{user.UserName} cgNames := []string{util.EncodeSha256Hex(user.UserName)}
// must do all the check in a single transaction to avoid concurrent changes // must do all the check in a single transaction to avoid concurrent changes
err := s.readDB.Do(func(tx *db.Tx) error { err := s.readDB.Do(func(tx *db.Tx) error {
@ -430,7 +430,7 @@ func (s *CommandHandler) CreateUserLA(ctx context.Context, req *CreateUserLARequ
return util.NewErrBadRequest(errors.Errorf("user %q doesn't exist", req.UserName)) return util.NewErrBadRequest(errors.Errorf("user %q doesn't exist", req.UserName))
} }
cgNames := []string{user.ID} cgNames := []string{util.EncodeSha256Hex(user.ID)}
cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames) cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames)
if err != nil { if err != nil {
return err return err
@ -513,7 +513,7 @@ func (s *CommandHandler) DeleteUserLA(ctx context.Context, userName, laID string
return util.NewErrBadRequest(errors.Errorf("user %q doesn't exist", userName)) return util.NewErrBadRequest(errors.Errorf("user %q doesn't exist", userName))
} }
cgNames := []string{user.ID} cgNames := []string{util.EncodeSha256Hex(user.ID)}
cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames) cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames)
if err != nil { if err != nil {
return err return err
@ -580,7 +580,7 @@ func (s *CommandHandler) UpdateUserLA(ctx context.Context, req *UpdateUserLARequ
return util.NewErrBadRequest(errors.Errorf("user %q doesn't exist", req.UserName)) return util.NewErrBadRequest(errors.Errorf("user %q doesn't exist", req.UserName))
} }
cgNames := []string{user.ID} cgNames := []string{util.EncodeSha256Hex(user.ID)}
cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames) cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames)
if err != nil { if err != nil {
return err return err
@ -649,7 +649,7 @@ func (s *CommandHandler) CreateUserToken(ctx context.Context, userName, tokenNam
return util.NewErrBadRequest(errors.Errorf("user %q doesn't exist", userName)) return util.NewErrBadRequest(errors.Errorf("user %q doesn't exist", userName))
} }
cgNames := []string{user.ID} cgNames := []string{util.EncodeSha256Hex(user.ID)}
cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames) cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames)
if err != nil { if err != nil {
return err return err
@ -714,7 +714,7 @@ func (s *CommandHandler) DeleteUserToken(ctx context.Context, userName, tokenNam
return util.NewErrBadRequest(errors.Errorf("user %q doesn't exist", userName)) return util.NewErrBadRequest(errors.Errorf("user %q doesn't exist", userName))
} }
cgNames := []string{user.ID} cgNames := []string{util.EncodeSha256Hex(user.ID)}
cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames) cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames)
if err != nil { if err != nil {
return err return err
@ -756,7 +756,7 @@ func (s *CommandHandler) CreateRemoteSource(ctx context.Context, remoteSource *t
} }
var cgt *datamanager.ChangeGroupsUpdateToken var cgt *datamanager.ChangeGroupsUpdateToken
cgNames := []string{remoteSource.Name} cgNames := []string{util.EncodeSha256Hex(remoteSource.Name)}
// must do all the check in a single transaction to avoid concurrent changes // must do all the check in a single transaction to avoid concurrent changes
err := s.readDB.Do(func(tx *db.Tx) error { err := s.readDB.Do(func(tx *db.Tx) error {
@ -803,7 +803,7 @@ func (s *CommandHandler) DeleteRemoteSource(ctx context.Context, remoteSourceNam
var remoteSource *types.RemoteSource var remoteSource *types.RemoteSource
var cgt *datamanager.ChangeGroupsUpdateToken var cgt *datamanager.ChangeGroupsUpdateToken
cgNames := []string{remoteSource.ID} cgNames := []string{util.EncodeSha256Hex(remoteSource.ID)}
// must do all the check in a single transaction to avoid concurrent changes // must do all the check in a single transaction to avoid concurrent changes
err := s.readDB.Do(func(tx *db.Tx) error { err := s.readDB.Do(func(tx *db.Tx) error {
@ -846,7 +846,7 @@ func (s *CommandHandler) CreateOrg(ctx context.Context, org *types.Organization)
} }
var cgt *datamanager.ChangeGroupsUpdateToken var cgt *datamanager.ChangeGroupsUpdateToken
cgNames := []string{org.Name} cgNames := []string{util.EncodeSha256Hex(org.Name)}
// must do all the check in a single transaction to avoid concurrent changes // must do all the check in a single transaction to avoid concurrent changes
err := s.readDB.Do(func(tx *db.Tx) error { err := s.readDB.Do(func(tx *db.Tx) error {
@ -911,7 +911,7 @@ func (s *CommandHandler) DeleteOrg(ctx context.Context, orgName string) error {
var projects []*types.Project var projects []*types.Project
var cgt *datamanager.ChangeGroupsUpdateToken var cgt *datamanager.ChangeGroupsUpdateToken
cgNames := []string{orgName} cgNames := []string{util.EncodeSha256Hex(orgName)}
// must do all the check in a single transaction to avoid concurrent changes // must do all the check in a single transaction to avoid concurrent changes
err := s.readDB.Do(func(tx *db.Tx) error { err := s.readDB.Do(func(tx *db.Tx) error {
@ -980,7 +980,7 @@ func (s *CommandHandler) CreateSecret(ctx context.Context, secret *types.Secret)
} }
var cgt *datamanager.ChangeGroupsUpdateToken var cgt *datamanager.ChangeGroupsUpdateToken
cgNames := []string{secret.Name} cgNames := []string{util.EncodeSha256Hex(secret.Name)}
// must do all the check in a single transaction to avoid concurrent changes // must do all the check in a single transaction to avoid concurrent changes
err := s.readDB.Do(func(tx *db.Tx) error { err := s.readDB.Do(func(tx *db.Tx) error {
@ -1052,7 +1052,7 @@ func (s *CommandHandler) DeleteSecret(ctx context.Context, parentType types.Conf
return util.NewErrBadRequest(errors.Errorf("secret with name %q doesn't exist", secretName)) return util.NewErrBadRequest(errors.Errorf("secret with name %q doesn't exist", secretName))
} }
cgNames := []string{secretName} cgNames := []string{util.EncodeSha256Hex(secretName)}
cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames) cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames)
if err != nil { if err != nil {
return err return err
@ -1094,7 +1094,7 @@ func (s *CommandHandler) CreateVariable(ctx context.Context, variable *types.Var
} }
var cgt *datamanager.ChangeGroupsUpdateToken var cgt *datamanager.ChangeGroupsUpdateToken
cgNames := []string{variable.Name} cgNames := []string{util.EncodeSha256Hex(variable.Name)}
// must do all the check in a single transaction to avoid concurrent changes // must do all the check in a single transaction to avoid concurrent changes
err := s.readDB.Do(func(tx *db.Tx) error { err := s.readDB.Do(func(tx *db.Tx) error {
@ -1166,7 +1166,7 @@ func (s *CommandHandler) DeleteVariable(ctx context.Context, parentType types.Co
return util.NewErrBadRequest(errors.Errorf("variable with name %q doesn't exist", variableName)) return util.NewErrBadRequest(errors.Errorf("variable with name %q doesn't exist", variableName))
} }
cgNames := []string{variableName} cgNames := []string{util.EncodeSha256Hex(variableName)}
cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames) cgt, err = s.readDB.GetChangeGroupsUpdateTokens(tx, cgNames)
if err != nil { if err != nil {
return err return err