github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-04-21 18:17:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Can not delete terraform provider (#4070)

Browse Source 
Signed-off-by: StevenLeiZhang <zhangleiic@163.com>
This commit is contained in:
StevenLeiZhang
2022-05-31 15:01:00 +08:00
committed by GitHub
parent a5cd007311
commit f8f0730ed8
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/utils/config/application.go
View File

@@ -37,7 +37,7 @@ import (
const (
errAuthenticateProvider = "failed to authenticate Terraform cloud provider %s for %s"
errProviderExists = "terraform provider %s for %s already exists"
errDeleteProvider = "failed to delete Terraform Provider %s"
errDeleteProvider = "failed to delete Terraform Provider %s err: %w"
errCouldNotDeleteProvider = "the Terraform Provider %s could not be disabled because it was created by enabling a Terraform provider or was manually created"
errCheckProviderExistence = "failed to check if Terraform Provider %s exists"
)
@@ -112,16 +112,16 @@ func DeleteApplication(ctx context.Context, k8sClient client.Client, name string
name = legacyName
}
if err1 != nil {
if kerrors.IsNotFound(err1) {
err2 := k8sClient.Get(ctx, client.ObjectKey{Namespace: types.DefaultKubeVelaNS, Name: name}, &v1beta1.Application{})
if err2 != nil {
if kerrors.IsNotFound(err2) {
return fmt.Errorf(errCouldNotDeleteProvider, name)
}
return fmt.Errorf(errDeleteProvider, name)
}
if !kerrors.IsNotFound(err1) {
return fmt.Errorf(errDeleteProvider, name, err1)
}
err2 := k8sClient.Get(ctx, client.ObjectKey{Namespace: types.DefaultKubeVelaNS, Name: name}, &v1beta1.Application{})
if err2 != nil {
if kerrors.IsNotFound(err2) {
return fmt.Errorf(errCouldNotDeleteProvider, name)
}
return fmt.Errorf(errDeleteProvider, name, err2)
}
return fmt.Errorf(errDeleteProvider, name)
}
}
}