private repo

Author: sukantoraymond

cmd/nodecmd/load_test_start.go

@@ -502,7 +502,7 @@ func GetLoadTestScript(app *application.Avalanche) error {
 	var err error
 	if loadTestRepoURL != "" {
 		ux.Logger.PrintToUser("Checking source code repository URL %s", loadTestRepoURL)
-		if err := prompts.ValidateURL(loadTestRepoURL); err != nil {
+		if err := validateRepositoryURL(loadTestRepoURL); err != nil {
 			ux.Logger.PrintToUser("Invalid repository url %s: %s", loadTestRepoURL, err)
 			loadTestRepoURL = ""
 		}
@@ -551,3 +551,23 @@ func getExistingLoadTestInstance(clusterName, loadTestName string) (string, erro
 	}
 	return "", nil
 }
+
+// validateRepositoryURL validates both HTTP and SSH repository URLs
+func validateRepositoryURL(url string) error {
+	// Check if it's an SSH URL (git@host:path format)
+	if strings.HasPrefix(url, "git@") && strings.Contains(url, ":") {
+		// Basic SSH URL validation
+		parts := strings.Split(url, ":")
+		if len(parts) != 2 {
+			return fmt.Errorf("invalid SSH URL format")
+		}
+		hostPart := strings.TrimPrefix(parts[0], "git@")
+		if hostPart == "" || parts[1] == "" {
+			return fmt.Errorf("invalid SSH URL format")
+		}
+		return nil
+	}
+
+	// For HTTP/HTTPS URLs, use the existing validation
+	return prompts.ValidateURL(url)
+}

pkg/ssh/shell/setupDeployKey.sh

@@ -11,14 +11,14 @@ chmod 700 ~/.ssh
 # The key should already be at ~/.ssh/avalanche-deploy-key
 
 # Set proper permissions for the deploy key
-chmod 600 ~/.ssh/avalanche-deploy-key
+chmod 600 /home/ubuntu/.ssh/avalanche-deploy-key
 
 # Configure SSH to use the deploy key
 cat >> ~/.ssh/config <<'EOF'
 Host github.com-avalanche
   HostName github.com
   User git
-  IdentityFile ~/.ssh/avalanche-deploy-key
+  IdentityFile /home/ubuntu/.ssh/avalanche-deploy-key
   IdentitiesOnly yes
   StrictHostKeyChecking accept-new
 EOF

pkg/ssh/ssh.go

@@ -834,7 +834,8 @@ func RunSSHSetupDeployKey(host *models.Host, deployKeyPath string) error {
 	}
 
 	// Upload the deploy key first
-	remoteDeployKeyPath := "~/.ssh/avalanche-deploy-key"
+	remoteDeployKeyPath := "/home/ubuntu/.ssh/avalanche-deploy-key"
+
 	if err := host.Upload(expandedPath, remoteDeployKeyPath, constants.SSHFileOpsTimeout); err != nil {
 		return fmt.Errorf("failed to upload deploy key: %w", err)
 	}
@@ -851,12 +852,16 @@ func RunSSHSetupDeployKey(host *models.Host, deployKeyPath string) error {
 
 // expandTilde expands ~ to the user's home directory
 func expandTilde(path string) (string, error) {
-	if strings.HasPrefix(path, "~/") {
+	if strings.HasPrefix(path, "~") {
 		homeDir, err := os.UserHomeDir()
 		if err != nil {
 			return "", err
 		}
-		return filepath.Join(homeDir, path[2:]), nil
+		// Handle both ~/ and ~ cases
+		if len(path) == 1 {
+			return homeDir, nil
+		}
+		return filepath.Join(homeDir, path[1:]), nil
 	}
 	return path, nil
 }

pkg/utils/common.go

@@ -270,6 +270,19 @@ func GetIndexInSlice[T comparable](list []T, element T) (int, error) {
 // Example: https://github.com/ava-labs/hypersdk/pull/772/commits/b88acfb370f5aeb83a000aece2d72f28154410a5
 // Should return https://github.com/ava-labs/hypersdk
 func GetRepoFromCommitURL(gitRepoURL string) (string, string) {
+	// Handle SSH URLs (git@host:path format)
+	if strings.HasPrefix(gitRepoURL, "git@") && strings.Contains(gitRepoURL, ":") {
+		parts := strings.Split(gitRepoURL, ":")
+		if len(parts) == 2 {
+			// Extract repo name from path (remove .git suffix if present)
+			// For git@github.com:owner/repo.git, we want just "repo"
+			pathParts := strings.Split(parts[1], "/")
+			repoName := strings.TrimSuffix(pathParts[len(pathParts)-1], ".git")
+			return gitRepoURL, repoName
+		}
+	}
+
+	// Handle HTTP/HTTPS URLs
 	splitURL := strings.Split(gitRepoURL, "/")
 	if len(splitURL) > 4 {
 		// get first five members of splitURL because it will be [ https, ' ', github.com, ava-labs, hypersdk]