From e600b441b942b05c7a19178e1756d97df6900c7e Mon Sep 17 00:00:00 2001 From: Otto Bittner Date: Tue, 3 Dec 2024 15:52:43 +0100 Subject: [PATCH] rm unnecessary tags and add tags flag to checkphase --- cli/cmd/recover.go | 2 -- cli/cmd/set.go | 2 -- cli/cmd/verify.go | 2 -- cli/main.go | 2 -- e2e/aks-runtime/aks_runtime_test.go | 2 +- e2e/genpolicy/genpolicy_test.go | 2 +- e2e/getdents/getdents_test.go | 2 +- e2e/internal/contrasttest/contrasttest.go | 2 +- e2e/openssl/openssl_test.go | 2 +- e2e/policy/policy_test.go | 2 +- e2e/regression/regression_test.go | 2 +- e2e/servicemesh/servicemesh_test.go | 2 +- e2e/volumestatefulset/volumestatefulset_test.go | 2 +- e2e/workloadsecret/workloadsecret_test.go | 2 +- packages/by-name/contrast/package.nix | 2 +- 15 files changed, 11 insertions(+), 19 deletions(-) diff --git a/cli/cmd/recover.go b/cli/cmd/recover.go index 4f1ac0d678..2d3665b43d 100644 --- a/cli/cmd/recover.go +++ b/cli/cmd/recover.go @@ -1,8 +1,6 @@ // Copyright 2024 Edgeless Systems GmbH // SPDX-License-Identifier: AGPL-3.0-only -//go:build contrast_unstable_api - package cmd import ( diff --git a/cli/cmd/set.go b/cli/cmd/set.go index 5eed1e1ca7..6d2858138e 100644 --- a/cli/cmd/set.go +++ b/cli/cmd/set.go @@ -1,8 +1,6 @@ // Copyright 2024 Edgeless Systems GmbH // SPDX-License-Identifier: AGPL-3.0-only -//go:build contrast_unstable_api - package cmd import ( diff --git a/cli/cmd/verify.go b/cli/cmd/verify.go index c6336d2737..decf0dfef4 100644 --- a/cli/cmd/verify.go +++ b/cli/cmd/verify.go @@ -1,8 +1,6 @@ // Copyright 2024 Edgeless Systems GmbH // SPDX-License-Identifier: AGPL-3.0-only -//go:build contrast_unstable_api - package cmd import ( diff --git a/cli/main.go b/cli/main.go index f27951816d..54e3889e13 100644 --- a/cli/main.go +++ b/cli/main.go @@ -1,8 +1,6 @@ // Copyright 2024 Edgeless Systems GmbH // SPDX-License-Identifier: AGPL-3.0-only -//go:build contrast_unstable_api - package main import ( diff --git a/e2e/aks-runtime/aks_runtime_test.go b/e2e/aks-runtime/aks_runtime_test.go index cf1ccc9866..bd39c9ce7a 100644 --- a/e2e/aks-runtime/aks_runtime_test.go +++ b/e2e/aks-runtime/aks_runtime_test.go @@ -1,7 +1,7 @@ // Copyright 2024 Edgeless Systems GmbH // SPDX-License-Identifier: AGPL-3.0-only -//go:build e2e && contrast_unstable_api +//go:build e2e package aksruntime diff --git a/e2e/genpolicy/genpolicy_test.go b/e2e/genpolicy/genpolicy_test.go index 2fb7aea4de..b35d6a28f4 100644 --- a/e2e/genpolicy/genpolicy_test.go +++ b/e2e/genpolicy/genpolicy_test.go @@ -1,7 +1,7 @@ // Copyright 2024 Edgeless Systems GmbH // SPDX-License-Identifier: AGPL-3.0-only -//go:build e2e && contrast_unstable_api +//go:build e2e package genpolicy diff --git a/e2e/getdents/getdents_test.go b/e2e/getdents/getdents_test.go index 2b6b8dc85d..1f9b489497 100644 --- a/e2e/getdents/getdents_test.go +++ b/e2e/getdents/getdents_test.go @@ -1,7 +1,7 @@ // Copyright 2024 Edgeless Systems GmbH // SPDX-License-Identifier: AGPL-3.0-only -//go:build e2e && contrast_unstable_api +//go:build e2e package getdents diff --git a/e2e/internal/contrasttest/contrasttest.go b/e2e/internal/contrasttest/contrasttest.go index 835547e5f3..8b79e1547d 100644 --- a/e2e/internal/contrasttest/contrasttest.go +++ b/e2e/internal/contrasttest/contrasttest.go @@ -1,7 +1,7 @@ // Copyright 2024 Edgeless Systems GmbH // SPDX-License-Identifier: AGPL-3.0-only -//go:build e2e && contrast_unstable_api +//go:build e2e package contrasttest diff --git a/e2e/openssl/openssl_test.go b/e2e/openssl/openssl_test.go index 5d0a6ce3a3..88bd3b6116 100644 --- a/e2e/openssl/openssl_test.go +++ b/e2e/openssl/openssl_test.go @@ -1,7 +1,7 @@ // Copyright 2024 Edgeless Systems GmbH // SPDX-License-Identifier: AGPL-3.0-only -//go:build e2e && contrast_unstable_api +//go:build e2e package openssl diff --git a/e2e/policy/policy_test.go b/e2e/policy/policy_test.go index 1aa8e4606d..55db8f1b6e 100644 --- a/e2e/policy/policy_test.go +++ b/e2e/policy/policy_test.go @@ -1,7 +1,7 @@ // Copyright 2024 Edgeless Systems GmbH // SPDX-License-Identifier: AGPL-3.0-only -//go:build e2e && contrast_unstable_api +//go:build e2e package policy diff --git a/e2e/regression/regression_test.go b/e2e/regression/regression_test.go index 24d64274b1..784c910878 100644 --- a/e2e/regression/regression_test.go +++ b/e2e/regression/regression_test.go @@ -1,7 +1,7 @@ // Copyright 2024 Edgeless Systems GmbH // SPDX-License-Identifier: AGPL-3.0-only -//go:build e2e && contrast_unstable_api +//go:build e2e package regression diff --git a/e2e/servicemesh/servicemesh_test.go b/e2e/servicemesh/servicemesh_test.go index 23cb417d71..eeea231bd5 100644 --- a/e2e/servicemesh/servicemesh_test.go +++ b/e2e/servicemesh/servicemesh_test.go @@ -1,7 +1,7 @@ // Copyright 2024 Edgeless Systems GmbH // SPDX-License-Identifier: AGPL-3.0-only -//go:build e2e && contrast_unstable_api +//go:build e2e package servicemesh diff --git a/e2e/volumestatefulset/volumestatefulset_test.go b/e2e/volumestatefulset/volumestatefulset_test.go index f3b5847c50..9e4a9f3738 100644 --- a/e2e/volumestatefulset/volumestatefulset_test.go +++ b/e2e/volumestatefulset/volumestatefulset_test.go @@ -1,7 +1,7 @@ // Copyright 2024 Edgeless Systems GmbH // SPDX-License-Identifier: AGPL-3.0-only -//go:build e2e && contrast_unstable_api +//go:build e2e package volumestatefulset diff --git a/e2e/workloadsecret/workloadsecret_test.go b/e2e/workloadsecret/workloadsecret_test.go index fc6fd2d7bb..8257558f28 100644 --- a/e2e/workloadsecret/workloadsecret_test.go +++ b/e2e/workloadsecret/workloadsecret_test.go @@ -1,7 +1,7 @@ // Copyright 2024 Edgeless Systems GmbH // SPDX-License-Identifier: AGPL-3.0-only -//go:build e2e && contrast_unstable_api +//go:build e2e package workloadsecret diff --git a/packages/by-name/contrast/package.nix b/packages/by-name/contrast/package.nix index 1727832e0c..9a3dc42f98 100644 --- a/packages/by-name/contrast/package.nix +++ b/packages/by-name/contrast/package.nix @@ -212,7 +212,7 @@ buildGoModule rec { checkPhase = '' runHook preCheck - go test -race ./... + go test -tags=contrast_unstable_api -race ./... runHook postCheck '';