generateBranchForLocalSource fix (#51)

generateBranchForLocalSource fix

Author: mnuttall

pkg/avancement/service_manager.go

@@ -91,16 +91,18 @@ func (s *ServiceManager) Promote(serviceName, fromURL, toURL, newBranchName, mes
 	isLocal := fromLocalRepo(fromURL)
 	if isLocal {
 		localSource = s.localFactory(fromURL, s.debug)
+		if newBranchName == "" {
+			newBranchName = generateBranchForLocalSource(localSource)
+		}
 	} else {
 		source, errorSource = s.checkoutSourceRepo(fromURL, fromBranch)
 		if errorSource != nil {
 			return fmt.Errorf("failed to checkout repo: %w", errorSource)
 		}
 		reposToDelete = append(reposToDelete, source)
-	}
-
-	if newBranchName == "" {
-		newBranchName = generateBranch(source)
+		if newBranchName == "" {
+			newBranchName = generateBranch(source)
+		}
 	}
 
 	destination, err := s.checkoutDestinationRepo(toURL, newBranchName)
@@ -241,6 +243,14 @@ func generateBranch(repo git.Repo) string {
 	return branchName
 }
 
+func generateBranchForLocalSource(source git.Source) string {
+	uniqueString := uuid.New()
+	runes := []rune(uniqueString.String())
+	branchName := source.GetName() + "-" + "local-dir" + "-" + string(runes[0:5])
+	branchName = strings.Replace(branchName, "\n", "", -1)
+	return branchName
+}
+
 // generateDefaultCommitMsg constructs a default commit message based on the source information.
 func generateDefaultCommitMsg(sourceRepo git.Repo, serviceName, from, fromBranch string) string {
 	commit := sourceRepo.GetCommitID()

pkg/avancement/service_manager_test.go

@@ -200,10 +200,15 @@ func TestPromoteWithCacheDeletionFailure(t *testing.T) {
 
 func TestGenerateBranchWithSuccess(t *testing.T) {
 	repo := mock.New("/dev", "master")
-	GenerateBranchWithSuccess(t, repo)
+	generateBranchWithSuccess(t, repo)
 }
 
-func GenerateBranchWithSuccess(t *testing.T, repo git.Repo) {
+func TestGenerateBranchForLocalSource(t *testing.T) {
+	source := NewLocal("/path/to/topLevel")
+	generateBranchForLocalWithSuccess(t, source)
+}
+
+func generateBranchWithSuccess(t *testing.T, repo git.Repo) {
 	branch := generateBranch(repo)
 	nameRegEx := "^([0-9A-Za-z]+)-([0-9a-z]{7})-([0-9A-Za-z]{5})$"
 	_, err := regexp.Match(nameRegEx, []byte(branch))
@@ -212,6 +217,15 @@ func GenerateBranchWithSuccess(t *testing.T, repo git.Repo) {
 	}
 }
 
+func generateBranchForLocalWithSuccess(t *testing.T, source git.Source) {
+	branch := generateBranchForLocalSource(source)
+	nameRegEx := "^path-to-topLevel-local-dir-([0-9A-Za-z]{5})$"
+	_, err := regexp.Match(nameRegEx, []byte(branch))
+	if err != nil {
+		t.Fatalf("generated name `%s` for local case %s failed to matching pattern %s", nameRegEx, source.GetName(), nameRegEx)
+	}
+}
+
 type mockSource struct {
 	files     []string
 	localPath string
@@ -248,6 +262,10 @@ func (s *mockSource) Walk(_ string, cb func(string, string) error) error {
 	return nil
 }
 
+func (s *mockSource) GetName() string {
+	return "mock-source-name"
+}
+
 func (s *mockSource) AddFiles(name string) {
 	if s.files == nil {
 		s.files = []string{}

pkg/git/copy_test.go

@@ -129,6 +129,10 @@ func (s *mockSource) Walk(base string, cb func(string, string) error) error {
 	return nil
 }
 
+func (s *mockSource) GetName() string {
+	return "local-dir-repo-name-unknown"
+}
+
 func (s *mockSource) addFile(name string) {
 	if s.files == nil {
 		s.files = []string{}

pkg/git/interface.go

@@ -15,16 +15,16 @@ type Source interface {
 	// Walk walks the repository tree, calling the callback with the prefix and
 	// filename.
 	Walk(path string, cb func(prefix, name string) error) error
+	GetName() string
 }
 
 type Repo interface {
 	Destination
 	Source
-	GetName() string
-	GetCommitID() string
 	Clone() error
 	Checkout(branch string) error
 	CheckoutAndCreate(branch string) error
+	GetCommitID() string
 	StageFiles(filenames ...string) error
 	Commit(msg string, author *Author) error
 	Push(branch string) error

pkg/local/local.go

@@ -54,3 +54,10 @@ func (l *Local) Walk(_ string, cb func(prefix, name string) error) error {
 		return cb(prefix, strings.TrimPrefix(path, prefix))
 	})
 }
+
+// GetName - we're using a directory that may not be a git repo, all we know is our path
+func (l *Local) GetName() string {
+	path := filepath.ToSlash(l.LocalPath)
+	name := strings.ReplaceAll(path, "/", "-")
+	return name
+}

pkg/local/local_test.go

@@ -63,6 +63,10 @@ func (s *mockSource) Walk(_ string, cb func(string, string) error) error {
 	return nil
 }
 
+func (s *mockSource) GetName() string {
+	return "AlwaysTheSameName"
+}
+
 func (s *mockSource) addFile(name string) {
 	if s.files == nil {
 		s.files = []string{}