From 0db7c0a8c8a6a48e296c4669e235a6d545ab369c Mon Sep 17 00:00:00 2001
From: Matthew Garrett <magarret@microsoft.com>
Date: Tue, 9 Apr 2024 08:03:26 -0700
Subject: [PATCH 1/2] Split build workflow into new & legacy steps, updated
 azure/login to v2 on all workflows and made some minor adjustments for
 readability in workflow files

---
 .github/workflows/azure-ipam-build.yml   | 31 ++++++++++++++++++++++--
 .github/workflows/azure-ipam-testing.yml |  6 ++---
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/azure-ipam-build.yml b/.github/workflows/azure-ipam-build.yml
index 65dfac77..363eb20f 100644
--- a/.github/workflows/azure-ipam-build.yml
+++ b/.github/workflows/azure-ipam-build.yml
@@ -32,8 +32,9 @@ jobs:
         with:
           node-version: 18
 
-      - uses: actions/github-script@v7
+      - name: "Extract Pull Request Details"
         id: getPullRequestData
+        uses: actions/github-script@v7
         with:
           script: |
             return (
@@ -143,7 +144,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ version, release ]
     steps:
-      - name: Azure login
+      - name: Azure Login
         uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -167,6 +168,32 @@ jobs:
           az acr build -r $ACR_NAME -t ipam:$IPAM_VERSION -t ipam:latest -f ./Dockerfile.deb .
           az acr build -r $ACR_NAME -t ipamfunc:$IPAM_VERSION -t ipamfunc:latest -f ./Dockerfile.func .
 
+  build-legacy:
+    name: Build Legacy Azure IPAM Containers
+    runs-on: ubuntu-latest
+    needs: [ version, release ]
+    steps:
+      - name: Azure Login
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          enable-AzPSSession: true
+
+      - name: Checkout Azure IPAM Code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.version.outputs.commitHash }}
+          sparse-checkout: |
+            engine
+            ui
+            lb
+
+      - name: Build Legacy Azure IPAM Containers
+        env:
+          IPAM_VERSION: ${{ needs.version.outputs.ipamVersion }}
+        run: |
           az acr build -r $ACR_NAME -t ipam-engine:$IPAM_VERSION -t ipam-engine:latest -f ./engine/Dockerfile.deb ./engine
           az acr build -r $ACR_NAME -t ipam-func:$IPAM_VERSION -t ipam-func:latest -f ./engine/Dockerfile.func ./engine
           az acr build -r $ACR_NAME -t ipam-ui:$IPAM_VERSION -t ipam-ui:latest -f ./ui/Dockerfile.deb ./ui
diff --git a/.github/workflows/azure-ipam-testing.yml b/.github/workflows/azure-ipam-testing.yml
index 6b299276..02ea4b79 100644
--- a/.github/workflows/azure-ipam-testing.yml
+++ b/.github/workflows/azure-ipam-testing.yml
@@ -30,7 +30,7 @@ jobs:
           Install-Module Az, Microsoft.Graph -AllowClobber -Force
 
       - name: Azure Login
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
           enable-AzPSSession: true
@@ -132,7 +132,7 @@ jobs:
           Install-Module Az, Pester -AllowClobber -Force
 
       - name: Azure Login
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
           enable-AzPSSession: true
@@ -180,7 +180,7 @@ jobs:
           Install-Module Az -AllowClobber -Force
 
       - name: Azure Login
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
           enable-AzPSSession: true

From eae62aa6cedd6179c2683b5ac8f689935571ac81 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <magarret@microsoft.com>
Date: Tue, 9 Apr 2024 08:04:29 -0700
Subject: [PATCH 2/2] Reset version files to v3.0.0 to recreate Release

---
 docs/_coverpage.md      | 2 +-
 engine/app/version.json | 2 +-
 ui/package.json         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/_coverpage.md b/docs/_coverpage.md
index 12684b77..f998a7b5 100644
--- a/docs/_coverpage.md
+++ b/docs/_coverpage.md
@@ -2,7 +2,7 @@
 
 ![logo](./images/ipam-logo.png ':size=45%')
 
-# IPAM <small>3.1.0</small>
+# IPAM <small>3.0.0</small>
 > Azure IP Address Management Made Easy
 
 [GitHub](https://github.com/Azure/ipam)
diff --git a/engine/app/version.json b/engine/app/version.json
index 05e6f1d1..f27700cc 100644
--- a/engine/app/version.json
+++ b/engine/app/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "3.1.0"
+  "version": "3.0.0"
 }
diff --git a/ui/package.json b/ui/package.json
index cf9aff18..b93d52f5 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-ipam-ui",
-  "version": "3.1.0",
+  "version": "3.0.0",
   "type": "module",
   "private": true,
   "dependencies": {