address review comments

kubernetes-sigs · Oct 18, 2021 · a3e1e82 · a3e1e82
1 parent fb7863e
commit a3e1e82
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/cloud/scope/cluster.go b/cloud/scope/cluster.go
@@ -195,8 +195,7 @@ func (s *ClusterScope) CreateSubnet() (*vpcv1.Subnet, error) {
 	}
 
 	options := &vpcv1.CreateSubnetOptions{}
-	var cidrBlock string
-	cidrBlock, err = s.getSubnetAddrPrefix(s.IBMVPCCluster.Status.VPC.ID, s.IBMVPCCluster.Spec.Zone)
+	cidrBlock, err := s.getSubnetAddrPrefix(s.IBMVPCCluster.Status.VPC.ID, s.IBMVPCCluster.Spec.Zone)
 	if err != nil {
 		return nil, err
 	}
@@ -227,8 +226,9 @@ func (s *ClusterScope) CreateSubnet() (*vpcv1.Subnet, error) {
 }
 
 func (s *ClusterScope) getSubnetAddrPrefix(vpcID, zone string) (string, error) {
-	options := &vpcv1.ListVPCAddressPrefixesOptions{}
-	options.VPCID = &vpcID
+	options := &vpcv1.ListVPCAddressPrefixesOptions{
+		VPCID: &vpcID,
+	}
 	addrCollection, _, err := s.IBMVPCClients.VPCService.ListVPCAddressPrefixes(options)
 
 	if err != nil {
@@ -239,7 +239,7 @@ func (s *ClusterScope) getSubnetAddrPrefix(vpcID, zone string) (string, error) {
 				return *addrPrefix.CIDR, nil
 			}
 		}
-		return "", fmt.Errorf("Error when getting subnet addr prefix for VPC %s in zone %s", vpcID, zone)
+		return "", fmt.Errorf("not found a valid CIDR for VPC %s in zone %s", vpcID, zone)
 	}
 }