Skip to content

Commit 881b2a0

Browse files
1gtmpiyush1146115
andauthored
Make sure to fail the backup/restore sessions if license check fails. (#622) (#626)
/cherry-pick Signed-off-by: piyush1146115 <piyush@appscode.com> Co-authored-by: Piyush Kanti Das <piyush@appscode.com>
1 parent 9e7d3a1 commit 881b2a0

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

pkg/backup.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,8 @@ func NewCmdBackup() *cobra.Command {
6969
if err != nil {
7070
return err
7171
}
72-
err = license.CheckLicenseEndpoint(config, licenseApiService, SupportedProducts)
73-
if err != nil {
74-
return err
75-
}
72+
opt.config = config
73+
7674
opt.kubeClient, err = kubernetes.NewForConfig(config)
7775
if err != nil {
7876
return err
@@ -155,6 +153,11 @@ func NewCmdBackup() *cobra.Command {
155153

156154
func (opt *mysqlOptions) backupMySQL(targetRef api_v1beta1.TargetRef) (*restic.BackupOutput, error) {
157155
var err error
156+
err = license.CheckLicenseEndpoint(opt.config, licenseApiService, SupportedProducts)
157+
if err != nil {
158+
return nil, err
159+
}
160+
158161
opt.setupOptions.StorageSecret, err = opt.kubeClient.CoreV1().Secrets(opt.storageSecret.Namespace).Get(context.TODO(), opt.storageSecret.Name, metav1.GetOptions{})
159162
if err != nil {
160163
return nil, err

pkg/restore.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ func NewCmdRestore() *cobra.Command {
6060
if err != nil {
6161
return err
6262
}
63-
err = license.CheckLicenseEndpoint(config, licenseApiService, SupportedProducts)
64-
if err != nil {
65-
return err
66-
}
63+
opt.config = config
64+
6765
opt.kubeClient, err = kubernetes.NewForConfig(config)
6866
if err != nil {
6967
return err
@@ -137,6 +135,12 @@ func NewCmdRestore() *cobra.Command {
137135

138136
func (opt *mysqlOptions) restoreMySQL(targetRef api_v1beta1.TargetRef) (*restic.RestoreOutput, error) {
139137
var err error
138+
139+
err = license.CheckLicenseEndpoint(opt.config, licenseApiService, SupportedProducts)
140+
if err != nil {
141+
return nil, err
142+
}
143+
140144
opt.setupOptions.StorageSecret, err = opt.kubeClient.CoreV1().Secrets(opt.storageSecret.Namespace).Get(context.TODO(), opt.storageSecret.Name, metav1.GetOptions{})
141145
if err != nil {
142146
return nil, err

pkg/utils.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3333
"k8s.io/apimachinery/pkg/util/wait"
3434
"k8s.io/client-go/kubernetes"
35+
restclient "k8s.io/client-go/rest"
3536
"k8s.io/klog/v2"
3637
kmapi "kmodules.xyz/client-go/api/v1"
3738
appcatalog "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1"
@@ -64,6 +65,7 @@ type mysqlOptions struct {
6465
setupOptions restic.SetupOptions
6566
backupOptions restic.BackupOptions
6667
dumpOptions restic.DumpOptions
68+
config *restclient.Config
6769
}
6870

6971
type sessionWrapper struct {

0 commit comments

Comments
 (0)