do not use CI api key in test infra (#41793)

### What does this PR do?
Use `E2E_API_KEY` for test infra apikey instead of `DD_API_KEY`

### Motivation
https://datadoghq.atlassian.net/browse/WINA-1910

`DD_API_KEY` was referenced to have an option for local testing, but the CI sets this var to report results and other telemetry, and this was overriding the expected API key from the runner config.

Author: clarkb7

test/new-e2e/tests/installer/script/all_scripts_test.go

@@ -20,9 +20,8 @@ import (
 	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e"
 	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments"
 	awshost "github.com/DataDog/datadog-agent/test/new-e2e/pkg/provisioners/aws/host"
-	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/runner"
-	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/runner/parameters"
 	"github.com/DataDog/datadog-agent/test/new-e2e/tests/installer/host"
+	installer "github.com/DataDog/datadog-agent/test/new-e2e/tests/installer/unix"
 )
 
 type installerScriptTests func(os e2eos.Descriptor, arch e2eos.Architecture) installerScriptSuite
@@ -162,18 +161,6 @@ func (s *installerScriptBaseSuite) RunInstallScript(url string, params ...string
 	require.NoErrorf(s.T(), err, "install script failed")
 }
 
-func (s *installerScriptBaseSuite) getAPIKey() string {
-	apiKey := os.Getenv("DD_API_KEY")
-	if apiKey == "" {
-		var err error
-		apiKey, err = runner.GetProfile().SecretStore().Get(parameters.APIKey)
-		if apiKey == "" || err != nil {
-			apiKey = "deadbeefdeadbeefdeadbeefdeadbeef"
-		}
-	}
-	return apiKey
-}
-
 func (s *installerScriptBaseSuite) RunInstallScriptWithError(url string, params ...string) error {
 	// Download scripts -- add retries for network issues
 	var err error
@@ -189,7 +176,7 @@ func (s *installerScriptBaseSuite) RunInstallScriptWithError(url string, params
 		time.Sleep(1 * time.Second)
 	}
 
-	scriptParams := append(params, fmt.Sprintf("DD_API_KEY=%s", s.getAPIKey()), "DD_INSTALLER_REGISTRY_URL_INSTALLER_PACKAGE=installtesting.datad0g.com.internal.dda-testing.com")
+	scriptParams := append(params, fmt.Sprintf("DD_API_KEY=%s", installer.GetAPIKey()), "DD_INSTALLER_REGISTRY_URL_INSTALLER_PACKAGE=installtesting.datad0g.com.internal.dda-testing.com")
 	_, err = s.Env().RemoteHost.Execute(fmt.Sprintf("%s bash install_script", strings.Join(scriptParams, " ")))
 	return err
 }

test/new-e2e/tests/installer/script/default_script_test.go

@@ -17,6 +17,7 @@ import (
 
 	awshost "github.com/DataDog/datadog-agent/test/new-e2e/pkg/provisioners/aws/host"
 	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/utils/e2e/client"
+	installer "github.com/DataDog/datadog-agent/test/new-e2e/tests/installer/unix"
 )
 
 type installScriptDefaultSuite struct {
@@ -119,7 +120,7 @@ func (s *installScriptDefaultSuite) TestInstallParity() {
 		s.Env().RemoteHost.MustExecute("sudo systemctl daemon-reexec")
 	}
 	_, err := s.Env().RemoteHost.Execute(fmt.Sprintf(`%s bash -c "$(curl -L https://dd-agent.s3.amazonaws.com/scripts/install_script_agent7.sh)"`, strings.Join(params, " ")), client.WithEnvVariables(map[string]string{
-		"DD_API_KEY":               s.getAPIKey(),
+		"DD_API_KEY":               installer.GetAPIKey(),
 		"TESTING_KEYS_URL":         "apttesting.datad0g.com/test-keys",
 		"TESTING_APT_URL":          fmt.Sprintf("s3.amazonaws.com/apttesting.datad0g.com/datadog-agent/pipeline-%s-a7", os.Getenv("E2E_PIPELINE_ID")),
 		"TESTING_APT_REPO_VERSION": fmt.Sprintf("stable-%s 7", s.arch),
@@ -158,7 +159,7 @@ func (s *installScriptDefaultSuite) TestInstallParity() {
 // the major / minor version when installing the agent
 func (s *installScriptDefaultSuite) TestInstallIgnoreMajorMinor() {
 	params := []string{
-		"DD_API_KEY=" + s.getAPIKey(),
+		"DD_API_KEY=" + installer.GetAPIKey(),
 		"DD_REMOTE_UPDATES=true",
 		"DD_AGENT_MAJOR_VERSION=7",
 		"DD_AGENT_MINOR_VERSION=65.0",

test/new-e2e/tests/installer/unix/package_definitions.go

@@ -13,6 +13,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/runner"
+	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/runner/parameters"
 	e2eos "github.com/DataDog/test-infra-definitions/components/os"
 	"github.com/google/go-containerregistry/pkg/crane"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
@@ -82,11 +84,7 @@ var PackagesConfig = []TestPackageConfig{
 }
 
 func installScriptPackageManagerEnv(env map[string]string, arch e2eos.Architecture) {
-	apiKey := os.Getenv("DD_API_KEY")
-	if apiKey == "" {
-		apiKey = "deadbeefdeadbeefdeadbeefdeadbeef"
-	}
-	env["DD_API_KEY"] = apiKey
+	env["DD_API_KEY"] = GetAPIKey()
 	env["DD_SITE"] = "datadoghq.com"
 	// Install Script env variables
 	env["TESTING_KEYS_URL"] = "apttesting.datad0g.com/test-keys"
@@ -129,16 +127,26 @@ func InstallScriptEnvWithPackages(arch e2eos.Architecture, packagesConfig []Test
 // InstallInstallerScriptEnvWithPackages returns the environment variables for the installer script for the given packages
 func InstallInstallerScriptEnvWithPackages() map[string]string {
 	env := map[string]string{}
-	apiKey := os.Getenv("DD_API_KEY")
-	if apiKey == "" {
-		apiKey = "deadbeefdeadbeefdeadbeefdeadbeef"
-	}
-	env["DD_API_KEY"] = apiKey
+	env["DD_API_KEY"] = GetAPIKey()
 	env["DD_SITE"] = "datadoghq.com"
 	installScriptInstallerEnv(env, PackagesConfig)
 	return env
 }
 
+// GetAPIKey returns the API key from the runner config, or a default value if not set
+//
+// Set the key in ~/.test_infra_config.yaml or use the E2E_API_KEY env var
+//
+// Do not use the DD_API_KEY env var, the CI uses it to report results to org2, the tests
+// should use a different key.
+func GetAPIKey() string {
+	apiKey, err := runner.GetProfile().SecretStore().Get(parameters.APIKey)
+	if apiKey == "" || err != nil {
+		apiKey = "deadbeefdeadbeefdeadbeefdeadbeef"
+	}
+	return apiKey
+}
+
 // PipelineAgentVersion returns the version of the pipeline agent
 func PipelineAgentVersion(t *testing.T) string {
 	ref := fmt.Sprintf("installtesting.datad0g.com/agent-package:pipeline-%s", os.Getenv("E2E_PIPELINE_ID"))

test/new-e2e/tests/installer/windows/install_script.go

@@ -7,7 +7,6 @@ package installer
 
 import (
 	"fmt"
-	"os"
 	"path/filepath"
 	"strings"
 
@@ -75,15 +74,7 @@ func (b *baseInstaller) getInstallerURL(params Params) (string, error) {
 // Always sets DD_REMOTE_UPDATES to true to ensure remote updates are enabled.
 func (b *baseInstaller) getBaseEnvVars() map[string]string {
 	envVars := installer.InstallScriptEnv(e2eos.AMD64Arch)
-	apiKey := os.Getenv("DD_API_KEY")
-	if apiKey == "" {
-		var err error
-		apiKey, err = runner.GetProfile().SecretStore().Get(parameters.APIKey)
-		if apiKey == "" || err != nil {
-			apiKey = "deadbeefdeadbeefdeadbeefdeadbeef"
-		}
-	}
-	envVars["DD_API_KEY"] = apiKey
+	envVars["DD_API_KEY"] = installer.GetAPIKey()
 	for k, v := range b.params.extraEnvVars {
 		envVars[k] = v
 	}

test/new-e2e/tests/installer/windows/installer.go

@@ -19,8 +19,6 @@ import (
 	e2eos "github.com/DataDog/test-infra-definitions/components/os"
 
 	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/environments"
-	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/runner"
-	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/runner/parameters"
 	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/utils/e2e/client"
 	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/utils/optional"
 	installer "github.com/DataDog/datadog-agent/test/new-e2e/tests/installer/unix"
@@ -86,16 +84,8 @@ func (d *DatadogInstaller) SetBinaryPath(path string) {
 
 func (d *DatadogInstaller) execute(cmd string, options ...client.ExecuteOption) (string, error) {
 	// Ensure the API key and site are set for telemetry
-	apiKey := os.Getenv("DD_API_KEY")
-	if apiKey == "" {
-		var err error
-		apiKey, err = runner.GetProfile().SecretStore().Get(parameters.APIKey)
-		if apiKey == "" || err != nil {
-			apiKey = "deadbeefdeadbeefdeadbeefdeadbeef"
-		}
-	}
 	envVars := map[string]string{
-		"DD_API_KEY": apiKey,
+		"DD_API_KEY": installer.GetAPIKey(),
 		"DD_SITE":    "datadoghq.com",
 	}
 

test/new-e2e/tests/installer/windows/suites/agent-package/upgrade_test.go

@@ -17,8 +17,7 @@ import (
 
 	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e"
 	winawshost "github.com/DataDog/datadog-agent/test/new-e2e/pkg/provisioners/aws/host/windows"
-	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/runner"
-	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/runner/parameters"
+	installer "github.com/DataDog/datadog-agent/test/new-e2e/tests/installer/unix"
 	installerwindows "github.com/DataDog/datadog-agent/test/new-e2e/tests/installer/windows"
 	"github.com/DataDog/datadog-agent/test/new-e2e/tests/installer/windows/consts"
 	windowscommon "github.com/DataDog/datadog-agent/test/new-e2e/tests/windows/common"
@@ -658,15 +657,7 @@ func (s *testAgentUpgradeSuite) setAgentConfigWithAltDir(path string) {
 	s.Env().RemoteHost.MkdirAll(path)
 	configPath := path + `\datadog.yaml`
 	// Ensure the API key is set for telemetry
-	apiKey := os.Getenv("DD_API_KEY")
-	if apiKey == "" {
-		var err error
-		apiKey, err = runner.GetProfile().SecretStore().Get(parameters.APIKey)
-		if apiKey == "" || err != nil {
-			apiKey = "deadbeefdeadbeefdeadbeefdeadbeef"
-		}
-	}
-
+	apiKey := installer.GetAPIKey()
 	s.Env().RemoteHost.WriteFile(configPath, []byte(`
 api_key: `+apiKey+`
 site: datadoghq.com

test/new-e2e/tests/installer/windows/suites/apm-library-dotnet-package/msi_install_test.go

@@ -13,8 +13,7 @@ import (
 	"github.com/DataDog/datadog-agent/pkg/util/testutil/flake"
 	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/e2e"
 	winawshost "github.com/DataDog/datadog-agent/test/new-e2e/pkg/provisioners/aws/host/windows"
-	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/runner"
-	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/runner/parameters"
+	installer "github.com/DataDog/datadog-agent/test/new-e2e/tests/installer/unix"
 	installerwindows "github.com/DataDog/datadog-agent/test/new-e2e/tests/installer/windows"
 	"github.com/DataDog/datadog-agent/test/new-e2e/tests/installer/windows/consts"
 
@@ -365,7 +364,7 @@ func (s *testAgentMSIInstallsDotnetLibrary) installPreviousAgentVersion(opts ...
 	options := []installerwindows.MsiOption{
 		installerwindows.WithOption(installerwindows.WithInstallerURL(s.StableAgentVersion().MSIPackage().URL)),
 		installerwindows.WithMSILogFile("install-previous-version.log"),
-		installerwindows.WithMSIArg(fmt.Sprintf("APIKEY=%s", s.getAPIKey())),
+		installerwindows.WithMSIArg(fmt.Sprintf("APIKEY=%s", installer.GetAPIKey())),
 		installerwindows.WithMSIArg("SITE=datadoghq.com"),
 	}
 	options = append(options, opts...)
@@ -386,7 +385,7 @@ func (s *testAgentMSIInstallsDotnetLibrary) installCurrentAgentVersion(opts ...i
 	options := []installerwindows.MsiOption{
 		installerwindows.WithOption(installerwindows.WithInstallerURL(s.CurrentAgentVersion().MSIPackage().URL)),
 		installerwindows.WithMSILogFile("install-current-version.log"),
-		installerwindows.WithMSIArg(fmt.Sprintf("APIKEY=%s", s.getAPIKey())),
+		installerwindows.WithMSIArg(fmt.Sprintf("APIKEY=%s", installer.GetAPIKey())),
 		installerwindows.WithMSIArg("SITE=datadoghq.com"),
 	}
 	options = append(options, opts...)
@@ -402,15 +401,3 @@ func (s *testAgentMSIInstallsDotnetLibrary) installCurrentAgentVersion(opts ...i
 			s.Require().Contains(version, agentVersion)
 		})
 }
-
-func (s *testAgentMSIInstallsDotnetLibrary) getAPIKey() string {
-	apiKey := os.Getenv("DD_API_KEY")
-	if apiKey == "" {
-		var err error
-		apiKey, err = runner.GetProfile().SecretStore().Get(parameters.APIKey)
-		if apiKey == "" || err != nil {
-			apiKey = "deadbeefdeadbeefdeadbeefdeadbeef"
-		}
-	}
-	return apiKey
-}