Add gl2gh GitLab adapter

.devcontainer/devcontainer.json

@@ -16,7 +16,10 @@
 	},
 
 	"features": {
-		"ghcr.io/devcontainers/features/github-cli:1": {}
+		"ghcr.io/devcontainers/features/github-cli:1": {},
+		"ghcr.io/devcontainers/features/dotnet:2": {
+			"version": "8.0"
+		}
 	},
 
 	"remoteUser": "vscode"

.github/workflows/CI.yml

@@ -148,12 +148,15 @@ jobs:
             dist/linux-x64/ado2gh-linux-amd64
             dist/linux-x64/bbs2gh-linux-amd64
             dist/linux-x64/gei-linux-amd64
+            dist/linux-x64/gl2gh-linux-amd64
             dist/osx-x64/ado2gh-darwin-amd64
             dist/osx-x64/bbs2gh-darwin-amd64
             dist/osx-x64/gei-darwin-amd64
+            dist/osx-x64/gl2gh-darwin-amd64
             dist/win-x64/ado2gh-windows-amd64.exe
             dist/win-x64/bbs2gh-windows-amd64.exe
             dist/win-x64/gei-windows-amd64.exe
+            dist/win-x64/gl2gh-windows-amd64.exe
 
   e2e-test:
     permissions:
@@ -166,7 +169,7 @@ jobs:
       fail-fast: false
       matrix:
         runner-os: [windows-latest, ubuntu-latest, macos-latest]
-        source-vcs: [AdoBasic, AdoCsv, Bbs, Ghes, Github]
+        source-vcs: [AdoBasic, AdoCsv, Bbs, Ghes, Github, Gitlab]
     runs-on: ${{ matrix.runner-os }}
     concurrency: integration-test-${{ matrix.source-vcs }}-${{ matrix.runner-os }}
     steps:
@@ -191,9 +194,11 @@ jobs:
           New-Item -Path "./" -Name "gh-gei" -ItemType "directory"
           New-Item -Path "./" -Name "gh-ado2gh" -ItemType "directory"
           New-Item -Path "./" -Name "gh-bbs2gh" -ItemType "directory"
+          New-Item -Path "./" -Name "gh-gl2gh" -ItemType "directory"
           Copy-Item ./dist/linux-x64/gei-linux-amd64 ./gh-gei/gh-gei
           Copy-Item ./dist/linux-x64/ado2gh-linux-amd64 ./gh-ado2gh/gh-ado2gh
           Copy-Item ./dist/linux-x64/bbs2gh-linux-amd64 ./gh-bbs2gh/gh-bbs2gh
+          Copy-Item ./dist/linux-x64/gl2gh-linux-amd64 ./gh-gl2gh/gh-gl2gh
         shell: pwsh
 
       - name: Copy binary to root (windows)
@@ -202,9 +207,11 @@ jobs:
           New-Item -Path "./" -Name "gh-gei" -ItemType "directory"
           New-Item -Path "./" -Name "gh-ado2gh" -ItemType "directory"
           New-Item -Path "./" -Name "gh-bbs2gh" -ItemType "directory"
+          New-Item -Path "./" -Name "gh-gl2gh" -ItemType "directory"
           Copy-Item ./dist/win-x64/gei-windows-amd64.exe ./gh-gei/gh-gei.exe
           Copy-Item ./dist/win-x64/ado2gh-windows-amd64.exe ./gh-ado2gh/gh-ado2gh.exe
           Copy-Item ./dist/win-x64/bbs2gh-windows-amd64.exe ./gh-bbs2gh/gh-bbs2gh.exe
+          Copy-Item ./dist/win-x64/gl2gh-windows-amd64.exe ./gh-gl2gh/gh-gl2gh.exe
         shell: pwsh
 
       - name: Copy binary to root (macos)
@@ -213,16 +220,19 @@ jobs:
           New-Item -Path "./" -Name "gh-gei" -ItemType "directory"
           New-Item -Path "./" -Name "gh-ado2gh" -ItemType "directory"
           New-Item -Path "./" -Name "gh-bbs2gh" -ItemType "directory"
+          New-Item -Path "./" -Name "gh-gl2gh" -ItemType "directory"
           Copy-Item ./dist/osx-x64/gei-darwin-amd64 ./gh-gei/gh-gei
           Copy-Item ./dist/osx-x64/ado2gh-darwin-amd64 ./gh-ado2gh/gh-ado2gh
           Copy-Item ./dist/osx-x64/bbs2gh-darwin-amd64 ./gh-bbs2gh/gh-bbs2gh
+          Copy-Item ./dist/osx-x64/gl2gh-darwin-amd64 ./gh-gl2gh/gh-gl2gh
         shell: pwsh
 
       - name: Set execute permissions
         run: |
           chmod +x ./gh-gei/gh-gei
           chmod +x ./gh-ado2gh/gh-ado2gh
           chmod +x ./gh-bbs2gh/gh-bbs2gh
+          chmod +x ./gh-gl2gh/gh-gl2gh
 
       - name: Install gh-gei extension
         run: gh extension install .
@@ -245,6 +255,13 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Install gh-gl2gh extension
+        run: gh extension install .
+        shell: pwsh
+        working-directory: ./gh-gl2gh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Integration Test
         env:
           ADO_PAT: ${{ secrets.ADO_PAT }}
@@ -266,6 +283,7 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME }}
+          GITLAB_PAT: ${{ secrets.GITLAB_PAT }}
           LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:${{ github.workspace }}/src/OctoshiftCLI.IntegrationTests/bin/Debug/net8.0/runtimes/ubuntu.18.04-x64/native"
         run: dotnet test src/OctoshiftCLI.IntegrationTests/OctoshiftCLI.IntegrationTests.csproj --filter "${{ matrix.source-vcs }}ToGithub" --logger:"junit;LogFilePath=integration-tests.xml" --logger "console;verbosity=normal" /p:VersionPrefix=9.9
 
@@ -386,6 +404,21 @@ jobs:
             ./dist/osx-x64/bbs2gh-darwin-amd64
             ./dist/osx-arm64/bbs2gh-darwin-arm64
 
+      - name: Create gh-gl2gh Release
+        # a06a81a03ee405af7f2048a818ed3f03bbf83c7b is tag v2, pinned to avoid supply chain attacks
+        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b
+        with:
+          body_path: ./RELEASENOTES.md
+          repository: github/gh-gl2gh
+          token: ${{ secrets.RELEASE_NOTES_PAT }}
+          files: |
+            ./dist/win-x86/gl2gh-windows-386.exe
+            ./dist/win-x64/gl2gh-windows-amd64.exe
+            ./dist/linux-x64/gl2gh-linux-amd64
+            ./dist/linux-arm64/gl2gh-linux-arm64
+            ./dist/osx-x64/gl2gh-darwin-amd64
+            ./dist/osx-arm64/gl2gh-darwin-arm64
+
       - name: Archive Release Notes
         shell: pwsh
         run: |

.github/workflows/integration-tests.yml

@@ -78,20 +78,23 @@ jobs:
           dist/linux-x64/ado2gh-linux-amd64
           dist/linux-x64/bbs2gh-linux-amd64
           dist/linux-x64/gei-linux-amd64
+          dist/linux-x64/gl2gh-linux-amd64
           dist/osx-x64/ado2gh-darwin-amd64
           dist/osx-x64/bbs2gh-darwin-amd64
           dist/osx-x64/gei-darwin-amd64
+          dist/osx-x64/gl2gh-darwin-amd64
           dist/win-x64/ado2gh-windows-amd64.exe
           dist/win-x64/bbs2gh-windows-amd64.exe
           dist/win-x64/gei-windows-amd64.exe
+          dist/win-x64/gl2gh-windows-amd64.exe
 
   e2e-test:
     needs: [ build-for-e2e-test ]
     strategy:
       fail-fast: false
       matrix:
         runner-os: [windows-latest, ubuntu-latest, macos-latest]
-        source-vcs: [AdoBasic, AdoCsv, Bbs, Ghes, Github]
+        source-vcs: [AdoBasic, AdoCsv, Bbs, Ghes, Github, Gitlab]
     runs-on: ${{ matrix.runner-os }}
     concurrency: integration-test-${{ matrix.source-vcs }}-${{ matrix.runner-os }}
     steps:
@@ -124,9 +127,11 @@ jobs:
         New-Item -Path "./" -Name "gh-gei" -ItemType "directory"
         New-Item -Path "./" -Name "gh-ado2gh" -ItemType "directory"
         New-Item -Path "./" -Name "gh-bbs2gh" -ItemType "directory"
+        New-Item -Path "./" -Name "gh-gl2gh" -ItemType "directory"
         Copy-Item ./dist/linux-x64/gei-linux-amd64 ./gh-gei/gh-gei
         Copy-Item ./dist/linux-x64/ado2gh-linux-amd64 ./gh-ado2gh/gh-ado2gh
         Copy-Item ./dist/linux-x64/bbs2gh-linux-amd64 ./gh-bbs2gh/gh-bbs2gh
+        Copy-Item ./dist/linux-x64/gl2gh-linux-amd64 ./gh-gl2gh/gh-gl2gh
       shell: pwsh
 
     - name: Copy binary to root (windows)
@@ -135,9 +140,11 @@ jobs:
         New-Item -Path "./" -Name "gh-gei" -ItemType "directory"
         New-Item -Path "./" -Name "gh-ado2gh" -ItemType "directory"
         New-Item -Path "./" -Name "gh-bbs2gh" -ItemType "directory"
+        New-Item -Path "./" -Name "gh-gl2gh" -ItemType "directory"
         Copy-Item ./dist/win-x64/gei-windows-amd64.exe ./gh-gei/gh-gei.exe
         Copy-Item ./dist/win-x64/ado2gh-windows-amd64.exe ./gh-ado2gh/gh-ado2gh.exe
         Copy-Item ./dist/win-x64/bbs2gh-windows-amd64.exe ./gh-bbs2gh/gh-bbs2gh.exe
+        Copy-Item ./dist/win-x64/gl2gh-windows-amd64.exe ./gh-gl2gh/gh-gl2gh.exe
       shell: pwsh
 
     - name: Copy binary to root (macos)
@@ -146,16 +153,19 @@ jobs:
         New-Item -Path "./" -Name "gh-gei" -ItemType "directory"
         New-Item -Path "./" -Name "gh-ado2gh" -ItemType "directory"
         New-Item -Path "./" -Name "gh-bbs2gh" -ItemType "directory"
+        New-Item -Path "./" -Name "gh-gl2gh" -ItemType "directory"
         Copy-Item ./dist/osx-x64/gei-darwin-amd64 ./gh-gei/gh-gei
         Copy-Item ./dist/osx-x64/ado2gh-darwin-amd64 ./gh-ado2gh/gh-ado2gh
         Copy-Item ./dist/osx-x64/bbs2gh-darwin-amd64 ./gh-bbs2gh/gh-bbs2gh
+        Copy-Item ./dist/osx-x64/gl2gh-darwin-amd64 ./gh-gl2gh/gh-gl2gh
       shell: pwsh
 
     - name: Set execute permissions
       run: |
         chmod +x ./gh-gei/gh-gei
         chmod +x ./gh-ado2gh/gh-ado2gh
         chmod +x ./gh-bbs2gh/gh-bbs2gh
+        chmod +x ./gh-gl2gh/gh-gl2gh
 
     - name: Install gh-gei extension
       run: gh extension install .
@@ -178,6 +188,13 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+    - name: Install gh-gl2gh extension
+      run: gh extension install .
+      shell: pwsh
+      working-directory: ./gh-gl2gh
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Integration Test
       env:
         ADO_PAT: ${{ secrets.ADO_PAT }}
@@ -199,6 +216,7 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME }}
+        GITLAB_PAT: ${{ secrets.GITLAB_PAT }}
         GEI_DEBUG_MODE: 'true'
         LD_LIBRARY_PATH: '$LD_LIBRARY_PATH:${{ github.workspace }}/src/OctoshiftCLI.IntegrationTests/bin/Debug/net8.0/runtimes/ubuntu.18.04-x64/native'
       run: dotnet test src/OctoshiftCLI.IntegrationTests/OctoshiftCLI.IntegrationTests.csproj --filter "${{ matrix.source-vcs }}ToGithub" --logger:"junit;LogFilePath=integration-tests.xml" --logger "console;verbosity=normal" /p:VersionPrefix=9.9

README.md

@@ -8,10 +8,11 @@ The [GitHub Enterprise Importer](https://docs.github.com/en/migrations/using-git
 > GEI is generally available for repository migrations originating from Azure DevOps or GitHub that target GitHub Enterprise Cloud. It is in public beta for repository migrations from BitBucket Server and Data Center to GitHub Enterprise Cloud.
 
 ## Using the GEI CLI
-There are 3 separate CLIs that we ship as extensions for the official [GitHub CLI](https://github.com/cli/cli#installation):
+There are 4 separate CLIs that we ship as extensions for the official [GitHub CLI](https://github.com/cli/cli#installation):
 - `gh gei` - Run migrations between GitHub products
 - `gh ado2gh` - Run migrations from Azure DevOps to GitHub
 - `gh bbs2gh` - Run migrations from BitBucket Server or Data Center to GitHub
+- `gh gl2gh` - Run migrations from GitLab to GitHub _(not yet generally available)_
 
 To use `gh gei` first install the latest [GitHub CLI](https://github.com/cli/cli#installation), then run the command
 >`gh extension install github/gh-gei`
@@ -22,6 +23,11 @@ To use `gh ado2gh` first install the latest [GitHub CLI](https://github.com/cli/
 To use `gh bbs2gh` first install the latest [GitHub CLI](https://github.com/cli/cli#installation), then run the command
 >`gh extension install github/gh-bbs2gh`
 
+To use `gh gl2gh` first install the latest [GitHub CLI](https://github.com/cli/cli#installation), then run the command
+>`gh extension install github/gh-gl2gh`
+
+> **Note:** `gh gl2gh` is not yet generally available. The extension repo and releases may not be published yet.
+
 We update the extensions frequently, so make sure you update them on a regular basis:
 >`gh extension upgrade github/gh-gei`
 
@@ -33,6 +39,8 @@ To see the available commands and options run:
 
 >`gh bbs2gh --help`
 
+>`gh gl2gh --help`
+
 ### GitHub to GitHub Usage (GitHub.com -> GitHub.com)
 1. Create Personal Access Tokens with access to the source GitHub org, and the target GitHub org (for more details on scopes needed refer to our [official documentation](https://docs.github.com/en/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/managing-access-for-github-enterprise-importer)).
 
@@ -87,6 +95,24 @@ Refer to the [official documentation](https://docs.github.com/en/migrations/usin
 
 Refer to the [official documentation](https://docs.github.com/en/migrations/using-github-enterprise-importer/migrating-repositories-with-github-enterprise-importer/migrating-repositories-from-bitbucket-server-to-github-enterprise-cloud) for more details.
 
+### GitLab to GitHub Usage
+1. Create a Personal Access Token for the source GitLab instance (with `api` and `read_repository` scopes) and one for the target GitHub org (for more details on scopes needed refer to our [official documentation](https://docs.github.com/en/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/managing-access-for-github-enterprise-importer)).
+
+2. Set the `GITLAB_PAT` and `GH_PAT` environment variables.
+
+3. Run the `generate-script` command to generate a migration script.
+```
+> gh gl2gh generate-script --gitlab-server-url GITLAB-SERVER-URL \
+  --github-org DESTINATION \
+  --output FILENAME
+```
+
+The `--gitlab-server-url` flag accepts both GitLab.com (`https://gitlab.com`) and self-hosted GitLab instances.
+
+4. The previous command will have created a `migrate.ps1` PowerShell script. Review the steps in the generated script and tweak if necessary.
+
+5. The `migrate.ps1` script requires PowerShell to run. If not already installed see the [install instructions](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell?view=powershell-7.2) to install PowerShell on Windows, Linux, or Mac. Then run the script.
+
 ### Skipping version checks
 
 When the CLI is launched, it logs if a newer version of the CLI is available. You can skip this check by setting the `GEI_SKIP_VERSION_CHECK` environment variable to `true`. 

RELEASENOTES.md

@@ -0,0 +1 @@
+- Added new `gl2gh` CLI (not yet generally available) for migrating GitLab repositories (GitLab.com and self-hosted) to GitHub. Includes `migrate-repo`, `generate-script`, and `inventory-report` along with the standard supporting commands (e.g. `download-logs`, `wait-for-migration`, `abort-migration`, `grant-migrator-role`, `revoke-migrator-role`, `create-team`, `generate-mannequin-csv`, `reclaim-mannequin`). Archives can be uploaded via Azure Blob Storage, AWS S3, or GitHub-owned storage.

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.410",
+    "version": "8.0.421",
     "rollForward": "minor"
   }
 }

justfile

@@ -60,6 +60,10 @@ run-ado2gh *args: build
 run-bbs2gh *args: build
     dotnet run --project src/bbs2gh/bbs2gh.csproj {{args}}
 
+# Build and run the gl2gh CLI locally
+run-gl2gh *args: build
+    dotnet run --project src/gl2gh/gl2gh.csproj {{args}}
+
 # Watch and auto-rebuild gei on changes
 watch-gei:
     dotnet watch build --project src/gei/gei.csproj
@@ -72,6 +76,10 @@ watch-ado2gh:
 watch-bbs2gh:
     dotnet watch build --project src/bbs2gh/bbs2gh.csproj
 
+# Watch and auto-rebuild gl2gh on changes
+watch-gl2gh:
+    dotnet watch build --project src/gl2gh/gl2gh.csproj
+
 # Build self-contained binaries for all platforms (requires PowerShell)
 publish:
     pwsh ./publish.ps1
@@ -115,19 +123,21 @@ install-extensions: publish-linux
     set -euo pipefail
 
     # Create extension directories
-    mkdir -p gh-gei gh-ado2gh gh-bbs2gh
+    mkdir -p gh-gei gh-ado2gh gh-bbs2gh gh-gl2gh
 
     # Copy binaries
     cp ./dist/linux-x64/gei-linux-amd64 ./gh-gei/gh-gei
     cp ./dist/linux-x64/ado2gh-linux-amd64 ./gh-ado2gh/gh-ado2gh
     cp ./dist/linux-x64/bbs2gh-linux-amd64 ./gh-bbs2gh/gh-bbs2gh
+    cp ./dist/linux-x64/gl2gh-linux-amd64 ./gh-gl2gh/gh-gl2gh
 
     # Set execute permissions
-    chmod +x ./gh-gei/gh-gei ./gh-ado2gh/gh-ado2gh ./gh-bbs2gh/gh-bbs2gh
+    chmod +x ./gh-gei/gh-gei ./gh-ado2gh/gh-ado2gh ./gh-bbs2gh/gh-bbs2gh ./gh-gl2gh/gh-gl2gh
 
     # Install extensions
     cd gh-gei && gh extension install . && cd ..
     cd gh-ado2gh && gh extension install . && cd ..
     cd gh-bbs2gh && gh extension install . && cd ..
+    cd gh-gl2gh && gh extension install . && cd ..
 
     echo "Extensions installed successfully!"