Fixes CheckBackupRepository test

azak-azkaran · Mar 12, 2021 · 990ae93 · 990ae93
1 parent bd7fd93
commit 990ae93
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/main.go b/main.go
@@ -233,13 +233,11 @@ func backup() {
 }
 
 func BackupRepositoryExists(token string) {
-	err := DoBackup(token, "exist", false, false, false, true)
-	if err != nil {
+	err := DoBackup(token, "exist", true, false, false, true)
+	if err == nil {
 		return
 	}
-
 	Sugar.Info(MAIN_MESSAGE_BACKUP_INIT)
-
 	err = DoBackupVerbose(token, "init")
 	if err != nil {
 		Sugar.Error(err)

diff --git a/main_test.go b/main_test.go
@@ -95,6 +95,8 @@ func TestMainInit(t *testing.T) {
 	os.Setenv("AGENT_DURATION", MAIN_TEST_DURATION)
 	os.Setenv("AGENT_MOUNT_DURATION", MAIN_TEST_MOUNT_DURATION)
 	os.Setenv("AGENT_MOUNT_ALLOW", MAIN_TEST_MOUNT_ALLOW)
+	os.Setenv("AGENT_VAULT_ROLE_ID", VAULT_TEST_ROLE_ID)
+	os.Setenv("AGENT_VAULT_SECRET_ID", VAULT_TEST_SECRET_ID)
 
 	err = Init(testconfig.config, nil)
 	require.NoError(t, err)
@@ -104,7 +106,9 @@ func TestMainInit(t *testing.T) {
 	assert.Equal(t, dur, AgentConfiguration.TimeBetweenStart)
 	assert.Equal(t, false, AgentConfiguration.MountAllow)
 	assert.Equal(t, MAIN_TEST_MOUNT_DURATION, AgentConfiguration.MountDuration)
-	assert.False(t, AgentConfiguration.useLogin)
+	assert.Equal(t, VAULT_TEST_SECRET_ID, AgentConfiguration.SecretID)
+	assert.Equal(t, VAULT_TEST_ROLE_ID, AgentConfiguration.RoleID)
+	assert.True(t, AgentConfiguration.useLogin)
 }
 
 func TestMainStart(t *testing.T) {
@@ -119,6 +123,8 @@ func TestMainStart(t *testing.T) {
 	os.Setenv("AGENT_PATHDB", "./test/DB")
 	os.Setenv("AGENT", MAIN_TEST_MOUNT_DURATION)
 	os.Setenv("AGENT", MAIN_TEST_MOUNT_ALLOW)
+	os.Setenv("AGENT_VAULT_ROLE_ID", VAULT_TEST_ROLE_ID)
+	os.Setenv("AGENT_VAULT_SECRET_ID", VAULT_TEST_SECRET_ID)
 	err := Init(testconfig.config, os.Args)
 	require.NoError(t, err)
 
@@ -159,6 +165,8 @@ func TestMainMain(t *testing.T) {
 	os.Setenv("AGENT_PATHDB", "./test/DB")
 	os.Setenv("AGENT_MOUNT_DURATION", MAIN_TEST_MOUNT_DURATION)
 	os.Setenv("AGENT_MOUNT_ALLOW", MAIN_TEST_MOUNT_ALLOW)
+	os.Setenv("AGENT_VAULT_ROLE_ID", VAULT_TEST_ROLE_ID)
+	os.Setenv("AGENT_VAULT_SECRET_ID", VAULT_TEST_SECRET_ID)
 	os.Setenv("AGENT_VAULT_KEY_FILE", MAIN_TEST_KEYFILE_PATH)
 	multipleKey = true
 	sealStatus = true
@@ -252,6 +260,8 @@ func TestMainBackupRepositoryExists(t *testing.T) {
 	os.Setenv("AGENT_DURATION", testconfig.Duration)
 	os.Setenv("AGENT_PATHDB", "./test/DB")
 	os.Setenv("AGENT_MOUNT_DURATION", MAIN_TEST_MOUNT_DURATION)
+	os.Setenv("AGENT_VAULT_ROLE_ID", VAULT_TEST_ROLE_ID)
+	os.Setenv("AGENT_VAULT_SECRET_ID", VAULT_TEST_SECRET_ID)
 	os.Setenv("AGENT_MOUNT_ALLOW", MAIN_TEST_MOUNT_ALLOW)
 	err := Init(testconfig.config, os.Args)
 	require.NoError(t, err)
@@ -351,6 +361,8 @@ func TestMainGitCheckout(t *testing.T) {
 	os.Setenv("AGENT_DURATION", testconfig.Duration)
 	os.Setenv("AGENT_PATHDB", "./test/DB")
 	os.Setenv("AGENT_MOUNT_DURATION", MAIN_TEST_MOUNT_DURATION)
+	os.Setenv("AGENT_VAULT_ROLE_ID", VAULT_TEST_ROLE_ID)
+	os.Setenv("AGENT_VAULT_SECRET_ID", VAULT_TEST_SECRET_ID)
 	os.Setenv("AGENT_MOUNT_ALLOW", MAIN_TEST_MOUNT_ALLOW)
 	err := Init(testconfig.config, os.Args)
 	require.NoError(t, err)

diff --git a/restrouter_test.go b/restrouter_test.go
@@ -27,6 +27,8 @@ func setupRestrouterTest(t *testing.T) {
 	os.Setenv("AGENT_ADDRESS", MAIN_TEST_ADDRESS)
 	os.Setenv("AGENT_DURATION", testconfig.Duration)
 	os.Setenv("AGENT_PATHDB", "./test/DB")
+	os.Setenv("AGENT_VAULT_ROLE_ID", VAULT_TEST_ROLE_ID)
+	os.Setenv("AGENT_VAULT_SECRET_ID", VAULT_TEST_SECRET_ID)
 	err := Init(testconfig.config, os.Args)
 	require.NoError(t, err)
 

diff --git a/store.go b/store.go
@@ -37,7 +37,7 @@ func InitDB(path string, masterkey string, debug bool) *badger.DB {
 	if debug {
 		Sugar.Warn("Debug is on switching to InMemory")
 
-		opt = badger.DefaultOptions("").WithInMemory(true).WithLogger(&defaultLog{}).WithKeepL0InMemory(true)
+		opt = badger.DefaultOptions("").WithInMemory(true).WithLogger(&defaultLog{})
 	} else {
 		opt = badger.DefaultOptions(path).WithLogger(&defaultLog{})
 	}