Skip to content

Commit b33bd69

Browse files
committed
temp nolint
1 parent 3119276 commit b33bd69

File tree

11 files changed

+31
-6
lines changed

11 files changed

+31
-6
lines changed

api/v3/wms_validation.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ func (wms *WMS) ValidateUpdate(wmsOld *WMS) ([]string, error) {
3636
return ValidateUpdate(wms, wmsOld, ValidateWMS)
3737
}
3838

39-
// TODO fix linting (cyclop)
39+
// TODO fix linting (cyclop,funlen)
40+
//
41+
//nolint:cyclop,funlen
4042
func ValidateWMS(wms *WMS, warnings *[]string, allErrs *field.ErrorList) {
4143
if strings.Contains(wms.GetName(), "wms") {
4244
sharedValidation.AddWarning(
@@ -203,6 +205,7 @@ func ValidateWMS(wms *WMS, warnings *[]string, allErrs *field.ErrorList) {
203205
}
204206

205207
// TODO fix linting (nestif)
208+
//nolint:nestif
206209
if layer.Visible {
207210
hasVisibleLayer = true
208211

cmd/main.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,9 @@ func init() {
7878
// +kubebuilder:scaffold:scheme
7979
}
8080

81-
// TODO fix linting (cyclop)
81+
// TODO fix linting (cyclop,funlen)
82+
//
83+
//nolint:cyclop,funlen
8284
func main() {
8385
var metricsAddr string
8486
var certDir string

config/crd/update_openapi.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ func main() {
1919
}
2020

2121
// TODO fix linting (funlen)
22+
//
23+
//nolint:funlen
2224
func updateWMSV3Layers(crdDir string) {
2325
path := filepath.Join(crdDir, "pdok.nl_wms.yaml")
2426

internal/controller/capabilitiesgenerator/mapper.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ func mapServiceProvider(provider *smoothoperatorv1.ServiceProvider) (serviceProv
166166
}
167167

168168
// TODO fix linting (nestif)
169+
//nolint:nestif
169170
if provider.ServiceContact != nil {
170171
serviceProvider.ServiceContact = &wfs200.ServiceContact{
171172
IndividualName: provider.ServiceContact.IndividualName,
@@ -363,6 +364,8 @@ func getDcpType(url string, fillPost bool) *wms130.DCPType {
363364
}
364365

365366
// TODO fix linting (funlen)
367+
//
368+
//nolint:funlen
366369
func getLayers(wms *pdoknlv3.WMS, canonicalURL string) []wms130.Layer {
367370
result := make([]wms130.Layer, 0)
368371
referenceLayer := wms.Spec.Service.Layer

internal/controller/mapfilegenerator/mapper.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,8 @@ func MapWMSToMapfileGeneratorInput(wms *pdoknlv3.WMS, _ *smoothoperatorv1.OwnerI
221221
}
222222

223223
// TODO fix linting (cyclop)
224+
//
225+
//nolint:cyclop
224226
func getWMSLayer(serviceLayer pdoknlv3.Layer, serviceExtent string, wms *pdoknlv3.WMS) WMSLayer {
225227
layerExtent := serviceExtent
226228
if len(serviceLayer.BoundingBoxes) > 0 {

internal/controller/mapserver/deployment.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ const (
3030
)
3131

3232
// TODO fix linting (funlen)
33+
//
34+
//nolint:funlen
3335
func GetVolumesForDeployment[O pdoknlv3.WMSWFS](obj O, configMapNames types.HashedConfigMapNames) []v1.Volume {
3436
baseVolume := v1.Volume{Name: "base"}
3537
if use, size := mapperutils.UseEphemeralVolume(obj); use {
@@ -227,8 +229,10 @@ func GetEnvVarsForDeployment[O pdoknlv3.WMSWFS](obj O, blobsSecretName string) [
227229
}
228230
}
229231

230-
// TODO fix linting (cyclop)
232+
// TODO fix linting (cyclop,funlen)
231233
// Resources for mapserver container
234+
//
235+
//nolint:cyclop,funlen
232236
func GetResourcesForDeployment[O pdoknlv3.WMSWFS](obj O) v1.ResourceRequirements {
233237
resources := v1.ResourceRequirements{
234238
Limits: v1.ResourceList{},

internal/controller/shared_controller.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,9 @@ func getFinalizerName[O pdoknlv3.WMSWFS](obj O) string {
10121012
return strings.ToLower(string(obj.Type())) + "." + pdoknlv3.GroupVersion.Group + "/finalizer"
10131013
}
10141014

1015-
// TODO fix linting (cyclop)
1015+
// TODO fix linting (cyclop,funlen)
1016+
//
1017+
//nolint:cyclop,funlen
10161018
func createOrUpdateAllForWMSWFS[R Reconciler, O pdoknlv3.WMSWFS](ctx context.Context, r R, obj O, ownerInfo *smoothoperatorv1.OwnerInfo) (operationResults map[string]controllerutil.OperationResult, err error) {
10171019
operationResults = make(map[string]controllerutil.OperationResult)
10181020
reconcilerClient := getReconcilerClient(r)
@@ -1084,6 +1086,7 @@ func createOrUpdateAllForWMSWFS[R Reconciler, O pdoknlv3.WMSWFS](ctx context.Con
10841086
// end region ConfigMap-BlobDownload
10851087

10861088
// TODO fix linting (nestif)
1089+
//nolint:nestif
10871090
if obj.Type() == pdoknlv3.ServiceTypeWMS {
10881091
wms, _ := any(obj).(*pdoknlv3.WMS)
10891092
wmsReconciler := (*WMSReconciler)(r)
@@ -1220,6 +1223,8 @@ func createOrUpdateAllForWMSWFS[R Reconciler, O pdoknlv3.WMSWFS](ctx context.Con
12201223
}
12211224

12221225
// TODO fix linting (funlen)
1226+
//
1227+
//nolint:funlen
12231228
func deleteAllForWMSWFS[R Reconciler, O pdoknlv3.WMSWFS](ctx context.Context, r R, obj O, ownerInfo *smoothoperatorv1.OwnerInfo) (err error) {
12241229
bareObjects := getSharedBareObjects(obj)
12251230
var objects []client.Object

internal/controller/wfs_controller.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ type WFSReconciler struct {
6868
// For more details, check Reconcile and its Result here:
6969
// - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
7070
// TODO fix linting (dupl)
71+
//
72+
//nolint:dupl
7173
func (r *WFSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, err error) {
7274
lgr := log.FromContext(ctx)
7375
lgr.Info("Starting reconcile for WFS resource", "name", req.NamespacedName)

internal/controller/wms_controller.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ type WMSReconciler struct {
7979
// For more details, check Reconcile and its Result here:
8080
// - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
8181
// TODO fix linting (dupl)
82+
//
83+
//nolint:dupl
8284
func (r *WMSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, err error) {
8385
lgr := log.FromContext(ctx)
8486
lgr.Info("Starting reconcile for WMS resource", "name", req.NamespacedName)

internal/webhook/v3/wfs_webhook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2222
SOFTWARE.
2323
*/
2424

25+
//nolint:dupl
2526
package v3
2627

27-
// TODO fix linting (dupl)
2828
import (
2929
"context"
3030
"fmt"

0 commit comments

Comments
 (0)