Merge branch 'main' into jr/upstream-main/107-adminvm-os-image

CHANGELOG.md

@@ -11,6 +11,7 @@ ENHANCEMENTS:
 * Upgrade AzureRM Terraform provider from `3.117.0` to `4.14.0`. ([[#4255](https://github.com/microsoft/AzureTRE/pull/4255/)])
 * Subnet definitions are now inline in the `azurerm_virtual_network` resource, and NSG associations are set using `security_group` in each subnet block (no separate `azurerm_subnet_network_security_group_association` needed). ([[#4255](https://github.com/microsoft/AzureTRE/pull/4255/)])
 * Azure Cosmos DB should disable public network access ([#4322](https://github.com/microsoft/AzureTRE/issues/4322))
+* Add bundle target to Makefile for handling different bundle types in single command ([#4372](https://github.com/microsoft/AzureTRE/issues/4372))
 * Add Windows image field to the Admin VM template ([#4274](https://github.com/microsoft/AzureTRE/pull/4274))
 
 BUG FIXES:

Makefile

@@ -218,6 +218,15 @@ bundle-install: bundle-check-params
 		--credential-set aad_auth \
 		--debug
 
+bundle:
+	case ${BUNDLE_TYPE} in \
+		(workspace) $(MAKE) workspace_bundle BUNDLE=${BUNDLE} ;; \
+		(workspace_service) $(MAKE) workspace_service_bundle BUNDLE=${BUNDLE} ;; \
+		(shared_service) $(MAKE) shared_service_bundle BUNDLE=${BUNDLE} ;; \
+		(user_resource) $(MAKE) user_resource_bundle WORKSPACE_SERVICE=${WORKSPACE_SERVICE} BUNDLE=${BUNDLE} ;; \
+		(*) echo "Invalid BUNDLE_TYPE: ${BUNDLE_TYPE}"; exit 1 ;; \
+	esac
+
 # Validates that the parameters file is synced with the bundle.
 # The file is used when installing the bundle from a local machine.
 # We remove arm_use_msi on both sides since it shouldn't take effect locally anyway.