cleanup: remove BoolTrue and BoolFalse variable

hyperledger-labs · Nov 4, 2022 · cce5221 · cce5221
1 parent 4af1358
commit cce5221
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 41 deletions.
diff --git a/api/v1beta1/common_struct.go b/api/v1beta1/common_struct.go
@@ -22,9 +22,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 )
 
-var BoolTrue = true
-var BoolFalse = false
-
 // Service is the overrides to be used for Service of the component
 // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
 type Service struct {

diff --git a/api/v1beta1/ibporderer.go b/api/v1beta1/ibporderer.go
@@ -236,27 +236,11 @@ func (s *IBPOrdererSpec) DomainSet() bool {
 }
 
 func (s *IBPOrdererSpec) IsPrecreateOrderer() bool {
-	if s.IsPrecreate == nil {
-		return false
-	}
-
-	if *s.IsPrecreate == BoolTrue {
-		return true
-	}
-
-	return false
+	return s.IsPrecreate != nil && *s.IsPrecreate
 }
 
 func (s *IBPOrdererSpec) IsUsingChannelLess() bool {
-	if s.UseChannelLess == nil {
-		return false
-	}
-
-	if *s.UseChannelLess == BoolTrue {
-		return true
-	}
-
-	return false
+	return s.UseChannelLess != nil && *s.UseChannelLess
 }
 
 func (s *IBPOrdererSpec) GetNumSecondsWarningPeriod() int64 {

diff --git a/controllers/ibporderer/ibporderer_controller_test.go b/controllers/ibporderer/ibporderer_controller_test.go
@@ -28,6 +28,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"k8s.io/utils/pointer"
 
 	current "github.com/IBM-Blockchain/fabric-operator/api/v1beta1"
 	orderermocks "github.com/IBM-Blockchain/fabric-operator/controllers/ibporderer/mocks"
@@ -640,7 +641,7 @@ var _ = Describe("ReconcileIBPOrderer", func() {
 						Name: instance.Name,
 					},
 				}
-				newOrderer.Spec.DisableNodeOU = &current.BoolTrue
+				newOrderer.Spec.DisableNodeOU = pointer.Bool(true)
 
 				e = event.UpdateEvent{
 					ObjectOld: oldOrderer,

diff --git a/controllers/ibppeer/ibppeer_controller_test.go b/controllers/ibppeer/ibppeer_controller_test.go
@@ -26,6 +26,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"k8s.io/utils/pointer"
 
 	current "github.com/IBM-Blockchain/fabric-operator/api/v1beta1"
 	peermocks "github.com/IBM-Blockchain/fabric-operator/controllers/ibppeer/mocks"
@@ -41,7 +42,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	yaml "sigs.k8s.io/yaml"
+	"sigs.k8s.io/yaml"
 )
 
 var _ = Describe("ReconcileIBPPeer", func() {
@@ -606,7 +607,7 @@ var _ = Describe("ReconcileIBPPeer", func() {
 						Name: instance.Name,
 					},
 				}
-				newPeer.Spec.DisableNodeOU = &current.BoolTrue
+				newPeer.Spec.DisableNodeOU = pointer.Bool(true)
 
 				e = event.UpdateEvent{
 					ObjectOld: oldPeer,

diff --git a/go.mod b/go.mod
@@ -28,6 +28,7 @@ require (
 	k8s.io/apimachinery v0.21.5
 	k8s.io/client-go v0.21.5
 	k8s.io/code-generator v0.21.5
+	k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
 	sigs.k8s.io/controller-runtime v0.9.0
 	sigs.k8s.io/yaml v1.2.0
 )
@@ -138,7 +139,6 @@ require (
 	k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect
 	k8s.io/klog/v2 v2.8.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
-	k8s.io/utils v0.0.0-20210527160623-6fdb442a123b // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
 )
 

diff --git a/integration/e2ev2/orderer_test.go b/integration/e2ev2/orderer_test.go
@@ -28,6 +28,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	current "github.com/IBM-Blockchain/fabric-operator/api/v1beta1"
@@ -302,7 +303,7 @@ var _ = Describe("orderer", func() {
 				result.Into(ibporderer)
 
 				// Disable node ou
-				ibporderer.Spec.DisableNodeOU = &current.BoolTrue
+				ibporderer.Spec.DisableNodeOU = pointer.Bool(true)
 				bytes, err := json.Marshal(ibporderer)
 				Expect(err).NotTo(HaveOccurred())
 

diff --git a/integration/e2ev2/peer_test.go b/integration/e2ev2/peer_test.go
@@ -25,6 +25,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"k8s.io/utils/pointer"
 
 	current "github.com/IBM-Blockchain/fabric-operator/api/v1beta1"
 	"github.com/IBM-Blockchain/fabric-operator/pkg/apis/common"
@@ -154,7 +155,7 @@ var _ = Describe("peer", func() {
 			result.Into(peer)
 
 			// Disable node ou
-			peer.Spec.DisableNodeOU = &current.BoolTrue
+			peer.Spec.DisableNodeOU = pointer.Bool(true)
 			bytes, err = json.Marshal(peer)
 			Expect(err).NotTo(HaveOccurred())
 		})

diff --git a/integration/init/orderer_test.go b/integration/init/orderer_test.go
@@ -32,6 +32,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/pointer"
 )
 
 const (
@@ -86,7 +87,7 @@ var _ = Describe("Orderer init", func() {
 							TLS:       msp,
 						},
 					},
-					DisableNodeOU: &current.BoolTrue,
+					DisableNodeOU: pointer.Bool(true),
 				},
 			}
 			instance.Namespace = namespace
@@ -211,7 +212,7 @@ var _ = Describe("Orderer init", func() {
 							TLS:       enrollment,
 						},
 					},
-					DisableNodeOU: &current.BoolTrue,
+					DisableNodeOU: pointer.Bool(true),
 				},
 			}
 			instance.Namespace = namespace

diff --git a/integration/init/peer_test.go b/integration/init/peer_test.go
@@ -26,7 +26,7 @@ import (
 	"path/filepath"
 
 	current "github.com/IBM-Blockchain/fabric-operator/api/v1beta1"
-	operatorconfig "github.com/IBM-Blockchain/fabric-operator/operatorconfig"
+	"github.com/IBM-Blockchain/fabric-operator/operatorconfig"
 	"github.com/IBM-Blockchain/fabric-operator/pkg/initializer/common/enroller"
 	initializer "github.com/IBM-Blockchain/fabric-operator/pkg/initializer/peer"
 	peerinit "github.com/IBM-Blockchain/fabric-operator/pkg/initializer/peer"
@@ -37,6 +37,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/pointer"
 )
 
 const (
@@ -98,7 +99,7 @@ var _ = Describe("Peer init", func() {
 							TLS:       msp,
 						},
 					},
-					DisableNodeOU: &current.BoolTrue,
+					DisableNodeOU: pointer.Bool(true),
 				},
 			}
 			instance.Namespace = namespace
@@ -220,7 +221,7 @@ var _ = Describe("Peer init", func() {
 							TLS:       enrollment,
 						},
 					},
-					DisableNodeOU: &current.BoolTrue,
+					DisableNodeOU: pointer.Bool(true),
 				},
 			}
 			instance.Namespace = namespace

diff --git a/integration/orderer/orderer_test.go b/integration/orderer/orderer_test.go
@@ -27,6 +27,7 @@ import (
 	"fmt"
 	"time"
 
+	"k8s.io/utils/pointer"
 	"sigs.k8s.io/yaml"
 
 	current "github.com/IBM-Blockchain/fabric-operator/api/v1beta1"
@@ -939,7 +940,7 @@ func GetOrderer() (*Orderer, []Orderer) {
 				},
 			},
 			ConfigOverride: &runtime.RawExtension{Raw: configBytes},
-			DisableNodeOU:  &current.BoolTrue,
+			DisableNodeOU:  pointer.Bool(true),
 			FabricVersion:  integration.FabricVersion + "-1",
 		},
 	}
@@ -1022,7 +1023,7 @@ func GetOrderer2() (*Orderer, []Orderer) {
 					Limits:   defaultLimitsProxy,
 				},
 			},
-			DisableNodeOU: &current.BoolTrue,
+			DisableNodeOU: pointer.Bool(true),
 			FabricVersion: integration.FabricVersion + "-1",
 		},
 	}
@@ -1117,7 +1118,7 @@ func GetOrderer3() (*Orderer, []Orderer) {
 					Region: "us-south2",
 				},
 			},
-			DisableNodeOU: &current.BoolTrue,
+			DisableNodeOU: pointer.Bool(true),
 			FabricVersion: integration.FabricVersion + "-1",
 		},
 	}
@@ -1200,7 +1201,7 @@ func GetOrderer4() (*Orderer, []Orderer) {
 					Limits:   defaultLimitsProxy,
 				},
 			},
-			DisableNodeOU: &current.BoolTrue,
+			DisableNodeOU: pointer.Bool(true),
 			FabricVersion: integration.FabricVersion + "-1",
 		},
 	}
@@ -1268,7 +1269,7 @@ func GetOrderer5() (*Orderer, []Orderer) {
 			},
 			OrdererType:       "etcdraft",
 			SystemChannelName: "testchainid",
-			UseChannelLess:    &current.BoolTrue,
+			UseChannelLess:    pointer.Bool(true),
 			OrgName:           "orderermsp",
 			MSPID:             "orderermsp",
 			ImagePullSecrets:  []string{"regcred"},
@@ -1297,7 +1298,7 @@ func GetOrderer5() (*Orderer, []Orderer) {
 					Limits:   defaultLimitsProxy,
 				},
 			},
-			DisableNodeOU: &current.BoolTrue,
+			DisableNodeOU: pointer.Bool(true),
 			FabricVersion: integration.FabricVersion24 + "-1",
 		},
 	}

diff --git a/integration/peer/peer_test.go b/integration/peer/peer_test.go
@@ -43,6 +43,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/utils/pointer"
 	"sigs.k8s.io/yaml"
 )
 
@@ -813,7 +814,7 @@ func GetPeer1() *Peer {
 				MSP: testMSPSpec,
 			},
 			ConfigOverride: &runtime.RawExtension{Raw: configBytes},
-			DisableNodeOU:  &current.BoolTrue,
+			DisableNodeOU:  pointer.Bool(true),
 			FabricVersion:  integration.FabricVersion + "-1",
 		},
 	}
@@ -867,7 +868,7 @@ func GetPeer2() *Peer {
 			Secret: &current.SecretSpec{
 				MSP: testMSPSpec,
 			},
-			DisableNodeOU: &current.BoolTrue,
+			DisableNodeOU: pointer.Bool(true),
 			FabricVersion: integration.FabricVersion + "-1",
 		},
 	}

diff --git a/pkg/offering/base/orderer/orderer.go b/pkg/offering/base/orderer/orderer.go
@@ -55,6 +55,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -461,7 +462,7 @@ func (o *Orderer) CreateNodeCR(instance *current.IBPOrderer, number int) error {
 	if instance.Spec.IsUsingChannelLess() {
 		node.Spec.UseChannelLess = instance.Spec.UseChannelLess
 	} else {
-		node.Spec.IsPrecreate = &current.BoolTrue
+		node.Spec.IsPrecreate = pointer.Bool(true)
 	}
 	node.Spec.NodeNumber = &number
 	node.Spec.ClusterSize = 1