Make sure to fail the backup/restore sessions if license check fails. (…

…#1554) (#1567) /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>
stashed · Jun 6, 2022 · 78999c9 · 78999c9
1 parent 6d690e1
commit 78999c9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/pkg/backup.go b/pkg/backup.go
@@ -121,10 +121,6 @@ func NewCmdBackup() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			err = license.CheckLicenseEndpoint(config, licenseApiService, SupportedProducts)
-			if err != nil {
-				return err
-			}
 			opt.kubeClient, err = kubernetes.NewForConfig(config)
 			if err != nil {
 				return err
@@ -211,6 +207,11 @@ func NewCmdBackup() *cobra.Command {
 
 func (opt *mongoOptions) backupMongoDB(targetRef api_v1beta1.TargetRef) (*restic.BackupOutput, error) {
 	var err error
+	err = license.CheckLicenseEndpoint(opt.config, licenseApiService, SupportedProducts)
+	if err != nil {
+		return nil, err
+	}
+
 	opt.setupOptions.StorageSecret, err = opt.kubeClient.CoreV1().Secrets(opt.storageSecret.Namespace).Get(context.TODO(), opt.storageSecret.Name, metav1.GetOptions{})
 	if err != nil {
 		return nil, err

diff --git a/pkg/restore.go b/pkg/restore.go
@@ -81,10 +81,8 @@ func NewCmdRestore() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			err = license.CheckLicenseEndpoint(config, licenseApiService, SupportedProducts)
-			if err != nil {
-				return err
-			}
+			opt.config = config
+
 			opt.stashClient, err = stash_cs.NewForConfig(config)
 			if err != nil {
 				return err
@@ -164,6 +162,11 @@ func NewCmdRestore() *cobra.Command {
 
 func (opt *mongoOptions) restoreMongoDB(targetRef api_v1beta1.TargetRef) (*restic.RestoreOutput, error) {
 	var err error
+	err = license.CheckLicenseEndpoint(opt.config, licenseApiService, SupportedProducts)
+	if err != nil {
+		return nil, err
+	}
+
 	opt.setupOptions.StorageSecret, err = opt.kubeClient.CoreV1().Secrets(opt.storageSecret.Namespace).Get(context.TODO(), opt.storageSecret.Name, metav1.GetOptions{})
 	if err != nil {
 		return nil, err

diff --git a/pkg/utils.go b/pkg/utils.go
@@ -27,6 +27,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/kubernetes"
+	restclient "k8s.io/client-go/rest"
 	"k8s.io/klog/v2"
 	kmapi "kmodules.xyz/client-go/api/v1"
 	appcatalog_cs "kmodules.xyz/custom-resources/client/clientset/versioned"
@@ -66,6 +67,7 @@ type mongoOptions struct {
 	defaultBackupOptions restic.BackupOptions
 	dumpOptions          []restic.DumpOptions
 	defaultDumpOptions   restic.DumpOptions
+	config               *restclient.Config
 }
 
 func waitForDBReady(host string, port, waitTimeout int32) {