Skip to content

Commit 062c7b3

Browse files
author
Joshua Reed
committed
Lint and vet passing again.
1 parent 5fe47ec commit 062c7b3

20 files changed

+181
-186
lines changed

‎api/v1beta1/cloudstackcluster_types.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type CloudStackIdentityReference struct {
4242
type Network struct {
4343
// Cloudstack Network ID the cluster is built in.
4444
// +optional
45-
Id string `json:"id,omitempty"`
45+
ID string `json:"id,omitempty"`
4646

4747
// Cloudstack Network Type the cluster is built in.
4848
// + optional
@@ -82,7 +82,7 @@ type Zone struct {
8282

8383
// The CS zone ID the cluster is built in.
8484
// + optional
85-
Id string `json:"id,omitempty"`
85+
ID string `json:"id,omitempty"`
8686

8787
// The network within the Zone to use.
8888
Network Network `json:"network"`
@@ -129,8 +129,8 @@ type CloudStackClusterStatus struct {
129129
// The CS public IP ID to use for the k8s endpoint.
130130
PublicIPID string `json:"publicIPID,omitempty"`
131131

132-
// The Id of the network the PublicIP is in.
133-
PublicIPNetworkId string `json:"publicIPNetworkId,omitempty"`
132+
// The ID of the network the PublicIP is in.
133+
PublicIPNetworkID string `json:"publicIPNetworkID,omitempty"`
134134

135135
// The ID of the lb rule used to assign VMs to the lb.
136136
LBRuleID string `json:"loadBalancerRuleID,omitempty"`

‎api/v1beta1/cloudstackmachine_types.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ type CloudStackMachineSpec struct {
5252

5353
// Optional affinitygroupids for deployVirtualMachine
5454
// +optional
55-
AffinityGroupIds []string `json:"affinitygroupids,omitempty"`
55+
AffinityGroupIDs []string `json:"affinitygroupids,omitempty"`
5656

57-
// Mutually exclusive parameter with AffinityGroupIds.
57+
// Mutually exclusive parameter with AffinityGroupIDs.
5858
// Defaults to `no`. Can be `pro` or `anti`. Will create an affinity group per machine set.
5959
// +optional
6060
Affinity string `json:"affinity,omitempty"`
6161

62-
// The CS specific unique identifier. Of the form: fmt.Sprintf("cloudstack:///%s", CS Machine Id)
62+
// The CS specific unique identifier. Of the form: fmt.Sprintf("cloudstack:///%s", CS Machine ID)
6363
// +optional
6464
ProviderID *string `json:"providerID,omitempty"`
6565

@@ -111,7 +111,7 @@ func (csm CloudStackMachine) AffinityGroupName(
111111

112112
managerOwnerRef := csCtrlrUtils.GetManagementOwnerRef(capiMachine)
113113
if managerOwnerRef == nil {
114-
return "", errors.Errorf("Could not find owner UID for %s/%s.", csm.Namespace, csm.Name)
114+
return "", errors.Errorf("could not find owner UID for %s/%s", csm.Namespace, csm.Name)
115115
}
116116
return fmt.Sprintf("%sAffinity-%s-%s", strings.Title(csm.Spec.Affinity), managerOwnerRef.Name, managerOwnerRef.UID), nil
117117
}

‎api/v1beta1/cloudstackmachine_webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ func (r *CloudStackMachine) ValidateUpdate(old runtime.Object) error {
9393
}
9494
errorList = webhookutil.EnsureStringFieldsAreEqual(r.Spec.Affinity, oldSpec.Affinity, "affinity", errorList)
9595

96-
if !reflect.DeepEqual(r.Spec.AffinityGroupIds, oldSpec.AffinityGroupIds) { // Equivalent to other Ensure funcs.
97-
errorList = append(errorList, field.Forbidden(field.NewPath("spec", "AffinityGroupIds"), "AffinityGroupIds"))
96+
if !reflect.DeepEqual(r.Spec.AffinityGroupIDs, oldSpec.AffinityGroupIDs) { // Equivalent to other Ensure funcs.
97+
errorList = append(errorList, field.Forbidden(field.NewPath("spec", "AffinityGroupIDs"), "AffinityGroupIDs"))
9898
}
9999

100100
return webhookutil.AggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, errorList)

‎api/v1beta1/cloudstackmachine_webhook_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ var _ = Describe("CloudStackMachine webhook", func() {
8989
Expect(k8sClient.Update(ctx, cloudStackMachineUpdate).Error()).Should(MatchRegexp(forbiddenRegex, "identityRef\\.Kind"))
9090

9191
dummies.CSMachine1.DeepCopyInto(cloudStackMachineUpdate)
92-
cloudStackMachineUpdate.Spec.IdentityRef.Name = "IdentityConfigMap"
92+
cloudStackMachineUpdate.Spec.IdentityRef.Name = "IDentityConfigMap"
9393
Expect(k8sClient.Update(ctx, cloudStackMachineUpdate).Error()).Should(MatchRegexp(forbiddenRegex, "identityRef\\.Name"))
9494

9595
dummies.CSMachine1.DeepCopyInto(cloudStackMachineUpdate)
96-
cloudStackMachineUpdate.Spec.AffinityGroupIds = []string{"28b907b8-75a7-4214-bd3d-6c61961fc2af"}
97-
Expect(k8sClient.Update(ctx, cloudStackMachineUpdate).Error()).Should(MatchRegexp(forbiddenRegex, "AffinityGroupIds"))
96+
cloudStackMachineUpdate.Spec.AffinityGroupIDs = []string{"28b907b8-75a7-4214-bd3d-6c61961fc2af"}
97+
Expect(k8sClient.Update(ctx, cloudStackMachineUpdate).Error()).Should(MatchRegexp(forbiddenRegex, "AffinityGroupIDs"))
9898
})
9999
})
100100
})

‎api/v1beta1/cloudstackmachinetemplate_webhook.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ func (r *CloudStackMachineTemplate) ValidateCreate() error {
7171
errorList = append(errorList, field.Invalid(field.NewPath("spec", "Affinity"), spec.Affinity,
7272
`Affinity must be "no", "pro", "anti", or unspecified.`))
7373
}
74-
if affinity != "no" && affinity != "" && len(spec.AffinityGroupIds) > 0 {
75-
errorList = append(errorList, field.Forbidden(field.NewPath("spec", "AffinityGroupIds"),
76-
"AffinityGroupIds cannot be specified when Affinity is specified as anything but `no`"))
74+
if affinity != "no" && affinity != "" && len(spec.AffinityGroupIDs) > 0 {
75+
errorList = append(errorList, field.Forbidden(field.NewPath("spec", "AffinityGroupIDs"),
76+
"AffinityGroupIDs cannot be specified when Affinity is specified as anything but `no`"))
7777
}
7878

7979
errorList = webhookutil.EnsureFieldExists(spec.Offering, "Offering", errorList)
@@ -104,8 +104,8 @@ func (r *CloudStackMachineTemplate) ValidateUpdate(old runtime.Object) error {
104104

105105
errorList = webhookutil.EnsureStringFieldsAreEqual(spec.Affinity, oldSpec.Affinity, "affinity", errorList)
106106

107-
if !reflect.DeepEqual(spec.AffinityGroupIds, oldSpec.AffinityGroupIds) { // Equivalent to other Ensure funcs.
108-
errorList = append(errorList, field.Forbidden(field.NewPath("spec", "AffinityGroupIds"), "AffinityGroupIds"))
107+
if !reflect.DeepEqual(spec.AffinityGroupIDs, oldSpec.AffinityGroupIDs) { // Equivalent to other Ensure funcs.
108+
errorList = append(errorList, field.Forbidden(field.NewPath("spec", "AffinityGroupIDs"), "AffinityGroupIDs"))
109109
}
110110

111111
if spec.IdentityRef != nil && oldSpec.IdentityRef != nil {

‎api/v1beta1/cloudstackmachinetemplate_webhook_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ var _ = Describe("CloudStackMachineTemplate webhook", func() {
9191
Should(MatchRegexp(forbiddenRegex, "identityRef\\.Kind"))
9292

9393
dummies.CSMachineTemplate1.DeepCopyInto(cloudStackMachineTemplateUpdate)
94-
cloudStackMachineTemplateUpdate.Spec.Spec.Spec.IdentityRef.Name = "IdentityConfigMap"
94+
cloudStackMachineTemplateUpdate.Spec.Spec.Spec.IdentityRef.Name = "IDentityConfigMap"
9595
Expect(k8sClient.Update(ctx, cloudStackMachineTemplateUpdate).Error()).
9696
Should(MatchRegexp(forbiddenRegex, "identityRef\\.Name"))
9797

9898
dummies.CSMachineTemplate1.DeepCopyInto(cloudStackMachineTemplateUpdate)
99-
cloudStackMachineTemplateUpdate.Spec.Spec.Spec.AffinityGroupIds = []string{"28b907b8-75a7-4214-bd3d-6c61961fc2ag"}
99+
cloudStackMachineTemplateUpdate.Spec.Spec.Spec.AffinityGroupIDs = []string{"28b907b8-75a7-4214-bd3d-6c61961fc2ag"}
100100
Expect(k8sClient.Update(ctx, cloudStackMachineTemplateUpdate)).
101101
ShouldNot(Succeed())
102102
})

‎controllers/cloudstackcluster_controller_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ import (
3030
"sigs.k8s.io/controller-runtime/pkg/client"
3131
)
3232

33-
func getCapiCluster() *clusterv1.Cluster {
34-
return dummies.CAPICluster
35-
}
36-
3733
const (
3834
timeout = time.Second * 120
3935
)

‎controllers/cloudstackmachine_controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func (r *CloudStackMachineReconciler) Reconcile(ctx context.Context, req ctrl.Re
137137
}
138138

139139
if capiMachine.Spec.FailureDomain != nil && *capiMachine.Spec.FailureDomain == "" {
140-
log.Info("CloudStackCluster ZoneId not initialized. Likely not ready.")
140+
log.Info("CloudStackCluster ZoneID not initialized. Likely not ready.")
141141
return ctrl.Result{RequeueAfter: requeueTimeout}, nil
142142
}
143143

@@ -155,10 +155,10 @@ func (r *CloudStackMachineReconciler) reconcile(
155155

156156
log.V(1).Info("reconcile CloudStackMachine")
157157

158-
zoneId := capiMachine.Spec.FailureDomain
158+
zoneID := capiMachine.Spec.FailureDomain
159159
zone := infrav1.Zone{}
160160
for _, zoneStatus := range csCluster.Status.Zones {
161-
if zoneId == &zoneStatus.Id {
161+
if zoneID == &zoneStatus.ID {
162162
zone = zoneStatus
163163
break
164164
}
@@ -230,7 +230,7 @@ func (r *CloudStackMachineReconciler) reconcileDelete(
230230
return ctrl.Result{}, err
231231
} else if deleted {
232232
if err := r.RemoveManagedAffinity(log, capiMachine, csMachine); err != nil {
233-
return ctrl.Result{}, errors.Wrap(err, "Error encountered when removing affinity group.")
233+
return ctrl.Result{}, errors.Wrap(err, "error encountered when removing affinity group")
234234
}
235235
}
236236

‎pkg/cloud/affinity_groups.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ func (c *client) getCurrentAffinityGroups(csMachine *infrav1.CloudStackMachine)
112112
}
113113

114114
func (ags *affinityGroups) toArrayOfIDs() []string {
115-
groupIds := make([]string, 0, len(*ags))
115+
groupIDs := make([]string, 0, len(*ags))
116116
for _, group := range *ags {
117-
groupIds = append(groupIds, group.ID)
117+
groupIDs = append(groupIDs, group.ID)
118118
}
119-
return groupIds
119+
return groupIDs
120120
}
121121

122122
func (ags *affinityGroups) addGroup(addGroup AffinityGroup) {

‎pkg/cloud/affinity_groups_test.go

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,13 @@ var _ = Describe("AffinityGroup Unit Tests", func() {
5454
Ω(client.GetOrCreateAffinityGroup(dummies.CSCluster, dummies.AffinityGroup)).Should(Succeed())
5555
})
5656
It("creates an affinity group", func() {
57-
<<<<<<< HEAD
58-
fakeAG.ID = "FakeID"
59-
cluster.Spec.Account = "FakeAccount"
60-
cluster.Status.DomainID = "FakeDomainId"
61-
ags.EXPECT().GetAffinityGroupByID(fakeAG.ID).Return(nil, -1, errors.New("fakeError"))
62-
ags.EXPECT().NewCreateAffinityGroupParams(fakeAG.Name, fakeAG.Type).
63-
=======
64-
dummies.AffinityGroup.Id = "FakeID"
57+
dummies.AffinityGroup.ID = "FakeID"
6558
dummies.CSCluster.Spec.Account = "FakeAccount"
66-
dummies.CSCluster.Status.DomainID = "FakeDomainId"
67-
ags.EXPECT().GetAffinityGroupByID(dummies.AffinityGroup.Id).Return(nil, -1, errors.New("FakeError"))
59+
dummies.CSCluster.Status.DomainID = "FakeDomainID"
60+
ags.EXPECT().GetAffinityGroupByID(dummies.AffinityGroup.ID).Return(nil, -1, errors.New("FakeError"))
6861
ags.EXPECT().NewCreateAffinityGroupParams(dummies.AffinityGroup.Name, dummies.AffinityGroup.Type).
69-
>>>>>>> 36c0963 (Major moves toward multizone, but still broken.)
7062
Return(&cloudstack.CreateAffinityGroupParams{})
71-
ags.EXPECT().CreateAffinityGroup(ParamMatch(And(AccountEquals("FakeAccount"), DomainIDEquals("FakeDomainId")))).
63+
ags.EXPECT().CreateAffinityGroup(ParamMatch(And(AccountEquals("FakeAccount"), DomainIDEquals("FakeDomainID")))).
7264
Return(&cloudstack.CreateAffinityGroupResponse{}, nil)
7365

7466
Ω(client.GetOrCreateAffinityGroup(dummies.CSCluster, dummies.AffinityGroup)).Should(Succeed())

0 commit comments

Comments
 (0)