Skip to content

Commit 6f3d4da

Browse files
1gtmpiyush1146115
andauthored
Make sure to fail the backup/restore sessions if license check fails. (#1554) (#1564)
/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> Co-authored-by: Piyush Kanti Das <piyush123kantidas@gmail.com>
1 parent a4697d1 commit 6f3d4da

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

pkg/backup.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,6 @@ func NewCmdBackup() *cobra.Command {
118118
if err != nil {
119119
return err
120120
}
121-
err = license.CheckLicenseEndpoint(config, licenseApiService, SupportedProducts)
122-
if err != nil {
123-
return err
124-
}
125121
opt.kubeClient, err = kubernetes.NewForConfig(config)
126122
if err != nil {
127123
return err
@@ -208,6 +204,11 @@ func NewCmdBackup() *cobra.Command {
208204

209205
func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic.BackupOutput, error) {
210206
var err error
207+
err = license.CheckLicenseEndpoint(opt.config, licenseApiService, SupportedProducts)
208+
if err != nil {
209+
return nil, err
210+
}
211+
211212
opt.setupOptions.StorageSecret, err = opt.kubeClient.CoreV1().Secrets(opt.storageSecret.Namespace).Get(context.TODO(), opt.storageSecret.Name, metav1.GetOptions{})
212213
if err != nil {
213214
return nil, err

pkg/restore.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,8 @@ func NewCmdRestore() *cobra.Command {
8080
if err != nil {
8181
return err
8282
}
83-
err = license.CheckLicenseEndpoint(config, licenseApiService, SupportedProducts)
84-
if err != nil {
85-
return err
86-
}
83+
opt.config = config
84+
8785
opt.stashClient, err = stash_cs.NewForConfig(config)
8886
if err != nil {
8987
return err
@@ -163,6 +161,11 @@ func NewCmdRestore() *cobra.Command {
163161

164162
func (opt *mongoOptions) restoreMongoDB(targetRef api_v1beta1.TargetRef) (*restic.RestoreOutput, error) {
165163
var err error
164+
err = license.CheckLicenseEndpoint(opt.config, licenseApiService, SupportedProducts)
165+
if err != nil {
166+
return nil, err
167+
}
168+
166169
opt.setupOptions.StorageSecret, err = opt.kubeClient.CoreV1().Secrets(opt.storageSecret.Namespace).Get(context.TODO(), opt.storageSecret.Name, metav1.GetOptions{})
167170
if err != nil {
168171
return nil, err

pkg/utils.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727

2828
"k8s.io/apimachinery/pkg/util/sets"
2929
"k8s.io/client-go/kubernetes"
30+
restclient "k8s.io/client-go/rest"
3031
"k8s.io/klog/v2"
3132
kmapi "kmodules.xyz/client-go/api/v1"
3233
appcatalog_cs "kmodules.xyz/custom-resources/client/clientset/versioned"
@@ -66,6 +67,7 @@ type mongoOptions struct {
6667
defaultBackupOptions restic.BackupOptions
6768
dumpOptions []restic.DumpOptions
6869
defaultDumpOptions restic.DumpOptions
70+
config *restclient.Config
6971
}
7072

7173
func waitForDBReady(host string, port, waitTimeout int32) {

0 commit comments

Comments
 (0)