@@ -18,11 +18,7 @@ package pkg
1818
1919import (
2020 "context"
21- "fmt"
22- "io/ioutil"
23- "os"
2421 "path/filepath"
25- "strings"
2622
2723 api_v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1"
2824 stash "stash.appscode.dev/apimachinery/client/clientset/versioned"
@@ -68,7 +64,7 @@ func NewCmdBackup() *cobra.Command {
6864 Short : "Takes a backup of MariaDB DB" ,
6965 DisableAutoGenTag : true ,
7066 RunE : func (cmd * cobra.Command , args []string ) error {
71- flags .EnsureRequiredFlags (cmd , "appbinding" , "provider" , "secret-dir " )
67+ flags .EnsureRequiredFlags (cmd , "appbinding" , "provider" , "storage- secret-name" , "storage-secret-namespace "
7268
7369 // prepare client
7470 config , err := clientcmd .BuildConfigFromFlags (masterURL , kubeconfigPath )
@@ -130,13 +126,14 @@ func NewCmdBackup() *cobra.Command {
130126 cmd .Flags ().StringVar (& opt .namespace , "namespace" , "default" , "Namespace of Backup/Restore Session" )
131127 cmd .Flags ().StringVar (& opt .backupSessionName , "backupsession" , opt .backupSessionName , "Name of the Backup Session" )
132128 cmd .Flags ().StringVar (& opt .appBindingName , "appbinding" , opt .appBindingName , "Name of the app binding" )
129+ cmd .Flags ().StringVar (& opt .storageSecret .Name , "storage-secret-name" , opt .storageSecret .Name , "Name of the storage secret" )
130+ cmd .Flags ().StringVar (& opt .storageSecret .Namespace , "storage-secret-namespace" , opt .storageSecret .Namespace , "Namespace of the storage secret" )
133131
134132 cmd .Flags ().StringVar (& opt .setupOptions .Provider , "provider" , opt .setupOptions .Provider , "Backend provider (i.e. gcs, s3, azure etc)" )
135133 cmd .Flags ().StringVar (& opt .setupOptions .Bucket , "bucket" , opt .setupOptions .Bucket , "Name of the cloud bucket/container (keep empty for local backend)" )
136134 cmd .Flags ().StringVar (& opt .setupOptions .Endpoint , "endpoint" , opt .setupOptions .Endpoint , "Endpoint for s3/s3 compatible backend or REST backend URL" )
137135 cmd .Flags ().StringVar (& opt .setupOptions .Region , "region" , opt .setupOptions .Region , "Region for s3/s3 compatible backend" )
138136 cmd .Flags ().StringVar (& opt .setupOptions .Path , "path" , opt .setupOptions .Path , "Directory inside the bucket where backup will be stored" )
139- cmd .Flags ().StringVar (& opt .setupOptions .SecretDir , "secret-dir" , opt .setupOptions .SecretDir , "Directory where storage secret has been mounted" )
140137 cmd .Flags ().StringVar (& opt .setupOptions .ScratchDir , "scratch-dir" , opt .setupOptions .ScratchDir , "Temporary directory" )
141138 cmd .Flags ().BoolVar (& opt .setupOptions .EnableCache , "enable-cache" , opt .setupOptions .EnableCache , "Specify whether to enable caching for restic" )
142139 cmd .Flags ().Int64Var (& opt .setupOptions .MaxConnections , "max-connections" , opt .setupOptions .MaxConnections , "Specify maximum concurrent connections for GCS, Azure and B2 backend" )
@@ -159,6 +156,11 @@ func NewCmdBackup() *cobra.Command {
159156}
160157
161158func (opt * mariadbOptions ) backupMariaDB (targetRef api_v1beta1.TargetRef ) (* restic.BackupOutput , error ) {
159+ var err error
160+ opt .setupOptions .StorageSecret , err = opt .kubeClient .CoreV1 ().Secrets (opt .storageSecret .Namespace ).Get (context .TODO (), opt .storageSecret .Name , metav1.GetOptions {})
161+ if err != nil {
162+ return nil , err
163+ }
162164 // if any pre-backup actions has been assigned to it, execute them
163165 actionOptions := api_util.ActionOptions {
164166 StashClient : opt .stashClient ,
@@ -167,7 +169,7 @@ func (opt *mariadbOptions) backupMariaDB(targetRef api_v1beta1.TargetRef) (*rest
167169 BackupSessionName : opt .backupSessionName ,
168170 Namespace : opt .namespace ,
169171 }
170- err : =api_util .ExecutePreBackupActions (actionOptions )
172+ err = api_util .ExecutePreBackupActions (actionOptions )
171173 if err != nil {
172174 return nil , err
173175 }
@@ -186,68 +188,40 @@ func (opt *mariadbOptions) backupMariaDB(targetRef api_v1beta1.TargetRef) (*rest
186188 return nil , err
187189 }
188190
189- // get app binding
190191 appBinding , err := opt .catalogClient .AppcatalogV1alpha1 ().AppBindings (opt .namespace ).Get (context .TODO (), opt .appBindingName , metav1.GetOptions {})
191192 if err != nil {
192193 return nil , err
193194 }
194- // get secret
195- appBindingSecret , err := opt .kubeClient .CoreV1 ().Secrets (opt .namespace ).Get (context .TODO (), appBinding .Spec .Secret .Name , metav1.GetOptions {})
195+
196+ session := opt .newSessionWrapper (MariaDBDumpCMD )
197+
198+ err = session .setDatabaseCredentials (opt .kubeClient , appBinding )
196199 if err != nil {
197200 return nil , err
198201 }
199202
200- // transform secret
201- err = appBinding .TransformSecret (opt .kubeClient , appBindingSecret .Data )
203+ err = session .setDatabaseConnectionParameters (appBinding )
202204 if err != nil {
203205 return nil , err
204206 }
205207
206- // init restic wrapper
207- resticWrapper , err := restic .NewResticWrapper (opt .setupOptions )
208+ err = session .setTLSParameters (appBinding , opt .setupOptions .ScratchDir )
208209 if err != nil {
209210 return nil , err
210211 }
211212
212- // set env for mariadbdump
213- resticWrapper .SetEnv (EnvMariaDBPassword , string (appBindingSecret .Data [MariaDBPassword ]))
214- // setup backup command
215- backupCmd := restic.Command {
216- Name : MariaDBDumpCMD ,
217- Args : []interface {}{
218- "-u" , string (appBindingSecret .Data [MariaDBUser ]),
219- "-h" , appBinding .Spec .ClientConfig .Service .Name ,
220- },
221- }
222- // if port is specified, append port in the arguments
223- if appBinding .Spec .ClientConfig .Service .Port != 0 {
224- backupCmd .Args = append (backupCmd .Args , fmt .Sprintf ("--port=%d" , appBinding .Spec .ClientConfig .Service .Port ))
225- }
226- for _ , arg := range strings .Fields (opt .myArgs ) {
227- backupCmd .Args = append (backupCmd .Args , arg )
213+ err = session .waitForDBReady ()
214+ if err != nil {
215+ return nil , err
228216 }
229217
230- // if ssl enabled, add ca.crt in the arguments
231- if appBinding .Spec .ClientConfig .CABundle != nil {
232- if err := ioutil .WriteFile (filepath .Join (opt .setupOptions .ScratchDir , MariaDBTLSRootCA ), appBinding .Spec .ClientConfig .CABundle , os .ModePerm ); err != nil {
233- return nil , err
234- }
235- tlsCreds := []interface {}{
236- fmt .Sprintf ("--ssl-ca=%v" , filepath .Join (opt .setupOptions .ScratchDir , MariaDBTLSRootCA )),
237- }
238-
239- backupCmd .Args = append (backupCmd .Args , tlsCreds ... )
240- }
218+ session .setUserArgs (opt .myArgs )
241219
242- // wait for DB ready
243- err = opt .waitForDBReady (appBinding , appBindingSecret )
220+ // append the backup command to the pipeline
221+ opt .backupOptions .StdinPipeCommands = append (opt .backupOptions .StdinPipeCommands , * session .cmd )
222+ resticWrapper , err := restic .NewResticWrapperFromShell (opt .setupOptions , session .sh )
244223 if err != nil {
245224 return nil , err
246225 }
247-
248- // append the backup command to the pipeline
249- opt .backupOptions .StdinPipeCommands = append (opt .backupOptions .StdinPipeCommands , backupCmd )
250-
251- // Run backup
252226 return resticWrapper .RunBackup (opt .backupOptions , targetRef )
253227}
0 commit comments