Skip to content

fix: Helm repository deleted from argocd-cm when deleted from UI (Github Issue #1399) #2970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 17, 2023
Merged

fix: Helm repository deleted from argocd-cm when deleted from UI (Github Issue #1399) #2970

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
29a0c83
Helm repo delete from argo-cm
Ash-exp Feb 15, 2023
44073b3
update helm repo bug fixed
Ash-exp Feb 15, 2023
91172a8
Merge branch 'main' into bug-delete-helm-repo
Ash-exp Mar 14, 2023
597a76a
panic error replaced
Ash-exp Mar 14, 2023
85967bb
refactored code and added test cases
Ash-exp Mar 16, 2023
b27f55e
Merge branch 'main' into bug-delete-helm-repo
Ash-exp Mar 16, 2023
e83d67b
unit test for updateRepoData function
Ash-exp Mar 16, 2023
56d682a
added comments
Ash-exp Mar 16, 2023
f224a34
updated function names
Ash-exp Mar 16, 2023
4caaa8c
Merge branch 'main' into bug-delete-helm-repo
Ash-exp Mar 16, 2023
11706d6
removed unnecessary test function
Ash-exp Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
266 changes: 235 additions & 31 deletions pkg/chartRepo/ChartRepositoryService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,10 @@ func (impl *ChartRepositoryServiceImpl) UpdateChartRepo(request *ChartRepoDto) (
if err != nil && !util.IsErrNoRows(err) {
return nil, err
}
previousName := chartRepo.Name

chartRepo.Url = request.Url
chartRepo.Name = request.Name
chartRepo.AuthMode = request.AuthMode
chartRepo.UserName = request.UserName
chartRepo.Password = request.Password
Expand All @@ -186,7 +188,6 @@ func (impl *ChartRepositoryServiceImpl) UpdateChartRepo(request *ChartRepoDto) (
if err != nil {
return nil, err
}

client, err := impl.K8sUtil.GetClient(cfg)
if err != nil {
return nil, err
Expand All @@ -200,7 +201,13 @@ func (impl *ChartRepositoryServiceImpl) UpdateChartRepo(request *ChartRepoDto) (
if err != nil {
return nil, err
}
data := impl.updateData(cm.Data, request)
var data map[string]string
if previousName == request.Name {
data = impl.updateData(cm.Data, request)
} else {
data = impl.updateAndDeleteData(cm.Data, request, previousName)
}

cm.Data = data
_, err = impl.K8sUtil.UpdateConfigMap(impl.aCDAuthConfig.ACDConfigMapNamespace, cm, client)
if err != nil {
Expand All @@ -223,6 +230,84 @@ func (impl *ChartRepositoryServiceImpl) UpdateChartRepo(request *ChartRepoDto) (
return chartRepo, nil
}

// DeleteChartRepo update the active state from DB and modify the argo-cm with repo URL to null
func (impl *ChartRepositoryServiceImpl) DeleteChartRepo(request *ChartRepoDto) error {
dbConnection := impl.repoRepository.GetConnection()
tx, err := dbConnection.Begin()
if err != nil {
impl.logger.Errorw("error in establishing db connection, DeleteChartRepo", "err", err)
return err
}
// Rollback tx on error.
defer tx.Rollback()

chartRepo, err := impl.repoRepository.FindById(request.Id)
if err != nil && !util.IsErrNoRows(err) {
impl.logger.Errorw("error in finding chart repo by id", "err", err, "id", request.Id)
return err
}
chartRepo.Url = request.Url
chartRepo.AuthMode = request.AuthMode
chartRepo.UserName = request.UserName
chartRepo.Password = request.Password
chartRepo.Active = request.Active
chartRepo.AccessToken = request.AccessToken
chartRepo.SshKey = request.SshKey
chartRepo.Active = request.Active
chartRepo.UpdatedBy = request.UserId
chartRepo.UpdatedOn = time.Now()
err = impl.repoRepository.MarkChartRepoDeleted(chartRepo, tx)
if err != nil {
impl.logger.Errorw("error in deleting chart repo", "err", err)
return err
}

// modify configmap
clusterBean, err := impl.clusterService.FindOne(cluster.DefaultClusterName)
if err != nil {
return err
}
cfg, err := impl.clusterService.GetClusterConfig(clusterBean)
if err != nil {
return err
}
client, err := impl.K8sUtil.GetClient(cfg)
if err != nil {
return err
}
updateSuccess := false
retryCount := 0
//request.Url = ""
for !updateSuccess && retryCount < 3 {
retryCount = retryCount + 1

cm, err := impl.K8sUtil.GetConfigMap(impl.aCDAuthConfig.ACDConfigMapNamespace, impl.aCDAuthConfig.ACDConfigMapName, client)
if err != nil {
return err
}
data := impl.deleteData(cm.Data, request)
cm.Data = data
_, err = impl.K8sUtil.UpdateConfigMap(impl.aCDAuthConfig.ACDConfigMapNamespace, cm, client)
if err != nil {
impl.logger.Warnw(" config map failed", "err", err)
continue
}
if err == nil {
impl.logger.Warnw(" config map apply succeeded", "on retryCount", retryCount)
updateSuccess = true
}
}
if !updateSuccess {
return fmt.Errorf("resouce version not matched with config map attempted 3 times")
}
err = tx.Commit()
if err != nil {
impl.logger.Errorw("error in tx commit, DeleteChartRepo", "err", err)
return err
}
return nil
}

func (impl *ChartRepositoryServiceImpl) GetChartRepoById(id int) (*ChartRepoDto, error) {
model, err := impl.repoRepository.FindById(id)
if err != nil && !util.IsErrNoRows(err) {
Expand Down Expand Up @@ -461,6 +546,7 @@ func (impl *ChartRepositoryServiceImpl) createRepoElement(request *ChartRepoDto)
return repoData
}

// updateData update the request field in the argo-cm
func (impl *ChartRepositoryServiceImpl) updateData(data map[string]string, request *ChartRepoDto) map[string]string {
helmRepoStr := data["helm.repositories"]
helmRepoByte, err := yaml.YAMLToJSON([]byte(helmRepoStr))
Expand Down Expand Up @@ -496,7 +582,7 @@ func (impl *ChartRepositoryServiceImpl) updateData(data map[string]string, reque

found := false
for _, item := range repositories {
//if request chart repo found, than update its values
//if request chart repo found, then update its values
if item.Name == request.Name {
if request.AuthMode == repository.AUTH_MODE_USERNAME_PASSWORD {
usernameSecret := &KeyDto{Name: request.UserName, Key: "username"}
Expand Down Expand Up @@ -541,41 +627,159 @@ func (impl *ChartRepositoryServiceImpl) updateData(data map[string]string, reque
return data
}

func (impl *ChartRepositoryServiceImpl) DeleteChartRepo(request *ChartRepoDto) error {
dbConnection := impl.repoRepository.GetConnection()
tx, err := dbConnection.Begin()
// updateAndDeleteData update the request field in the argo-cm and delete the previous repo
func (impl *ChartRepositoryServiceImpl) updateAndDeleteData(data map[string]string, request *ChartRepoDto, previousName string) map[string]string {
helmRepoStr := data["helm.repositories"]
helmRepoByte, err := yaml.YAMLToJSON([]byte(helmRepoStr))
if err != nil {
impl.logger.Errorw("error in establishing db connection, DeleteChartRepo", "err", err)
return err
panic(err)
}
var helmRepositories []*AcdConfigMapRepositoriesDto
err = json.Unmarshal(helmRepoByte, &helmRepositories)
if err != nil {
panic(err)
}
// Rollback tx on error.
defer tx.Rollback()

chartRepo, err := impl.repoRepository.FindById(request.Id)
if err != nil && !util.IsErrNoRows(err) {
impl.logger.Errorw("error in finding chart repo by id", "err", err, "id", request.Id)
return err
rb, err := json.Marshal(helmRepositories)
if err != nil {
panic(err)
}
helmRepositoriesYamlByte, err := yaml.JSONToYAML(rb)
if err != nil {
panic(err)
}

chartRepo.Url = request.Url
chartRepo.AuthMode = request.AuthMode
chartRepo.UserName = request.UserName
chartRepo.Password = request.Password
chartRepo.Active = request.Active
chartRepo.AccessToken = request.AccessToken
chartRepo.SshKey = request.SshKey
chartRepo.Active = request.Active
chartRepo.UpdatedBy = request.UserId
chartRepo.UpdatedOn = time.Now()
err = impl.repoRepository.MarkChartRepoDeleted(chartRepo, tx)
//SETUP for repositories
var repositories []*AcdConfigMapRepositoriesDto
repoStr := data["repositories"]
repoByte, err := yaml.YAMLToJSON([]byte(repoStr))
if err != nil {
impl.logger.Errorw("error in deleting chart repo", "err", err)
return err
panic(err)
}
err = tx.Commit()
err = json.Unmarshal(repoByte, &repositories)
if err != nil {
impl.logger.Errorw("error in tx commit, DeleteChartRepo", "err", err)
return err
panic(err)
}
return nil

found := false
deleteIndex := -1
for index, item := range repositories {
//if request chart repo found, then update its values
if item.Name == request.Name {
if request.AuthMode == repository.AUTH_MODE_USERNAME_PASSWORD {
usernameSecret := &KeyDto{Name: request.UserName, Key: "username"}
passwordSecret := &KeyDto{Name: request.Password, Key: "password"}
item.PasswordSecret = passwordSecret
item.UsernameSecret = usernameSecret
} else if request.AuthMode == repository.AUTH_MODE_ACCESS_TOKEN {
// TODO - is it access token or ca cert nd secret
} else if request.AuthMode == repository.AUTH_MODE_SSH {
keySecret := &KeyDto{Name: request.SshKey, Key: "key"}
item.KeySecret = keySecret
}
item.Url = request.Url
found = true
}
if item.Name == previousName {
deleteIndex = index
}
}
if deleteIndex != -1 {
repositories = append(repositories[:deleteIndex], repositories[deleteIndex+1:]...)
}
// if request chart repo not found, add new one
if !found {
repoData := impl.createRepoElement(request)
repositories = append(repositories, repoData)
}

rb, err = json.Marshal(repositories)
if err != nil {
panic(err)
}
repositoriesYamlByte, err := yaml.JSONToYAML(rb)
if err != nil {
panic(err)
}

if len(helmRepositoriesYamlByte) > 0 {
data["helm.repositories"] = string(helmRepositoriesYamlByte)
}
if len(repositoriesYamlByte) > 0 {
data["repositories"] = string(repositoriesYamlByte)
}
//dex config copy as it is
dexConfigStr := data["dex.config"]
data["dex.config"] = string([]byte(dexConfigStr))
return data
}

// deleteData delete the request field from the argo-cm
func (impl *ChartRepositoryServiceImpl) deleteData(data map[string]string, request *ChartRepoDto) map[string]string {
helmRepoStr := data["helm.repositories"]
helmRepoByte, err := yaml.YAMLToJSON([]byte(helmRepoStr))
if err != nil {
panic(err)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dont use panic

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated 👍

}
var helmRepositories []*AcdConfigMapRepositoriesDto
err = json.Unmarshal(helmRepoByte, &helmRepositories)
if err != nil {
panic(err)
}

rb, err := json.Marshal(helmRepositories)
if err != nil {
panic(err)
}
helmRepositoriesYamlByte, err := yaml.JSONToYAML(rb)
if err != nil {
panic(err)
}

//SETUP for repositories
var repositories []*AcdConfigMapRepositoriesDto
repoStr := data["repositories"]
repoByte, err := yaml.YAMLToJSON([]byte(repoStr))
if err != nil {
panic(err)
}
err = json.Unmarshal(repoByte, &repositories)
if err != nil {
panic(err)
}

found := false
for index, item := range repositories {
//if request chart repo found, then delete its values
if item.Name == request.Name {
repositories = append(repositories[:index], repositories[index+1:]...)
found = true
break
}
}

// if request chart repo not found, add new one
if !found {
panic("No repo found to delete")
}

rb, err = json.Marshal(repositories)
if err != nil {
panic(err)
}
repositoriesYamlByte, err := yaml.JSONToYAML(rb)
if err != nil {
panic(err)
}

if len(helmRepositoriesYamlByte) > 0 {
data["helm.repositories"] = string(helmRepositoriesYamlByte)
}
if len(repositoriesYamlByte) > 0 {
data["repositories"] = string(repositoriesYamlByte)
}
//dex config copy as it is
dexConfigStr := data["dex.config"]
data["dex.config"] = string([]byte(dexConfigStr))
return data
}