1180 fix url validation

RELEASENOTES.md

@@ -1 +1,3 @@
+- Added validation to detect and return clear error messages when a URL is provided instead of a name for organization, repository, or enterprise arguments (e.g., `--github-org`, `--github-target-org`, `--source-repo`, `--github-target-enterprise`)
+
 - bbs2gh : Added validation for `--archive-path` and `--bbs-shared-home` options to fail fast with clear error messages if the provided paths do not exist or are not accessible. Archive path is now logged before upload operations to help with troubleshooting

src/Octoshift/Commands/CreateTeam/CreateTeamCommandArgs.cs

@@ -1,4 +1,7 @@
-namespace OctoshiftCLI.Commands.CreateTeam;
+using OctoshiftCLI.Extensions;
+using OctoshiftCLI.Services;
+
+namespace OctoshiftCLI.Commands.CreateTeam;
 
 public class CreateTeamCommandArgs : CommandArgs
 {
@@ -8,4 +11,12 @@ public class CreateTeamCommandArgs : CommandArgs
     [Secret]
     public string GithubPat { get; set; }
     public string TargetApiUrl { get; set; }
+
+    public override void Validate(OctoLogger log)
+    {
+        if (GithubOrg.IsUrl())
+        {
+            throw new OctoshiftCliException($"The --github-org option expects an organization name, not a URL. Please provide just the organization name (e.g., 'my-org' instead of 'https://github.com/my-org').");
+        }
+    }
 }

src/Octoshift/Commands/DownloadLogs/DownloadLogsCommandArgs.cs

@@ -1,4 +1,6 @@
-
+using OctoshiftCLI.Extensions;
+using OctoshiftCLI.Services;
+
 namespace OctoshiftCLI.Commands.DownloadLogs;
 
 public class DownloadLogsCommandArgs : CommandArgs
@@ -11,4 +13,17 @@ public class DownloadLogsCommandArgs : CommandArgs
     public string GithubPat { get; set; }
     public string MigrationLogFile { get; set; }
     public bool Overwrite { get; set; }
+
+    public override void Validate(OctoLogger log)
+    {
+        if (GithubOrg.IsUrl())
+        {
+            throw new OctoshiftCliException($"The --github-org option expects an organization name, not a URL. Please provide just the organization name (e.g., 'my-org' instead of 'https://github.com/my-org').");
+        }
+
+        if (GithubRepo.IsUrl())
+        {
+            throw new OctoshiftCliException($"The --github-repo option expects a repository name, not a URL. Please provide just the repository name (e.g., 'my-repo' instead of 'https://github.com/my-org/my-repo').");
+        }
+    }
 }

src/Octoshift/Commands/GenerateMannequinCsv/GenerateMannequinCsvCommandArgs.cs

@@ -1,4 +1,6 @@
 using System.IO;
+using OctoshiftCLI.Extensions;
+using OctoshiftCLI.Services;
 
 namespace OctoshiftCLI.Commands.GenerateMannequinCsv;
 
@@ -10,4 +12,12 @@ public class GenerateMannequinCsvCommandArgs : CommandArgs
     [Secret]
     public string GithubPat { get; set; }
     public string TargetApiUrl { get; set; }
+
+    public override void Validate(OctoLogger log)
+    {
+        if (GithubOrg.IsUrl())
+        {
+            throw new OctoshiftCliException($"The --github-org option expects an organization name, not a URL. Please provide just the organization name (e.g., 'my-org' instead of 'https://github.com/my-org').");
+        }
+    }
 }

src/Octoshift/Commands/GrantMigratorRole/GrantMigratorRoleCommandArgs.cs

@@ -15,6 +15,11 @@ public class GrantMigratorRoleCommandArgs : CommandArgs
 
     public override void Validate(OctoLogger log)
     {
+        if (GithubOrg.IsUrl())
+        {
+            throw new OctoshiftCliException($"The --github-org option expects an organization name, not a URL. Please provide just the organization name (e.g., 'my-org' instead of 'https://github.com/my-org').");
+        }
+
         ActorType = ActorType?.ToUpper();
 
         if (ActorType is "TEAM" or "USER")

src/Octoshift/Commands/ReclaimMannequin/ReclaimMannequinCommandArgs.cs

@@ -1,4 +1,5 @@
-using OctoshiftCLI.Services;
+using OctoshiftCLI.Extensions;
+using OctoshiftCLI.Services;
 
 namespace OctoshiftCLI.Commands.ReclaimMannequin;
 
@@ -17,6 +18,11 @@ public class ReclaimMannequinCommandArgs : CommandArgs
     public string TargetApiUrl { get; set; }
     public override void Validate(OctoLogger log)
     {
+        if (GithubOrg.IsUrl())
+        {
+            throw new OctoshiftCliException($"The --github-org option expects an organization name, not a URL. Please provide just the organization name (e.g., 'my-org' instead of 'https://github.com/my-org').");
+        }
+
         if (string.IsNullOrEmpty(Csv) && (string.IsNullOrEmpty(MannequinUser) || string.IsNullOrEmpty(TargetUser)))
         {
             throw new OctoshiftCliException($"Either --csv or --mannequin-user and --target-user must be specified");

src/Octoshift/Commands/RevokeMigratorRole/RevokeMigratorRoleCommandArgs.cs

@@ -15,6 +15,11 @@ public class RevokeMigratorRoleCommandArgs : CommandArgs
 
     public override void Validate(OctoLogger log)
     {
+        if (GithubOrg.IsUrl())
+        {
+            throw new OctoshiftCliException($"The --github-org option expects an organization name, not a URL. Please provide just the organization name (e.g., 'my-org' instead of 'https://github.com/my-org').");
+        }
+
         ActorType = ActorType?.ToUpper();
 
         if (ActorType is "TEAM" or "USER")

src/Octoshift/Extensions/StringExtensions.cs

@@ -26,5 +26,29 @@ public static class StringExtensions
         public static string EscapeDataString(this string value) => Uri.EscapeDataString(value);
 
         public static byte[] ToBytes(this string s) => Encoding.UTF8.GetBytes(s);
+
+        public static bool IsUrl(this string s)
+        {
+            if (s.IsNullOrWhiteSpace())
+            {
+                return false;
+            }
+
+            // Check if string starts with http:// or https://
+            if (s.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
+                s.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            // Check if string contains common URL patterns like domain.com/path or www.
+            if (s.Contains("://") || s.StartsWith("www.", StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            // Check if it looks like a URL path (contains / and .)
+            return s.Contains('/') && s.Contains('.');
+        }
     }
 }

src/OctoshiftCLI.Tests/Octoshift/Commands/CreateTeam/CreateTeamCommandArgsTests.cs

@@ -0,0 +1,44 @@
+using FluentAssertions;
+using Moq;
+using OctoshiftCLI.Commands.CreateTeam;
+using OctoshiftCLI.Services;
+using Xunit;
+
+namespace OctoshiftCLI.Tests.Octoshift.Commands.CreateTeam;
+
+public class CreateTeamCommandArgsTests
+{
+    private readonly Mock<OctoLogger> _mockOctoLogger = TestHelpers.CreateMock<OctoLogger>();
+
+    private const string GITHUB_ORG = "foo-org";
+    private const string TEAM_NAME = "my-team";
+
+    [Fact]
+    public void Validate_Throws_When_GithubOrg_Is_Url()
+    {
+        var args = new CreateTeamCommandArgs
+        {
+            GithubOrg = "http://github.com/my-org",
+            TeamName = TEAM_NAME
+        };
+
+        FluentActions.Invoking(() => args.Validate(_mockOctoLogger.Object))
+            .Should()
+            .ThrowExactly<OctoshiftCliException>()
+            .WithMessage("The --github-org option expects an organization name, not a URL. Please provide just the organization name (e.g., 'my-org' instead of 'https://github.com/my-org').");
+    }
+
+    [Fact]
+    public void Validate_Succeeds_With_Valid_Name()
+    {
+        var args = new CreateTeamCommandArgs
+        {
+            GithubOrg = GITHUB_ORG,
+            TeamName = TEAM_NAME
+        };
+
+        args.Validate(_mockOctoLogger.Object);
+
+        args.GithubOrg.Should().Be(GITHUB_ORG);
+    }
+}

src/OctoshiftCLI.Tests/Octoshift/Commands/DownloadLogs/DownloadLogsCommandArgsTests.cs

@@ -0,0 +1,60 @@
+using FluentAssertions;
+using Moq;
+using OctoshiftCLI.Commands.DownloadLogs;
+using OctoshiftCLI.Services;
+using Xunit;
+
+namespace OctoshiftCLI.Tests.Octoshift.Commands.DownloadLogs;
+
+public class DownloadLogsCommandArgsTests
+{
+    private readonly Mock<OctoLogger> _mockOctoLogger = TestHelpers.CreateMock<OctoLogger>();
+
+    private const string GITHUB_ORG = "foo-org";
+    private const string GITHUB_REPO = "foo-repo";
+
+    [Fact]
+    public void Validate_Throws_When_GithubOrg_Is_Url()
+    {
+        var args = new DownloadLogsCommandArgs
+        {
+            GithubOrg = "https://github.com/my-org",
+            GithubRepo = GITHUB_REPO
+        };
+
+        FluentActions.Invoking(() => args.Validate(_mockOctoLogger.Object))
+            .Should()
+            .ThrowExactly<OctoshiftCliException>()
+            .WithMessage("The --github-org option expects an organization name, not a URL. Please provide just the organization name (e.g., 'my-org' instead of 'https://github.com/my-org').");
+    }
+
+    [Fact]
+    public void Validate_Throws_When_GithubRepo_Is_Url()
+    {
+        var args = new DownloadLogsCommandArgs
+        {
+            GithubOrg = GITHUB_ORG,
+            GithubRepo = "github.com/org/repo"
+        };
+
+        FluentActions.Invoking(() => args.Validate(_mockOctoLogger.Object))
+            .Should()
+            .ThrowExactly<OctoshiftCliException>()
+            .WithMessage("The --github-repo option expects a repository name, not a URL. Please provide just the repository name (e.g., 'my-repo' instead of 'https://github.com/my-org/my-repo').");
+    }
+
+    [Fact]
+    public void Validate_Succeeds_With_Valid_Names()
+    {
+        var args = new DownloadLogsCommandArgs
+        {
+            GithubOrg = GITHUB_ORG,
+            GithubRepo = GITHUB_REPO
+        };
+
+        args.Validate(_mockOctoLogger.Object);
+
+        args.GithubOrg.Should().Be(GITHUB_ORG);
+        args.GithubRepo.Should().Be(GITHUB_REPO);
+    }
+}

src/OctoshiftCLI.Tests/Octoshift/Commands/GenerateMannequinCsv/GenerateMannequinCsvCommandArgsTests.cs

@@ -0,0 +1,41 @@
+using FluentAssertions;
+using Moq;
+using OctoshiftCLI.Commands.GenerateMannequinCsv;
+using OctoshiftCLI.Services;
+using Xunit;
+
+namespace OctoshiftCLI.Tests.Octoshift.Commands.GenerateMannequinCsv;
+
+public class GenerateMannequinCsvCommandArgsTests
+{
+    private readonly Mock<OctoLogger> _mockOctoLogger = TestHelpers.CreateMock<OctoLogger>();
+
+    private const string GITHUB_ORG = "foo-org";
+
+    [Fact]
+    public void Validate_Throws_When_GithubOrg_Is_Url()
+    {
+        var args = new GenerateMannequinCsvCommandArgs
+        {
+            GithubOrg = "www.github.com"
+        };
+
+        FluentActions.Invoking(() => args.Validate(_mockOctoLogger.Object))
+            .Should()
+            .ThrowExactly<OctoshiftCliException>()
+            .WithMessage("The --github-org option expects an organization name, not a URL. Please provide just the organization name (e.g., 'my-org' instead of 'https://github.com/my-org').");
+    }
+
+    [Fact]
+    public void Validate_Succeeds_With_Valid_Name()
+    {
+        var args = new GenerateMannequinCsvCommandArgs
+        {
+            GithubOrg = GITHUB_ORG
+        };
+
+        args.Validate(_mockOctoLogger.Object);
+
+        args.GithubOrg.Should().Be(GITHUB_ORG);
+    }
+}

src/OctoshiftCLI.Tests/Octoshift/Commands/GrantMigratorRole/GrantMigratorRoleCommandArgsTests.cs

@@ -42,4 +42,20 @@ public void It_Validates_GhesApiUrl_And_TargetApiUrl()
         FluentActions.Invoking(() => args.Validate(_mockOctoLogger.Object))
             .Should().Throw<OctoshiftCliException>();
     }
+
+    [Fact]
+    public void Validate_Throws_When_GithubOrg_Is_Url()
+    {
+        var args = new GrantMigratorRoleCommandArgs
+        {
+            GithubOrg = "https://github.com/my-org",
+            Actor = ACTOR,
+            ActorType = "USER"
+        };
+
+        FluentActions.Invoking(() => args.Validate(_mockOctoLogger.Object))
+            .Should()
+            .ThrowExactly<OctoshiftCliException>()
+            .WithMessage("The --github-org option expects an organization name, not a URL. Please provide just the organization name (e.g., 'my-org' instead of 'https://github.com/my-org').");
+    }
 }

src/OctoshiftCLI.Tests/Octoshift/Commands/ReclaimMannequin/ReclaimMannequinCommandArgsTests.cs

@@ -21,4 +21,19 @@ public void No_Parameters_Provided_Throws_OctoshiftCliException()
             .Invoking(() => args.Validate(_mockOctoLogger.Object))
             .Should().Throw<OctoshiftCliException>();
     }
+
+    [Fact]
+    public void Validate_Throws_When_GithubOrg_Is_Url()
+    {
+        var args = new ReclaimMannequinCommandArgs
+        {
+            GithubOrg = "www.github.com/my-org",
+            Csv = "mannequins.csv"
+        };
+
+        FluentActions.Invoking(() => args.Validate(_mockOctoLogger.Object))
+            .Should()
+            .ThrowExactly<OctoshiftCliException>()
+            .WithMessage("The --github-org option expects an organization name, not a URL. Please provide just the organization name (e.g., 'my-org' instead of 'https://github.com/my-org').");
+    }
 }

src/OctoshiftCLI.Tests/Octoshift/Commands/RevokeMigratorRole/RevokeMigratorRoleCommandArgsTests.cs

@@ -45,4 +45,20 @@ public void It_Validates_GhesApiUrl_And_TargetApiUrl()
             .Should()
             .ThrowExactly<OctoshiftCliException>();
     }
+
+    [Fact]
+    public void Validate_Throws_When_GithubOrg_Is_Url()
+    {
+        var args = new RevokeMigratorRoleCommandArgs
+        {
+            GithubOrg = "github.com/my-org",
+            Actor = ACTOR,
+            ActorType = "USER"
+        };
+
+        FluentActions.Invoking(() => args.Validate(_mockOctoLogger.Object))
+            .Should()
+            .ThrowExactly<OctoshiftCliException>()
+            .WithMessage("The --github-org option expects an organization name, not a URL. Please provide just the organization name (e.g., 'my-org' instead of 'https://github.com/my-org').");
+    }
 }

src/OctoshiftCLI.Tests/StringExtensionsTests.cs

@@ -17,5 +17,28 @@ public void ReplaceInvalidCharactersWithDash_Returns_Valid_String(string value,
 
             normalizedValue.Should().Be(expectedValue);
         }
+
+        [Theory]
+        [InlineData("https://github.com/my-org", true)]
+        [InlineData("http://github.com/my-org", true)]
+        [InlineData("https://github.com/my-org/my-repo", true)]
+        [InlineData("http://example.com", true)]
+        [InlineData("www.github.com", true)]
+        [InlineData("github.com/my-org", true)]
+        [InlineData("my-org", false)]
+        [InlineData("my-repo", false)]
+        [InlineData("my-org-123", false)]
+        [InlineData("my_repo", false)]
+        [InlineData("MyOrganization", false)]
+        [InlineData("", false)]
+        [InlineData(null, false)]
+        [InlineData("   ", false)]
+        public void IsUrl_Detects_URLs_Correctly(string value, bool expectedResult)
+        {
+            var result = value.IsUrl();
+
+            result.Should().Be(expectedResult);
+        }
     }
 }
+