Merge branch 'add-bb-commands' into bitbucket/add-forecast-command

github · Sep 11, 2023 · bcd91e4 · bcd91e4 · islamdinibilimmerkezi · Sep 14, 2023
2 parents 62198f9 + c1272eb
commit bcd91e4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 21 deletions.
diff --git a/docs/jenkins/SCPPublish.md b/docs/jenkins/SCPPublish.md
@@ -55,7 +55,7 @@
       scp scp_transfer.tar 127.0.0.1:
       ssh 127.0.0.1 'tar -xvf scp_transfer.tar -C /results && rm scp_transfer.tar'
 ```
+
 ### Unsupported Options
 
 - Keeps Hierarchy (currrently always keeps folder structure)
-
diff --git a/src/ActionsImporter.UnitTests/ActionsImporter.UnitTests.csproj b/src/ActionsImporter.UnitTests/ActionsImporter.UnitTests.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="JUnitTestLogger" Version="1.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Moq" Version="4.20.69" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.0">

diff --git a/src/ActionsImporter/Commands/Bitbucket/Audit.cs b/src/ActionsImporter/Commands/Bitbucket/Audit.cs
@@ -12,7 +12,6 @@ public Audit(string[] args) : base(args)
     protected override string Name => "bitbucket";
     protected override string Description => "An audit will output a list of data used in a Bitbucket instance.";
     protected override ImmutableArray<Option> Options => ImmutableArray.Create<Option>(
-        Common.InstanceUrl,
         Common.AccessToken,
         Common.Workspace,
         Common.Project,

diff --git a/src/ActionsImporter/Commands/Bitbucket/Common.cs b/src/ActionsImporter/Commands/Bitbucket/Common.cs
@@ -4,38 +4,27 @@ namespace ActionsImporter.Commands.Bitbucket;
 
 public static class Common
 {
-    public static readonly Option<string> InstanceUrl = new("--bitbucket-instance-url")
-    {
-        Description = "The URL of the Bitbucket instance.",
-        IsRequired = false,
-    };
 
-    public static readonly Option<string[]> Namespace = new(new[] { "--namespace", "-n" })
-    {
-        Description = "The Bitbucket namespace(s).",
-        IsRequired = false,
-        AllowMultipleArgumentsPerToken = true
-    };
 
     public static readonly Option<string> AccessToken = new("--bitbucket-access-token")
     {
         Description = "Access token for the Bitbucket instance.",
         IsRequired = false,
     };
 
-    public static readonly Option<string> Workspace = new("--workspace")
+    public static readonly Option<string> Workspace = new(new[] { "--workspace", "-w" })
     {
         Description = "The Bitbucket workspace name.",
         IsRequired = true,
     };
 
-    public static readonly Option<string> Project = new("--project")
+    public static readonly Option<string> Project = new(new[] { "--project-key", "-p" })
     {
-        Description = "The Bitbucket project name.",
+        Description = "The Bitbucket project key.",
         IsRequired = false,
     };
 
-    public static readonly Option<string> Repository = new("--repository")
+    public static readonly Option<string> Repository = new(new[] { "--repository", "-r" })
     {
         Description = "The Bitbucket repository name.",
         IsRequired = true,

diff --git a/src/ActionsImporter/Commands/Bitbucket/DryRun.cs b/src/ActionsImporter/Commands/Bitbucket/DryRun.cs
@@ -15,7 +15,6 @@ public DryRun(string[] args) : base(args)
     protected override ImmutableArray<Option> Options => ImmutableArray.Create<Option>(
         Common.Workspace,
         Common.Repository,
-        Common.InstanceUrl,
         Common.AccessToken,
         Common.SourceFilePath,
         Common.ConfigFilePath

diff --git a/src/ActionsImporter/Commands/Bitbucket/Migrate.cs b/src/ActionsImporter/Commands/Bitbucket/Migrate.cs
@@ -15,7 +15,6 @@ public Migrate(string[] args) : base(args)
     protected override ImmutableArray<Option> Options => ImmutableArray.Create<Option>(
         Common.Workspace,
         Common.Repository,
-        Common.InstanceUrl,
         Common.AccessToken,
         Common.SourceFilePath,
         Common.ConfigFilePath