From 2033e632ff7029fbbe0ef1eb4eccc4a03c4034b2 Mon Sep 17 00:00:00 2001
From: Shyam Radhakrishnan <shyam.radhakrishnan@oracle.com>
Date: Fri, 18 Aug 2023 20:35:02 +0530
Subject: [PATCH] Fix implicit aliasing nested maps (#319)

* Fix implicit aliasing issue in nested maps
---
 Makefile                                 |  2 +-
 api/v1beta1/zz_generated.deepcopy.go     | 10 ++++++----
 api/v1beta2/zz_generated.deepcopy.go     | 10 ++++++----
 cloud/scope/clients.go                   |  7 +++----
 exp/api/v1beta1/zz_generated.deepcopy.go |  1 -
 exp/api/v1beta2/zz_generated.deepcopy.go |  1 -
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 300c029f..8f0107c2 100644
--- a/Makefile
+++ b/Makefile
@@ -369,7 +369,7 @@ envsubst: $(ENVSUBST) ## Build a local copy of envsubst.
 kubectl: $(KUBECTL) ## Build a local copy of kubectl.
 
 $(CONTROLLER_GEN): ## Download controller-gen locally if necessary.
-	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) v0.10.0
+	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) v0.13.0
 
 $(CONVERSION_GEN): ## Download controller-gen locally if necessary.
 	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) k8s.io/code-generator/cmd/conversion-gen $(CONVERSION_GEN_BIN) v0.23.1
diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
index 247c3d78..ab034f8f 100644
--- a/api/v1beta1/zz_generated.deepcopy.go
+++ b/api/v1beta1/zz_generated.deepcopy.go
@@ -1,5 +1,4 @@
 //go:build !ignore_autogenerated
-// +build !ignore_autogenerated
 
 /*
 Copyright (c) 2022, Oracle and/or its affiliates.
@@ -1211,7 +1210,8 @@ func (in *OCIClusterSpec) DeepCopyInto(out *OCIClusterSpec) {
 			if val == nil {
 				(*out)[key] = nil
 			} else {
-				in, out := &val, &outVal
+				inVal := (*in)[key]
+				in, out := &inVal, &outVal
 				*out = make(map[string]string, len(*in))
 				for key, val := range *in {
 					(*out)[key] = val
@@ -1517,7 +1517,8 @@ func (in *OCIMachineSpec) DeepCopyInto(out *OCIMachineSpec) {
 			if val == nil {
 				(*out)[key] = nil
 			} else {
-				in, out := &val, &outVal
+				inVal := (*in)[key]
+				in, out := &inVal, &outVal
 				*out = make(map[string]string, len(*in))
 				for key, val := range *in {
 					(*out)[key] = val
@@ -1748,7 +1749,8 @@ func (in *OCIManagedClusterSpec) DeepCopyInto(out *OCIManagedClusterSpec) {
 			if val == nil {
 				(*out)[key] = nil
 			} else {
-				in, out := &val, &outVal
+				inVal := (*in)[key]
+				in, out := &inVal, &outVal
 				*out = make(map[string]string, len(*in))
 				for key, val := range *in {
 					(*out)[key] = val
diff --git a/api/v1beta2/zz_generated.deepcopy.go b/api/v1beta2/zz_generated.deepcopy.go
index 3d1c7f4b..7b6b6ffa 100644
--- a/api/v1beta2/zz_generated.deepcopy.go
+++ b/api/v1beta2/zz_generated.deepcopy.go
@@ -1,5 +1,4 @@
 //go:build !ignore_autogenerated
-// +build !ignore_autogenerated
 
 /*
 Copyright (c) 2022, Oracle and/or its affiliates.
@@ -1439,7 +1438,8 @@ func (in *OCIClusterSpec) DeepCopyInto(out *OCIClusterSpec) {
 			if val == nil {
 				(*out)[key] = nil
 			} else {
-				in, out := &val, &outVal
+				inVal := (*in)[key]
+				in, out := &inVal, &outVal
 				*out = make(map[string]string, len(*in))
 				for key, val := range *in {
 					(*out)[key] = val
@@ -1750,7 +1750,8 @@ func (in *OCIMachineSpec) DeepCopyInto(out *OCIMachineSpec) {
 			if val == nil {
 				(*out)[key] = nil
 			} else {
-				in, out := &val, &outVal
+				inVal := (*in)[key]
+				in, out := &inVal, &outVal
 				*out = make(map[string]string, len(*in))
 				for key, val := range *in {
 					(*out)[key] = val
@@ -1981,7 +1982,8 @@ func (in *OCIManagedClusterSpec) DeepCopyInto(out *OCIManagedClusterSpec) {
 			if val == nil {
 				(*out)[key] = nil
 			} else {
-				in, out := &val, &outVal
+				inVal := (*in)[key]
+				in, out := &inVal, &outVal
 				*out = make(map[string]string, len(*in))
 				for key, val := range *in {
 					(*out)[key] = val
diff --git a/cloud/scope/clients.go b/cloud/scope/clients.go
index 230dfab0..a813ac2d 100644
--- a/cloud/scope/clients.go
+++ b/cloud/scope/clients.go
@@ -17,7 +17,6 @@ limitations under the License.
 package scope
 
 import (
-	"crypto/tls"
 	"crypto/x509"
 	"net/http"
 	"sync"
@@ -416,9 +415,9 @@ func (c *ClientProvider) setCerts(client *http.Client) error {
 	if tr.TLSClientConfig != nil {
 		tr.TLSClientConfig.RootCAs = c.certOverride
 	} else {
-		tr.TLSClientConfig = &tls.Config{
-			RootCAs: c.certOverride,
-		}
+		// If TLS client config is not set, we should error out. else the default values will
+		// be used which will be insecure
+		return errors.New("TLSClientConfig is not set on the client")
 	}
 	client.Transport = tr
 
diff --git a/exp/api/v1beta1/zz_generated.deepcopy.go b/exp/api/v1beta1/zz_generated.deepcopy.go
index d5951691..f3a13817 100644
--- a/exp/api/v1beta1/zz_generated.deepcopy.go
+++ b/exp/api/v1beta1/zz_generated.deepcopy.go
@@ -1,5 +1,4 @@
 //go:build !ignore_autogenerated
-// +build !ignore_autogenerated
 
 /*
 Copyright (c) 2022, Oracle and/or its affiliates.
diff --git a/exp/api/v1beta2/zz_generated.deepcopy.go b/exp/api/v1beta2/zz_generated.deepcopy.go
index ab5d8c5d..4a528edc 100644
--- a/exp/api/v1beta2/zz_generated.deepcopy.go
+++ b/exp/api/v1beta2/zz_generated.deepcopy.go
@@ -1,5 +1,4 @@
 //go:build !ignore_autogenerated
-// +build !ignore_autogenerated
 
 /*
 Copyright (c) 2022, Oracle and/or its affiliates.