Skip to content

Commit ba59530

Browse files
1gtmpiyush1146115
andauthored
Make sure to fail the backup/restore sessions if license check fails. (#1053) (#1056)
/cherry-pick * Make sure to fail the backup/restore sessions if license check fails. Signed-off-by: piyush1146115 <piyush@appscode.com> * Refactor implementation. Signed-off-by: piyush1146115 <piyush@appscode.com> * Run linter. Signed-off-by: piyush1146115 <piyush@appscode.com> Co-authored-by: Piyush Kanti Das <piyush123kantidas@gmail.com>
1 parent 4055f1b commit ba59530

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

pkg/backup.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ func NewCmdBackup() *cobra.Command {
6666
if err != nil {
6767
return err
6868
}
69-
err = license.CheckLicenseEndpoint(config, licenseApiService, SupportedProducts)
70-
if err != nil {
71-
return err
72-
}
7369
opt.kubeClient, err = kubernetes.NewForConfig(config)
7470
if err != nil {
7571
return err
@@ -156,6 +152,11 @@ func NewCmdBackup() *cobra.Command {
156152

157153
func (opt *postgresOptions) backupPostgreSQL(targetRef api_v1beta1.TargetRef) (*restic.BackupOutput, error) {
158154
var err error
155+
err = license.CheckLicenseEndpoint(opt.config, licenseApiService, SupportedProducts)
156+
if err != nil {
157+
return nil, err
158+
}
159+
159160
opt.setupOptions.StorageSecret, err = opt.kubeClient.CoreV1().Secrets(opt.storageSecret.Namespace).Get(context.TODO(), opt.storageSecret.Name, metav1.GetOptions{})
160161
if err != nil {
161162
return nil, err

pkg/restore.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@ func NewCmdRestore() *cobra.Command {
6363
if err != nil {
6464
return err
6565
}
66-
err = license.CheckLicenseEndpoint(config, licenseApiService, SupportedProducts)
67-
if err != nil {
68-
return err
69-
}
7066
opt.kubeClient, err = kubernetes.NewForConfig(config)
7167
if err != nil {
7268
return err
@@ -139,6 +135,11 @@ func NewCmdRestore() *cobra.Command {
139135

140136
func (opt *postgresOptions) restorePostgreSQL(targetRef api_v1beta1.TargetRef) (*restic.RestoreOutput, error) {
141137
var err error
138+
err = license.CheckLicenseEndpoint(opt.config, licenseApiService, SupportedProducts)
139+
if err != nil {
140+
return nil, err
141+
}
142+
142143
opt.setupOptions.StorageSecret, err = opt.kubeClient.CoreV1().Secrets(opt.storageSecret.Namespace).Get(context.TODO(), opt.storageSecret.Name, metav1.GetOptions{})
143144
if err != nil {
144145
return nil, err

pkg/util.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
core "k8s.io/api/core/v1"
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232
"k8s.io/client-go/kubernetes"
33+
restclient "k8s.io/client-go/rest"
3334
"k8s.io/klog/v2"
3435
kmapi "kmodules.xyz/client-go/api/v1"
3536
meta_util "kmodules.xyz/client-go/meta"
@@ -77,6 +78,7 @@ type postgresOptions struct {
7778
setupOptions restic.SetupOptions
7879
backupOptions restic.BackupOptions
7980
dumpOptions restic.DumpOptions
81+
config *restclient.Config
8082
}
8183

8284
func must(v []byte, err error) string {

0 commit comments

Comments
 (0)