Fix implicit aliasing and other errors (#258)

Author: shyamradhakrishnan

api/v1beta1/conversion.go

@@ -24,7 +24,10 @@ import (
 
 // Convert_v1beta1_VCN_To_v1beta2_VCN converts v1beta1 VCN to v1beta2 VCN
 func Convert_v1beta1_VCN_To_v1beta2_VCN(in *VCN, out *v1beta2.VCN, s conversion.Scope) error {
-	autoConvert_v1beta1_VCN_To_v1beta2_VCN(in, out, s)
+	err := autoConvert_v1beta1_VCN_To_v1beta2_VCN(in, out, s)
+	if err != nil {
+		return err
+	}
 	if in.InternetGatewayId != nil {
 		out.InternetGateway.Id = in.InternetGatewayId
 	}
@@ -52,7 +55,10 @@ func Convert_v1beta1_VCN_To_v1beta2_VCN(in *VCN, out *v1beta2.VCN, s conversion.
 
 // Convert_v1beta2_VCN_To_v1beta1_VCN converts v1beta2 VCN to v1beta1 VCN
 func Convert_v1beta2_VCN_To_v1beta1_VCN(in *v1beta2.VCN, out *VCN, s conversion.Scope) error {
-	autoConvert_v1beta2_VCN_To_v1beta1_VCN(in, out, s)
+	err := autoConvert_v1beta2_VCN_To_v1beta1_VCN(in, out, s)
+	if err != nil {
+		return err
+	}
 	if in.InternetGateway.Id != nil {
 		out.InternetGatewayId = in.InternetGateway.Id
 	}

api/v1beta1/ocicluster_conversion.go

@@ -86,9 +86,10 @@ func convertv1beta2NSGListTov1beta1NSGList(in []*v1beta2.NSG) ([]*NSG, error) {
 
 func Convertv1beta1AdMapTov1beta2AdMap(in map[string]OCIAvailabilityDomain) (map[string]v1beta2.OCIAvailabilityDomain, error) {
 	out := make(map[string]v1beta2.OCIAvailabilityDomain)
-	for k, v := range in {
+	for k, _ := range in {
 		outV := &v1beta2.OCIAvailabilityDomain{}
-		err := Convert_v1beta1_OCIAvailabilityDomain_To_v1beta2_OCIAvailabilityDomain(&v, outV, nil)
+		inDomain := in[k]
+		err := Convert_v1beta1_OCIAvailabilityDomain_To_v1beta2_OCIAvailabilityDomain(&inDomain, outV, nil)
 		if err != nil {
 			return nil, err
 		}
@@ -99,9 +100,10 @@ func Convertv1beta1AdMapTov1beta2AdMap(in map[string]OCIAvailabilityDomain) (map
 
 func Convertv1beta2AdMapTov1beta1AdMap(in map[string]v1beta2.OCIAvailabilityDomain) (map[string]OCIAvailabilityDomain, error) {
 	out := make(map[string]OCIAvailabilityDomain)
-	for k, v := range in {
+	for k, _ := range in {
 		outV := &OCIAvailabilityDomain{}
-		err := Convert_v1beta2_OCIAvailabilityDomain_To_v1beta1_OCIAvailabilityDomain(&v, outV, nil)
+		inDomain := in[k]
+		err := Convert_v1beta2_OCIAvailabilityDomain_To_v1beta1_OCIAvailabilityDomain(&inDomain, outV, nil)
 		if err != nil {
 			return nil, err
 		}

cloud/config/config.go

@@ -18,6 +18,7 @@ package config
 
 import (
 	"os"
+	"path/filepath"
 	"strconv"
 
 	"github.com/oracle/oci-go-sdk/v65/common"
@@ -64,7 +65,7 @@ func FromDir(path string) (*AuthConfig, error) {
 
 func getConfigFromFile(path string) (authConfig *AuthConfig, err error) {
 	var f *os.File
-	f, err = os.Open(path)
+	f, err = os.Open(filepath.Clean(path))
 	if err != nil {
 		return nil, err
 	}
@@ -168,7 +169,8 @@ func NewConfigurationProviderWithUserPrincipal(cfg *AuthConfig) (common.Configur
 }
 
 func ReadFile(path string, key string) (string, error) {
-	b, err := os.ReadFile(path + "/" + key)
+	filePath := filepath.Join(path, key)
+	b, err := os.ReadFile(filepath.Clean(filePath))
 	if err != nil {
 		return "", err
 	}

cloud/scope/clients_mock.go

@@ -97,7 +97,7 @@ func MockAuthConfig() (config.AuthConfig, error) {
 }
 
 func generatePrivateKeyPEM() (string, error) {
-	privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
+	privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
 	if err != nil {
 		return "", err
 	}

cloud/scope/machine.go

@@ -18,12 +18,12 @@ package scope
 
 import (
 	"context"
+	"crypto/rand"
 	"encoding/base64"
 	"fmt"
-	"math/rand"
+	"math/big"
 	"net/url"
 	"strconv"
-	"time"
 
 	"github.com/go-logr/logr"
 	infrastructurev1beta2 "github.com/oracle/cluster-api-provider-oci/api/v1beta2"
@@ -195,10 +195,13 @@ func (m *MachineScope) GetOrCreateMachine(ctx context.Context) (*core.Instance,
 	failureDomain := m.Machine.Spec.FailureDomain
 	if failureDomain == nil {
 		m.Logger.Info("Failure Domain is not set in the machine spec, setting it to a random value from 1 to 3")
-		rand.Seed(time.Now().UnixNano())
-		// rand.Intn(3) will produce a random number from 0(inclusive) to 3(exclusive)
-		// ee add one to get a number from 1 to 3
-		failureDomain = common.String(strconv.Itoa(rand.Intn(3) + 1))
+		randomFaultDomain, err := rand.Int(rand.Reader, big.NewInt(3))
+		if err != nil {
+			m.Logger.Error(err, "Failed to generate random fault domain")
+			return nil, err
+		}
+		// the random number generated is between zero and two, whereas we need a number between one and three
+		failureDomain = common.String(strconv.Itoa(int(randomFaultDomain.Int64()) + 1))
 	}
 	failureDomainIndex, err := strconv.Atoi(*failureDomain)
 	if err != nil {

cloud/scope/machine_pool.go

@@ -530,9 +530,9 @@ func (m *MachinePoolScope) FindInstancePool(ctx context.Context) (*core.Instance
 	}
 
 	var instancePoolSummary *core.InstancePoolSummary
-	for _, i := range instancePoolSummaries {
-		if m.IsResourceCreatedByClusterAPI(i.FreeformTags) {
-			instancePoolSummary = &i
+	for i, summary := range instancePoolSummaries {
+		if m.IsResourceCreatedByClusterAPI(summary.FreeformTags) {
+			instancePoolSummary = &instancePoolSummaries[i]
 			break
 		}
 	}