Fix more line errors about Id vs ID

Author: wongni

api/v1beta1/cloudstackcluster_webhook_test.go

@@ -31,7 +31,7 @@ var _ = Describe("CloudStackCluster webhooks", func() {
 		clusterKind        = "CloudStackCluster"
 		clusterName        = "test-cluster"
 		clusterNamespace   = "default"
-		clusterId          = "0"
+		clusterID          = "0"
 		identitySecretName = "IdentitySecret"
 		zone               = "Zone"
 		network            = "Network"
@@ -48,7 +48,7 @@ var _ = Describe("CloudStackCluster webhooks", func() {
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      clusterName,
 					Namespace: clusterNamespace,
-					UID:       clusterId,
+					UID:       clusterID,
 				},
 				Spec: CloudStackClusterSpec{
 					IdentityRef: &CloudStackIdentityReference{
@@ -74,7 +74,7 @@ var _ = Describe("CloudStackCluster webhooks", func() {
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      clusterName,
 					Namespace: clusterNamespace,
-					UID:       clusterId,
+					UID:       clusterID,
 				},
 				Spec: CloudStackClusterSpec{
 					IdentityRef: &CloudStackIdentityReference{
@@ -99,7 +99,7 @@ var _ = Describe("CloudStackCluster webhooks", func() {
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      clusterName,
 					Namespace: clusterNamespace,
-					UID:       clusterId,
+					UID:       clusterID,
 				},
 				Spec: CloudStackClusterSpec{
 					IdentityRef: &CloudStackIdentityReference{
@@ -129,7 +129,7 @@ var _ = Describe("CloudStackCluster webhooks", func() {
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      clusterName,
 					Namespace: clusterNamespace,
-					UID:       clusterId,
+					UID:       clusterID,
 				},
 				Spec: CloudStackClusterSpec{
 					IdentityRef: &CloudStackIdentityReference{

pkg/cloud/network_test.go

@@ -103,15 +103,15 @@ var _ = Describe("Network", func() {
 		It("does not call to create a new network via GetOrCreateNetwork", func() {
 			ns.EXPECT().GetNetworkID(fakeNetName).Return(fakeNetID, 1, nil)
 			ns.EXPECT().GetNetworkByID(fakeNetID).Return(&cloudstack.Network{Type: isolatedNetworkType}, 1, nil)
-			expectNetworkTags(fakeNetId)
+			expectNetworkTags(fakeNetID)
 
 			Ω(client.GetOrCreateNetwork(csCluster)).Should(Succeed())
 		})
 
 		It("resolves network details with network ID instead of network name", func() {
 			ns.EXPECT().GetNetworkID(gomock.Any()).Return("", -1, errors.New("no match found for blah"))
 			ns.EXPECT().GetNetworkByID(fakeNetID).Return(&cloudstack.Network{Type: isolatedNetworkType}, 1, nil)
-			expectNetworkTags(fakeNetId)
+			expectNetworkTags(fakeNetID)
 
 			csCluster.Spec.Network = fakeNetID
 			Ω(client.GetOrCreateNetwork(csCluster)).Should(Succeed())
@@ -126,7 +126,7 @@ var _ = Describe("Network", func() {
 			ns.EXPECT().NewCreateNetworkParams(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).
 				Return(&cloudstack.CreateNetworkParams{})
 			ns.EXPECT().CreateNetwork(gomock.Any()).Return(&cloudstack.CreateNetworkResponse{Id: netID}, nil)
-			expectNetworkTags(netId)
+			expectNetworkTags(netID)
 
 			Ω(client.GetOrCreateNetwork(csCluster)).Should(Succeed())
 		})

pkg/cloud/tags.go

@@ -29,31 +29,31 @@ const (
 )
 
 // TagNetwork adds tags to a network by network id.
-func (c *client) AddNetworkTags(networkId string, tags map[string]string) error {
-	p := c.cs.Resourcetags.NewCreateTagsParams([]string{networkId}, resourceTypeNetwork, tags)
+func (c *client) AddNetworkTags(networkID string, tags map[string]string) error {
+	p := c.cs.Resourcetags.NewCreateTagsParams([]string{networkID}, resourceTypeNetwork, tags)
 	_, err := c.cs.Resourcetags.CreateTags(p)
 	return err
 }
 
 // GetNetworkTags gets tags by network id.
-func (c *client) GetNetworkTags(networkId string) (map[string]string, error) {
+func (c *client) GetNetworkTags(networkID string) (map[string]string, error) {
 	p := c.cs.Resourcetags.NewListTagsParams()
-	p.SetResourceid(networkId)
+	p.SetResourceid(networkID)
 	p.SetResourcetype(resourceTypeNetwork)
-	if listTagResponse, err := c.cs.Resourcetags.ListTags(p); err != nil {
+	listTagResponse, err := c.cs.Resourcetags.ListTags(p)
+	if err != nil {
 		return nil, err
-	} else {
-		tags := make(map[string]string, listTagResponse.Count)
-		for _, t := range listTagResponse.Tags {
-			tags[t.Key] = t.Value
-		}
-		return tags, nil
 	}
+	tags := make(map[string]string, listTagResponse.Count)
+	for _, t := range listTagResponse.Tags {
+		tags[t.Key] = t.Value
+	}
+	return tags, nil
 }
 
 // DeleteNetworkTags deletes matching tags from a network
-func (c *client) DeleteNetworkTags(networkId string, tagsToDelete map[string]string) error {
-	p := c.cs.Resourcetags.NewDeleteTagsParams([]string{networkId}, resourceTypeNetwork)
+func (c *client) DeleteNetworkTags(networkID string, tagsToDelete map[string]string) error {
+	p := c.cs.Resourcetags.NewDeleteTagsParams([]string{networkID}, resourceTypeNetwork)
 	p.SetTags(tagsToDelete)
 	_, err := c.cs.Resourcetags.DeleteTags(p)
 	return err

pkg/cloud/tags_test.go

@@ -49,7 +49,7 @@ var _ = Describe("Tag Unit Tests", func() {
 		)
 
 		var (
-			networkId string
+			networkID string
 			testTags  map[string]string
 		)
 
@@ -62,25 +62,25 @@ var _ = Describe("Tag Unit Tests", func() {
 				Skip("Could not find network.")
 			}
 
-			networkId = cluster.Status.NetworkID
+			networkID = cluster.Status.NetworkID
 			testTags = map[string]string{tagKey: tagValue}
 		})
 
 		It("Tags a network with an arbitrary tag.", func() {
 			// Delete the tag if it already exists from a prior test run, otherwise the test will fail.
-			_ = client.DeleteNetworkTags(networkId, testTags)
-			Ω(client.AddNetworkTags(networkId, testTags)).Should(Succeed())
+			_ = client.DeleteNetworkTags(networkID, testTags)
+			Ω(client.AddNetworkTags(networkID, testTags)).Should(Succeed())
 		})
 
 		It("Fetches said tag.", func() {
-			tags, err := client.GetNetworkTags(networkId)
+			tags, err := client.GetNetworkTags(networkID)
 			Ω(err).Should(BeNil())
 			Ω(tags[tagKey]).Should(Equal(tagValue))
 		})
 
 		It("Deletes said tag.", func() {
-			Ω(client.DeleteNetworkTags(networkId, testTags)).Should(Succeed())
-			remainingTags, err := client.GetNetworkTags(networkId)
+			Ω(client.DeleteNetworkTags(networkID, testTags)).Should(Succeed())
+			remainingTags, err := client.GetNetworkTags(networkID)
 			Ω(err).Should(BeNil())
 			Ω(remainingTags[tagKey]).Should(Equal(""))
 		})