Skip to content

Commit

Permalink
Fix linter warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@willie-yao
willie-yao committed Sep 26, 2023
1 parent b24d20b commit e7400ef
Show file tree
Hide file tree
Showing 8 changed files with 107 additions and 99 deletions.
27 changes: 13 additions & 14 deletions api/v1beta1/azuremanagedcontrolplane_webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
kerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
"sigs.k8s.io/cluster-api-provider-azure/feature"
webhookutils "sigs.k8s.io/cluster-api-provider-azure/util/webhook"
Expand Down Expand Up @@ -73,7 +72,7 @@ func (mw *azureManagedControlPlaneWebhook) Default(ctx context.Context, obj runt
return apierrors.NewBadRequest("expected an AzureManagedControlPlane")
}
if m.Spec.NetworkPlugin == nil {
networkPlugin := "azure"
networkPlugin := CloudProviderName
m.Spec.NetworkPlugin = &networkPlugin
}
if m.Spec.LoadBalancerSKU == nil {
Expand Down Expand Up @@ -683,8 +682,8 @@ func validateAutoScalerProfile(autoScalerProfile *AutoScalerProfile, fldPath *fi
// validateMaxNodeProvisionTime validates update to AutoscalerProfile.MaxNodeProvisionTime.
func validateMaxNodeProvisionTime(maxNodeProvisionTime *string, fldPath *field.Path) field.ErrorList {
var allErrs field.ErrorList
if pointer.StringDeref(maxNodeProvisionTime, "") != "" {
if !rMaxNodeProvisionTime.MatchString(pointer.StringDeref(maxNodeProvisionTime, "")) {
if ptr.Deref(maxNodeProvisionTime, "") != "" {
if !rMaxNodeProvisionTime.MatchString(ptr.Deref(maxNodeProvisionTime, "")) {
allErrs = append(allErrs, field.Invalid(fldPath.Child("MaxNodeProvisionTime"), maxNodeProvisionTime, "invalid value"))
}
}
Expand All @@ -694,8 +693,8 @@ func validateMaxNodeProvisionTime(maxNodeProvisionTime *string, fldPath *field.P
// validateScanInterval validates update to AutoscalerProfile.ScanInterval.
func validateScanInterval(scanInterval *string, fldPath *field.Path) field.ErrorList {
var allErrs field.ErrorList
if pointer.StringDeref(scanInterval, "") != "" {
if !rScanInterval.MatchString(pointer.StringDeref(scanInterval, "")) {
if ptr.Deref(scanInterval, "") != "" {
if !rScanInterval.MatchString(ptr.Deref(scanInterval, "")) {
allErrs = append(allErrs, field.Invalid(fldPath.Child("ScanInterval"), scanInterval, "invalid value"))
}
}
Expand All @@ -705,8 +704,8 @@ func validateScanInterval(scanInterval *string, fldPath *field.Path) field.Error
// validateNewPodScaleUpDelay validates update to AutoscalerProfile.NewPodScaleUpDelay.
func validateNewPodScaleUpDelay(newPodScaleUpDelay *string, fldPath *field.Path) field.ErrorList {
var allErrs field.ErrorList
if pointer.StringDeref(newPodScaleUpDelay, "") != "" {
_, err := time.ParseDuration(pointer.StringDeref(newPodScaleUpDelay, ""))
if ptr.Deref(newPodScaleUpDelay, "") != "" {
_, err := time.ParseDuration(ptr.Deref(newPodScaleUpDelay, ""))
if err != nil {
allErrs = append(allErrs, field.Invalid(fldPath.Child("NewPodScaleUpDelay"), newPodScaleUpDelay, "invalid value"))
}
Expand All @@ -717,9 +716,9 @@ func validateNewPodScaleUpDelay(newPodScaleUpDelay *string, fldPath *field.Path)
// validateScaleDownDelayAfterDelete validates update to AutoscalerProfile.ScaleDownDelayAfterDelete value.
func validateScaleDownDelayAfterDelete(scaleDownDelayAfterDelete *string, fldPath *field.Path) field.ErrorList {
var allErrs field.ErrorList
if pointer.StringDeref(scaleDownDelayAfterDelete, "") != "" {
if !rScaleDownDelayAfterDelete.MatchString(pointer.StringDeref(scaleDownDelayAfterDelete, "")) {
allErrs = append(allErrs, field.Invalid(fldPath.Child("ScaleDownDelayAfterDelete"), pointer.StringDeref(scaleDownDelayAfterDelete, ""), "invalid value"))
if ptr.Deref(scaleDownDelayAfterDelete, "") != "" {
if !rScaleDownDelayAfterDelete.MatchString(ptr.Deref(scaleDownDelayAfterDelete, "")) {
allErrs = append(allErrs, field.Invalid(fldPath.Child("ScaleDownDelayAfterDelete"), ptr.Deref(scaleDownDelayAfterDelete, ""), "invalid value"))
}
}
return allErrs
Expand All @@ -728,9 +727,9 @@ func validateScaleDownDelayAfterDelete(scaleDownDelayAfterDelete *string, fldPat
// validateScaleDownTime validates update to AutoscalerProfile.ScaleDown* values.
func validateScaleDownTime(scaleDownValue *string, fldPath *field.Path, fieldName string) field.ErrorList {
var allErrs field.ErrorList
if pointer.StringDeref(scaleDownValue, "") != "" {
if !rScaleDownTime.MatchString(pointer.StringDeref(scaleDownValue, "")) {
allErrs = append(allErrs, field.Invalid(fldPath.Child(fieldName), pointer.StringDeref(scaleDownValue, ""), "invalid value"))
if ptr.Deref(scaleDownValue, "") != "" {
if !rScaleDownTime.MatchString(ptr.Deref(scaleDownValue, "")) {
allErrs = append(allErrs, field.Invalid(fldPath.Child(fieldName), ptr.Deref(scaleDownValue, ""), "invalid value"))
}
}
return allErrs
Expand Down
93 changes: 46 additions & 47 deletions api/v1beta1/azuremanagedcontrolplane_webhook_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/validation/field"
utilfeature "k8s.io/component-base/featuregate/testing"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
"sigs.k8s.io/cluster-api-provider-azure/feature"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
Expand Down Expand Up @@ -120,12 +119,12 @@ func TestValidateDNSServiceIP(t *testing.T) {
}{
{
name: "Testing valid DNSServiceIP",
dnsIP: pointer.String("192.168.0.0"),
dnsIP: ptr.To("192.168.0.0"),
expectErr: false,
},
{
name: "Testing invalid DNSServiceIP",
dnsIP: pointer.String("192.168.0.0.3"),
dnsIP: ptr.To("192.168.0.0.3"),
expectErr: false,
},
}
Expand Down Expand Up @@ -195,30 +194,30 @@ func TestValidateLoadBalancerProfile(t *testing.T) {
{
name: "Valid LoadBalancerProfile",
profile: &LoadBalancerProfile{
ManagedOutboundIPs: pointer.Int32(10),
AllocatedOutboundPorts: pointer.Int32(1000),
IdleTimeoutInMinutes: pointer.Int32(60),
ManagedOutboundIPs: ptr.To[int32](10),
AllocatedOutboundPorts: ptr.To[int32](1000),
IdleTimeoutInMinutes: ptr.To[int32](60),
},
expectErr: false,
},
{
name: "Invalid LoadBalancerProfile.ManagedOutboundIPs",
profile: &LoadBalancerProfile{
ManagedOutboundIPs: pointer.Int32(200),
ManagedOutboundIPs: ptr.To[int32](200),
},
expectErr: true,
},
{
name: "Invalid LoadBalancerProfile.IdleTimeoutInMinutes",
profile: &LoadBalancerProfile{
IdleTimeoutInMinutes: pointer.Int32(600),
IdleTimeoutInMinutes: ptr.To[int32](600),
},
expectErr: true,
},
{
name: "LoadBalancerProfile must specify at most one of ManagedOutboundIPs, OutboundIPPrefixes and OutboundIPs",
profile: &LoadBalancerProfile{
ManagedOutboundIPs: pointer.Int32(1),
ManagedOutboundIPs: ptr.To[int32](1),
OutboundIPs: []string{
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/foo-bar/providers/Microsoft.Network/publicIPAddresses/my-public-ip",
},
Expand Down Expand Up @@ -249,170 +248,170 @@ func TestValidateAutoScalerProfile(t *testing.T) {
{
name: "Valid AutoScalerProfile",
profile: &AutoScalerProfile{
BalanceSimilarNodeGroups: (*BalanceSimilarNodeGroups)(pointer.String(string(BalanceSimilarNodeGroupsFalse))),
Expander: (*Expander)(pointer.String(string(ExpanderRandom))),
MaxEmptyBulkDelete: pointer.String("10"),
MaxGracefulTerminationSec: pointer.String("600"),
MaxNodeProvisionTime: pointer.String("10m"),
MaxTotalUnreadyPercentage: pointer.String("45"),
NewPodScaleUpDelay: pointer.String("10m"),
OkTotalUnreadyCount: pointer.String("3"),
ScanInterval: pointer.String("60s"),
ScaleDownDelayAfterAdd: pointer.String("10m"),
ScaleDownDelayAfterDelete: pointer.String("10s"),
ScaleDownDelayAfterFailure: pointer.String("10m"),
ScaleDownUnneededTime: pointer.String("10m"),
ScaleDownUnreadyTime: pointer.String("10m"),
ScaleDownUtilizationThreshold: pointer.String("0.5"),
SkipNodesWithLocalStorage: (*SkipNodesWithLocalStorage)(pointer.String(string(SkipNodesWithLocalStorageTrue))),
SkipNodesWithSystemPods: (*SkipNodesWithSystemPods)(pointer.String(string(SkipNodesWithSystemPodsTrue))),
BalanceSimilarNodeGroups: (*BalanceSimilarNodeGroups)(ptr.To(string(BalanceSimilarNodeGroupsFalse))),
Expander: (*Expander)(ptr.To(string(ExpanderRandom))),
MaxEmptyBulkDelete: ptr.To("10"),
MaxGracefulTerminationSec: ptr.To("600"),
MaxNodeProvisionTime: ptr.To("10m"),
MaxTotalUnreadyPercentage: ptr.To("45"),
NewPodScaleUpDelay: ptr.To("10m"),
OkTotalUnreadyCount: ptr.To("3"),
ScanInterval: ptr.To("60s"),
ScaleDownDelayAfterAdd: ptr.To("10m"),
ScaleDownDelayAfterDelete: ptr.To("10s"),
ScaleDownDelayAfterFailure: ptr.To("10m"),
ScaleDownUnneededTime: ptr.To("10m"),
ScaleDownUnreadyTime: ptr.To("10m"),
ScaleDownUtilizationThreshold: ptr.To("0.5"),
SkipNodesWithLocalStorage: (*SkipNodesWithLocalStorage)(ptr.To(string(SkipNodesWithLocalStorageTrue))),
SkipNodesWithSystemPods: (*SkipNodesWithSystemPods)(ptr.To(string(SkipNodesWithSystemPodsTrue))),
},
expectErr: false,
},
{
name: "Testing valid AutoScalerProfile.ExpanderRandom",
profile: &AutoScalerProfile{
Expander: (*Expander)(pointer.String(string(ExpanderRandom))),
Expander: (*Expander)(ptr.To(string(ExpanderRandom))),
},
expectErr: false,
},
{
name: "Testing valid AutoScalerProfile.ExpanderLeastWaste",
profile: &AutoScalerProfile{
Expander: (*Expander)(pointer.String(string(ExpanderLeastWaste))),
Expander: (*Expander)(ptr.To(string(ExpanderLeastWaste))),
},
expectErr: false,
},
{
name: "Testing valid AutoScalerProfile.ExpanderMostPods",
profile: &AutoScalerProfile{
Expander: (*Expander)(pointer.String(string(ExpanderMostPods))),
Expander: (*Expander)(ptr.To(string(ExpanderMostPods))),
},
expectErr: false,
},
{
name: "Testing valid AutoScalerProfile.ExpanderPriority",
profile: &AutoScalerProfile{
Expander: (*Expander)(pointer.String(string(ExpanderPriority))),
Expander: (*Expander)(ptr.To(string(ExpanderPriority))),
},
expectErr: false,
},
{
name: "Testing valid AutoScalerProfile.BalanceSimilarNodeGroupsTrue",
profile: &AutoScalerProfile{
BalanceSimilarNodeGroups: (*BalanceSimilarNodeGroups)(pointer.String(string(BalanceSimilarNodeGroupsTrue))),
BalanceSimilarNodeGroups: (*BalanceSimilarNodeGroups)(ptr.To(string(BalanceSimilarNodeGroupsTrue))),
},
expectErr: false,
},
{
name: "Testing valid AutoScalerProfile.BalanceSimilarNodeGroupsFalse",
profile: &AutoScalerProfile{
BalanceSimilarNodeGroups: (*BalanceSimilarNodeGroups)(pointer.String(string(BalanceSimilarNodeGroupsFalse))),
BalanceSimilarNodeGroups: (*BalanceSimilarNodeGroups)(ptr.To(string(BalanceSimilarNodeGroupsFalse))),
},
expectErr: false,
},
{
name: "Testing invalid AutoScalerProfile.MaxEmptyBulkDelete",
profile: &AutoScalerProfile{
MaxEmptyBulkDelete: pointer.String("invalid"),
MaxEmptyBulkDelete: ptr.To("invalid"),
},
expectErr: true,
},
{
name: "Testing invalid AutoScalerProfile.MaxGracefulTerminationSec",
profile: &AutoScalerProfile{
MaxGracefulTerminationSec: pointer.String("invalid"),
MaxGracefulTerminationSec: ptr.To("invalid"),
},
expectErr: true,
},
{
name: "Testing invalid AutoScalerProfile.MaxNodeProvisionTime",
profile: &AutoScalerProfile{
MaxNodeProvisionTime: pointer.String("invalid"),
MaxNodeProvisionTime: ptr.To("invalid"),
},
expectErr: true,
},
{
name: "Testing invalid AutoScalerProfile.MaxTotalUnreadyPercentage",
profile: &AutoScalerProfile{
MaxTotalUnreadyPercentage: pointer.String("invalid"),
MaxTotalUnreadyPercentage: ptr.To("invalid"),
},
expectErr: true,
},
{
name: "Testing invalid AutoScalerProfile.NewPodScaleUpDelay",
profile: &AutoScalerProfile{
NewPodScaleUpDelay: pointer.String("invalid"),
NewPodScaleUpDelay: ptr.To("invalid"),
},
expectErr: true,
},
{
name: "Testing invalid AutoScalerProfile.OkTotalUnreadyCount",
profile: &AutoScalerProfile{
OkTotalUnreadyCount: pointer.String("invalid"),
OkTotalUnreadyCount: ptr.To("invalid"),
},
expectErr: true,
},
{
name: "Testing invalid AutoScalerProfile.ScanInterval",
profile: &AutoScalerProfile{
ScanInterval: pointer.String("invalid"),
ScanInterval: ptr.To("invalid"),
},
expectErr: true,
},
{
name: "Testing invalid AutoScalerProfile.ScaleDownDelayAfterAdd",
profile: &AutoScalerProfile{
ScaleDownDelayAfterAdd: pointer.String("invalid"),
ScaleDownDelayAfterAdd: ptr.To("invalid"),
},
expectErr: true,
},
{
name: "Testing invalid AutoScalerProfile.ScaleDownDelayAfterDelete",
profile: &AutoScalerProfile{
ScaleDownDelayAfterDelete: pointer.String("invalid"),
ScaleDownDelayAfterDelete: ptr.To("invalid"),
},
expectErr: true,
},
{
name: "Testing invalid AutoScalerProfile.ScaleDownDelayAfterFailure",
profile: &AutoScalerProfile{
ScaleDownDelayAfterFailure: pointer.String("invalid"),
ScaleDownDelayAfterFailure: ptr.To("invalid"),
},
expectErr: true,
},
{
name: "Testing invalid AutoScalerProfile.ScaleDownUnneededTime",
profile: &AutoScalerProfile{
ScaleDownUnneededTime: pointer.String("invalid"),
ScaleDownUnneededTime: ptr.To("invalid"),
},
expectErr: true,
},
{
name: "Testing invalid AutoScalerProfile.ScaleDownUnreadyTime",
profile: &AutoScalerProfile{
ScaleDownUnreadyTime: pointer.String("invalid"),
ScaleDownUnreadyTime: ptr.To("invalid"),
},
expectErr: true,
},
{
name: "Testing invalid AutoScalerProfile.ScaleDownUtilizationThreshold",
profile: &AutoScalerProfile{
ScaleDownUtilizationThreshold: pointer.String("invalid"),
ScaleDownUtilizationThreshold: ptr.To("invalid"),
},
expectErr: true,
},
{
name: "Testing valid AutoScalerProfile.SkipNodesWithLocalStorageTrue",
profile: &AutoScalerProfile{
SkipNodesWithLocalStorage: (*SkipNodesWithLocalStorage)(pointer.String(string(SkipNodesWithLocalStorageTrue))),
SkipNodesWithLocalStorage: (*SkipNodesWithLocalStorage)(ptr.To(string(SkipNodesWithLocalStorageTrue))),
},
expectErr: false,
},
{
name: "Testing valid AutoScalerProfile.SkipNodesWithLocalStorageFalse",
profile: &AutoScalerProfile{
SkipNodesWithSystemPods: (*SkipNodesWithSystemPods)(pointer.String(string(SkipNodesWithSystemPodsFalse))),
SkipNodesWithSystemPods: (*SkipNodesWithSystemPods)(ptr.To(string(SkipNodesWithSystemPodsFalse))),
},
expectErr: false,
},
Expand Down
Loading

0 comments on commit e7400ef

Please sign in to comment.