Merge branch 'main' into jwt

Author: bradlarsen

pkg/pb/source_metadatapb/source_metadata.pb.go

@@ -602,11 +602,11 @@ func CloneRepoUsingUnauthenticated(ctx context.Context, url, clonePath string, a
 // CloneRepoUsingSSH clones a repo using SSH.
 func CloneRepoUsingSSH(ctx context.Context, gitURL string, args ...string) (string, *git.Repository, error) {
 	if isCodeCommitURL(gitURL) {
-		return CloneRepo(ctx, nil, gitURL, "", false, args...)
+		return CloneRepo(ctx, nil, gitURL, "", true, args...)
 	}
 
 	userInfo := url.User("git")
-	return CloneRepo(ctx, userInfo, gitURL, "", false, args...)
+	return CloneRepo(ctx, userInfo, gitURL, "", true, args...)
 }
 
 var codeCommitRE = regexp.MustCompile(`ssh://git-codecommit\.[\w-]+\.amazonaws\.com`)

pkg/pb/source_metadatapb/source_metadata.pb.validate.go

@@ -66,6 +66,7 @@ message Confluence {
   string location = 7;
   string file = 8;
   string user = 9;
+  string comment_id = 10;
 }
 
 message Docker {

pkg/pb/sourcespb/sources.pb.go

@@ -153,6 +153,7 @@ message Confluence {
   repeated string ignore_spaces = 8;
   bool include_attachments = 9;
   bool skip_history = 10;
+  bool include_comments = 11;
 }
 
 message Docker {