From 3c6470f48137ed59328a1e8b26e9c7ed0b9c5477 Mon Sep 17 00:00:00 2001 From: Piotr Kowalczyk Date: Fri, 17 Mar 2023 15:16:07 +0100 Subject: [PATCH] Adding logic which disables google cloud registration if there's no KeyFilePath setting (for usage with GCP service account) --- pkg/backup/gcloud.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/backup/gcloud.go b/pkg/backup/gcloud.go index 8bd9eb0..0c71b37 100644 --- a/pkg/backup/gcloud.go +++ b/pkg/backup/gcloud.go @@ -13,12 +13,13 @@ import ( func gCloudUpload(file string, plan config.Plan) (string, error) { - register := fmt.Sprintf("gcloud auth activate-service-account --key-file=%v", - plan.GCloud.KeyFilePath) - - _, err := sh.Command("/bin/sh", "-c", register).CombinedOutput() - if err != nil { - return "", errors.Wrapf(err, "gcloud auth for plan %v failed", plan.Name) + if len(plan.GCloud.KeyFilePath) > 0 { + register := fmt.Sprintf("gcloud auth activate-service-account --key-file=%v", + plan.GCloud.KeyFilePath) + _, err := sh.Command("/bin/sh", "-c", register).CombinedOutput() + if err != nil { + return "", errors.Wrapf(err, "gcloud auth for plan %v failed", plan.Name) + } } upload := fmt.Sprintf("gsutil cp %v gs://%v",