frontend: Modify BuildCSCluster parameters

Take the whole request header instead of just the tenant ID.

frontend/pkg/frontend/frontend.go

@@ -327,13 +327,6 @@ func (f *Frontend) ArmResourceCreateOrUpdate(writer http.ResponseWriter, request
 		return
 	}
 
-	tenantID := request.Header.Get(arm.HeaderNameHomeTenantID)
-	if tenantID == "" {
-		f.logger.Error("Missing " + arm.HeaderNameHomeTenantID + " header")
-		arm.WriteInternalServerError(writer)
-		return
-	}
-
 	f.logger.Info(fmt.Sprintf("%s: ArmResourceCreateOrUpdate", versionedInterface))
 
 	doc, err := f.dbClient.GetResourceDoc(ctx, resourceID)
@@ -432,7 +425,7 @@ func (f *Frontend) ArmResourceCreateOrUpdate(writer http.ResponseWriter, request
 	versionedRequestCluster.Normalize(hcpCluster)
 
 	hcpCluster.Name = request.PathValue(PathSegmentResourceName)
-	csCluster, err := f.BuildCSCluster(resourceID, tenantID, hcpCluster, updating)
+	csCluster, err := f.BuildCSCluster(resourceID, request.Header, hcpCluster, updating)
 	if err != nil {
 		f.logger.Error(err.Error())
 		arm.WriteInternalServerError(writer)

frontend/pkg/frontend/node_pool_test.go

@@ -94,8 +94,11 @@ func TestCreateNodePool(t *testing.T) {
 			}
 			hcpCluster := api.NewDefaultHCPOpenShiftCluster()
 
+			requestHeader := make(http.Header)
+			requestHeader.Add(arm.HeaderNameHomeTenantID, dummyTenantId)
+
 			hcpCluster.Name = dummyClusterName
-			csCluster, _ := f.BuildCSCluster(clusterResouceID, dummyTenantId, hcpCluster, false)
+			csCluster, _ := f.BuildCSCluster(clusterResouceID, requestHeader, hcpCluster, false)
 
 			if test.subDoc != nil {
 				err := f.dbClient.CreateSubscriptionDoc(context.TODO(), test.subDoc)

frontend/pkg/frontend/ocm.go

@@ -2,6 +2,8 @@ package frontend
 
 import (
 	"context"
+	"fmt"
+	"net/http"
 
 	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
 	configv1 "github.com/openshift/api/config/v1"
@@ -130,7 +132,12 @@ func ensureManagedResourceGroupName(hcpCluster *api.HCPOpenShiftCluster) string
 }
 
 // BuildCSCluster creates a CS Cluster object from an HCPOpenShiftCluster object
-func (f *Frontend) BuildCSCluster(resourceID *arm.ResourceID, tenantID string, hcpCluster *api.HCPOpenShiftCluster, updating bool) (*cmv1.Cluster, error) {
+func (f *Frontend) BuildCSCluster(resourceID *arm.ResourceID, requestHeader http.Header, hcpCluster *api.HCPOpenShiftCluster, updating bool) (*cmv1.Cluster, error) {
+
+	// Ensure required headers are present.
+	if requestHeader.Get(arm.HeaderNameHomeTenantID) == "" {
+		return nil, fmt.Errorf("Missing " + arm.HeaderNameHomeTenantID + " header")
+	}
 
 	clusterBuilder := cmv1.NewCluster()
 
@@ -170,7 +177,7 @@ func (f *Frontend) BuildCSCluster(resourceID *arm.ResourceID, tenantID string, h
 			EtcdEncryption(hcpCluster.Properties.Spec.EtcdEncryption)
 
 		azureBuilder := cmv1.NewAzure().
-			TenantID(tenantID).
+			TenantID(requestHeader.Get(arm.HeaderNameHomeTenantID)).
 			SubscriptionID(resourceID.SubscriptionID).
 			ResourceGroupName(resourceID.ResourceGroupName).
 			ResourceName(hcpCluster.Name).