Fix test

Author: Milla Samuel

api/v1beta2/foundationdbbackup_types.go

@@ -298,12 +298,6 @@ func (backup *FoundationDBBackup) CheckReconciliation() (bool, error) {
 		reconciled = false
 	}
 
-	desiredBackupURL := backup.BackupURL()
-	if backup.Status.BackupDetails.URL != desiredBackupURL {
-		backup.Status.Generations.NeedsBackupReconfiguration = backup.Generation
-		reconciled = false
-	}
-
 	isRunning := backup.Status.BackupDetails != nil && backup.Status.BackupDetails.Running
 	isPaused := backup.Status.BackupDetails != nil && backup.Status.BackupDetails.Paused
 
@@ -328,6 +322,11 @@ func (backup *FoundationDBBackup) CheckReconciliation() (bool, error) {
 		reconciled = false
 	}
 
+	if isRunning && backup.BackupURL() != backup.Status.BackupDetails.URL {
+		backup.Status.Generations.NeedsBackupReconfiguration = backup.Generation
+		reconciled = false
+	}
+
 	if reconciled {
 		backup.Status.Generations = BackupGenerationStatus{
 			Reconciled: backup.Generation,

api/v1beta2/foundationdbbackup_types_test.go

@@ -52,6 +52,9 @@ var _ = Describe("[api] FoundationDBBackup", func() {
 					},
 					Spec: FoundationDBBackupSpec{
 						AgentCount: &agentCount,
+						BlobStoreConfiguration: &BlobStoreConfiguration{
+							AccountName: "test@test-service",
+						},
 					},
 					Status: FoundationDBBackupStatus{
 						Generations: BackupGenerationStatus{
@@ -60,7 +63,7 @@ var _ = Describe("[api] FoundationDBBackup", func() {
 						AgentCount:           3,
 						DeploymentConfigured: true,
 						BackupDetails: &FoundationDBBackupStatusBackupDetails{
-							URL:                   "blobstore://test@test-service/sample-cluster?bucket=fdb-backups",
+							URL:                   "blobstore://test@test-service:443/sample-cluster?bucket=fdb-backups",
 							Running:               true,
 							SnapshotPeriodSeconds: 864000,
 						},
@@ -69,7 +72,6 @@ var _ = Describe("[api] FoundationDBBackup", func() {
 			}
 
 			backup = createBackup()
-
 			result, err := backup.CheckReconciliation()
 			Expect(result).To(BeTrue())
 			Expect(err).NotTo(HaveOccurred())

kubectl-fdb/cmd/version_test.go

@@ -16,7 +16,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */package cmd
+ */
+package cmd
 
 import (
 	"bytes"