From c21d2acd8b329a3c192bddff47ff89db4a8d2b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= Date: Thu, 16 Oct 2025 10:36:25 +0200 Subject: [PATCH] fix tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weiße --- MODULE.bazel | 1 - internal/constellation/kubecmd/backup_test.go | 4 +- internal/kubernetes/configmaps_test.go | 6 +-- internal/kubernetes/marshal_test.go | 39 +++++++------------ internal/kubernetes/secrets_test.go | 6 +-- 5 files changed, 19 insertions(+), 37 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 8ceda6db2..351fe954f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -39,7 +39,6 @@ go_deps.from_file(go_work = "//:go.work") use_repo( go_deps, "cat_dario_mergo", - "com_github_aws_aws_sdk_go", "com_github_aws_aws_sdk_go_v2", "com_github_aws_aws_sdk_go_v2_config", "com_github_aws_aws_sdk_go_v2_credentials", diff --git a/internal/constellation/kubecmd/backup_test.go b/internal/constellation/kubecmd/backup_test.go index ac6e42d54..c655309e5 100644 --- a/internal/constellation/kubecmd/backup_test.go +++ b/internal/constellation/kubecmd/backup_test.go @@ -33,8 +33,8 @@ func TestBackupCRDs(t *testing.T) { }{ "success": { upgradeID: "1234", - crd: "apiVersion: \nkind: \nmetadata:\n name: foobar\n creationTimestamp: null\nspec:\n group: \"\"\n names:\n kind: \"somename\"\n plural: \"somenames\"\n scope: \"\"\n versions: null\nstatus:\n acceptedNames:\n kind: \"\"\n plural: \"\"\n conditions: null\n storedVersions: null\n", - expectedFile: "apiVersion: apiextensions.k8s.io/v1\nkind: CustomResourceDefinition\nmetadata:\n name: foobar\n creationTimestamp: null\nspec:\n group: \"\"\n names:\n kind: \"somename\"\n plural: \"somenames\"\n scope: \"\"\n versions: null\nstatus:\n acceptedNames:\n kind: \"\"\n plural: \"\"\n conditions: null\n storedVersions: null\n", + crd: "apiVersion: \nkind: \nmetadata:\n name: foobar\nspec:\n group: \"\"\n names:\n kind: \"somename\"\n plural: \"somenames\"\n scope: \"\"\n versions: null\nstatus:\n acceptedNames:\n kind: \"\"\n plural: \"\"\n conditions: null\n storedVersions: null\n", + expectedFile: "apiVersion: apiextensions.k8s.io/v1\nkind: CustomResourceDefinition\nmetadata:\n name: foobar\nspec:\n group: \"\"\n names:\n kind: \"somename\"\n plural: \"somenames\"\n scope: \"\"\n versions: null\nstatus:\n acceptedNames:\n kind: \"\"\n plural: \"\"\n conditions: null\n storedVersions: null\n", }, "api request fails": { upgradeID: "1234", diff --git a/internal/kubernetes/configmaps_test.go b/internal/kubernetes/configmaps_test.go index 702ab4d5e..ebf774592 100644 --- a/internal/kubernetes/configmaps_test.go +++ b/internal/kubernetes/configmaps_test.go @@ -42,14 +42,12 @@ func TestConfigMaps(t *testing.T) { data: key: value1 kind: ConfigMap -metadata: - creationTimestamp: null +metadata: {} --- apiVersion: v1 data: key: value2 kind: ConfigMap -metadata: - creationTimestamp: null +metadata: {} `, string(data)) } diff --git a/internal/kubernetes/marshal_test.go b/internal/kubernetes/marshal_test.go index 2dff4d4fd..aa9fadaf3 100644 --- a/internal/kubernetes/marshal_test.go +++ b/internal/kubernetes/marshal_test.go @@ -41,8 +41,7 @@ func TestMarshalK8SResources(t *testing.T) { data: key: value kind: ConfigMap -metadata: - creationTimestamp: null +metadata: {} `, }, "Multiple fields are correctly encoded": { @@ -73,15 +72,13 @@ metadata: data: key: value kind: ConfigMap -metadata: - creationTimestamp: null +metadata: {} --- apiVersion: v1 data: key: dmFsdWU= kind: Secret -metadata: - creationTimestamp: null +metadata: {} `, }, "Non-pointer is detected": { @@ -134,8 +131,7 @@ func TestUnmarshalK8SResources(t *testing.T) { data: key: value kind: ConfigMap -metadata: - creationTimestamp: null +metadata: {} `, into: &struct { ConfigMap k8s.ConfigMap @@ -159,15 +155,13 @@ metadata: data: key: value kind: ConfigMap -metadata: - creationTimestamp: null +metadata: {} --- apiVersion: v1 data: key: dmFsdWU= kind: Secret -metadata: - creationTimestamp: null +metadata: {} `, into: &struct { ConfigMap k8s.ConfigMap @@ -202,15 +196,13 @@ metadata: data: key: value kind: ConfigMap -metadata: - creationTimestamp: null +metadata: {} --- apiVersion: v1 data: key: dmFsdWU= kind: Secret -metadata: - creationTimestamp: null +metadata: {} `, into: &struct { ConfigMap k8s.ConfigMap @@ -238,8 +230,7 @@ metadata: data: key: value kind: ConfigMap -metadata: - creationTimestamp: null +metadata: {} `, into: &struct { String string @@ -251,8 +242,7 @@ metadata: data: key: value kind: ConfigMap -metadata: - creationTimestamp: null +metadata: {} `, into: &struct { Secret k8s.Secret @@ -301,8 +291,7 @@ func TestMarshalK8SResourcesList(t *testing.T) { data: key: value kind: ConfigMap -metadata: - creationTimestamp: null +metadata: {} `, }, "Multiple fields are correctly encoded": { @@ -330,15 +319,13 @@ metadata: data: key: value kind: ConfigMap -metadata: - creationTimestamp: null +metadata: {} --- apiVersion: v1 data: key: dmFsdWU= kind: Secret -metadata: - creationTimestamp: null +metadata: {} `, }, "Nil resource pointer is encodes": { diff --git a/internal/kubernetes/secrets_test.go b/internal/kubernetes/secrets_test.go index 972d539bc..c572eb27e 100644 --- a/internal/kubernetes/secrets_test.go +++ b/internal/kubernetes/secrets_test.go @@ -42,14 +42,12 @@ func TestSecrets(t *testing.T) { data: key: dmFsdWUx kind: Secret -metadata: - creationTimestamp: null +metadata: {} --- apiVersion: v1 data: key: dmFsdWUy kind: Secret -metadata: - creationTimestamp: null +metadata: {} `, string(data)) }