Unnest an unnecessary ops-agent directory

integration_test/third_party_apps_test.go

@@ -88,9 +88,9 @@ func rejectDuplicates(apps []string) error {
 
 // appsToTest reads which applications to test for the given agent+platform
 // combination from the appropriate supported_applications.txt file.
-func appsToTest(agentType, platform string) ([]string, error) {
+func appsToTest(platform string) ([]string, error) {
 	contents, err := readFileFromScriptsDir(
-		path.Join("agent", agentType, osFolder(platform), "supported_applications.txt"))
+		path.Join("agent", osFolder(platform), "supported_applications.txt"))
 	if err != nil {
 		return nil, fmt.Errorf("could not read supported_applications.txt: %v", err)
 	}
@@ -168,24 +168,24 @@ func runScriptFromScriptsDir(ctx context.Context, logger *logging.DirectoryLogge
 
 // Installs the agent according to the instructions in a script
 // stored in the scripts directory.
-func installUsingScript(ctx context.Context, logger *logging.DirectoryLogger, vm *gce.VM, agentType string) (bool, error) {
+func installUsingScript(ctx context.Context, logger *logging.DirectoryLogger, vm *gce.VM) (bool, error) {
 	environmentVariables := make(map[string]string)
 	suffix := os.Getenv("REPO_SUFFIX")
 	if suffix != "" {
 		environmentVariables["REPO_SUFFIX"] = suffix
 	}
-	if _, err := runScriptFromScriptsDir(ctx, logger, vm, path.Join("agent", agentType, osFolder(vm.Platform), "install"), environmentVariables); err != nil {
+	if _, err := runScriptFromScriptsDir(ctx, logger, vm, path.Join("agent", osFolder(vm.Platform), "install"), environmentVariables); err != nil {
 		return retryable, fmt.Errorf("error installing agent: %v", err)
 	}
 	return nonRetryable, nil
 }
 
-func installAgent(ctx context.Context, logger *logging.DirectoryLogger, vm *gce.VM, agentType string) (bool, error) {
+func installAgent(ctx context.Context, logger *logging.DirectoryLogger, vm *gce.VM) (bool, error) {
 	defer time.Sleep(10 * time.Second)
 	if packagesInGCS == "" {
-		return installUsingScript(ctx, logger, vm, agentType)
+		return installUsingScript(ctx, logger, vm)
 	}
-	return nonRetryable, agents.InstallPackageFromGCS(ctx, logger, vm, agentType, packagesInGCS)
+	return nonRetryable, agents.InstallPackageFromGCS(ctx, logger, vm, agents.OpsAgentType, packagesInGCS)
 }
 
 // expectedEntries encodes a series of assertions about what data we expect to
@@ -273,7 +273,7 @@ func parseTestConfigFile() (testConfig, error) {
 // and ensures that the agent uploads data from the app.
 // Returns an error (nil on success), and a boolean indicating whether the error
 // is retryable.
-func runSingleTest(ctx context.Context, logger *logging.DirectoryLogger, vm *gce.VM, agentType, app string) (retry bool, err error) {
+func runSingleTest(ctx context.Context, logger *logging.DirectoryLogger, vm *gce.VM, app string) (retry bool, err error) {
 	folder, err := distroFolder(vm.Platform)
 	if err != nil {
 		return nonRetryable, err
@@ -283,7 +283,7 @@ func runSingleTest(ctx context.Context, logger *logging.DirectoryLogger, vm *gce
 		return retryable, fmt.Errorf("error installing %s: %v", app, err)
 	}
 
-	if shouldRetry, err := installAgent(ctx, logger, vm, agentType); err != nil {
+	if shouldRetry, err := installAgent(ctx, logger, vm); err != nil {
 		return shouldRetry, fmt.Errorf("error installing agent: %v", err)
 	}
 
@@ -421,21 +421,19 @@ func determineTestsToSkip(tests []test, impactedApps map[string]bool, testConfig
 func TestThirdPartyApps(t *testing.T) {
 	t.Cleanup(gce.CleanupKeysOrDie)
 
-	agentType := agents.OpsAgentType
-
 	testConfig, err := parseTestConfigFile()
 	if err != nil {
 		t.Fatal(err)
 	}
 	tests := []test{}
 	platforms := strings.Split(os.Getenv("PLATFORMS"), ",")
 	for _, platform := range platforms {
-		apps, err := appsToTest(agentType, platform)
+		apps, err := appsToTest(platform)
 		if err != nil {
-			t.Fatalf("Error when reading list of apps to test for agentType=%v, platform=%v. err=%v", agentType, platform, err)
+			t.Fatalf("Error when reading list of apps to test for platform=%v. err=%v", platform, err)
 		}
 		if len(apps) == 0 {
-			t.Fatalf("Found no applications when testing agentType=%v, platform=%v", agentType, platform)
+			t.Fatalf("Found no applications when testing platform=%v", platform)
 		}
 		for _, app := range apps {
 			tests = append(tests, test{platform, app, ""})
@@ -466,7 +464,7 @@ func TestThirdPartyApps(t *testing.T) {
 				logger.ToMainLog().Printf("VM is ready: %#v", vm)
 
 				var retryable bool
-				retryable, err = runSingleTest(ctx, logger, vm, agentType, tc.app)
+				retryable, err = runSingleTest(ctx, logger, vm, tc.app)
 				log.Printf("Attempt %v of %s test of %s finished with err=%v, retryable=%v", attempt, tc.platform, tc.app, err, retryable)
 				if err == nil {
 					return