Refactor duplicated Azure and AWS factories to shared Octoshift project

Copilot · dylan-smith · Copilot · commit dbcd20ac09b5 · 2025-07-08T05:55:32.000Z
Co-authored-by: dylan-smith &lt;1508559+dylan-smith@users.noreply.github.com&gt;
diff --git a/src/Octoshift/Factories/AwsApiFactory.cs b/src/Octoshift/Factories/AwsApiFactory.cs
@@ -1,6 +1,6 @@
 using OctoshiftCLI.Services;
 
-namespace OctoshiftCLI.BbsToGithub.Factories;
+namespace OctoshiftCLI.Factories;
 
 public class AwsApiFactory
 {
diff --git a/src/Octoshift/Factories/AzureApiFactory.cs b/src/Octoshift/Factories/AzureApiFactory.cs
@@ -1,7 +1,7 @@
 using System.Net.Http;
 using OctoshiftCLI.Services;
 
-namespace OctoshiftCLI.BbsToGithub.Factories;
+namespace OctoshiftCLI.Factories;
 
 public sealed class AzureApiFactory : IAzureApiFactory
 {
diff --git a/src/Octoshift/Factories/BlobServiceClientFactory.cs b/src/Octoshift/Factories/BlobServiceClientFactory.cs
@@ -1,6 +1,6 @@
 using Azure.Storage.Blobs;
 
-namespace OctoshiftCLI.BbsToGithub.Factories;
+namespace OctoshiftCLI.Factories;
 
 public class BlobServiceClientFactory : IBlobServiceClientFactory
 {
diff --git a/src/Octoshift/Factories/IAzureApiFactory.cs b/src/Octoshift/Factories/IAzureApiFactory.cs
@@ -1,6 +1,6 @@
 using OctoshiftCLI.Services;
 
-namespace OctoshiftCLI.BbsToGithub.Factories;
+namespace OctoshiftCLI.Factories;
 
 public interface IAzureApiFactory
 {
diff --git a/src/Octoshift/Factories/IBlobServiceClientFactory.cs b/src/Octoshift/Factories/IBlobServiceClientFactory.cs
@@ -1,6 +1,6 @@
 using Azure.Storage.Blobs;
 
-namespace OctoshiftCLI.BbsToGithub.Factories;
+namespace OctoshiftCLI.Factories;
 
 public interface IBlobServiceClientFactory
 {
diff --git a/src/OctoshiftCLI.Tests/bbs2gh/Commands/MigrateRepo/MigrateRepoCommandTests.cs b/src/OctoshiftCLI.Tests/bbs2gh/Commands/MigrateRepo/MigrateRepoCommandTests.cs
@@ -3,6 +3,7 @@
 using Moq;
 using OctoshiftCLI.BbsToGithub.Commands.MigrateRepo;
 using OctoshiftCLI.BbsToGithub.Factories;
+using OctoshiftCLI.Factories;
 using OctoshiftCLI.Services;
 using Xunit;
 
diff --git a/src/OctoshiftCLI.Tests/bbs2gh/Factories/AwsApiFactoryTests.cs b/src/OctoshiftCLI.Tests/bbs2gh/Factories/AwsApiFactoryTests.cs
@@ -1,6 +1,6 @@
 using FluentAssertions;
 using Moq;
-using OctoshiftCLI.BbsToGithub.Factories;
+using OctoshiftCLI.Factories;
 using OctoshiftCLI.Services;
 using Xunit;
 
diff --git a/src/OctoshiftCLI.Tests/gei/Factories/AwsApiFactoryTests.cs b/src/OctoshiftCLI.Tests/gei/Factories/AwsApiFactoryTests.cs
@@ -1,6 +1,6 @@
 using FluentAssertions;
 using Moq;
-using OctoshiftCLI.GithubEnterpriseImporter.Factories;
+using OctoshiftCLI.Factories;
 using OctoshiftCLI.Services;
 using Xunit;
 
diff --git a/src/OctoshiftCLI.Tests/gei/Factories/AzureApiFactoryTests.cs b/src/OctoshiftCLI.Tests/gei/Factories/AzureApiFactoryTests.cs
@@ -2,7 +2,7 @@
 using Azure.Storage.Blobs;
 using FluentAssertions;
 using Moq;
-using OctoshiftCLI.GithubEnterpriseImporter.Factories;
+using OctoshiftCLI.Factories;
 using OctoshiftCLI.Services;
 using Xunit;
 
diff --git a/src/bbs2gh/Commands/MigrateRepo/MigrateRepoCommand.cs b/src/bbs2gh/Commands/MigrateRepo/MigrateRepoCommand.cs
@@ -1,10 +1,11 @@
-﻿using System;
+using System;
 using System.CommandLine;
 using Microsoft.Extensions.DependencyInjection;
 using OctoshiftCLI.BbsToGithub.Factories;
 using OctoshiftCLI.BbsToGithub.Services;
 using OctoshiftCLI.Commands;
 using OctoshiftCLI.Extensions;
+using OctoshiftCLI.Factories;
 using OctoshiftCLI.Services;
 
 namespace OctoshiftCLI.BbsToGithub.Commands.MigrateRepo;
diff --git a/src/gei/Factories/AwsApiFactory.cs b/src/gei/Factories/AwsApiFactory.cs
diff --git a/src/gei/Factories/AzureApiFactory.cs b/src/gei/Factories/AzureApiFactory.cs
diff --git a/src/gei/Factories/BlobServiceClientFactory.cs b/src/gei/Factories/BlobServiceClientFactory.cs
diff --git a/src/gei/Factories/IAzureApiFactory.cs b/src/gei/Factories/IAzureApiFactory.cs
diff --git a/src/gei/Factories/IBlobServiceClientFactory.cs b/src/gei/Factories/IBlobServiceClientFactory.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using OctoshiftCLI.Services;`
`2`	`2`
`3`		`-namespace OctoshiftCLI.BbsToGithub.Factories;`
	`3`	`+namespace OctoshiftCLI.Factories;`
`4`	`4`
`5`	`5`	`public class AwsApiFactory`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Net.Http;`
`2`	`2`	`using OctoshiftCLI.Services;`
`3`	`3`
`4`		`-namespace OctoshiftCLI.BbsToGithub.Factories;`
	`4`	`+namespace OctoshiftCLI.Factories;`
`5`	`5`
`6`	`6`	`public sealed class AzureApiFactory : IAzureApiFactory`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Azure.Storage.Blobs;`
`2`	`2`
`3`		`-namespace OctoshiftCLI.BbsToGithub.Factories;`
	`3`	`+namespace OctoshiftCLI.Factories;`
`4`	`4`
`5`	`5`	`public class BlobServiceClientFactory : IBlobServiceClientFactory`
`6`	`6`	`{`