From b41fc71b8a96c4f5423cea8f2a6b9a6b03d146e1 Mon Sep 17 00:00:00 2001 From: Sam Gartner Date: Tue, 26 May 2026 11:40:27 -0500 Subject: [PATCH 1/2] Use AWS secrets manager defaults --- actions/config/defaults/smdefaults.go | 157 ++++++++++++++++++ actions/go.mod | 9 +- actions/go.sum | 18 +- go.mod | 9 +- go.sum | 18 +- .../provisioning/defaults/defaults.yaml | 2 +- .../provisioning/k3s/node_driver_test.go | 9 + .../provisioning/rke2/node_driver_test.go | 9 + 8 files changed, 206 insertions(+), 25 deletions(-) create mode 100644 actions/config/defaults/smdefaults.go diff --git a/actions/config/defaults/smdefaults.go b/actions/config/defaults/smdefaults.go new file mode 100644 index 0000000000..ebebd57f48 --- /dev/null +++ b/actions/config/defaults/smdefaults.go @@ -0,0 +1,157 @@ +package defaults + +import ( + "context" + "errors" + "fmt" + "regexp" + "strings" + + "github.com/aws/aws-sdk-go-v2/aws" + awsconfig "github.com/aws/aws-sdk-go-v2/config" + "github.com/aws/aws-sdk-go-v2/credentials" + "github.com/aws/aws-sdk-go-v2/service/secretsmanager" + secrettypes "github.com/aws/aws-sdk-go-v2/service/secretsmanager/types" + "github.com/rancher/shepherd/extensions/cloudcredentials" + "github.com/rancher/shepherd/extensions/defaults/providers" + "github.com/rancher/shepherd/pkg/config/operations" + "github.com/sirupsen/logrus" +) + +var awsSecretPlaceholderRegex = regexp.MustCompile(`<([^<>]+)>`) + +func LoadSecretsManagerDefaults(cattleConfig map[string]any) (map[string]any, error) { + credentialSpec := cloudcredentials.LoadCloudCredential(providers.AWS) + if credentialSpec.AmazonEC2CredentialConfig == nil || + credentialSpec.AmazonEC2CredentialConfig.AccessKey == "" || + credentialSpec.AmazonEC2CredentialConfig.SecretKey == "" || + credentialSpec.AmazonEC2CredentialConfig.DefaultRegion == "" { + logrus.Warning("Unable to load Secrets Manager defaults: AWS credentials are incomplete in cattle config") + return cattleConfig, nil + } + + awsCredentials := *credentialSpec.AmazonEC2CredentialConfig + + output, err := operations.DeepCopyMap(cattleConfig) + if err != nil { + return nil, err + } + + ctx := context.Background() + creds := credentials.NewStaticCredentialsProvider( + awsCredentials.AccessKey, + awsCredentials.SecretKey, + "", + ) + + awsCfg, err := awsconfig.LoadDefaultConfig( + ctx, + awsconfig.WithRegion(awsCredentials.DefaultRegion), + awsconfig.WithCredentialsProvider(creds), + ) + if err != nil { + return nil, err + } + + secretsClient := secretsmanager.NewFromConfig(awsCfg) + secretCache := map[string]string{} + + resolvedValue, err := resolveAWSSecretsInValue(ctx, secretsClient, output, secretCache) + if err != nil { + return nil, err + } + + resolvedConfig, ok := resolvedValue.(map[string]any) + if !ok { + return nil, fmt.Errorf("resolved cattle config is not a map") + } + + return resolvedConfig, nil +} + +func resolveAWSSecretsInValue(ctx context.Context, client *secretsmanager.Client, value any, cache map[string]string) (any, error) { + switch typedValue := value.(type) { + case map[string]any: + for key, nestedValue := range typedValue { + resolvedNestedValue, err := resolveAWSSecretsInValue(ctx, client, nestedValue, cache) + if err != nil { + return nil, err + } + + typedValue[key] = resolvedNestedValue + } + + return typedValue, nil + case []any: + for i, listValue := range typedValue { + resolvedListValue, err := resolveAWSSecretsInValue(ctx, client, listValue, cache) + if err != nil { + return nil, err + } + + typedValue[i] = resolvedListValue + } + + return typedValue, nil + case string: + return resolveSecretPlaceholdersInString(ctx, client, typedValue, cache) + default: + return value, nil + } +} + +func resolveSecretPlaceholdersInString(ctx context.Context, client *secretsmanager.Client, value string, cache map[string]string) (string, error) { + matches := awsSecretPlaceholderRegex.FindAllStringSubmatch(value, -1) + if len(matches) == 0 { + return value, nil + } + + resolvedValue := value + for _, match := range matches { + if len(match) < 2 { + continue + } + + secretName := match[1] + placeholder := match[0] + + secretValue, exists, err := getSecretValueByName(ctx, client, secretName, cache) + if err != nil { + return "", err + } + + if !exists { + continue + } + + resolvedValue = strings.ReplaceAll(resolvedValue, placeholder, secretValue) + } + + return resolvedValue, nil +} + +func getSecretValueByName(ctx context.Context, client *secretsmanager.Client, secretName string, cache map[string]string) (string, bool, error) { + if cachedValue, ok := cache[secretName]; ok { + return cachedValue, true, nil + } + + output, err := client.GetSecretValue(ctx, &secretsmanager.GetSecretValueInput{SecretId: aws.String(secretName)}) + if err != nil { + var notFoundErr *secrettypes.ResourceNotFoundException + if errors.As(err, ¬FoundErr) { + return "", false, nil + } + + return "", false, err + } + + secretValue := "" + if output.SecretString != nil { + secretValue = *output.SecretString + } else if output.SecretBinary != nil { + secretValue = string(output.SecretBinary) + } + + cache[secretName] = secretValue + return secretValue, true, nil +} diff --git a/actions/go.mod b/actions/go.mod index 50d4f25b3b..1274449f02 100644 --- a/actions/go.mod +++ b/actions/go.mod @@ -65,10 +65,11 @@ require ( require ( github.com/aws/aws-sdk-go v1.55.8 - github.com/aws/aws-sdk-go-v2 v1.41.5 + github.com/aws/aws-sdk-go-v2 v1.41.7 github.com/aws/aws-sdk-go-v2/config v1.31.16 github.com/aws/aws-sdk-go-v2/credentials v1.18.20 github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3 + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.41.7 github.com/pkg/errors v0.9.1 github.com/rancher/norman v0.8.1 github.com/rancher/rancher v0.0.0-20251223145833-24cecce3325e @@ -107,8 +108,8 @@ require ( github.com/apparentlymart/go-cidr v1.1.0 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.12 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 // indirect @@ -118,7 +119,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sso v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.4 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.39.0 // indirect - github.com/aws/smithy-go v1.24.2 // indirect + github.com/aws/smithy-go v1.25.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver v3.5.1+incompatible // indirect github.com/blang/semver/v4 v4.0.0 // indirect diff --git a/actions/go.sum b/actions/go.sum index 179263d971..1bee401a2a 100644 --- a/actions/go.sum +++ b/actions/go.sum @@ -22,8 +22,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/aws/aws-sdk-go v1.55.8 h1:JRmEUbU52aJQZ2AjX4q4Wu7t4uZjOu71uyNmaWlUkJQ= github.com/aws/aws-sdk-go v1.55.8/go.mod h1:ZkViS9AqA6otK+JBBNH2++sx1sgxrPKcSzPPvQkUtXk= -github.com/aws/aws-sdk-go-v2 v1.41.5 h1:dj5kopbwUsVUVFgO4Fi5BIT3t4WyqIDjGKCangnV/yY= -github.com/aws/aws-sdk-go-v2 v1.41.5/go.mod h1:mwsPRE8ceUUpiTgF7QmQIJ7lgsKUPQOUl3o72QBrE1o= +github.com/aws/aws-sdk-go-v2 v1.41.7 h1:DWpAJt66FmnnaRIOT/8ASTucrvuDPZASqhhLey6tLY8= +github.com/aws/aws-sdk-go-v2 v1.41.7/go.mod h1:4LAfZOPHNVNQEckOACQx60Y8pSRjIkNZQz1w92xpMJc= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 h1:eBMB84YGghSocM7PsjmmPffTa+1FBUeNvGvFou6V/4o= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8/go.mod h1:lyw7GFp3qENLh7kwzf7iMzAxDn+NzjXEAGjKS2UOKqI= github.com/aws/aws-sdk-go-v2/config v1.31.16 h1:E4Tz+tJiPc7kGnXwIfCyUj6xHJNpENlY11oKpRTgsjc= @@ -32,10 +32,10 @@ github.com/aws/aws-sdk-go-v2/credentials v1.18.20 h1:KFndAnHd9NUuzikHjQ8D5CfFVO+ github.com/aws/aws-sdk-go-v2/credentials v1.18.20/go.mod h1:9mCi28a+fmBHSQ0UM79omkz6JtN+PEsvLrnG36uoUv0= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.12 h1:VO3FIM2TDbm0kqp6sFNR0PbioXJb/HzCDW6NtIZpIWE= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.12/go.mod h1:6C39gB8kg82tx3r72muZSrNhHia9rjGkX7ORaS2GKNE= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 h1:Rgg6wvjjtX8bNHcvi9OnXWwcE0a2vGpbwmtICOsvcf4= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21/go.mod h1:A/kJFst/nm//cyqonihbdpQZwiUhhzpqTsdbhDdRF9c= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 h1:PEgGVtPoB6NTpPrBgqSE5hE/o47Ij9qk/SEZFbUOe9A= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21/go.mod h1:p+hz+PRAYlY3zcpJhPwXlLC4C+kqn70WIHwnzAfs6ps= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23 h1:GpT/TrnBYuE5gan2cZbTtvP+JlHsutdmlV2YfEyNde0= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23/go.mod h1:xYWD6BS9ywC5bS3sz9Xh04whO/hzK2plt2Zkyrp4JuA= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23 h1:bpd8vxhlQi2r1hiueOw02f/duEPTMK59Q4QMAoTTtTo= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23/go.mod h1:15DfR2nw+CRHIk0tqNyifu3G1YdAOy68RftkhMDDwYk= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22 h1:rWyie/PxDRIdhNf4DzRk0lvjVOqFJuNnO8WwaIRVxzQ= @@ -50,14 +50,16 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 h1:ZlvrNcHSFFWUR github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21/go.mod h1:cv3TNhVrssKR0O/xxLJVRfd2oazSnZnkUeTf6ctUwfQ= github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3 h1:HwxWTbTrIHm5qY+CAEur0s/figc3qwvLWsNkF4RPToo= github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3/go.mod h1:uoA43SdFwacedBfSgfFSjjCvYe8aYBS7EnU5GZ/YKMM= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.41.7 h1:JUGKqUnJHbXpS8uyuICP/zpQ+vXUIXW2zTEqjMLCqrY= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.41.7/go.mod h1:l/cqI7ujYqBuTR6Ll13d9/gG/uUdlVzJ1UDltEEBTOo= github.com/aws/aws-sdk-go-v2/service/sso v1.30.0 h1:xHXvxst78wBpJFgDW07xllOx0IAzbryrSdM4nMVQ4Dw= github.com/aws/aws-sdk-go-v2/service/sso v1.30.0/go.mod h1:/e8m+AO6HNPPqMyfKRtzZ9+mBF5/x1Wk8QiDva4m07I= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.4 h1:tBw2Qhf0kj4ZwtsVpDiVRU3zKLvjvjgIjHMKirxXg8M= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.4/go.mod h1:Deq4B7sRM6Awq/xyOBlxBdgW8/Z926KYNNaGMW2lrkA= github.com/aws/aws-sdk-go-v2/service/sts v1.39.0 h1:C+BRMnasSYFcgDw8o9H5hzehKzXyAb9GY5v/8bP9DUY= github.com/aws/aws-sdk-go-v2/service/sts v1.39.0/go.mod h1:4EjU+4mIx6+JqKQkruye+CaigV7alL3thVPfDd9VlMs= -github.com/aws/smithy-go v1.24.2 h1:FzA3bu/nt/vDvmnkg+R8Xl46gmzEDam6mZ1hzmwXFng= -github.com/aws/smithy-go v1.24.2/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc= +github.com/aws/smithy-go v1.25.1 h1:J8ERsGSU7d+aCmdQur5Txg6bVoYelvQJgtZehD12GkI= +github.com/aws/smithy-go v1.25.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= diff --git a/go.mod b/go.mod index 23f38ce01d..efcda0daf0 100644 --- a/go.mod +++ b/go.mod @@ -80,7 +80,7 @@ require ( github.com/Masterminds/semver/v3 v3.4.0 github.com/Masterminds/sprig/v3 v3.3.0 // indirect github.com/aws/aws-sdk-go v1.55.8 - github.com/aws/aws-sdk-go-v2 v1.41.5 // indirect + github.com/aws/aws-sdk-go-v2 v1.41.7 // indirect github.com/aws/aws-sdk-go-v2/config v1.31.16 github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3 github.com/blang/semver v3.5.1+incompatible // indirect @@ -147,18 +147,19 @@ require ( github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.18.20 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.12 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 // indirect + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.41.7 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.4 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.39.0 // indirect - github.com/aws/smithy-go v1.24.2 // indirect + github.com/aws/smithy-go v1.25.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/containerd/cgroups/v3 v3.0.2 // indirect github.com/containerd/errdefs v1.0.0 // indirect diff --git a/go.sum b/go.sum index 5806db075a..961a5f64b6 100644 --- a/go.sum +++ b/go.sum @@ -1398,8 +1398,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/aws/aws-sdk-go v1.55.8 h1:JRmEUbU52aJQZ2AjX4q4Wu7t4uZjOu71uyNmaWlUkJQ= github.com/aws/aws-sdk-go v1.55.8/go.mod h1:ZkViS9AqA6otK+JBBNH2++sx1sgxrPKcSzPPvQkUtXk= -github.com/aws/aws-sdk-go-v2 v1.41.5 h1:dj5kopbwUsVUVFgO4Fi5BIT3t4WyqIDjGKCangnV/yY= -github.com/aws/aws-sdk-go-v2 v1.41.5/go.mod h1:mwsPRE8ceUUpiTgF7QmQIJ7lgsKUPQOUl3o72QBrE1o= +github.com/aws/aws-sdk-go-v2 v1.41.7 h1:DWpAJt66FmnnaRIOT/8ASTucrvuDPZASqhhLey6tLY8= +github.com/aws/aws-sdk-go-v2 v1.41.7/go.mod h1:4LAfZOPHNVNQEckOACQx60Y8pSRjIkNZQz1w92xpMJc= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 h1:eBMB84YGghSocM7PsjmmPffTa+1FBUeNvGvFou6V/4o= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8/go.mod h1:lyw7GFp3qENLh7kwzf7iMzAxDn+NzjXEAGjKS2UOKqI= github.com/aws/aws-sdk-go-v2/config v1.31.16 h1:E4Tz+tJiPc7kGnXwIfCyUj6xHJNpENlY11oKpRTgsjc= @@ -1408,10 +1408,10 @@ github.com/aws/aws-sdk-go-v2/credentials v1.18.20 h1:KFndAnHd9NUuzikHjQ8D5CfFVO+ github.com/aws/aws-sdk-go-v2/credentials v1.18.20/go.mod h1:9mCi28a+fmBHSQ0UM79omkz6JtN+PEsvLrnG36uoUv0= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.12 h1:VO3FIM2TDbm0kqp6sFNR0PbioXJb/HzCDW6NtIZpIWE= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.12/go.mod h1:6C39gB8kg82tx3r72muZSrNhHia9rjGkX7ORaS2GKNE= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 h1:Rgg6wvjjtX8bNHcvi9OnXWwcE0a2vGpbwmtICOsvcf4= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21/go.mod h1:A/kJFst/nm//cyqonihbdpQZwiUhhzpqTsdbhDdRF9c= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 h1:PEgGVtPoB6NTpPrBgqSE5hE/o47Ij9qk/SEZFbUOe9A= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21/go.mod h1:p+hz+PRAYlY3zcpJhPwXlLC4C+kqn70WIHwnzAfs6ps= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23 h1:GpT/TrnBYuE5gan2cZbTtvP+JlHsutdmlV2YfEyNde0= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23/go.mod h1:xYWD6BS9ywC5bS3sz9Xh04whO/hzK2plt2Zkyrp4JuA= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23 h1:bpd8vxhlQi2r1hiueOw02f/duEPTMK59Q4QMAoTTtTo= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23/go.mod h1:15DfR2nw+CRHIk0tqNyifu3G1YdAOy68RftkhMDDwYk= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22 h1:rWyie/PxDRIdhNf4DzRk0lvjVOqFJuNnO8WwaIRVxzQ= @@ -1426,14 +1426,16 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 h1:ZlvrNcHSFFWUR github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21/go.mod h1:cv3TNhVrssKR0O/xxLJVRfd2oazSnZnkUeTf6ctUwfQ= github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3 h1:HwxWTbTrIHm5qY+CAEur0s/figc3qwvLWsNkF4RPToo= github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3/go.mod h1:uoA43SdFwacedBfSgfFSjjCvYe8aYBS7EnU5GZ/YKMM= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.41.7 h1:JUGKqUnJHbXpS8uyuICP/zpQ+vXUIXW2zTEqjMLCqrY= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.41.7/go.mod h1:l/cqI7ujYqBuTR6Ll13d9/gG/uUdlVzJ1UDltEEBTOo= github.com/aws/aws-sdk-go-v2/service/sso v1.30.0 h1:xHXvxst78wBpJFgDW07xllOx0IAzbryrSdM4nMVQ4Dw= github.com/aws/aws-sdk-go-v2/service/sso v1.30.0/go.mod h1:/e8m+AO6HNPPqMyfKRtzZ9+mBF5/x1Wk8QiDva4m07I= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.4 h1:tBw2Qhf0kj4ZwtsVpDiVRU3zKLvjvjgIjHMKirxXg8M= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.4/go.mod h1:Deq4B7sRM6Awq/xyOBlxBdgW8/Z926KYNNaGMW2lrkA= github.com/aws/aws-sdk-go-v2/service/sts v1.39.0 h1:C+BRMnasSYFcgDw8o9H5hzehKzXyAb9GY5v/8bP9DUY= github.com/aws/aws-sdk-go-v2/service/sts v1.39.0/go.mod h1:4EjU+4mIx6+JqKQkruye+CaigV7alL3thVPfDd9VlMs= -github.com/aws/smithy-go v1.24.2 h1:FzA3bu/nt/vDvmnkg+R8Xl46gmzEDam6mZ1hzmwXFng= -github.com/aws/smithy-go v1.24.2/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc= +github.com/aws/smithy-go v1.25.1 h1:J8ERsGSU7d+aCmdQur5Txg6bVoYelvQJgtZehD12GkI= +github.com/aws/smithy-go v1.25.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc= github.com/bazelbuild/rules_go v0.49.0/go.mod h1:Dhcz716Kqg1RHNWos+N6MlXNkjNP2EwZQ0LukRKJfMs= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= diff --git a/validation/provisioning/defaults/defaults.yaml b/validation/provisioning/defaults/defaults.yaml index 6198a75a0b..9b4f090700 100644 --- a/validation/provisioning/defaults/defaults.yaml +++ b/validation/provisioning/defaults/defaults.yaml @@ -42,7 +42,7 @@ awsMachineConfigs: region: "us-east-2" awsMachineConfig: - roles: ["etcd","controlplane","worker"] - ami: "" + ami: "" instanceType: "t3a.medium" volumeType: "" rootSize: "" diff --git a/validation/provisioning/k3s/node_driver_test.go b/validation/provisioning/k3s/node_driver_test.go index 0032f56884..a4d6023000 100644 --- a/validation/provisioning/k3s/node_driver_test.go +++ b/validation/provisioning/k3s/node_driver_test.go @@ -3,6 +3,8 @@ package k3s import ( + "encoding/json" + "fmt" "os" "testing" @@ -45,6 +47,13 @@ func nodeDriverSetup(t *testing.T) nodeDriverTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) + + cattleConfigPrettyPrint, err := json.MarshalIndent(k.cattleConfig, "", " ") + require.NoError(t, err) + fmt.Fprintf(logrus.StandardLogger().Out, "cattle config:\n%s\n", string(cattleConfigPrettyPrint)) + loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/node_driver_test.go b/validation/provisioning/rke2/node_driver_test.go index 0c783fe882..231930c6e7 100644 --- a/validation/provisioning/rke2/node_driver_test.go +++ b/validation/provisioning/rke2/node_driver_test.go @@ -3,6 +3,8 @@ package rke2 import ( + "encoding/json" + "fmt" "os" "testing" @@ -45,6 +47,13 @@ func nodeDriverSetup(t *testing.T) nodeDriverTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) + + cattleConfigPrettyPrint, err := json.MarshalIndent(r.cattleConfig, "", " ") + require.NoError(t, err) + fmt.Fprintf(logrus.StandardLogger().Out, "cattle config:\n%s\n", string(cattleConfigPrettyPrint)) + loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) From 7abed0ec9dfc842b14c34b35b1c28558cee8218f Mon Sep 17 00:00:00 2001 From: Sam Gartner Date: Tue, 26 May 2026 15:28:36 -0500 Subject: [PATCH 2/2] Update tests to utilize AWSSecretsManagerDefaults --- validation/certificates/k3s/cert_rotation_test.go | 3 +++ validation/certificates/rke2/cert_rotation_test.go | 3 +++ validation/certificates/rke2/cert_rotation_wins_test.go | 3 +++ validation/deleting/k3s/delete_cluster_test.go | 3 +++ validation/deleting/k3s/delete_init_machine_test.go | 3 +++ validation/deleting/k3s/delete_machine_test.go | 3 +++ validation/deleting/rke2/delete_cluster_test.go | 3 +++ validation/deleting/rke2/delete_init_machine_test.go | 3 +++ validation/deleting/rke2/delete_machine_test.go | 3 +++ validation/nodescaling/k3s/scaling_test.go | 3 +++ validation/nodescaling/rke2/scaling_test.go | 3 +++ validation/provisioning/airgap/airgap_setup.go | 3 +++ validation/provisioning/dualstack/k3s_custom_test.go | 3 +++ validation/provisioning/dualstack/k3s_node_driver_test.go | 3 +++ validation/provisioning/dualstack/rke2_custom_test.go | 3 +++ validation/provisioning/dualstack/rke2_node_driver_test.go | 3 +++ validation/provisioning/ipv6/k3s_custom_test.go | 3 +++ validation/provisioning/ipv6/k3s_node_driver_test.go | 3 +++ validation/provisioning/ipv6/rke2_custom_test.go | 3 +++ validation/provisioning/ipv6/rke2_node_driver_test.go | 3 +++ validation/provisioning/k3s/ace_test.go | 3 +++ validation/provisioning/k3s/custom_test.go | 3 +++ validation/provisioning/k3s/data_directories_test.go | 3 +++ validation/provisioning/k3s/hardened_test.go | 3 +++ validation/provisioning/k3s/hostname_truncation_test.go | 3 +++ validation/provisioning/k3s/psact_test.go | 3 +++ validation/provisioning/k3s/template_test.go | 3 +++ validation/provisioning/proxy/k3s_custom_test.go | 3 +++ validation/provisioning/proxy/k3s_proxy_node_driver_test.go | 3 +++ validation/provisioning/proxy/rke2_custom_test.go | 3 +++ validation/provisioning/proxy/rke2_proxy_node_driver_test.go | 3 +++ validation/provisioning/registries/registries_setup.go | 3 +++ validation/provisioning/rke2/ace_test.go | 3 +++ validation/provisioning/rke2/agent_customization_test.go | 3 +++ validation/provisioning/rke2/cloud_provider_test.go | 3 +++ validation/provisioning/rke2/cni_test.go | 3 +++ validation/provisioning/rke2/custom_test.go | 3 +++ validation/provisioning/rke2/data_directories_test.go | 3 +++ validation/provisioning/rke2/hardened_test.go | 3 +++ validation/provisioning/rke2/hostname_truncation_test.go | 4 ++++ validation/provisioning/rke2/ingress_test.go | 3 +++ validation/provisioning/rke2/psact_test.go | 3 +++ validation/provisioning/rke2/template_test.go | 3 +++ validation/snapshot/k3s/snapshot_recurring_test.go | 3 +++ validation/snapshot/k3s/snapshot_restore_test.go | 3 +++ validation/snapshot/k3s/snapshot_retention_test.go | 3 +++ validation/snapshot/k3s/snapshot_s3_restore_test.go | 3 +++ validation/snapshot/rke2/snapshot_recurring_test.go | 3 +++ validation/snapshot/rke2/snapshot_restore_test.go | 3 +++ validation/snapshot/rke2/snapshot_restore_wins_test.go | 3 +++ validation/snapshot/rke2/snapshot_retention_test.go | 3 +++ validation/snapshot/rke2/snapshot_s3_restore_test.go | 3 +++ validation/upgrade/k3s/kubernetes_test.go | 3 +++ validation/upgrade/rke2/cloud_provider_aws_migration_test.go | 3 +++ validation/upgrade/rke2/kubernetes_test.go | 3 +++ validation/upgrade/rke2/kubernetes_wins_test.go | 3 +++ 56 files changed, 169 insertions(+) diff --git a/validation/certificates/k3s/cert_rotation_test.go b/validation/certificates/k3s/cert_rotation_test.go index 353c63935b..e338037112 100644 --- a/validation/certificates/k3s/cert_rotation_test.go +++ b/validation/certificates/k3s/cert_rotation_test.go @@ -55,6 +55,9 @@ func (c *CertRotationTestSuite) SetupSuite() { c.cattleConfig, err = defaults.LoadPackageDefaults(c.cattleConfig, "") require.NoError(c.T(), err) + + c.cattleConfig, err = defaults.LoadSecretsManagerDefaults(c.cattleConfig) + require.NoError(c.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, c.cattleConfig, loggingConfig) diff --git a/validation/certificates/rke2/cert_rotation_test.go b/validation/certificates/rke2/cert_rotation_test.go index af37ef456c..933a4c74a7 100644 --- a/validation/certificates/rke2/cert_rotation_test.go +++ b/validation/certificates/rke2/cert_rotation_test.go @@ -55,6 +55,9 @@ func (c *CertRotationTestSuite) SetupSuite() { c.cattleConfig, err = defaults.LoadPackageDefaults(c.cattleConfig, "") require.NoError(c.T(), err) + + c.cattleConfig, err = defaults.LoadSecretsManagerDefaults(c.cattleConfig) + require.NoError(c.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, c.cattleConfig, loggingConfig) diff --git a/validation/certificates/rke2/cert_rotation_wins_test.go b/validation/certificates/rke2/cert_rotation_wins_test.go index 66d4e8af7a..268477d75e 100644 --- a/validation/certificates/rke2/cert_rotation_wins_test.go +++ b/validation/certificates/rke2/cert_rotation_wins_test.go @@ -58,6 +58,9 @@ func (c *CertRotationWindowsTestSuite) SetupSuite() { c.cattleConfig, err = defaults.LoadPackageDefaults(c.cattleConfig, "") require.NoError(c.T(), err) + + c.cattleConfig, err = defaults.LoadSecretsManagerDefaults(c.cattleConfig) + require.NoError(c.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, c.cattleConfig, loggingConfig) diff --git a/validation/deleting/k3s/delete_cluster_test.go b/validation/deleting/k3s/delete_cluster_test.go index ac45acedaa..30aadc5beb 100644 --- a/validation/deleting/k3s/delete_cluster_test.go +++ b/validation/deleting/k3s/delete_cluster_test.go @@ -53,6 +53,9 @@ func (d *DeleteClusterTestSuite) SetupSuite() { d.cattleConfig, err = defaults.LoadPackageDefaults(d.cattleConfig, "") require.NoError(d.T(), err) + + d.cattleConfig, err = defaults.LoadSecretsManagerDefaults(d.cattleConfig) + require.NoError(d.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, d.cattleConfig, loggingConfig) diff --git a/validation/deleting/k3s/delete_init_machine_test.go b/validation/deleting/k3s/delete_init_machine_test.go index 64f3221411..483a2b4f01 100644 --- a/validation/deleting/k3s/delete_init_machine_test.go +++ b/validation/deleting/k3s/delete_init_machine_test.go @@ -55,6 +55,9 @@ func (d *DeleteInitMachineTestSuite) SetupSuite() { d.cattleConfig, err = defaults.LoadPackageDefaults(d.cattleConfig, "") require.NoError(d.T(), err) + + d.cattleConfig, err = defaults.LoadSecretsManagerDefaults(d.cattleConfig) + require.NoError(d.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, d.cattleConfig, loggingConfig) diff --git a/validation/deleting/k3s/delete_machine_test.go b/validation/deleting/k3s/delete_machine_test.go index e7fe9eb322..e815e977f7 100644 --- a/validation/deleting/k3s/delete_machine_test.go +++ b/validation/deleting/k3s/delete_machine_test.go @@ -57,6 +57,9 @@ func (d *DeleteMachineTestSuite) SetupSuite() { d.cattleConfig, err = defaults.LoadPackageDefaults(d.cattleConfig, "") require.NoError(d.T(), err) + + d.cattleConfig, err = defaults.LoadSecretsManagerDefaults(d.cattleConfig) + require.NoError(d.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, d.cattleConfig, loggingConfig) diff --git a/validation/deleting/rke2/delete_cluster_test.go b/validation/deleting/rke2/delete_cluster_test.go index 94e82f04df..1ec749b343 100644 --- a/validation/deleting/rke2/delete_cluster_test.go +++ b/validation/deleting/rke2/delete_cluster_test.go @@ -53,6 +53,9 @@ func (d *DeleteClusterTestSuite) SetupSuite() { d.cattleConfig, err = defaults.LoadPackageDefaults(d.cattleConfig, "") require.NoError(d.T(), err) + + d.cattleConfig, err = defaults.LoadSecretsManagerDefaults(d.cattleConfig) + require.NoError(d.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, d.cattleConfig, loggingConfig) diff --git a/validation/deleting/rke2/delete_init_machine_test.go b/validation/deleting/rke2/delete_init_machine_test.go index ec33651880..22cff0f976 100644 --- a/validation/deleting/rke2/delete_init_machine_test.go +++ b/validation/deleting/rke2/delete_init_machine_test.go @@ -55,6 +55,9 @@ func (d *DeleteInitMachineTestSuite) SetupSuite() { d.cattleConfig, err = defaults.LoadPackageDefaults(d.cattleConfig, "") require.NoError(d.T(), err) + + d.cattleConfig, err = defaults.LoadSecretsManagerDefaults(d.cattleConfig) + require.NoError(d.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, d.cattleConfig, loggingConfig) diff --git a/validation/deleting/rke2/delete_machine_test.go b/validation/deleting/rke2/delete_machine_test.go index e741f16826..5303a1fd73 100644 --- a/validation/deleting/rke2/delete_machine_test.go +++ b/validation/deleting/rke2/delete_machine_test.go @@ -57,6 +57,9 @@ func (d *DeleteMachineTestSuite) SetupSuite() { d.cattleConfig, err = defaults.LoadPackageDefaults(d.cattleConfig, "") require.NoError(d.T(), err) + + d.cattleConfig, err = defaults.LoadSecretsManagerDefaults(d.cattleConfig) + require.NoError(d.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, d.cattleConfig, loggingConfig) diff --git a/validation/nodescaling/k3s/scaling_test.go b/validation/nodescaling/k3s/scaling_test.go index 15c5d700f6..20d38db4c7 100644 --- a/validation/nodescaling/k3s/scaling_test.go +++ b/validation/nodescaling/k3s/scaling_test.go @@ -58,6 +58,9 @@ func (s *NodeScalingTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/nodescaling/rke2/scaling_test.go b/validation/nodescaling/rke2/scaling_test.go index 02a95d5830..8980005eb3 100644 --- a/validation/nodescaling/rke2/scaling_test.go +++ b/validation/nodescaling/rke2/scaling_test.go @@ -59,6 +59,9 @@ func (s *NodeScalingTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/provisioning/airgap/airgap_setup.go b/validation/provisioning/airgap/airgap_setup.go index b4c62d77ee..1448ea3cb2 100644 --- a/validation/provisioning/airgap/airgap_setup.go +++ b/validation/provisioning/airgap/airgap_setup.go @@ -64,6 +64,9 @@ func airgapSetup(t *testing.T, clusterType string) airgapTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/dualstack/k3s_custom_test.go b/validation/provisioning/dualstack/k3s_custom_test.go index 039ab5ed09..021d7998b7 100644 --- a/validation/provisioning/dualstack/k3s_custom_test.go +++ b/validation/provisioning/dualstack/k3s_custom_test.go @@ -46,6 +46,9 @@ func customK3SDualstackSetup(t *testing.T) customK3SDualstackTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/dualstack/k3s_node_driver_test.go b/validation/provisioning/dualstack/k3s_node_driver_test.go index b8437f6d88..de36fe2545 100644 --- a/validation/provisioning/dualstack/k3s_node_driver_test.go +++ b/validation/provisioning/dualstack/k3s_node_driver_test.go @@ -45,6 +45,9 @@ func nodeDriverK3SSetup(t *testing.T) nodeDriverK3STest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/dualstack/rke2_custom_test.go b/validation/provisioning/dualstack/rke2_custom_test.go index c502d740a9..1b8bfa24da 100644 --- a/validation/provisioning/dualstack/rke2_custom_test.go +++ b/validation/provisioning/dualstack/rke2_custom_test.go @@ -46,6 +46,9 @@ func customRKE2DualstackSetup(t *testing.T) customRKE2DualstackTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/dualstack/rke2_node_driver_test.go b/validation/provisioning/dualstack/rke2_node_driver_test.go index 57d58dac63..4e0646c6ed 100644 --- a/validation/provisioning/dualstack/rke2_node_driver_test.go +++ b/validation/provisioning/dualstack/rke2_node_driver_test.go @@ -45,6 +45,9 @@ func nodeDriverRKE2Setup(t *testing.T) nodeDriverRKE2Test { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/ipv6/k3s_custom_test.go b/validation/provisioning/ipv6/k3s_custom_test.go index c1151204af..24a1ac9624 100644 --- a/validation/provisioning/ipv6/k3s_custom_test.go +++ b/validation/provisioning/ipv6/k3s_custom_test.go @@ -46,6 +46,9 @@ func customK3SIPv6Setup(t *testing.T) customK3SIPv6Test { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/ipv6/k3s_node_driver_test.go b/validation/provisioning/ipv6/k3s_node_driver_test.go index 77b77c513f..e4e4252aaa 100644 --- a/validation/provisioning/ipv6/k3s_node_driver_test.go +++ b/validation/provisioning/ipv6/k3s_node_driver_test.go @@ -45,6 +45,9 @@ func nodeDriverK3SIPv6Setup(t *testing.T) nodeDriverK3SIPv6Test { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/ipv6/rke2_custom_test.go b/validation/provisioning/ipv6/rke2_custom_test.go index 1ecd8e8bd3..9369bfcc8b 100644 --- a/validation/provisioning/ipv6/rke2_custom_test.go +++ b/validation/provisioning/ipv6/rke2_custom_test.go @@ -46,6 +46,9 @@ func customRKE2IPv6Setup(t *testing.T) customRKE2IPv6Test { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/ipv6/rke2_node_driver_test.go b/validation/provisioning/ipv6/rke2_node_driver_test.go index 9640afa9a4..de7e5f7f24 100644 --- a/validation/provisioning/ipv6/rke2_node_driver_test.go +++ b/validation/provisioning/ipv6/rke2_node_driver_test.go @@ -45,6 +45,9 @@ func nodeDriverRKE2IPv6Setup(t *testing.T) nodeDriverRKE2IPv6Test { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/k3s/ace_test.go b/validation/provisioning/k3s/ace_test.go index d0ede6528a..73f91d0921 100644 --- a/validation/provisioning/k3s/ace_test.go +++ b/validation/provisioning/k3s/ace_test.go @@ -48,6 +48,9 @@ func aceSetup(t *testing.T) aceTest { k.cattleConfig = config.LoadConfigFromFile(os.Getenv(config.ConfigEnvironmentKey)) k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/k3s/custom_test.go b/validation/provisioning/k3s/custom_test.go index 2819c32e2d..895218dcb2 100644 --- a/validation/provisioning/k3s/custom_test.go +++ b/validation/provisioning/k3s/custom_test.go @@ -46,6 +46,9 @@ func customSetup(t *testing.T) customTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/k3s/data_directories_test.go b/validation/provisioning/k3s/data_directories_test.go index 1886e409fa..a8b365f3d7 100644 --- a/validation/provisioning/k3s/data_directories_test.go +++ b/validation/provisioning/k3s/data_directories_test.go @@ -45,6 +45,9 @@ func dataDirectoriesSetup(t *testing.T) dataDirectoriesTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/k3s/hardened_test.go b/validation/provisioning/k3s/hardened_test.go index 5165a098a0..6904a65d8c 100644 --- a/validation/provisioning/k3s/hardened_test.go +++ b/validation/provisioning/k3s/hardened_test.go @@ -50,6 +50,9 @@ func hardenedSetup(t *testing.T) hardenedTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/k3s/hostname_truncation_test.go b/validation/provisioning/k3s/hostname_truncation_test.go index 9b084b5ee9..18aafe06f9 100644 --- a/validation/provisioning/k3s/hostname_truncation_test.go +++ b/validation/provisioning/k3s/hostname_truncation_test.go @@ -45,6 +45,9 @@ func hostnameTruncationSetup(t *testing.T) hostnameTruncationTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/k3s/psact_test.go b/validation/provisioning/k3s/psact_test.go index 3db3524163..bb4dac25de 100644 --- a/validation/provisioning/k3s/psact_test.go +++ b/validation/provisioning/k3s/psact_test.go @@ -45,6 +45,9 @@ func psactSetup(t *testing.T) psactTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/k3s/template_test.go b/validation/provisioning/k3s/template_test.go index c2868c1e86..ec3fdbbb25 100644 --- a/validation/provisioning/k3s/template_test.go +++ b/validation/provisioning/k3s/template_test.go @@ -60,6 +60,9 @@ func templateSetup(t *testing.T) templateTest { k.cattleConfig, err = configDefaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = configDefaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/proxy/k3s_custom_test.go b/validation/provisioning/proxy/k3s_custom_test.go index ab29d445ec..67241d2c9b 100644 --- a/validation/provisioning/proxy/k3s_custom_test.go +++ b/validation/provisioning/proxy/k3s_custom_test.go @@ -49,6 +49,9 @@ func customK3SProxySetup(t *testing.T) customK3SProxyTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/proxy/k3s_proxy_node_driver_test.go b/validation/provisioning/proxy/k3s_proxy_node_driver_test.go index 002db058e0..324769a319 100644 --- a/validation/provisioning/proxy/k3s_proxy_node_driver_test.go +++ b/validation/provisioning/proxy/k3s_proxy_node_driver_test.go @@ -48,6 +48,9 @@ func nodeDriverK3SProxySetup(t *testing.T) nodeDriverK3SProxyTest { k.cattleConfig, err = defaults.LoadPackageDefaults(k.cattleConfig, "") require.NoError(t, err) + + k.cattleConfig, err = defaults.LoadSecretsManagerDefaults(k.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, k.cattleConfig, loggingConfig) diff --git a/validation/provisioning/proxy/rke2_custom_test.go b/validation/provisioning/proxy/rke2_custom_test.go index 42b96c4851..635d43fa95 100644 --- a/validation/provisioning/proxy/rke2_custom_test.go +++ b/validation/provisioning/proxy/rke2_custom_test.go @@ -49,6 +49,9 @@ func customRKE2ProxySetup(t *testing.T) customRKE2ProxyTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/proxy/rke2_proxy_node_driver_test.go b/validation/provisioning/proxy/rke2_proxy_node_driver_test.go index 1bd4e24f90..444b333b7b 100644 --- a/validation/provisioning/proxy/rke2_proxy_node_driver_test.go +++ b/validation/provisioning/proxy/rke2_proxy_node_driver_test.go @@ -48,6 +48,9 @@ func nodeDriverRKE2ProxySetup(t *testing.T) nodeDriverRKE2ProxyTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/registries/registries_setup.go b/validation/provisioning/registries/registries_setup.go index 1bf172d6f5..ef4b686844 100644 --- a/validation/provisioning/registries/registries_setup.go +++ b/validation/provisioning/registries/registries_setup.go @@ -56,6 +56,9 @@ func registriesSetup(t *testing.T) registriesTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/ace_test.go b/validation/provisioning/rke2/ace_test.go index cbab3ee983..ae834760ce 100644 --- a/validation/provisioning/rke2/ace_test.go +++ b/validation/provisioning/rke2/ace_test.go @@ -48,6 +48,9 @@ func aceSetup(t *testing.T) aceTest { r.cattleConfig = config.LoadConfigFromFile(os.Getenv(config.ConfigEnvironmentKey)) r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/agent_customization_test.go b/validation/provisioning/rke2/agent_customization_test.go index 72e65f19b7..28d3f9de14 100644 --- a/validation/provisioning/rke2/agent_customization_test.go +++ b/validation/provisioning/rke2/agent_customization_test.go @@ -45,6 +45,9 @@ func agentCustomizationSetup(t *testing.T) agentCustomizationTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/cloud_provider_test.go b/validation/provisioning/rke2/cloud_provider_test.go index 1cd6a7b7fc..3f25c66866 100644 --- a/validation/provisioning/rke2/cloud_provider_test.go +++ b/validation/provisioning/rke2/cloud_provider_test.go @@ -47,6 +47,9 @@ func cloudProviderSetup(t *testing.T) cloudProviderTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/cni_test.go b/validation/provisioning/rke2/cni_test.go index b86440bda1..632b134f8a 100644 --- a/validation/provisioning/rke2/cni_test.go +++ b/validation/provisioning/rke2/cni_test.go @@ -44,6 +44,9 @@ func cniSetup(t *testing.T) cniTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/custom_test.go b/validation/provisioning/rke2/custom_test.go index 6c65847dc0..fa6bf26728 100644 --- a/validation/provisioning/rke2/custom_test.go +++ b/validation/provisioning/rke2/custom_test.go @@ -46,6 +46,9 @@ func customSetup(t *testing.T) customTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/data_directories_test.go b/validation/provisioning/rke2/data_directories_test.go index 1087ee8aa9..16c2842a1c 100644 --- a/validation/provisioning/rke2/data_directories_test.go +++ b/validation/provisioning/rke2/data_directories_test.go @@ -45,6 +45,9 @@ func dataDirectoriesSetup(t *testing.T) dataDirectoriesTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/hardened_test.go b/validation/provisioning/rke2/hardened_test.go index f5a4e2806a..ec4ca38663 100644 --- a/validation/provisioning/rke2/hardened_test.go +++ b/validation/provisioning/rke2/hardened_test.go @@ -50,6 +50,9 @@ func hardenedSetup(t *testing.T) hardenedTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/hostname_truncation_test.go b/validation/provisioning/rke2/hostname_truncation_test.go index 5871187bbd..68e7db77ed 100644 --- a/validation/provisioning/rke2/hostname_truncation_test.go +++ b/validation/provisioning/rke2/hostname_truncation_test.go @@ -45,6 +45,10 @@ func hostnameTruncationSetup(t *testing.T) hostnameTruncationTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) + loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/ingress_test.go b/validation/provisioning/rke2/ingress_test.go index dad4a01d7a..8617b24dc9 100644 --- a/validation/provisioning/rke2/ingress_test.go +++ b/validation/provisioning/rke2/ingress_test.go @@ -46,6 +46,9 @@ func ingressSetup(t *testing.T) ingressTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/psact_test.go b/validation/provisioning/rke2/psact_test.go index fc1c1d6359..647a48b37e 100644 --- a/validation/provisioning/rke2/psact_test.go +++ b/validation/provisioning/rke2/psact_test.go @@ -48,6 +48,9 @@ func psactSetup(t *testing.T) psactTest { r.cattleConfig, err = defaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = defaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/provisioning/rke2/template_test.go b/validation/provisioning/rke2/template_test.go index 58c824c86a..847f614512 100644 --- a/validation/provisioning/rke2/template_test.go +++ b/validation/provisioning/rke2/template_test.go @@ -60,6 +60,9 @@ func templateSetup(t *testing.T) templateTest { r.cattleConfig, err = configDefaults.LoadPackageDefaults(r.cattleConfig, "") require.NoError(t, err) + + r.cattleConfig, err = configDefaults.LoadSecretsManagerDefaults(r.cattleConfig) + require.NoError(t, err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, r.cattleConfig, loggingConfig) diff --git a/validation/snapshot/k3s/snapshot_recurring_test.go b/validation/snapshot/k3s/snapshot_recurring_test.go index 98ccf9ba44..58562df54c 100644 --- a/validation/snapshot/k3s/snapshot_recurring_test.go +++ b/validation/snapshot/k3s/snapshot_recurring_test.go @@ -54,6 +54,9 @@ func (s *SnapshotRecurringTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/k3s/snapshot_restore_test.go b/validation/snapshot/k3s/snapshot_restore_test.go index ca6e33fbb4..21ba0e1765 100644 --- a/validation/snapshot/k3s/snapshot_restore_test.go +++ b/validation/snapshot/k3s/snapshot_restore_test.go @@ -58,6 +58,9 @@ func (s *SnapshotRestoreTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/k3s/snapshot_retention_test.go b/validation/snapshot/k3s/snapshot_retention_test.go index e1a1edc3dc..424833c215 100644 --- a/validation/snapshot/k3s/snapshot_retention_test.go +++ b/validation/snapshot/k3s/snapshot_retention_test.go @@ -61,6 +61,9 @@ func (s *SnapshotRetentionTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/k3s/snapshot_s3_restore_test.go b/validation/snapshot/k3s/snapshot_s3_restore_test.go index eb560aefe4..ffac53fd6e 100644 --- a/validation/snapshot/k3s/snapshot_s3_restore_test.go +++ b/validation/snapshot/k3s/snapshot_s3_restore_test.go @@ -75,6 +75,9 @@ func (s *S3SnapshotRestoreTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/rke2/snapshot_recurring_test.go b/validation/snapshot/rke2/snapshot_recurring_test.go index e68f11a3bb..777ac86a3b 100644 --- a/validation/snapshot/rke2/snapshot_recurring_test.go +++ b/validation/snapshot/rke2/snapshot_recurring_test.go @@ -54,6 +54,9 @@ func (s *SnapshotRecurringTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/rke2/snapshot_restore_test.go b/validation/snapshot/rke2/snapshot_restore_test.go index 0107566d01..e2f5fa901c 100644 --- a/validation/snapshot/rke2/snapshot_restore_test.go +++ b/validation/snapshot/rke2/snapshot_restore_test.go @@ -58,6 +58,9 @@ func (s *SnapshotRestoreTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/rke2/snapshot_restore_wins_test.go b/validation/snapshot/rke2/snapshot_restore_wins_test.go index ad864b1247..1e85879de7 100644 --- a/validation/snapshot/rke2/snapshot_restore_wins_test.go +++ b/validation/snapshot/rke2/snapshot_restore_wins_test.go @@ -60,6 +60,9 @@ func (s *SnapshotRestoreWindowsTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/rke2/snapshot_retention_test.go b/validation/snapshot/rke2/snapshot_retention_test.go index 457bf007cb..64cea46c13 100644 --- a/validation/snapshot/rke2/snapshot_retention_test.go +++ b/validation/snapshot/rke2/snapshot_retention_test.go @@ -62,6 +62,9 @@ func (s *SnapshotRetentionTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/snapshot/rke2/snapshot_s3_restore_test.go b/validation/snapshot/rke2/snapshot_s3_restore_test.go index 0f5d01b582..bca83ff25c 100644 --- a/validation/snapshot/rke2/snapshot_s3_restore_test.go +++ b/validation/snapshot/rke2/snapshot_s3_restore_test.go @@ -74,6 +74,9 @@ func (s *S3SnapshotRestoreTestSuite) SetupSuite() { s.cattleConfig, err = defaults.LoadPackageDefaults(s.cattleConfig, "") require.NoError(s.T(), err) + + s.cattleConfig, err = defaults.LoadSecretsManagerDefaults(s.cattleConfig) + require.NoError(s.T(), err) loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, s.cattleConfig, loggingConfig) diff --git a/validation/upgrade/k3s/kubernetes_test.go b/validation/upgrade/k3s/kubernetes_test.go index 1437db3a1d..93a33dbf33 100644 --- a/validation/upgrade/k3s/kubernetes_test.go +++ b/validation/upgrade/k3s/kubernetes_test.go @@ -57,6 +57,9 @@ func (u *UpgradeKubernetesTestSuite) SetupSuite() { u.cattleConfig, err = defaults.LoadPackageDefaults(u.cattleConfig, "") require.NoError(u.T(), err) + u.cattleConfig, err = defaults.LoadSecretsManagerDefaults(u.cattleConfig) + require.NoError(u.T(), err) + loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, u.cattleConfig, loggingConfig) diff --git a/validation/upgrade/rke2/cloud_provider_aws_migration_test.go b/validation/upgrade/rke2/cloud_provider_aws_migration_test.go index 5ca2d857ca..0a2721c7ea 100644 --- a/validation/upgrade/rke2/cloud_provider_aws_migration_test.go +++ b/validation/upgrade/rke2/cloud_provider_aws_migration_test.go @@ -55,6 +55,9 @@ func (u *MigrateCloudProviderSuite) SetupSuite() { u.cattleConfig, err = defaults.LoadPackageDefaults(u.cattleConfig, "") require.NoError(u.T(), err) + u.cattleConfig, err = defaults.LoadSecretsManagerDefaults(u.cattleConfig) + require.NoError(u.T(), err) + loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, u.cattleConfig, loggingConfig) diff --git a/validation/upgrade/rke2/kubernetes_test.go b/validation/upgrade/rke2/kubernetes_test.go index 9f63ad6424..5b5690594d 100644 --- a/validation/upgrade/rke2/kubernetes_test.go +++ b/validation/upgrade/rke2/kubernetes_test.go @@ -57,6 +57,9 @@ func (u *UpgradeKubernetesTestSuite) SetupSuite() { u.cattleConfig, err = defaults.LoadPackageDefaults(u.cattleConfig, "") require.NoError(u.T(), err) + u.cattleConfig, err = defaults.LoadSecretsManagerDefaults(u.cattleConfig) + require.NoError(u.T(), err) + loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, u.cattleConfig, loggingConfig) diff --git a/validation/upgrade/rke2/kubernetes_wins_test.go b/validation/upgrade/rke2/kubernetes_wins_test.go index 0384d63e7b..1e839b7705 100644 --- a/validation/upgrade/rke2/kubernetes_wins_test.go +++ b/validation/upgrade/rke2/kubernetes_wins_test.go @@ -59,6 +59,9 @@ func (u *UpgradeWindowsKubernetesTestSuite) SetupSuite() { u.cattleConfig, err = defaults.LoadPackageDefaults(u.cattleConfig, "") require.NoError(u.T(), err) + u.cattleConfig, err = defaults.LoadSecretsManagerDefaults(u.cattleConfig) + require.NoError(u.T(), err) + loggingConfig := new(logging.Logging) operations.LoadObjectFromMap(logging.LoggingKey, u.cattleConfig, loggingConfig)