Skip to content

Commit

Permalink
update tests for private_endpoint service
Browse files Browse the repository at this point in the history
  • Loading branch information
@nawazkh
nawazkh committed Oct 25, 2023
1 parent 3fcfa90 commit 829cad7
Show file tree
Hide file tree
Showing 6 changed files with 208 additions and 41 deletions.
8 changes: 6 additions & 2 deletions azure/scope/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1057,13 +1057,17 @@ func (s *ClusterScope) SetAnnotation(key, value string) {

// PrivateEndpointSpecs returns the private endpoint specs.
func (s *ClusterScope) PrivateEndpointSpecs() []azure.ASOResourceSpecGetter[*asonetworkv1.PrivateEndpoint] {
var privateEndpointSpecs []azure.ASOResourceSpecGetter[*asonetworkv1.PrivateEndpoint]
subnetsList := s.AzureCluster.Spec.NetworkSpec.Subnets

numberOfSubnets := len(subnetsList)
if s.IsAzureBastionEnabled() {
subnetsList = append(subnetsList, s.AzureCluster.Spec.BastionSpec.AzureBastion.Subnet)
numberOfSubnets++
}

// privateEndpointSpecs will be an empty list if no private endpoints were found.
// We pre-allocate the list to avoid unnecessary allocations during append.
privateEndpointSpecs := make([]azure.ASOResourceSpecGetter[*asonetworkv1.PrivateEndpoint], 0, numberOfSubnets)

for _, subnet := range subnetsList {
for _, privateEndpoint := range subnet.PrivateEndpoints {
privateEndpointSpec := &privateendpoints.PrivateEndpointSpec{
Expand Down
11 changes: 7 additions & 4 deletions azure/scope/cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3447,7 +3447,7 @@ func TestPrivateEndpointSpecs(t *testing.T) {
want []azure.ASOResourceSpecGetter[*asonetworkv1.PrivateEndpoint]
}{
{
name: "returns nil if no subnets are specified",
name: "returns empty private endpoints list if no subnets are specified",
clusterScope: ClusterScope{
AzureCluster: &infrav1.AzureCluster{
Spec: infrav1.AzureClusterSpec{
Expand All @@ -3458,10 +3458,10 @@ func TestPrivateEndpointSpecs(t *testing.T) {
},
cache: &ClusterCache{},
},
want: nil,
want: make([]azure.ASOResourceSpecGetter[*asonetworkv1.PrivateEndpoint], 0),
},
{
name: "returns nil if no private endpoints are specified",
name: "returns empty private endpoints list if no private endpoints are specified",
clusterScope: ClusterScope{
AzureCluster: &infrav1.AzureCluster{
Spec: infrav1.AzureClusterSpec{
Expand All @@ -3478,7 +3478,7 @@ func TestPrivateEndpointSpecs(t *testing.T) {
},
cache: &ClusterCache{},
},
want: nil,
want: make([]azure.ASOResourceSpecGetter[*asonetworkv1.PrivateEndpoint], 0),
},
{
name: "returns list of private endpoint specs if private endpoints are specified",
Expand Down Expand Up @@ -3610,6 +3610,7 @@ func TestPrivateEndpointSpecs(t *testing.T) {
},
},
},
AdditionalTags: make(infrav1.Tags, 0),
},
&privateendpoints.PrivateEndpointSpec{
Name: "my-private-endpoint-2",
Expand Down Expand Up @@ -3637,6 +3638,7 @@ func TestPrivateEndpointSpecs(t *testing.T) {
},
},
},
AdditionalTags: make(infrav1.Tags, 0),
},
&privateendpoints.PrivateEndpointSpec{
Name: "my-private-endpoint-3",
Expand Down Expand Up @@ -3664,6 +3666,7 @@ func TestPrivateEndpointSpecs(t *testing.T) {
},
},
},
AdditionalTags: make(infrav1.Tags, 0),
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions azure/scope/managedcontrolplane.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -809,11 +809,12 @@ func (s *ManagedControlPlaneScope) AvailabilityStatusFilter(cond *clusterv1.Cond

// PrivateEndpointSpecs returns the private endpoint specs.
func (s *ManagedControlPlaneScope) PrivateEndpointSpecs() []azure.ASOResourceSpecGetter[*asonetworkv1.PrivateEndpoint] {
privateEndpointSpecs := make([]azure.ASOResourceSpecGetter[*asonetworkv1.PrivateEndpoint], len(s.ControlPlane.Spec.VirtualNetwork.Subnet.PrivateEndpoints))
privateEndpointSpecs := make([]azure.ASOResourceSpecGetter[*asonetworkv1.PrivateEndpoint], 0, len(s.ControlPlane.Spec.VirtualNetwork.Subnet.PrivateEndpoints))

for _, privateEndpoint := range s.ControlPlane.Spec.VirtualNetwork.Subnet.PrivateEndpoints {
privateEndpointSpec := &privateendpoints.PrivateEndpointSpec{
Name: privateEndpoint.Name,
Namespace: s.Cluster.Namespace,
ResourceGroup: s.VNetSpec().ResourceGroupName(),
Location: privateEndpoint.Location,
CustomNetworkInterfaceName: privateEndpoint.CustomNetworkInterfaceName,
Expand All @@ -839,7 +840,6 @@ func (s *ManagedControlPlaneScope) PrivateEndpointSpecs() []azure.ASOResourceSpe
}
privateEndpointSpec.PrivateLinkServiceConnections = append(privateEndpointSpec.PrivateLinkServiceConnections, pl)
}

privateEndpointSpecs = append(privateEndpointSpecs, privateEndpointSpec)
}

Expand Down
169 changes: 169 additions & 0 deletions azure/scope/managedcontrolplane_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ package scope

import (
"context"
"reflect"
"testing"

asonetworkv1 "github.com/Azure/azure-service-operator/v2/api/network/v1api20220701"
"github.com/Azure/go-autorest/autorest"
. "github.com/onsi/gomega"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -29,6 +31,7 @@ import (
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/agentpools"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/managedclusters"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/privateendpoints"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
Expand Down Expand Up @@ -1038,3 +1041,169 @@ func TestAreLocalAccountsDisabled(t *testing.T) {
})
}
}

func TestManagedControlPlaneScope_PrivateEndpointSpecs(t *testing.T) {
scheme := runtime.NewScheme()
_ = expv1.AddToScheme(scheme)
_ = infrav1.AddToScheme(scheme)

cases := []struct {
Name string
Input ManagedControlPlaneScopeParams
Expected []azure.ASOResourceSpecGetter[*asonetworkv1.PrivateEndpoint]
Err string
}{
{
Name: "returns empty private endpoints list if no subnets are specified",
Input: ManagedControlPlaneScopeParams{
AzureClients: AzureClients{
Authorizer: autorest.NullAuthorizer{},
},
Cluster: &clusterv1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster1",
Namespace: "default",
},
},
ControlPlane: &infrav1.AzureManagedControlPlane{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster1",
Namespace: "default",
},
Spec: infrav1.AzureManagedControlPlaneSpec{
VirtualNetwork: infrav1.ManagedControlPlaneVirtualNetwork{},
},
},
},
Expected: make([]azure.ASOResourceSpecGetter[*asonetworkv1.PrivateEndpoint], 0),
},
{
Name: "returns empty private endpoints list if no private endpoints are specified",
Input: ManagedControlPlaneScopeParams{
AzureClients: AzureClients{
Authorizer: autorest.NullAuthorizer{},
},
Cluster: &clusterv1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster1",
Namespace: "default",
},
},
ControlPlane: &infrav1.AzureManagedControlPlane{
ObjectMeta: metav1.ObjectMeta{
Name: "cluster1",
Namespace: "default",
},
Spec: infrav1.AzureManagedControlPlaneSpec{
VirtualNetwork: infrav1.ManagedControlPlaneVirtualNetwork{
Subnet: infrav1.ManagedControlPlaneSubnet{
PrivateEndpoints: infrav1.PrivateEndpoints{},
},
},
},
},
},
Expected: make([]azure.ASOResourceSpecGetter[*asonetworkv1.PrivateEndpoint], 0),
},
{
Name: "returns list of private endpoint specs if private endpoints are specified",
Input: ManagedControlPlaneScopeParams{
AzureClients: AzureClients{
Authorizer: autorest.NullAuthorizer{},
},
Cluster: &clusterv1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: "my-cluster",
Namespace: "dummy-ns",
},
},
ControlPlane: &infrav1.AzureManagedControlPlane{
ObjectMeta: metav1.ObjectMeta{
Name: "my-cluster",
Namespace: "dummy-ns",
},
Spec: infrav1.AzureManagedControlPlaneSpec{
SubscriptionID: "00000000-0000-0000-0000-000000000001",
VirtualNetwork: infrav1.ManagedControlPlaneVirtualNetwork{
ResourceGroup: "dummy-rg",
Name: "vnet1",
Subnet: infrav1.ManagedControlPlaneSubnet{
Name: "subnet1",
PrivateEndpoints: infrav1.PrivateEndpoints{
{
Name: "my-private-endpoint",
Location: "westus2",
PrivateLinkServiceConnections: []infrav1.PrivateLinkServiceConnection{
{
Name: "my-pls-connection",
PrivateLinkServiceID: "my-pls-id",
GroupIDs: []string{
"my-group-id-1",
},
RequestMessage: "my-request-message",
},
},
CustomNetworkInterfaceName: "my-custom-nic",
PrivateIPAddresses: []string{
"IP1",
"IP2",
},
ApplicationSecurityGroups: []string{
"ASG1",
"ASG2",
},
ManualApproval: true,
},
},
},
},
},
},
},
Expected: []azure.ASOResourceSpecGetter[*asonetworkv1.PrivateEndpoint]{
&privateendpoints.PrivateEndpointSpec{
Name: "my-private-endpoint",
Namespace: "dummy-ns",
ResourceGroup: "dummy-rg",
Location: "westus2",
CustomNetworkInterfaceName: "my-custom-nic",
PrivateIPAddresses: []string{
"IP1",
"IP2",
},
SubnetID: "/subscriptions/00000000-0000-0000-0000-000000000001/resourceGroups/dummy-rg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
ApplicationSecurityGroups: []string{
"ASG1",
"ASG2",
},
ClusterName: "my-cluster",
PrivateLinkServiceConnections: []privateendpoints.PrivateLinkServiceConnection{
{
Name: "my-pls-connection",
RequestMessage: "my-request-message",
PrivateLinkServiceID: "my-pls-id",
GroupIDs: []string{
"my-group-id-1",
},
},
},
ManualApproval: true,
AdditionalTags: make(infrav1.Tags, 0),
},
},
},
}
for _, c := range cases {
c := c
t.Run(c.Name, func(t *testing.T) {
g := NewWithT(t)
fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(c.Input.ControlPlane).Build()
c.Input.Client = fakeClient
s, err := NewManagedControlPlaneScope(context.TODO(), c.Input)
g.Expect(err).To(Succeed())
if got := s.PrivateEndpointSpecs(); !reflect.DeepEqual(got, c.Expected) {
t.Errorf("PrivateEndpointSpecs() = %s, want %s", specArrayToString(got), specArrayToString(c.Expected))
}
})
}
}
8 changes: 6 additions & 2 deletions azure/services/privateendpoints/spec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ func (s *PrivateEndpointSpec) Parameters(ctx context.Context, existingPrivateEnd
privateEndpoint.Spec.AzureName = s.Name

// CustomNetworkInterfaceName
privateEndpoint.Spec.CustomNetworkInterfaceName = ptr.To(s.CustomNetworkInterfaceName)
if s.CustomNetworkInterfaceName != "" {
privateEndpoint.Spec.CustomNetworkInterfaceName = ptr.To(s.CustomNetworkInterfaceName)
}

// IPConfigurations
if len(s.PrivateIPAddresses) > 0 {
Expand All @@ -105,7 +107,9 @@ func (s *PrivateEndpointSpec) Parameters(ctx context.Context, existingPrivateEnd
}

// Location
privateEndpoint.Spec.Location = ptr.To(s.Location)
if s.Location != "" {
privateEndpoint.Spec.Location = ptr.To(s.Location)
}

// ManualPrivateLinkServiceConnections and PrivateLinkServiceConnections
if len(s.PrivateLinkServiceConnections) > 0 {
Expand Down
Loading

0 comments on commit 829cad7

Please sign in to comment.