Revert some setup changes

Remove unnecessary integration test

internal/constants/constants.go

@@ -62,9 +62,6 @@ const DisableUpdates = "ACTIVESTATE_CLI_DISABLE_UPDATES"
 // UpdateBranchEnvVarName is the env var that is used to override which branch to pull the update from
 const UpdateBranchEnvVarName = "ACTIVESTATE_CLI_UPDATE_BRANCH"
 
-// InstallBuildDependencies is the env var that is used to override whether to install build dependencies
-const InstallBuildDependencies = "ACTIVESTATE_CLI_INSTALL_BUILD_DEPENDENCIES"
-
 // InternalConfigFileNameLegacy is effectively the same as InternalConfigName, but includes our preferred extension
 const InternalConfigFileNameLegacy = "config.yaml"
 

pkg/platform/runtime/buildplan/buildplan.go

@@ -459,9 +459,6 @@ func buildBuildClosureDependencies(artifactID strfmt.UUID, lookup map[strfmt.UUI
 
 	var uniqueDeps []strfmt.UUID
 	for id := range deps {
-		if _, ok := deps[id]; !ok {
-			continue
-		}
 		uniqueDeps = append(uniqueDeps, id)
 	}
 

pkg/platform/runtime/setup/setup.go

@@ -385,6 +385,11 @@ func (s *Setup) fetchAndInstallArtifactsFromBuildPlan(installFunc artifactInstal
 	var runtimeAndBuildtimeArtifacts artifact.Map
 	var runtimeArtifacts artifact.Map // Artifacts required for the runtime to function
 
+	runtimeArtifacts, err = buildplan.NewMapFromBuildPlan(buildResult.Build)
+	if err != nil {
+		return nil, nil, errs.Wrap(err, "Failed to create artifact map from build plan")
+	}
+
 	// If the build is not ready, we need to get the runtime and buildtime closure
 	if !buildResult.BuildReady {
 		runtimeAndBuildtimeArtifacts, err = buildplan.NewBuildtimeMap(buildResult.Build)
@@ -393,23 +398,6 @@ func (s *Setup) fetchAndInstallArtifactsFromBuildPlan(installFunc artifactInstal
 		}
 	}
 
-	// If we are installing build dependencies, then buildtime dependences are also runtime dependencies
-	if strings.EqualFold(os.Getenv(constants.InstallBuildDependencies), "true") {
-		logging.Debug("Installing build dependencies")
-		if runtimeAndBuildtimeArtifacts == nil {
-			runtimeAndBuildtimeArtifacts, err = buildplan.NewBuildtimeMap(buildResult.Build)
-			if err != nil {
-				return nil, nil, errs.Wrap(err, "Failed to create artifact map from build plan")
-			}
-		}
-		runtimeArtifacts = runtimeAndBuildtimeArtifacts
-	} else {
-		runtimeArtifacts, err = buildplan.NewMapFromBuildPlan(buildResult.Build)
-		if err != nil {
-			return nil, nil, errs.Wrap(err, "Failed to create artifact map from build plan")
-		}
-	}
-
 	var setup Setuper
 	if !buildResult.BuildReady {
 		setup, err = s.selectSetupImplementation(buildResult.BuildEngine, runtimeAndBuildtimeArtifacts)
@@ -508,17 +496,16 @@ func (s *Setup) fetchAndInstallArtifactsFromBuildPlan(installFunc artifactInstal
 	)
 
 	artifactsToInstall := []artifact.ArtifactID{}
-	for _, a := range downloadablePrebuiltResults {
-		if _, alreadyInstalled := alreadyInstalled[a.ArtifactID]; !alreadyInstalled {
-			artifactsToInstall = append(artifactsToInstall, a.ArtifactID)
-		}
-	}
-
 	var artifactsToBuild artifact.Map
-	if !buildResult.BuildReady {
-		artifactsToBuild = runtimeAndBuildtimeArtifacts
-	} else {
+	if buildResult.BuildReady {
+		for _, a := range downloadablePrebuiltResults {
+			if _, alreadyInstalled := alreadyInstalled[a.ArtifactID]; !alreadyInstalled {
+				artifactsToInstall = append(artifactsToInstall, a.ArtifactID)
+			}
+		}
 		artifactsToBuild = runtimeArtifacts
+	} else {
+		artifactsToBuild = runtimeAndBuildtimeArtifacts
 	}
 
 	// The log file we want to use for builds

test/integration/checkout_int_test.go

@@ -244,26 +244,6 @@ func (suite *CheckoutIntegrationTestSuite) TestCheckoutCaseInsensitive() {
 	suite.Assert().NotContains(string(bytes), "ACTIVESTATE-CLI/SMALL-PYTHON", "kept incorrect namespace case")
 }
 
-func (suite *CheckoutIntegrationTestSuite) TestCheckoutBuildtimeClosure() {
-	suite.OnlyRunForTags(tagsuite.Checkout)
-
-	if runtime.GOOS != "linux" {
-		suite.T().Skip("Skipping buildtime closure test on non-linux platform")
-	}
-
-	ts := e2e.New(suite.T(), false)
-	defer ts.Close()
-
-	cp := ts.SpawnWithOpts(
-		e2e.OptArgs("checkout", "ActiveState-CLI/small-python"),
-		e2e.OptAppendEnv(constants.InstallBuildDependencies+"=true"),
-		e2e.OptAppendEnv(constants.DisableRuntime+"=false"),
-	)
-	// Expect the number of build deps to be 27 which is more than the number of runtime deps.
-	cp.Expect("27")
-	cp.ExpectExitCode(0)
-}
-
 func TestCheckoutIntegrationTestSuite(t *testing.T) {
 	suite.Run(t, new(CheckoutIntegrationTestSuite))
 }