From 209ba3f88c78a9465583eeb27a43daa384ab42c9 Mon Sep 17 00:00:00 2001 From: Yann Brillouet Date: Fri, 7 Jul 2023 10:09:15 +0200 Subject: [PATCH] revert to yaml.v2 where UnmarshalStrict is used --- internal/dinosaur/pkg/config/dataplane_cluster_config.go | 2 +- internal/dinosaur/pkg/config/providers.go | 2 +- pkg/acl/access_control_list.go | 2 +- pkg/auth/roles_authz.go | 2 +- pkg/quotamanagement/quota_management_list_config.go | 2 +- pkg/shared/config.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/dinosaur/pkg/config/dataplane_cluster_config.go b/internal/dinosaur/pkg/config/dataplane_cluster_config.go index fc44764c0b..8765b33512 100644 --- a/internal/dinosaur/pkg/config/dataplane_cluster_config.go +++ b/internal/dinosaur/pkg/config/dataplane_cluster_config.go @@ -13,7 +13,7 @@ import ( userv1 "github.com/openshift/api/user/v1" "github.com/spf13/pflag" "github.com/stackrox/acs-fleet-manager/pkg/api" - "gopkg.in/yaml.v3" + "gopkg.in/yaml.v2" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" ) diff --git a/internal/dinosaur/pkg/config/providers.go b/internal/dinosaur/pkg/config/providers.go index 07b12ac7b9..3532d2fa7c 100644 --- a/internal/dinosaur/pkg/config/providers.go +++ b/internal/dinosaur/pkg/config/providers.go @@ -8,7 +8,7 @@ import ( "github.com/stackrox/acs-fleet-manager/internal/dinosaur/pkg/dinosaurs/types" "github.com/stackrox/acs-fleet-manager/pkg/environments" "github.com/stackrox/acs-fleet-manager/pkg/shared" - "gopkg.in/yaml.v3" + "gopkg.in/yaml.v2" ) // InstanceType ... diff --git a/pkg/acl/access_control_list.go b/pkg/acl/access_control_list.go index 63c815aa7c..5a329fde98 100644 --- a/pkg/acl/access_control_list.go +++ b/pkg/acl/access_control_list.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/pflag" "github.com/stackrox/acs-fleet-manager/pkg/shared" "github.com/stackrox/acs-fleet-manager/pkg/shared/utils/arrays" - "gopkg.in/yaml.v3" + "gopkg.in/yaml.v2" ) // DeniedUsers ... diff --git a/pkg/auth/roles_authz.go b/pkg/auth/roles_authz.go index 1aa7713caa..07b07bf63a 100644 --- a/pkg/auth/roles_authz.go +++ b/pkg/auth/roles_authz.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/pflag" "github.com/stackrox/acs-fleet-manager/pkg/environments" "github.com/stackrox/acs-fleet-manager/pkg/shared" - "gopkg.in/yaml.v3" + "gopkg.in/yaml.v2" ) var _ environments.ConfigModule = (*AdminRoleAuthZConfig)(nil) diff --git a/pkg/quotamanagement/quota_management_list_config.go b/pkg/quotamanagement/quota_management_list_config.go index 9be7f0b9bc..2998dd6037 100644 --- a/pkg/quotamanagement/quota_management_list_config.go +++ b/pkg/quotamanagement/quota_management_list_config.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/pflag" "github.com/stackrox/acs-fleet-manager/pkg/logger" "github.com/stackrox/acs-fleet-manager/pkg/shared" - "gopkg.in/yaml.v3" + "gopkg.in/yaml.v2" ) // QuotaManagementListConfig ... diff --git a/pkg/shared/config.go b/pkg/shared/config.go index e9b94ed7e4..6fa13e6f70 100644 --- a/pkg/shared/config.go +++ b/pkg/shared/config.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "gopkg.in/yaml.v3" + "gopkg.in/yaml.v2" ) var projectRootDirectory = GetProjectRootDir()