Skip to content

Commit

Permalink
Merge pull request #113 from gibizer/full-golangci-lint
Browse files Browse the repository at this point in the history 
Ensure golangci-lint runs on all files
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Apr 23, 2024
2 parents 066b5ce + a25fcfc commit 62edc96
Show file tree
Hide file tree
Showing 15 changed files with 47 additions and 254 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@ repos:
- repo: https://github.com/golangci/golangci-lint
rev: v1.55.2
hooks:
- id: golangci-lint
- id: golangci-lint-full
args: ["-v"]
11 changes: 5 additions & 6 deletions controllers/barbican_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ import (
"github.com/openstack-k8s-operators/lib-common/modules/common/labels"
nad "github.com/openstack-k8s-operators/lib-common/modules/common/networkattachment"
common_rbac "github.com/openstack-k8s-operators/lib-common/modules/common/rbac"
"github.com/openstack-k8s-operators/lib-common/modules/common/secret"
oko_secret "github.com/openstack-k8s-operators/lib-common/modules/common/secret"
"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
"github.com/openstack-k8s-operators/lib-common/modules/common/util"
Expand Down Expand Up @@ -243,7 +242,7 @@ func (r *BarbicanReconciler) reconcileNormal(ctx context.Context, instance *barb
//
// check for required OpenStack secret holding passwords for service/admin user and add hash to the vars map
//
ospSecret, hash, err := secret.GetSecret(ctx, helper, instance.Spec.Secret, instance.Namespace)
ospSecret, hash, err := oko_secret.GetSecret(ctx, helper, instance.Spec.Secret, instance.Namespace)
if err != nil {
if k8s_errors.IsNotFound(err) {
instance.Status.Conditions.Set(condition.FalseCondition(
Expand All @@ -265,15 +264,15 @@ func (r *BarbicanReconciler) reconcileNormal(ctx context.Context, instance *barb
configVars["secret-"+ospSecret.Name] = env.SetValue(hash)

// check for Simple Crypto Backend secret holding the KEK
kekSecret, hash, err := secret.GetSecret(ctx, helper, instance.Spec.SimpleCryptoBackendSecret, instance.Namespace)
kekSecret, hash, err := oko_secret.GetSecret(ctx, helper, instance.Spec.SimpleCryptoBackendSecret, instance.Namespace)
if err != nil {
if k8s_errors.IsNotFound(err) {
instance.Status.Conditions.Set(condition.FalseCondition(
condition.InputReadyCondition,
condition.RequestedReason,
condition.SeverityInfo,
condition.InputReadyWaitingMessage))
return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, fmt.Errorf("Simple Crypto backend secret %s not found", instance.Spec.SimpleCryptoBackendSecret)
return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, fmt.Errorf("simple Crypto backend secret %s not found", instance.Spec.SimpleCryptoBackendSecret)
}
instance.Status.Conditions.Set(condition.FalseCondition(
condition.InputReadyCondition,
Expand Down Expand Up @@ -588,12 +587,12 @@ func (r *BarbicanReconciler) generateServiceConfig(
// create Secret required for barbican input
labels := labels.GetLabels(instance, labels.GetGroupLabel(barbican.ServiceName), serviceLabels)

ospSecret, _, err := secret.GetSecret(ctx, h, instance.Spec.Secret, instance.Namespace)
ospSecret, _, err := oko_secret.GetSecret(ctx, h, instance.Spec.Secret, instance.Namespace)
if err != nil {
return err
}

transportURLSecret, _, err := secret.GetSecret(ctx, h, instance.Status.TransportURLSecret, instance.Namespace)
transportURLSecret, _, err := oko_secret.GetSecret(ctx, h, instance.Status.TransportURLSecret, instance.Namespace)
if err != nil {
return err
}
Expand Down
14 changes: 7 additions & 7 deletions controllers/barbicanapi_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ func (r *BarbicanAPIReconciler) getSecret(
condition.RequestedReason,
condition.SeverityInfo,
condition.InputReadyWaitingMessage))
return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, fmt.Errorf("Secret %s not found", secretName)
return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, fmt.Errorf("secret %s not found", secretName)
}
instance.Status.Conditions.Set(condition.FalseCondition(
condition.InputReadyCondition,
Expand Down Expand Up @@ -507,7 +507,7 @@ func (r *BarbicanAPIReconciler) reconcileInit(
return ctrl.Result{}, nil
}

func (r *BarbicanAPIReconciler) reconcileUpdate(ctx context.Context, instance *barbicanv1beta1.BarbicanAPI, helper *helper.Helper) (ctrl.Result, error) {
func (r *BarbicanAPIReconciler) reconcileUpdate(ctx context.Context, instance *barbicanv1beta1.BarbicanAPI) (ctrl.Result, error) {
Log := r.GetLogger(ctx)

Log.Info(fmt.Sprintf("Reconciling Service '%s' update", instance.Name))
Expand All @@ -519,7 +519,7 @@ func (r *BarbicanAPIReconciler) reconcileUpdate(ctx context.Context, instance *b
return ctrl.Result{}, nil
}

func (r *BarbicanAPIReconciler) reconcileUpgrade(ctx context.Context, instance *barbicanv1beta1.BarbicanAPI, helper *helper.Helper) (ctrl.Result, error) {
func (r *BarbicanAPIReconciler) reconcileUpgrade(ctx context.Context, instance *barbicanv1beta1.BarbicanAPI) (ctrl.Result, error) {
Log := r.GetLogger(ctx)

Log.Info(fmt.Sprintf("Reconciling Service '%s' upgrade", instance.Name))
Expand Down Expand Up @@ -703,15 +703,15 @@ func (r *BarbicanAPIReconciler) reconcileNormal(ctx context.Context, instance *b
}

// Handle service update
ctrlResult, err = r.reconcileUpdate(ctx, instance, helper)
ctrlResult, err = r.reconcileUpdate(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}

// Handle service upgrade
ctrlResult, err = r.reconcileUpgrade(ctx, instance, helper)
ctrlResult, err = r.reconcileUpgrade(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
Expand Down Expand Up @@ -878,15 +878,15 @@ func (r *BarbicanAPIReconciler) SetupWithManager(mgr ctrl.Manager) error {
func (r *BarbicanAPIReconciler) findObjectsForSrc(ctx context.Context, src client.Object) []reconcile.Request {
requests := []reconcile.Request{}

l := log.FromContext(context.Background()).WithName("Controllers").WithName("BarbicanAPI")
l := log.FromContext(ctx).WithName("Controllers").WithName("BarbicanAPI")

for _, field := range apinWatchFields {
crList := &barbicanv1beta1.BarbicanAPIList{}
listOps := &client.ListOptions{
FieldSelector: fields.OneTermEqualSelector(field, src.GetName()),
Namespace: src.GetNamespace(),
}
err := r.List(context.TODO(), crList, listOps)
err := r.List(ctx, crList, listOps)
if err != nil {
return []reconcile.Request{}
}
Expand Down
112 changes: 8 additions & 104 deletions controllers/barbicankeystonelistener_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func (r *BarbicanKeystoneListenerReconciler) getSecret(
condition.RequestedReason,
condition.SeverityInfo,
condition.InputReadyWaitingMessage))
return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, fmt.Errorf("Secret %s not found", secretName)
return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, fmt.Errorf("secret %s not found", secretName)
}
instance.Status.Conditions.Set(condition.FalseCondition(
condition.InputReadyCondition,
Expand Down Expand Up @@ -300,111 +300,15 @@ func (r *BarbicanKeystoneListenerReconciler) generateServiceConfigs(
func (r *BarbicanKeystoneListenerReconciler) reconcileInit(
ctx context.Context,
instance *barbicanv1beta1.BarbicanKeystoneListener,
helper *helper.Helper,
serviceLabels map[string]string,
) (ctrl.Result, error) {
Log := r.GetLogger(ctx)
Log.Info(fmt.Sprintf("[KeystoneListener] Reconciling Service '%s' init", instance.Name))

//
// expose the service (create service, route and return the created endpoint URLs)
//
//ports := map[endpoint.Endpoint]endpoint.Data{}
//ports[endpoint.EndpointInternal] = endpoint.Data{
// Port: barbican.BarbicanInternalPort,
//}
//ports[endpoint.EndpointPublic] = endpoint.Data{
// Port: barbican.BarbicanPublicPort,
//}

/*
for _, metallbcfg := range instance.Spec.ExternalEndpoints {
portCfg := ports[metallbcfg.Endpoint]
portCfg.MetalLB = &endpoint.MetalLBData{
IPAddressPool: metallbcfg.IPAddressPool,
SharedIP: metallbcfg.SharedIP,
SharedIPKey: metallbcfg.SharedIPKey,
LoadBalancerIPs: metallbcfg.LoadBalancerIPs,
}
ports[metallbcfg.Endpoint] = portCfg
}
apiEndpoints, ctrlResult, err := endpoint.ExposeEndpoints(
ctx,
helper,
barbican.ServiceName,
serviceLabels,
ports,
time.Duration(5)*time.Second,
)
if err != nil {
instance.Status.Conditions.Set(condition.FalseCondition(
condition.ExposeServiceReadyCondition,
condition.ErrorReason,
condition.SeverityWarning,
condition.ExposeServiceReadyErrorMessage,
err.Error()))
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
instance.Status.Conditions.Set(condition.FalseCondition(
condition.ExposeServiceReadyCondition,
condition.RequestedReason,
condition.SeverityInfo,
condition.ExposeServiceReadyRunningMessage))
return ctrlResult, nil
}
*/
//instance.Status.Conditions.MarkTrue(condition.ExposeServiceReadyCondition, condition.ExposeServiceReadyMessage)

//
// Update instance status with service endpoint url from route host information
//
// TODO: need to support https default here
//if instance.Status.APIEndpoints == nil {
// instance.Status.APIEndpoints = map[string]string{}
//}
//instance.Status.APIEndpoints = apiEndpoints

// expose service - end

//
// create keystone endpoints
//

//ksEndpointSpec := keystonev1.KeystoneEndpointSpec{
// ServiceName: barbican.ServiceName,
// Endpoints: instance.Status.APIEndpoints,
//}

/*
ksSvc := keystonev1.NewKeystoneEndpoint(instance.Name, instance.Namespace, ksEndpointSpec, serviceLabels, time.Duration(10)*time.Second)
ctrlResult, err = ksSvc.CreateOrPatch(ctx, helper)
if err != nil {
return ctrlResult, err
}
// mirror the Status, Reason, Severity and Message of the latest keystoneendpoint condition
// into a local condition with the type condition.KeystoneEndpointReadyCondition
c := ksSvc.GetConditions().Mirror(condition.KeystoneEndpointReadyCondition)
if c != nil {
instance.Status.Conditions.Set(c)
}
if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}
//
// create keystone endpoints - end
//
*/
Log.Info(fmt.Sprintf("[KeystoneListener] Reconciled Service '%s' init successfully", instance.Name))
return ctrl.Result{}, nil
}

func (r *BarbicanKeystoneListenerReconciler) reconcileUpdate(ctx context.Context, instance *barbicanv1beta1.BarbicanKeystoneListener, helper *helper.Helper) (ctrl.Result, error) {
func (r *BarbicanKeystoneListenerReconciler) reconcileUpdate(ctx context.Context, instance *barbicanv1beta1.BarbicanKeystoneListener) (ctrl.Result, error) {
Log := r.GetLogger(ctx)
Log.Info(fmt.Sprintf("[KeystoneListener] Reconciling Service '%s' update", instance.Name))

Expand All @@ -415,7 +319,7 @@ func (r *BarbicanKeystoneListenerReconciler) reconcileUpdate(ctx context.Context
return ctrl.Result{}, nil
}

func (r *BarbicanKeystoneListenerReconciler) reconcileUpgrade(ctx context.Context, instance *barbicanv1beta1.BarbicanKeystoneListener, helper *helper.Helper) (ctrl.Result, error) {
func (r *BarbicanKeystoneListenerReconciler) reconcileUpgrade(ctx context.Context, instance *barbicanv1beta1.BarbicanKeystoneListener) (ctrl.Result, error) {
Log := r.GetLogger(ctx)
Log.Info(fmt.Sprintf("[KeystoneListener] Reconciling Service '%s' upgrade", instance.Name))

Expand Down Expand Up @@ -597,23 +501,23 @@ func (r *BarbicanKeystoneListenerReconciler) reconcileNormal(ctx context.Context
Log.Info(fmt.Sprintf("[DELETE] %s", serviceAnnotations))

// Handle service init
ctrlResult, err = r.reconcileInit(ctx, instance, helper, serviceLabels)
ctrlResult, err = r.reconcileInit(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}

// Handle service update
ctrlResult, err = r.reconcileUpdate(ctx, instance, helper)
ctrlResult, err = r.reconcileUpdate(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}

// Handle service upgrade
ctrlResult, err = r.reconcileUpgrade(ctx, instance, helper)
ctrlResult, err = r.reconcileUpgrade(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
Expand Down Expand Up @@ -727,15 +631,15 @@ func (r *BarbicanKeystoneListenerReconciler) SetupWithManager(mgr ctrl.Manager)
func (r *BarbicanKeystoneListenerReconciler) findObjectsForSrc(ctx context.Context, src client.Object) []reconcile.Request {
requests := []reconcile.Request{}

l := log.FromContext(context.Background()).WithName("Controllers").WithName("BarbicanKeystoneListener")
l := log.FromContext(ctx).WithName("Controllers").WithName("BarbicanKeystoneListener")

for _, field := range commonWatchFields {
crList := &barbicanv1beta1.BarbicanKeystoneListenerList{}
listOps := &client.ListOptions{
FieldSelector: fields.OneTermEqualSelector(field, src.GetName()),
Namespace: src.GetNamespace(),
}
err := r.List(context.TODO(), crList, listOps)
err := r.List(ctx, crList, listOps)
if err != nil {
return []reconcile.Request{}
}
Expand Down
18 changes: 8 additions & 10 deletions controllers/barbicanworker_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ func (r *BarbicanWorkerReconciler) getSecret(
condition.RequestedReason,
condition.SeverityInfo,
condition.InputReadyWaitingMessage))
return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, fmt.Errorf("Secret %s not found", secretName)
return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, fmt.Errorf("secret %s not found", secretName)
}
instance.Status.Conditions.Set(condition.FalseCondition(
condition.InputReadyCondition,
Expand Down Expand Up @@ -282,15 +282,13 @@ func (r *BarbicanWorkerReconciler) generateServiceConfigs(
func (r *BarbicanWorkerReconciler) reconcileInit(
ctx context.Context,
instance *barbicanv1beta1.BarbicanWorker,
helper *helper.Helper,
serviceLabels map[string]string,
) (ctrl.Result, error) {
Log := r.GetLogger(ctx)
Log.Info(fmt.Sprintf("[Worker] Reconciled Service '%s' init successfully", instance.Name))
return ctrl.Result{}, nil
}

func (r *BarbicanWorkerReconciler) reconcileUpdate(ctx context.Context, instance *barbicanv1beta1.BarbicanWorker, helper *helper.Helper) (ctrl.Result, error) {
func (r *BarbicanWorkerReconciler) reconcileUpdate(ctx context.Context, instance *barbicanv1beta1.BarbicanWorker) (ctrl.Result, error) {
Log := r.GetLogger(ctx)
Log.Info(fmt.Sprintf("[Worker] Reconciling Service '%s' update", instance.Name))

Expand All @@ -301,7 +299,7 @@ func (r *BarbicanWorkerReconciler) reconcileUpdate(ctx context.Context, instance
return ctrl.Result{}, nil
}

func (r *BarbicanWorkerReconciler) reconcileUpgrade(ctx context.Context, instance *barbicanv1beta1.BarbicanWorker, helper *helper.Helper) (ctrl.Result, error) {
func (r *BarbicanWorkerReconciler) reconcileUpgrade(ctx context.Context, instance *barbicanv1beta1.BarbicanWorker) (ctrl.Result, error) {
Log := r.GetLogger(ctx)
Log.Info(fmt.Sprintf("[Worker] Reconciling Service '%s' upgrade", instance.Name))

Expand Down Expand Up @@ -465,23 +463,23 @@ func (r *BarbicanWorkerReconciler) reconcileNormal(ctx context.Context, instance
Log.Info(fmt.Sprintf("[DELETE] %s", serviceAnnotations))

// Handle service init
ctrlResult, err = r.reconcileInit(ctx, instance, helper, serviceLabels)
ctrlResult, err = r.reconcileInit(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}

// Handle service update
ctrlResult, err = r.reconcileUpdate(ctx, instance, helper)
ctrlResult, err = r.reconcileUpdate(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}

// Handle service upgrade
ctrlResult, err = r.reconcileUpgrade(ctx, instance, helper)
ctrlResult, err = r.reconcileUpgrade(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
Expand Down Expand Up @@ -594,15 +592,15 @@ func (r *BarbicanWorkerReconciler) SetupWithManager(mgr ctrl.Manager) error {
func (r *BarbicanWorkerReconciler) findObjectsForSrc(ctx context.Context, src client.Object) []reconcile.Request {
requests := []reconcile.Request{}

l := log.FromContext(context.Background()).WithName("Controllers").WithName("BarbicanWorker")
l := log.FromContext(ctx).WithName("Controllers").WithName("BarbicanWorker")

for _, field := range commonWatchFields {
crList := &barbicanv1beta1.BarbicanWorkerList{}
listOps := &client.ListOptions{
FieldSelector: fields.OneTermEqualSelector(field, src.GetName()),
Namespace: src.GetNamespace(),
}
err := r.List(context.TODO(), crList, listOps)
err := r.List(ctx, crList, listOps)
if err != nil {
return []reconcile.Request{}
}
Expand Down
Loading

0 comments on commit 62edc96

Please sign in to comment.