diff --git a/bitbucket.go b/bitbucket.go index b988c43..dfcf7a4 100644 --- a/bitbucket.go +++ b/bitbucket.go @@ -18,6 +18,7 @@ const ( bitbucketEnvVarKey = "BITBUCKET_KEY" bitbucketEnvVarSecret = "BITBUCKET_SECRET" bitbucketEnvVarUser = "BITBUCKET_USER" + bitbucketDomain = "bitbucket.com" ) type NewBitBucketHostInput struct { @@ -147,7 +148,7 @@ func (bb BitbucketHost) describeRepos() (dRO describeReposOutput) { Name: r.Name, HTTPSUrl: "https://bitbucket.org/" + r.FullName + ".git", PathWithNameSpace: r.FullName, - Domain: "bitbucket.com", + Domain: bitbucketDomain, } repos = append(repos, repo) diff --git a/bitbucket_test.go b/bitbucket_test.go index 012323e..988d7ae 100644 --- a/bitbucket_test.go +++ b/bitbucket_test.go @@ -38,13 +38,13 @@ func TestPublicBitbucketRepositoryRefsCompare(t *testing.T) { require.NoError(t, err) bbHost.Backup() - expectedPathOne := filepath.Join(bbHost.BackupDir, "bitbucket.com", "go-soba", "repo0") + expectedPathOne := filepath.Join(bbHost.BackupDir, bitbucketDomain, "go-soba", "repo0") require.DirExists(t, expectedPathOne) dirOneEntries, err := dirContents(expectedPathOne) require.NoError(t, err) require.Regexp(t, regexp.MustCompile(`^repo0\.\d{14}\.bundle$`), dirOneEntries[0].Name()) - expectedPathTwo := filepath.Join(bbHost.BackupDir, "bitbucket.com", "teamsoba", "teamsobarepoone") + expectedPathTwo := filepath.Join(bbHost.BackupDir, bitbucketDomain, "teamsoba", "teamsobarepoone") require.DirExists(t, expectedPathTwo) dirTwoEntries, err := dirContents(expectedPathTwo) require.NoError(t, err) @@ -106,13 +106,13 @@ func TestPublicBitbucketRepositoryCloneCompare(t *testing.T) { bbHost.Backup() - expectedPathOne := filepath.Join(bbHost.BackupDir, "bitbucket.com", "go-soba", "repo0") + expectedPathOne := filepath.Join(bbHost.BackupDir, bitbucketDomain, "go-soba", "repo0") require.DirExists(t, expectedPathOne) dirOneEntries, err := dirContents(expectedPathOne) require.NoError(t, err) require.Regexp(t, regexp.MustCompile(`^repo0\.\d{14}\.bundle$`), dirOneEntries[0].Name()) - expectedPathTwo := filepath.Join(bbHost.BackupDir, "bitbucket.com", "teamsoba", "teamsobarepoone") + expectedPathTwo := filepath.Join(bbHost.BackupDir, bitbucketDomain, "teamsoba", "teamsobarepoone") require.DirExists(t, expectedPathTwo) dirTwoEntries, err := dirContents(expectedPathTwo) require.NoError(t, err) diff --git a/bundles_test.go b/bundles_test.go index 8eb85ab..6c87a3c 100644 --- a/bundles_test.go +++ b/bundles_test.go @@ -16,7 +16,7 @@ func TestRenameInvalidBundle(t *testing.T) { resetBackups() backupDir := os.Getenv(envVarGitBackupDir) - dfDir := path.Join(backupDir, "github.com", "go-soba", "repo0") + dfDir := path.Join(backupDir, gitHubDomain, "go-soba", "repo0") require.NoError(t, os.MkdirAll(dfDir, 0o755)) dfName := "repo0.20200401111111.bundle" dfPath := path.Join(dfDir, dfName) diff --git a/core_test.go b/core_test.go index f996ee6..b2856ce 100644 --- a/core_test.go +++ b/core_test.go @@ -167,7 +167,7 @@ func TestPruneBackups(t *testing.T) { } }() - dfDir := path.Join(backupDir, "github.com", "go-soba", "repo0") + dfDir := path.Join(backupDir, gitHubDomain, "go-soba", "repo0") assert.NoError(t, os.MkdirAll(dfDir, 0o755), fmt.Sprintf("failed to create dummy files dir: %s", dfDir)) dummyFiles := []string{"repo0.20200401111111.bundle", "repo0.20200201010111.bundle", "repo0.20200501010111.bundle", "repo0.20200401011111.bundle", "repo0.20200601011111.bundle"} @@ -203,7 +203,7 @@ func TestPruneBackupsWithNonBundleFiles(t *testing.T) { } }() - dfDir := path.Join(backupDir, "github.com", "go-soba", "repo0") + dfDir := path.Join(backupDir, gitHubDomain, "go-soba", "repo0") assert.NoError(t, os.MkdirAll(dfDir, 0o755), fmt.Sprintf("failed to create dummy files dir: %s", dfDir)) dummyFiles := []string{"repo0.20200401111111.bundle", "repo0.20200201010111.bundle", "repo0.20200501010111.bundle", "repo0.20200401011111.bundle", "repo0.20200601011111.bundle", "repo0.20200601011111.bundle.lock"} diff --git a/github.go b/github.go index a7fdbfe..2e991e8 100644 --- a/github.go +++ b/github.go @@ -17,6 +17,7 @@ import ( const ( gitHubCallSize = 100 githubEnvVarCallSize = "GITHUB_CALL_SIZE" + gitHubDomain = "github.com" ) type NewGitHubHostInput struct { @@ -221,7 +222,7 @@ func (gh *GitHubHost) describeGithubUserRepos() []repository { SSHUrl: repo.Node.SSHURL, HTTPSUrl: repo.Node.URL, PathWithNameSpace: repo.Node.NameWithOwner, - Domain: "github.com", + Domain: gitHubDomain, }) } @@ -316,7 +317,7 @@ func (gh *GitHubHost) describeGithubOrgRepos(orgName string) []repository { SSHUrl: repo.Node.SSHURL, HTTPSUrl: repo.Node.URL, PathWithNameSpace: repo.Node.NameWithOwner, - Domain: "github.com", + Domain: gitHubDomain, }) } diff --git a/github_test.go b/github_test.go index cf595fc..f5dc55e 100644 --- a/github_test.go +++ b/github_test.go @@ -50,19 +50,19 @@ func TestPublicGitHubRepositoryBackup(t *testing.T) { ghHost.Backup() - expectedPathOne := filepath.Join(backupDIR, "github.com", "go-soba", "repo0") + expectedPathOne := filepath.Join(backupDIR, gitHubDomain, "go-soba", "repo0") require.DirExists(t, expectedPathOne) dirOneEntries, err := dirContents(expectedPathOne) require.NoError(t, err) require.Regexp(t, regexp.MustCompile(`^repo0\.\d{14}\.bundle$`), dirOneEntries[0].Name()) - expectedPathTwo := filepath.Join(backupDIR, "github.com", "go-soba", "repo1") + expectedPathTwo := filepath.Join(backupDIR, gitHubDomain, "go-soba", "repo1") require.DirExists(t, expectedPathTwo) dirTwoEntries, err := dirContents(expectedPathTwo) require.NoError(t, err) require.Regexp(t, regexp.MustCompile(`^repo1\.\d{14}\.bundle$`), dirTwoEntries[0].Name()) - expectedPathThree := filepath.Join(backupDIR, "github.com", "go-soba", "repo2") + expectedPathThree := filepath.Join(backupDIR, gitHubDomain, "go-soba", "repo2") require.NoDirExists(t, expectedPathThree) } @@ -124,19 +124,19 @@ func TestSinglePublicGitHubOrgRepoBackups(t *testing.T) { ghHost.Backup() - expectedPathOne := filepath.Join(backupDIR, "github.com", "go-soba", "repo0") + expectedPathOne := filepath.Join(backupDIR, gitHubDomain, "go-soba", "repo0") require.DirExists(t, expectedPathOne) dirOneEntries, err := dirContents(expectedPathOne) require.NoError(t, err) require.Regexp(t, regexp.MustCompile(`^repo0\.\d{14}\.bundle$`), dirOneEntries[0].Name()) - expectedPathTwo := filepath.Join(backupDIR, "github.com", "go-soba", "repo1") + expectedPathTwo := filepath.Join(backupDIR, gitHubDomain, "go-soba", "repo1") require.DirExists(t, expectedPathTwo) dirTwoEntries, err := dirContents(expectedPathTwo) require.NoError(t, err) require.Regexp(t, regexp.MustCompile(`^repo1\.\d{14}\.bundle$`), dirTwoEntries[0].Name()) - expectedPathThree := filepath.Join(backupDIR, "github.com", "Nudelmesse", "public1") + expectedPathThree := filepath.Join(backupDIR, gitHubDomain, "Nudelmesse", "public1") require.DirExists(t, expectedPathThree) dirThreeEntries, err := dirContents(expectedPathThree) require.NoError(t, err) @@ -198,13 +198,13 @@ func TestPublicGitHubOrgRepoBackups(t *testing.T) { ghHost.Backup() - expectedPathOne := filepath.Join(backupDIR, "github.com", "go-soba", "repo0") + expectedPathOne := filepath.Join(backupDIR, gitHubDomain, "go-soba", "repo0") require.DirExists(t, expectedPathOne) dirOneEntries, err := dirContents(expectedPathOne) require.NoError(t, err) require.Regexp(t, regexp.MustCompile(`^repo0\.\d{14}\.bundle$`), dirOneEntries[0].Name()) - expectedPathTwo := filepath.Join(backupDIR, "github.com", "go-soba", "repo1") + expectedPathTwo := filepath.Join(backupDIR, gitHubDomain, "go-soba", "repo1") require.DirExists(t, expectedPathTwo) dirTwoEntries, err := dirContents(expectedPathTwo) require.NoError(t, err) diff --git a/gitlab.go b/gitlab.go index b7e22dc..9ed7eb0 100644 --- a/gitlab.go +++ b/gitlab.go @@ -20,6 +20,7 @@ import ( const ( // GitLabDefaultMinimumProjectAccessLevel https://docs.gitlab.com/ee/user/permissions.html#roles GitLabDefaultMinimumProjectAccessLevel = 20 + gitLabDomain = "gitlab.com" ) type gitlabUser struct { @@ -221,7 +222,7 @@ func (gl *GitLabHost) getAllProjectRepositories(client http.Client) (repos []rep PathWithNameSpace: project.PathWithNameSpace, HTTPSUrl: project.HTTPSURL, SSHUrl: project.SSHURL, - Domain: "gitlab.com", + Domain: gitLabDomain, } repos = append(repos, repo) diff --git a/gitlab_test.go b/gitlab_test.go index 34ceed3..d959421 100644 --- a/gitlab_test.go +++ b/gitlab_test.go @@ -32,8 +32,8 @@ func TestPublicGitLabRepositoryBackupCloneMethod(t *testing.T) { require.NoError(t, err) gl.Backup() - expectedSubProjectOnePath := filepath.Join(backupDIR, "gitlab.com", "soba-test", "soba-sub", "soba-sub-project-one") - expectedSubProjectTwoPath := filepath.Join(backupDIR, "gitlab.com", "soba-test", "soba-sub", "soba-sub-project-two") + expectedSubProjectOnePath := filepath.Join(backupDIR, gitLabDomain, "soba-test", "soba-sub", "soba-sub-project-one") + expectedSubProjectTwoPath := filepath.Join(backupDIR, gitLabDomain, "soba-test", "soba-sub", "soba-sub-project-two") require.DirExists(t, expectedSubProjectOnePath) require.DirExists(t, expectedSubProjectTwoPath) projectOneEntries, err := dirContents(expectedSubProjectOnePath) @@ -68,8 +68,8 @@ func TestPublicGitLabRepositoryBackupRefsMethod(t *testing.T) { require.NoError(t, err) gl.Backup() - expectedSubProjectOnePath := filepath.Join(backupDIR, "gitlab.com", "soba-test", "soba-sub", "soba-sub-project-one") - expectedSubProjectTwoPath := filepath.Join(backupDIR, "gitlab.com", "soba-test", "soba-sub", "soba-sub-project-two") + expectedSubProjectOnePath := filepath.Join(backupDIR, gitLabDomain, "soba-test", "soba-sub", "soba-sub-project-one") + expectedSubProjectTwoPath := filepath.Join(backupDIR, gitLabDomain, "soba-test", "soba-sub", "soba-sub-project-two") require.DirExists(t, expectedSubProjectOnePath) require.DirExists(t, expectedSubProjectTwoPath) projectOneEntries, err := dirContents(expectedSubProjectOnePath)