Merge pull request #683 from rabbitmq/builder

Use embedded field in ResourceBuilder structs
rabbitmq · May 10, 2021 · d04724e · d04724e
2 parents 61e9619 + f3ba234
commit d04724e
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 77 deletions.
diff --git a/internal/resource/configmap.go b/internal/resource/configmap.go
@@ -19,11 +19,9 @@ import (
 
 	"gopkg.in/ini.v1"
 
-	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
 	"github.com/rabbitmq/cluster-operator/internal/metadata"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 )
 
 const (
@@ -57,15 +55,11 @@ prometheus.ssl.port      = 15691
 )
 
 type ServerConfigMapBuilder struct {
-	Instance *rabbitmqv1beta1.RabbitmqCluster
-	Scheme   *runtime.Scheme
+	*RabbitmqResourceBuilder
 }
 
 func (builder *RabbitmqResourceBuilder) ServerConfigMap() *ServerConfigMapBuilder {
-	return &ServerConfigMapBuilder{
-		Instance: builder.Instance,
-		Scheme:   builder.Scheme,
-	}
+	return &ServerConfigMapBuilder{builder}
 }
 
 func (builder *ServerConfigMapBuilder) Build() (client.Object, error) {

diff --git a/internal/resource/default_user_secret.go b/internal/resource/default_user_secret.go
@@ -12,16 +12,15 @@ package resource
 import (
 	"bytes"
 	"fmt"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
 	"github.com/rabbitmq/cluster-operator/internal/metadata"
 	"gopkg.in/ini.v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 )
 
 const (
@@ -31,15 +30,11 @@ const (
 )
 
 type DefaultUserSecretBuilder struct {
-	Instance *rabbitmqv1beta1.RabbitmqCluster
-	Scheme   *runtime.Scheme
+	*RabbitmqResourceBuilder
 }
 
 func (builder *RabbitmqResourceBuilder) DefaultUserSecret() *DefaultUserSecretBuilder {
-	return &DefaultUserSecretBuilder{
-		Instance: builder.Instance,
-		Scheme:   builder.Scheme,
-	}
+	return &DefaultUserSecretBuilder{builder}
 }
 
 func (builder *DefaultUserSecretBuilder) Build() (client.Object, error) {

diff --git a/internal/resource/erlang_cookie.go b/internal/resource/erlang_cookie.go
@@ -13,30 +13,25 @@ import (
 	"crypto/rand"
 	"encoding/base64"
 	"fmt"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
 	"github.com/rabbitmq/cluster-operator/internal/metadata"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 )
 
 const (
 	erlangCookieName = "erlang-cookie"
 )
 
 type ErlangCookieBuilder struct {
-	Instance *rabbitmqv1beta1.RabbitmqCluster
-	Scheme   *runtime.Scheme
+	*RabbitmqResourceBuilder
 }
 
 func (builder *RabbitmqResourceBuilder) ErlangCookie() *ErlangCookieBuilder {
-	return &ErlangCookieBuilder{
-		Instance: builder.Instance,
-		Scheme:   builder.Scheme,
-	}
+	return &ErlangCookieBuilder{builder}
 }
 
 func (builder *ErlangCookieBuilder) Build() (client.Object, error) {

diff --git a/internal/resource/headless_service.go b/internal/resource/headless_service.go
@@ -11,13 +11,12 @@ package resource
 
 import (
 	"fmt"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
 	"github.com/rabbitmq/cluster-operator/internal/metadata"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
@@ -27,15 +26,11 @@ const (
 )
 
 type HeadlessServiceBuilder struct {
-	Instance *rabbitmqv1beta1.RabbitmqCluster
-	Scheme   *runtime.Scheme
+	*RabbitmqResourceBuilder
 }
 
 func (builder *RabbitmqResourceBuilder) HeadlessService() *HeadlessServiceBuilder {
-	return &HeadlessServiceBuilder{
-		Instance: builder.Instance,
-		Scheme:   builder.Scheme,
-	}
+	return &HeadlessServiceBuilder{builder}
 }
 
 func (builder *HeadlessServiceBuilder) UpdateMayRequireStsRecreate() bool {

diff --git a/internal/resource/rabbitmq_plugins.go b/internal/resource/rabbitmq_plugins.go
@@ -2,16 +2,16 @@ package resource
 
 import (
 	"fmt"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"strings"
 
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
 	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
 	"github.com/rabbitmq/cluster-operator/internal/metadata"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 )
 
 var requiredPlugins = []string{
@@ -23,15 +23,11 @@ var requiredPlugins = []string{
 const PluginsConfigName = "plugins-conf"
 
 type RabbitmqPluginsConfigMapBuilder struct {
-	Instance *rabbitmqv1beta1.RabbitmqCluster
-	Scheme   *runtime.Scheme
+	*RabbitmqResourceBuilder
 }
 
 func (builder *RabbitmqResourceBuilder) RabbitmqPluginsConfigMap() *RabbitmqPluginsConfigMapBuilder {
-	return &RabbitmqPluginsConfigMapBuilder{
-		Instance: builder.Instance,
-		Scheme:   builder.Scheme,
-	}
+	return &RabbitmqPluginsConfigMapBuilder{builder}
 }
 
 func (builder *RabbitmqPluginsConfigMapBuilder) Build() (client.Object, error) {

diff --git a/internal/resource/role.go b/internal/resource/role.go
@@ -11,13 +11,12 @@ package resource
 
 import (
 	"fmt"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
 	"github.com/rabbitmq/cluster-operator/internal/metadata"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
 
@@ -26,15 +25,11 @@ const (
 )
 
 type RoleBuilder struct {
-	Instance *rabbitmqv1beta1.RabbitmqCluster
-	Scheme   *runtime.Scheme
+	*RabbitmqResourceBuilder
 }
 
 func (builder *RabbitmqResourceBuilder) Role() *RoleBuilder {
-	return &RoleBuilder{
-		Instance: builder.Instance,
-		Scheme:   builder.Scheme,
-	}
+	return &RoleBuilder{builder}
 }
 
 func (builder *RoleBuilder) Build() (client.Object, error) {

diff --git a/internal/resource/role_binding.go b/internal/resource/role_binding.go
@@ -11,13 +11,12 @@ package resource
 
 import (
 	"fmt"
+
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
 	"github.com/rabbitmq/cluster-operator/internal/metadata"
 )
 
@@ -26,15 +25,11 @@ const (
 )
 
 type RoleBindingBuilder struct {
-	Instance *rabbitmqv1beta1.RabbitmqCluster
-	Scheme   *runtime.Scheme
+	*RabbitmqResourceBuilder
 }
 
 func (builder *RabbitmqResourceBuilder) RoleBinding() *RoleBindingBuilder {
-	return &RoleBindingBuilder{
-		Instance: builder.Instance,
-		Scheme:   builder.Scheme,
-	}
+	return &RoleBindingBuilder{builder}
 }
 
 func (builder *RoleBindingBuilder) UpdateMayRequireStsRecreate() bool {

diff --git a/internal/resource/service.go b/internal/resource/service.go
@@ -22,7 +22,6 @@ import (
 	"github.com/rabbitmq/cluster-operator/internal/metadata"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
 
@@ -31,15 +30,11 @@ const (
 )
 
 type ServiceBuilder struct {
-	Instance *rabbitmqv1beta1.RabbitmqCluster
-	Scheme   *runtime.Scheme
+	*RabbitmqResourceBuilder
 }
 
 func (builder *RabbitmqResourceBuilder) Service() *ServiceBuilder {
-	return &ServiceBuilder{
-		Instance: builder.Instance,
-		Scheme:   builder.Scheme,
-	}
+	return &ServiceBuilder{builder}
 }
 
 func (builder *ServiceBuilder) Build() (client.Object, error) {

diff --git a/internal/resource/service_account.go b/internal/resource/service_account.go
@@ -11,13 +11,12 @@ package resource
 
 import (
 	"fmt"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
 	"github.com/rabbitmq/cluster-operator/internal/metadata"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
 
@@ -26,15 +25,11 @@ const (
 )
 
 type ServiceAccountBuilder struct {
-	Instance *rabbitmqv1beta1.RabbitmqCluster
-	Scheme   *runtime.Scheme
+	*RabbitmqResourceBuilder
 }
 
 func (builder *RabbitmqResourceBuilder) ServiceAccount() *ServiceAccountBuilder {
-	return &ServiceAccountBuilder{
-		Instance: builder.Instance,
-		Scheme:   builder.Scheme,
-	}
+	return &ServiceAccountBuilder{builder}
 }
 
 func (builder *ServiceAccountBuilder) Build() (client.Object, error) {

diff --git a/internal/resource/statefulset.go b/internal/resource/statefulset.go
@@ -38,15 +38,11 @@ const (
 )
 
 type StatefulSetBuilder struct {
-	Instance *rabbitmqv1beta1.RabbitmqCluster
-	Scheme   *runtime.Scheme
+	*RabbitmqResourceBuilder
 }
 
 func (builder *RabbitmqResourceBuilder) StatefulSet() *StatefulSetBuilder {
-	return &StatefulSetBuilder{
-		Instance: builder.Instance,
-		Scheme:   builder.Scheme,
-	}
+	return &StatefulSetBuilder{builder}
 }
 
 func (builder *StatefulSetBuilder) Build() (client.Object, error) {