From c5ebe750dc80480d66b7deb26873ac1e483f09ef Mon Sep 17 00:00:00 2001 From: Nikola Jokic Date: Thu, 18 May 2023 14:15:05 +0200 Subject: [PATCH] Discard logs on helm chart tests (#2607) --- .../tests/template_test.go | 22 +++++++++ .../tests/template_test.go | 46 +++++++++++++++++++ go.mod | 6 +-- go.sum | 6 +++ 4 files changed, 77 insertions(+), 3 deletions(-) diff --git a/charts/gha-runner-scale-set-controller/tests/template_test.go b/charts/gha-runner-scale-set-controller/tests/template_test.go index a097b433..663e64b2 100644 --- a/charts/gha-runner-scale-set-controller/tests/template_test.go +++ b/charts/gha-runner-scale-set-controller/tests/template_test.go @@ -8,6 +8,7 @@ import ( "github.com/gruntwork-io/terratest/modules/helm" "github.com/gruntwork-io/terratest/modules/k8s" + "github.com/gruntwork-io/terratest/modules/logger" "github.com/gruntwork-io/terratest/modules/random" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -33,6 +34,7 @@ func TestTemplate_CreateServiceAccount(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "serviceAccount.create": "true", "serviceAccount.annotations.foo": "bar", @@ -61,6 +63,7 @@ func TestTemplate_CreateServiceAccount_OverwriteName(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "serviceAccount.create": "true", "serviceAccount.name": "overwritten-name", @@ -90,6 +93,7 @@ func TestTemplate_CreateServiceAccount_CannotUseDefaultServiceAccount(t *testing namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "serviceAccount.create": "true", "serviceAccount.name": "default", @@ -113,6 +117,7 @@ func TestTemplate_NotCreateServiceAccount(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "serviceAccount.create": "false", "serviceAccount.name": "overwritten-name", @@ -136,6 +141,7 @@ func TestTemplate_NotCreateServiceAccount_ServiceAccountNotSet(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "serviceAccount.create": "false", "serviceAccount.annotations.foo": "bar", @@ -158,6 +164,7 @@ func TestTemplate_CreateManagerClusterRole(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{}, KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName), } @@ -189,6 +196,7 @@ func TestTemplate_ManagerClusterRoleBinding(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "serviceAccount.create": "true", }, @@ -224,6 +232,7 @@ func TestTemplate_CreateManagerListenerRole(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{}, KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName), } @@ -253,6 +262,7 @@ func TestTemplate_ManagerListenerRoleBinding(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "serviceAccount.create": "true", }, @@ -289,6 +299,7 @@ func TestTemplate_ControllerDeployment_Defaults(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "image.tag": "dev", }, @@ -384,6 +395,7 @@ func TestTemplate_ControllerDeployment_Customize(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "labels.foo": "bar", "labels.github": "actions", @@ -508,6 +520,7 @@ func TestTemplate_EnableLeaderElectionRole(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "replicaCount": "2", }, @@ -534,6 +547,7 @@ func TestTemplate_EnableLeaderElectionRoleBinding(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "replicaCount": "2", }, @@ -562,6 +576,7 @@ func TestTemplate_EnableLeaderElection(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "replicaCount": "2", "image.tag": "dev", @@ -605,6 +620,7 @@ func TestTemplate_ControllerDeployment_ForwardImagePullSecrets(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "imagePullSecrets[0].name": "dockerhub", "imagePullSecrets[1].name": "ghcr", @@ -643,6 +659,7 @@ func TestTemplate_ControllerDeployment_WatchSingleNamespace(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "image.tag": "dev", "flags.watchSingleNamespace": "demo", @@ -732,6 +749,7 @@ func TestTemplate_ControllerContainerEnvironmentVariables(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "env[0].Name": "ENV_VAR_NAME_1", "env[0].Value": "ENV_VAR_VALUE_1", @@ -778,6 +796,7 @@ func TestTemplate_WatchSingleNamespace_NotCreateManagerClusterRole(t *testing.T) namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "flags.watchSingleNamespace": "demo", }, @@ -799,6 +818,7 @@ func TestTemplate_WatchSingleNamespace_NotManagerClusterRoleBinding(t *testing.T namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "serviceAccount.create": "true", "flags.watchSingleNamespace": "demo", @@ -821,6 +841,7 @@ func TestTemplate_CreateManagerSingleNamespaceRole(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "flags.watchSingleNamespace": "demo", }, @@ -857,6 +878,7 @@ func TestTemplate_ManagerSingleNamespaceRoleBinding(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "flags.watchSingleNamespace": "demo", }, diff --git a/charts/gha-runner-scale-set/tests/template_test.go b/charts/gha-runner-scale-set/tests/template_test.go index 8676da66..d1d1c777 100644 --- a/charts/gha-runner-scale-set/tests/template_test.go +++ b/charts/gha-runner-scale-set/tests/template_test.go @@ -10,6 +10,7 @@ import ( actionsgithubcom "github.com/actions/actions-runner-controller/controllers/actions.github.com" "github.com/gruntwork-io/terratest/modules/helm" "github.com/gruntwork-io/terratest/modules/k8s" + "github.com/gruntwork-io/terratest/modules/logger" "github.com/gruntwork-io/terratest/modules/random" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -28,6 +29,7 @@ func TestTemplateRenderedGitHubSecretWithGitHubToken(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -59,6 +61,7 @@ func TestTemplateRenderedGitHubSecretWithGitHubApp(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_app_id": "10", @@ -92,6 +95,7 @@ func TestTemplateRenderedGitHubSecretErrorWithMissingAuthInput(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_app_id": "", @@ -119,6 +123,7 @@ func TestTemplateRenderedGitHubSecretErrorWithMissingAppInput(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_app_id": "10", @@ -145,6 +150,7 @@ func TestTemplateNotRenderedGitHubSecretWithPredefinedSecret(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret": "pre-defined-secret", @@ -169,6 +175,7 @@ func TestTemplateRenderedSetServiceAccountToNoPermission(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -204,6 +211,7 @@ func TestTemplateRenderedSetServiceAccountToKubeMode(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -271,6 +279,7 @@ func TestTemplateRenderedUserProvideSetServiceAccount(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -303,6 +312,7 @@ func TestTemplateRenderedAutoScalingRunnerSet(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -354,6 +364,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_RunnerScaleSetName(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -403,6 +414,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_ProvideMetadata(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -450,6 +462,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_MaxRunnersValidationError(t *testi namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -477,6 +490,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_MinRunnersValidationError(t *testi namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -505,6 +519,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_MinMaxRunnersValidationError(t *te namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -533,6 +548,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_MinMaxRunnersValidationSameValue(t namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -564,6 +580,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_MinMaxRunnersValidation_OnlyMin(t namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -594,6 +611,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_MinMaxRunnersValidation_OnlyMax(t namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -627,6 +645,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_MinMaxRunners_FromValuesFile(t *te namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, ValuesFiles: []string{testValuesPath}, KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName), } @@ -654,6 +673,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_ExtraVolumes(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "controllerServiceAccount.name": "arc", "controllerServiceAccount.namespace": "arc-system", @@ -688,6 +708,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_DinD_ExtraVolumes(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "controllerServiceAccount.name": "arc", "controllerServiceAccount.namespace": "arc-system", @@ -724,6 +745,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_K8S_ExtraVolumes(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "controllerServiceAccount.name": "arc", "controllerServiceAccount.namespace": "arc-system", @@ -755,6 +777,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_EnableDinD(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -846,6 +869,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_EnableKubernetesMode(t *testing.T) namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -903,6 +927,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_UsePredefinedSecret(t *testing.T) namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret": "pre-defined-secrets", @@ -937,6 +962,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_ErrorOnEmptyPredefinedSecret(t *te namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret": "", @@ -963,6 +989,7 @@ func TestTemplateRenderedWithProxy(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret": "pre-defined-secrets", @@ -1026,6 +1053,7 @@ func TestTemplateRenderedWithTLS(t *testing.T) { t.Run("providing githubServerTLS.runnerMountPath", func(t *testing.T) { t.Run("mode: default", func(t *testing.T) { options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret": "pre-defined-secrets", @@ -1084,6 +1112,7 @@ func TestTemplateRenderedWithTLS(t *testing.T) { t.Run("mode: dind", func(t *testing.T) { options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret": "pre-defined-secrets", @@ -1143,6 +1172,7 @@ func TestTemplateRenderedWithTLS(t *testing.T) { t.Run("mode: kubernetes", func(t *testing.T) { options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret": "pre-defined-secrets", @@ -1204,6 +1234,7 @@ func TestTemplateRenderedWithTLS(t *testing.T) { t.Run("without providing githubServerTLS.runnerMountPath", func(t *testing.T) { t.Run("mode: default", func(t *testing.T) { options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret": "pre-defined-secrets", @@ -1258,6 +1289,7 @@ func TestTemplateRenderedWithTLS(t *testing.T) { t.Run("mode: dind", func(t *testing.T) { options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret": "pre-defined-secrets", @@ -1313,6 +1345,7 @@ func TestTemplateRenderedWithTLS(t *testing.T) { t.Run("mode: kubernetes", func(t *testing.T) { options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret": "pre-defined-secrets", @@ -1402,6 +1435,7 @@ func TestTemplateNamingConstraints(t *testing.T) { for name, tc := range tt { t.Run(name, func(t *testing.T) { options := &helm.Options{ + Logger: logger.Discard, SetValues: setValues, KubectlOptions: k8s.NewKubectlOptions("", "", tc.namespaceName), } @@ -1423,6 +1457,7 @@ func TestTemplateRenderedGitHubConfigUrlEndsWIthSlash(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions/", "githubConfigSecret.github_token": "gh_token12345", @@ -1453,6 +1488,7 @@ func TestTemplate_CreateManagerRole(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -1487,6 +1523,7 @@ func TestTemplate_CreateManagerRole_UseConfigMaps(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -1520,6 +1557,7 @@ func TestTemplate_CreateManagerRoleBinding(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -1556,6 +1594,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_ExtraContainers(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "controllerServiceAccount.name": "arc", "controllerServiceAccount.namespace": "arc-system", @@ -1603,6 +1642,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_ExtraPodSpec(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "controllerServiceAccount.name": "arc", "controllerServiceAccount.namespace": "arc-system", @@ -1636,6 +1676,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_DinDMergePodSpec(t *testing.T) { namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "controllerServiceAccount.name": "arc", "controllerServiceAccount.namespace": "arc-system", @@ -1681,6 +1722,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_KubeModeMergePodSpec(t *testing.T) namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "controllerServiceAccount.name": "arc", "controllerServiceAccount.namespace": "arc-system", @@ -1722,6 +1764,7 @@ func TestTemplateRenderedAutoscalingRunnerSetAnnotation_GitHubSecret(t *testing. annotationExpectedTests := map[string]*helm.Options{ "GitHub token": { + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", @@ -1731,6 +1774,7 @@ func TestTemplateRenderedAutoscalingRunnerSetAnnotation_GitHubSecret(t *testing. KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName), }, "GitHub app": { + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_app_id": "10", @@ -1755,6 +1799,7 @@ func TestTemplateRenderedAutoscalingRunnerSetAnnotation_GitHubSecret(t *testing. t.Run("Annotation should not be set", func(t *testing.T) { options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret": "pre-defined-secret", @@ -1782,6 +1827,7 @@ func TestTemplateRenderedAutoscalingRunnerSetAnnotation_KubernetesModeCleanup(t namespaceName := "test-" + strings.ToLower(random.UniqueId()) options := &helm.Options{ + Logger: logger.Discard, SetValues: map[string]string{ "githubConfigUrl": "https://github.com/actions", "githubConfigSecret.github_token": "gh_token12345", diff --git a/go.mod b/go.mod index c5a759eb..350b8809 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 - github.com/gruntwork-io/terratest v0.41.11 + github.com/gruntwork-io/terratest v0.41.24 github.com/hashicorp/go-retryablehttp v0.7.2 github.com/kelseyhightower/envconfig v1.4.0 github.com/onsi/ginkgo v1.16.5 @@ -27,7 +27,7 @@ require ( go.uber.org/multierr v1.7.0 go.uber.org/zap v1.24.0 golang.org/x/net v0.8.0 - golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 + golang.org/x/oauth2 v0.1.0 golang.org/x/sync v0.1.0 gomodules.xyz/jsonpatch/v2 v2.2.0 gopkg.in/yaml.v2 v2.4.0 @@ -39,7 +39,7 @@ require ( ) require ( - github.com/aws/aws-sdk-go v1.40.56 // indirect + github.com/aws/aws-sdk-go v1.44.122 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect diff --git a/go.sum b/go.sum index b09cc55a..5aa01e15 100644 --- a/go.sum +++ b/go.sum @@ -43,6 +43,8 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/aws/aws-sdk-go v1.40.56 h1:FM2yjR0UUYFzDTMx+mH9Vyw1k1EUUxsAFzk+BjkzANA= github.com/aws/aws-sdk-go v1.40.56/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= +github.com/aws/aws-sdk-go v1.44.122 h1:p6mw01WBaNpbdP2xrisz5tIkcNwzj/HysobNoaAHjgo= +github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -210,6 +212,8 @@ github.com/gruntwork-io/go-commons v0.8.0 h1:k/yypwrPqSeYHevLlEDmvmgQzcyTwrlZGRa github.com/gruntwork-io/go-commons v0.8.0/go.mod h1:gtp0yTtIBExIZp7vyIV9I0XQkVwiQZze678hvDXof78= github.com/gruntwork-io/terratest v0.41.11 h1:EAHiK6PFWJCVkgW2yUompjSsZQzA0CfBcuqIaXtZdpk= github.com/gruntwork-io/terratest v0.41.11/go.mod h1:qH1xkPTTGx30XkMHw8jAVIbzqheSjIa5IyiTwSV2vKI= +github.com/gruntwork-io/terratest v0.41.24 h1:j6T6qe4deVvynTG2UmnjGwZy83he6xKgTaYWiSdFv/w= +github.com/gruntwork-io/terratest v0.41.24/go.mod h1:O6gajNBjO1wvc7Wl9WtbO+ORcdnhAV2GQiBE71ycwIk= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= @@ -468,6 +472,8 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +golang.org/x/oauth2 v0.1.0 h1:isLCZuhj4v+tYv7eskaN4v/TM+A1begWWgyVJDdl1+Y= +golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=