Skip to content

Commit

Permalink
Use k8s utils/pointer instead of Azure autorest/to
Browse files Browse the repository at this point in the history
  • Loading branch information
@mboersma
mboersma committed Jan 16, 2023
1 parent 8e4ea53 commit 195dfaa
Show file tree
Hide file tree
Showing 124 changed files with 2,030 additions and 1,997 deletions.
64 changes: 32 additions & 32 deletions api/v1beta1/azurecluster_default_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/Azure/go-autorest/autorest/to"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
)

func TestResourceGroupDefault(t *testing.T) {
Expand Down Expand Up @@ -139,7 +139,7 @@ func TestVnetDefaults(t *testing.T) {
},
},
NodeOutboundLB: &LoadBalancerSpec{
FrontendIPsCount: to.Int32Ptr(1),
FrontendIPsCount: pointer.Int32Ptr(1),
},
},
},
Expand Down Expand Up @@ -629,10 +629,10 @@ func TestSubnetDefaults(t *testing.T) {
Description: "allow port 50000",
Protocol: "*",
Priority: 2202,
SourcePorts: to.StringPtr("*"),
DestinationPorts: to.StringPtr("*"),
Source: to.StringPtr("*"),
Destination: to.StringPtr("*"),
SourcePorts: pointer.String("*"),
DestinationPorts: pointer.String("*"),
Source: pointer.String("*"),
Destination: pointer.String("*"),
},
},
},
Expand Down Expand Up @@ -664,10 +664,10 @@ func TestSubnetDefaults(t *testing.T) {
Description: "allow port 50000",
Protocol: "*",
Priority: 2202,
SourcePorts: to.StringPtr("*"),
DestinationPorts: to.StringPtr("*"),
Source: to.StringPtr("*"),
Destination: to.StringPtr("*"),
SourcePorts: pointer.String("*"),
DestinationPorts: pointer.String("*"),
Source: pointer.String("*"),
Destination: pointer.String("*"),
Direction: SecurityRuleDirectionInbound,
},
},
Expand Down Expand Up @@ -868,7 +868,7 @@ func TestAPIServerLBDefaults(t *testing.T) {
LoadBalancerClassSpec: LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Public,
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
},
},
},
Expand Down Expand Up @@ -912,7 +912,7 @@ func TestAPIServerLBDefaults(t *testing.T) {
LoadBalancerClassSpec: LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Internal,
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
},
Name: "cluster-test-internal-lb",
},
Expand Down Expand Up @@ -960,7 +960,7 @@ func TestAPIServerLBDefaults(t *testing.T) {
LoadBalancerClassSpec: LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Internal,
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
},
Name: "cluster-test-internal-lb",
},
Expand Down Expand Up @@ -1143,11 +1143,11 @@ func TestNodeOutboundLBDefaults(t *testing.T) {
BackendPool: BackendPool{
Name: "cluster-test-outboundBackendPool",
},
FrontendIPsCount: to.Int32Ptr(1),
FrontendIPsCount: pointer.Int32(1),
LoadBalancerClassSpec: LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Public,
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
},
},
},
Expand Down Expand Up @@ -1324,11 +1324,11 @@ func TestNodeOutboundLBDefaults(t *testing.T) {
BackendPool: BackendPool{
Name: "cluster-test-outboundBackendPool",
},
FrontendIPsCount: to.Int32Ptr(1),
FrontendIPsCount: pointer.Int32(1),
LoadBalancerClassSpec: LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Public,
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
},
},
},
Expand Down Expand Up @@ -1433,14 +1433,14 @@ func TestNodeOutboundLBDefaults(t *testing.T) {
Name: "pip-cluster-test-node-outbound",
},
}},
FrontendIPsCount: to.Int32Ptr(1),
FrontendIPsCount: pointer.Int32(1),
BackendPool: BackendPool{
Name: "cluster-test-outboundBackendPool",
},
LoadBalancerClassSpec: LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Public,
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
},
Name: "cluster-test",
},
Expand Down Expand Up @@ -1616,12 +1616,12 @@ func TestNodeOutboundLBDefaults(t *testing.T) {
NetworkSpec: NetworkSpec{
APIServerLB: LoadBalancerSpec{LoadBalancerClassSpec: LoadBalancerClassSpec{Type: Public}},
NodeOutboundLB: &LoadBalancerSpec{
FrontendIPsCount: to.Int32Ptr(2),
FrontendIPsCount: pointer.Int32(2),
BackendPool: BackendPool{
Name: "custom-backend-pool",
},
LoadBalancerClassSpec: LoadBalancerClassSpec{
IdleTimeoutInMinutes: to.Int32Ptr(15),
IdleTimeoutInMinutes: pointer.Int32(15),
},
},
},
Expand Down Expand Up @@ -1656,11 +1656,11 @@ func TestNodeOutboundLBDefaults(t *testing.T) {
BackendPool: BackendPool{
Name: "custom-backend-pool",
},
FrontendIPsCount: to.Int32Ptr(2), // we expect the original value to be respected here
FrontendIPsCount: pointer.Int32(2), // we expect the original value to be respected here
LoadBalancerClassSpec: LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Public,
IdleTimeoutInMinutes: to.Int32Ptr(15), // we expect the original value to be respected here
IdleTimeoutInMinutes: pointer.Int32(15), // we expect the original value to be respected here
},
Name: "cluster-test",
},
Expand Down Expand Up @@ -1750,11 +1750,11 @@ func TestNodeOutboundLBDefaults(t *testing.T) {
BackendPool: BackendPool{
Name: "user-defined-name-outboundBackendPool",
},
FrontendIPsCount: to.Int32Ptr(1),
FrontendIPsCount: pointer.Int32(1),
LoadBalancerClassSpec: LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Public,
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
},
},
ControlPlaneOutboundLB: &LoadBalancerSpec{
Expand Down Expand Up @@ -1850,9 +1850,9 @@ func TestControlPlaneOutboundLBDefaults(t *testing.T) {
NetworkSpec: NetworkSpec{
APIServerLB: LoadBalancerSpec{LoadBalancerClassSpec: LoadBalancerClassSpec{Type: Internal}},
ControlPlaneOutboundLB: &LoadBalancerSpec{
FrontendIPsCount: to.Int32Ptr(2),
FrontendIPsCount: pointer.Int32(2),
LoadBalancerClassSpec: LoadBalancerClassSpec{
IdleTimeoutInMinutes: to.Int32Ptr(15),
IdleTimeoutInMinutes: pointer.Int32(15),
},
},
},
Expand Down Expand Up @@ -1888,11 +1888,11 @@ func TestControlPlaneOutboundLBDefaults(t *testing.T) {
},
},
},
FrontendIPsCount: to.Int32Ptr(2),
FrontendIPsCount: pointer.Int32(2),
LoadBalancerClassSpec: LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Public,
IdleTimeoutInMinutes: to.Int32Ptr(15),
IdleTimeoutInMinutes: pointer.Int32(15),
},
},
},
Expand All @@ -1913,7 +1913,7 @@ func TestControlPlaneOutboundLBDefaults(t *testing.T) {
Name: "custom-outbound-lb",
},
LoadBalancerClassSpec: LoadBalancerClassSpec{
IdleTimeoutInMinutes: to.Int32Ptr(15),
IdleTimeoutInMinutes: pointer.Int32(15),
},
},
},
Expand Down Expand Up @@ -1943,11 +1943,11 @@ func TestControlPlaneOutboundLBDefaults(t *testing.T) {
},
},
},
FrontendIPsCount: to.Int32Ptr(1),
FrontendIPsCount: pointer.Int32(1),
LoadBalancerClassSpec: LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Public,
IdleTimeoutInMinutes: to.Int32Ptr(15),
IdleTimeoutInMinutes: pointer.Int32(15),
},
},
},
Expand Down
16 changes: 8 additions & 8 deletions api/v1beta1/azureclustertemplate_default_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/Azure/go-autorest/autorest/to"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
)

func TestVnetTemplateDefaults(t *testing.T) {
Expand Down Expand Up @@ -472,7 +472,7 @@ func TestAPIServerLBClassDefaults(t *testing.T) {
APIServerLB: LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Public,
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
},
},
},
Expand Down Expand Up @@ -509,7 +509,7 @@ func TestAPIServerLBClassDefaults(t *testing.T) {
APIServerLB: LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Internal,
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
},
},
},
Expand Down Expand Up @@ -591,7 +591,7 @@ func TestNodeOutboundLBClassDefaults(t *testing.T) {
NodeOutboundLB: &LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Public,
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
},
},
},
Expand Down Expand Up @@ -728,7 +728,7 @@ func TestNodeOutboundLBClassDefaults(t *testing.T) {
NodeOutboundLB: &LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Public,
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
},
},
},
Expand Down Expand Up @@ -798,7 +798,7 @@ func TestNodeOutboundLBClassDefaults(t *testing.T) {
NodeOutboundLB: &LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Public,
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
},
},
},
Expand Down Expand Up @@ -926,7 +926,7 @@ func TestNodeOutboundLBClassDefaults(t *testing.T) {
NetworkSpec: NetworkTemplateSpec{
APIServerLB: LoadBalancerClassSpec{Type: Internal},
NodeOutboundLB: &LoadBalancerClassSpec{
IdleTimeoutInMinutes: to.Int32Ptr(15),
IdleTimeoutInMinutes: pointer.Int32(15),
},
},
},
Expand All @@ -943,7 +943,7 @@ func TestNodeOutboundLBClassDefaults(t *testing.T) {
NetworkSpec: NetworkTemplateSpec{
APIServerLB: LoadBalancerClassSpec{Type: Internal},
NodeOutboundLB: &LoadBalancerClassSpec{
IdleTimeoutInMinutes: to.Int32Ptr(15),
IdleTimeoutInMinutes: pointer.Int32(15),
SKU: SKUStandard,
Type: Public,
},
Expand Down
16 changes: 8 additions & 8 deletions api/v1beta1/azureclustertemplate_validation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package v1beta1
import (
"testing"

"github.com/Azure/go-autorest/autorest/to"
. "github.com/onsi/gomega"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/utils/pointer"
)

func TestValdateVnetCIDRs(t *testing.T) {
Expand Down Expand Up @@ -446,7 +446,7 @@ func TestValidateAPIServerLBTemplate(t *testing.T) {
APIServerLB: LoadBalancerClassSpec{
SKU: SKUStandard,
Type: Public,
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
},
},
},
Expand All @@ -468,7 +468,7 @@ func TestValidateAPIServerLBTemplate(t *testing.T) {
APIServerLB: LoadBalancerClassSpec{
SKU: SKU("wrong"),
Type: Public,
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
},
},
},
Expand All @@ -490,7 +490,7 @@ func TestValidateAPIServerLBTemplate(t *testing.T) {
APIServerLB: LoadBalancerClassSpec{
SKU: SKUStandard,
Type: LBType("wrong"),
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
},
},
},
Expand Down Expand Up @@ -580,7 +580,7 @@ func TestControlPlaneOutboundLBTemplate(t *testing.T) {
Type: Internal,
},
ControlPlaneOutboundLB: &LoadBalancerClassSpec{
IdleTimeoutInMinutes: to.Int32Ptr(2),
IdleTimeoutInMinutes: pointer.Int32(2),
},
},
},
Expand All @@ -603,7 +603,7 @@ func TestControlPlaneOutboundLBTemplate(t *testing.T) {
Type: Internal,
},
ControlPlaneOutboundLB: &LoadBalancerClassSpec{
IdleTimeoutInMinutes: to.Int32Ptr(60),
IdleTimeoutInMinutes: pointer.Int32(60),
},
},
},
Expand Down Expand Up @@ -710,7 +710,7 @@ func TestNodeOutboundLBTemplate(t *testing.T) {
Type: Public,
},
NodeOutboundLB: &LoadBalancerClassSpec{
IdleTimeoutInMinutes: to.Int32Ptr(2),
IdleTimeoutInMinutes: pointer.Int32(2),
},
},
},
Expand All @@ -733,7 +733,7 @@ func TestNodeOutboundLBTemplate(t *testing.T) {
Type: Public,
},
NodeOutboundLB: &LoadBalancerClassSpec{
IdleTimeoutInMinutes: to.Int32Ptr(60),
IdleTimeoutInMinutes: pointer.Int32(60),
},
},
},
Expand Down
8 changes: 4 additions & 4 deletions api/v1beta1/azureimage_validation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package v1beta1
import (
"testing"

"github.com/Azure/go-autorest/autorest/to"
. "github.com/onsi/gomega"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/utils/pointer"
)

func TestImageOptional(t *testing.T) {
Expand Down Expand Up @@ -74,15 +74,15 @@ func TestComputeImageGalleryValid(t *testing.T) {
},
"AzureComputeGalleryImage - fully specified private image": {
expectedErrors: 0,
image: createTestComputeImage(to.StringPtr("SUB1234"), to.StringPtr("RG1234")),
image: createTestComputeImage(pointer.String("SUB1234"), pointer.String("RG1234")),
},
"AzureComputeGalleryImage - private image with missing subscription": {
expectedErrors: 1,
image: createTestComputeImage(nil, to.StringPtr("RG1234")),
image: createTestComputeImage(nil, pointer.String("RG1234")),
},
"AzureComputeGalleryImage - private image with missing resource group": {
expectedErrors: 1,
image: createTestComputeImage(to.StringPtr("SUB1234"), nil),
image: createTestComputeImage(pointer.String("SUB1234"), nil),
},
}

Expand Down
Loading

0 comments on commit 195dfaa

Please sign in to comment.