From 92afd423ec37be35d8d91eb029cd9cf2cbac5985 Mon Sep 17 00:00:00 2001 From: Dmitriy Matrenichev Date: Fri, 21 Jun 2024 00:26:39 +0300 Subject: [PATCH] chore: replace append with slices pkg functions Use slices.Insert and slices.Concat where it's proper. Signed-off-by: Dmitriy Matrenichev --- client/pkg/template/internal/models/list.go | 2 +- client/pkg/template/operations/delete.go | 4 +-- internal/backend/runtime/omni/omni.go | 29 ++++++++++++--------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/client/pkg/template/internal/models/list.go b/client/pkg/template/internal/models/list.go index 93ec2ea5..904fef1a 100644 --- a/client/pkg/template/internal/models/list.go +++ b/client/pkg/template/internal/models/list.go @@ -98,7 +98,7 @@ func (l List) Validate() error { multiErr = multierror.Append(multiErr, fmt.Errorf("machines %v are used in both controlplane and workers", intersection)) } - allMachines := append(slices.Clone(controlPlaneMachines), workerMachines...) + allMachines := slices.Concat(controlPlaneMachines, workerMachines) allMachinesSet := xslices.ToSet(allMachines) for _, model := range l { diff --git a/client/pkg/template/operations/delete.go b/client/pkg/template/operations/delete.go index 3c96c14e..e7bbe1d2 100644 --- a/client/pkg/template/operations/delete.go +++ b/client/pkg/template/operations/delete.go @@ -8,6 +8,7 @@ import ( "context" "fmt" "io" + "slices" "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" @@ -83,8 +84,7 @@ func deleteTemplate(ctx context.Context, tmpl *template.Template, out io.Writer, return err } - syncResult.Destroy = append([][]resource.Resource{extensionsConfigurations.Items}, append([][]resource.Resource{links}, - append([][]resource.Resource{allPatches}, syncResult.Destroy...)...)...) + syncResult.Destroy = slices.Insert(syncResult.Destroy, 0, extensionsConfigurations.Items, links, allPatches) } return syncDelete(ctx, syncResult, out, st, syncOptions) diff --git a/internal/backend/runtime/omni/omni.go b/internal/backend/runtime/omni/omni.go index 69a9ad6d..aa1088ed 100644 --- a/internal/backend/runtime/omni/omni.go +++ b/internal/backend/runtime/omni/omni.go @@ -9,6 +9,7 @@ package omni import ( "context" "fmt" + "slices" "time" "github.com/cosi-project/runtime/pkg/controller" @@ -273,19 +274,21 @@ func New(talosClientFactory *talos.ClientFactory, dnsService *dns.Service, workl metricsRegistry.MustRegister(expvarCollector) - validationOptions := clusterValidationOptions(resourceState, config.Config.EtcdBackup, config.Config.EmbeddedDiscoveryService) - validationOptions = append(validationOptions, relationLabelsValidationOptions()...) - validationOptions = append(validationOptions, accessPolicyValidationOptions()...) - validationOptions = append(validationOptions, aclValidationOptions(resourceState)...) - validationOptions = append(validationOptions, roleValidationOptions()...) - validationOptions = append(validationOptions, machineSetNodeValidationOptions(resourceState)...) - validationOptions = append(validationOptions, machineSetValidationOptions(resourceState, storeFactory)...) - validationOptions = append(validationOptions, identityValidationOptions(config.Config.Auth.SAML)...) - validationOptions = append(validationOptions, exposedServiceValidationOptions()...) - validationOptions = append(validationOptions, configPatchValidationOptions(resourceState)...) - validationOptions = append(validationOptions, etcdManualBackupValidationOptions()...) - validationOptions = append(validationOptions, samlLabelRuleValidationOptions()...) - validationOptions = append(validationOptions, s3ConfigValidationOptions()...) + validationOptions := slices.Concat( + clusterValidationOptions(resourceState, config.Config.EtcdBackup, config.Config.EmbeddedDiscoveryService), + relationLabelsValidationOptions(), + accessPolicyValidationOptions(), + aclValidationOptions(resourceState), + roleValidationOptions(), + machineSetNodeValidationOptions(resourceState), + machineSetValidationOptions(resourceState, storeFactory), + identityValidationOptions(config.Config.Auth.SAML), + exposedServiceValidationOptions(), + configPatchValidationOptions(resourceState), + etcdManualBackupValidationOptions(), + samlLabelRuleValidationOptions(), + s3ConfigValidationOptions(), + ) return &Runtime{ controllerRuntime: controllerRuntime,