Fix integration tests

.github/workflows/build.yml

@@ -242,7 +242,11 @@ jobs:
               if [ "$START" == "Test" ]; then
                 TAG=${i##*:}
                 TAG=$(echo $TAG | xargs)
-                TEST_SUITE_TAGS="$TAG:$TEST_SUITE_TAGS"
+                if [[ "$TEST_SUITE_TAGS" == "" ]]; then
+                  TEST_SUITE_TAGS=$TAG
+                else
+                  TEST_SUITE_TAGS="$TAG:$TEST_SUITE_TAGS"
+                fi
               fi
             done
 
@@ -262,7 +266,7 @@ jobs:
           export TEST_SUITE_TAGS="$TEST_SUITE_TAGS"
           TIMEOUT=10m
           if [[ "$TEST_SUITE_TAGS" == "all" ]]; then
-            TIMEOUT=90m
+            TIMEOUT=30m
           fi
           set +e
           SHELL='' go test -timeout $TIMEOUT -v `go list ./... | grep integration` &> build/integration-tests.out

.gotestfmt/package.gotpl

@@ -23,7 +23,7 @@ we are creating a stylized header for each package.
                 {{- else -}}
                     {{ "\033" }}[0;31m❌
                 {{- end -}}
-                {{ " " }}{{- .Name -}}
+                {{ " " }}{{- .Name -}}{{ " " }}[{{ .Result -}}]
                 {{- "\033" -}}[0;37m ({{ .Duration -}}
                 {{- with .Coverage -}}
                     , coverage: {{ . }}%

cmd/state-installer/cmd.go

@@ -62,8 +62,8 @@ func main() {
 			exitCode = 1
 		}
 
-		if err := cfg.Close(); err != nil {
-			multilog.Error("Failed to close config: %v", err)
+		if cfg != nil {
+			events.Close("config", cfg.Close)
 		}
 
 		if err := events.WaitForEvents(5*time.Second, rollbar.Wait, an.Wait, logging.Close); err != nil {
@@ -78,7 +78,8 @@ func main() {
 	rollbar.SetupRollbar(constants.StateInstallerRollbarToken)
 
 	// Set up configuration handler
-	cfg, err := config.New()
+	var err error
+	cfg, err = config.New()
 	if err != nil {
 		multilog.Error("Could not set up configuration handler: " + errs.JoinMessage(err))
 		fmt.Fprintln(os.Stderr, err.Error())

cmd/state-installer/installer.go

@@ -126,7 +126,7 @@ func (i *Installer) Install() (rerr error) {
 
 	// Run state _prepare after updates to facilitate anything the new version of the state tool might need to set up
 	// Yes this is awkward, followup story here: https://www.pivotaltracker.com/story/show/176507898
-	if stdout, stderr, err := exeutils.ExecSimple(stateExec, "_prepare"); err != nil {
+	if stdout, stderr, err := exeutils.ExecSimple(stateExec, []string{"_prepare"}, []string{}); err != nil {
 		multilog.Error("_prepare failed after update: %v\n\nstdout: %s\n\nstderr: %s", err, stdout, stderr)
 	}
 

cmd/state-svc/internal/deprecation/deprecation.go

@@ -13,10 +13,8 @@ import (
 	"github.com/ActiveState/cli/internal/graph"
 	"github.com/ActiveState/cli/internal/locale"
 	"github.com/ActiveState/cli/internal/logging"
-	"github.com/ActiveState/cli/internal/multilog"
 	"github.com/ActiveState/cli/internal/retryhttp"
 	"github.com/hashicorp/go-version"
-	"github.com/patrickmn/go-cache"
 )
 
 const (
@@ -39,8 +37,6 @@ type info struct {
 // Checker is the struct that we use to do checks with
 type Checker struct {
 	config configurable
-	cache  *cache.Cache
-	done   chan struct{}
 }
 
 // configurable defines the configuration function used by the functions in this package
@@ -55,61 +51,20 @@ type configurable interface {
 func NewChecker(configuration configurable) *Checker {
 	checker := &Checker{
 		configuration,
-		cache.New(15*time.Minute, 5*time.Minute),
-		make(chan struct{}),
 	}
 
-	go checker.pollDeprecationInfo()
-
 	return checker
 }
 
 // Check will Check if the current version of the tool is deprecated and returns deprecation info if it is.
 // This uses a fairly short timeout to Check against our deprecation url, so this should not be considered conclusive.
 func (checker *Checker) Check() (*graph.DeprecationInfo, error) {
-	data, exists := checker.cache.Get(cacheKey)
-	if !exists {
-		logging.Debug("No deprecation information cached")
-		return nil, nil
-	}
-
-	deprecationInfo, ok := data.(*graph.DeprecationInfo)
-	if !ok {
-		return nil, errs.New("Unexpected cache entry for deprecation info")
-	}
-	return deprecationInfo, nil
-}
-
-func (checker *Checker) pollDeprecationInfo() {
-	timer := time.NewTicker(1 * time.Hour)
-	defer timer.Stop()
-
-	for {
-		select {
-		case <-timer.C:
-			err := checker.Refresh()
-			if err != nil {
-				multilog.Error("Could not update deprecation information %s", errs.JoinMessage(err))
-				return
-			}
-		case <-checker.done:
-			return
-		}
-	}
-}
-
-func (checker *Checker) Refresh() error {
-	info, err := checker.fetchDeprecationInfo()
+	deprecationInfo, err := checker.fetchDeprecationInfo()
 	if err != nil {
-		return errs.Wrap(err, "Could not fetch deprecation information")
-	}
-	if info == nil {
-		return nil
+		return nil, errs.Wrap(err, "Could not fetch deprecation information")
 	}
 
-	checker.cache.Set(cacheKey, info, cache.DefaultExpiration)
-
-	return nil
+	return deprecationInfo, nil
 }
 
 func (checker *Checker) fetchDeprecationInfo() (*graph.DeprecationInfo, error) {
@@ -197,7 +152,3 @@ func initializeInfo(data []byte) ([]info, error) {
 	return info, nil
 }
 
-func (checker *Checker) Close() {
-	logging.Debug("Closing deprecation checker")
-	checker.done <- struct{}{}
-}

cmd/state-svc/internal/resolver/resolver.go

@@ -10,6 +10,7 @@ import (
 	"github.com/ActiveState/cli/internal/analytics/client/sync"
 	"github.com/ActiveState/cli/internal/analytics/dimensions"
 	"github.com/ActiveState/cli/internal/cache/projectcache"
+	"github.com/ActiveState/cli/internal/poller"
 	"github.com/ActiveState/cli/pkg/platform/authentication"
 	"golang.org/x/net/context"
 
@@ -23,13 +24,12 @@ import (
 	configMediator "github.com/ActiveState/cli/internal/mediators/config"
 	"github.com/ActiveState/cli/internal/updater"
 	"github.com/ActiveState/cli/pkg/projectfile"
-	"github.com/patrickmn/go-cache"
 )
 
 type Resolver struct {
 	cfg            *config.Instance
-	cache          *cache.Cache
-	deprecation    *deprecation.Checker
+	depPoller      *poller.Poller
+	updatePoller   *poller.Poller
 	projectIDCache *projectcache.ID
 	an             *sync.Client
 	anForClient    *sync.Client // Use separate client for events sent through service so we don't contaminate one with the other
@@ -39,16 +39,21 @@ type Resolver struct {
 // var _ genserver.ResolverRoot = &Resolver{} // Must implement ResolverRoot
 
 func New(cfg *config.Instance, an *sync.Client, auth *authentication.Auth) (*Resolver, error) {
-	checker := deprecation.NewChecker(cfg)
-	err := checker.Refresh()
-	if err != nil {
-		return nil, errs.Wrap(err, "Could not refresh deprecation info")
-	}
+	depchecker := deprecation.NewChecker(cfg)
+	pollDep := poller.New(1*time.Hour, func() (interface{}, error) {
+		return depchecker.Check()
+	})
+
+	upchecker := updater.NewDefaultChecker(cfg)
+	pollUpdate := poller.New(1*time.Hour, func() (interface{}, error) {
+		return upchecker.Check()
+	})
+
 	anForClient := sync.New(cfg, auth)
 	return &Resolver{
 		cfg,
-		cache.New(12*time.Hour, time.Hour),
-		checker,
+		pollDep,
+		pollUpdate,
 		projectcache.NewID(),
 		an,
 		anForClient,
@@ -57,7 +62,8 @@ func New(cfg *config.Instance, an *sync.Client, auth *authentication.Auth) (*Res
 }
 
 func (r *Resolver) Close() error {
-	r.deprecation.Close()
+	r.depPoller.Close()
+	r.updatePoller.Close()
 	r.anForClient.Close()
 	return r.rtwatch.Close()
 }
@@ -85,24 +91,13 @@ func (r *Resolver) AvailableUpdate(ctx context.Context) (*graph.AvailableUpdate,
 	logging.Debug("AvailableUpdate resolver")
 	defer logging.Debug("AvailableUpdate done")
 
-	const cacheKey = "AvailableUpdate"
-	if up, exists := r.cache.Get(cacheKey); exists {
-		logging.Debug("Using cache")
-		return up.(*graph.AvailableUpdate), nil
-	}
-
-	var availableUpdate *graph.AvailableUpdate
-	defer func() { r.cache.Set(cacheKey, availableUpdate, cache.DefaultExpiration) }()
-
-	update, err := updater.NewDefaultChecker(r.cfg).Check()
-	if err != nil {
-		return nil, errs.Wrap(err, "Failed to check for available update")
-	}
-	if update == nil {
+	update, ok := r.updatePoller.ValueFromCache().(*updater.AvailableUpdate)
+	if !ok {
+		logging.Debug("No update info in cache")
 		return nil, nil
 	}
 
-	availableUpdate = &graph.AvailableUpdate{
+	availableUpdate := &graph.AvailableUpdate{
 		Version:  update.Version,
 		Channel:  update.Channel,
 		Path:     update.Path,
@@ -147,7 +142,7 @@ func (r *Resolver) AnalyticsEvent(_ context.Context, category, action string, _l
 	// Resolve the project ID - this is a little awkward since I had to work around an import cycle
 	dims.RegisterPreProcessor(func(values *dimensions.Values) error {
 		values.ProjectID = nil
-		if values.ProjectNameSpace == nil {
+		if values.ProjectNameSpace == nil || *values.ProjectNameSpace == "" {
 			return nil
 		}
 		id, err := r.projectIDCache.FromNamespace(*values.ProjectNameSpace)
@@ -178,9 +173,9 @@ func (r *Resolver) RuntimeUsage(ctx context.Context, pid int, exec string, dimen
 func (r *Resolver) CheckDeprecation(ctx context.Context) (*graph.DeprecationInfo, error) {
 	logging.Debug("Check deprecation resolver")
 
-	deprecated, err := r.deprecation.Check()
-	if err != nil {
-		return nil, errs.Wrap(err, "Could not fetch deprecation information")
+	deprecated, ok := r.depPoller.ValueFromCache().(*graph.DeprecationInfo)
+	if !ok {
+		logging.Debug("No deprecation info in cache")
 	}
 
 	return deprecated, nil

cmd/state-svc/main.go

@@ -45,8 +45,8 @@ func main() {
 			exitCode = 1
 		}
 
-		if err := cfg.Close(); err != nil {
-			multilog.Error("Failed to close config: %v", err)
+		if cfg != nil {
+			events.Close("config", cfg.Close)
 		}
 
 		if err := events.WaitForEvents(5*time.Second, rollbar.Wait, authentication.LegacyClose, logging.Close); err != nil {
@@ -55,7 +55,8 @@ func main() {
 		os.Exit(exitCode)
 	}()
 
-	cfg, err := config.New()
+	var err error
+	cfg, err = config.New()
 	if err != nil {
 		multilog.Critical("Could not initialize config: %v", errs.JoinMessage(err))
 		fmt.Fprintf(os.Stderr, "Could not load config, if this problem persists please reinstall the State Tool. Error: %s\n", errs.JoinMessage(err))

cmd/state-tray/main.go

@@ -59,8 +59,8 @@ func onReady() {
 		}
 		logging.Debug("onReady is done with exit code %d", exitCode)
 
-		if err := cfg.Close(); err != nil {
-			multilog.Error("Failed to close config after exiting systray: %v", err)
+		if cfg != nil {
+			events.Close("config", cfg.Close)
 		}
 
 		if err := events.WaitForEvents(1*time.Second, rollbar.Wait, authentication.LegacyClose, logging.Close); err != nil {
@@ -69,7 +69,8 @@ func onReady() {
 		os.Exit(exitCode)
 	}()
 
-	cfg, err := config.New()
+	var err error
+	cfg, err = config.New()
 	if err != nil {
 		multilog.Critical("Could not initialize config: %v", errs.JoinMessage(err))
 		fmt.Fprintf(os.Stderr, "Could not load config, if this problem persists please reinstall the State Tool. Error: %s\n", errs.JoinMessage(err))
@@ -275,11 +276,7 @@ func onExit() {
 		multilog.Error("Could not get configuration object on Systray exit")
 		return
 	}
-	defer func() {
-		if err := cfg.Close(); err != nil {
-			multilog.Error("Failed to close config after exiting systray: %v", err)
-		}
-	}()
+	defer events.Close("config", cfg.Close)
 	err = cfg.GetThenSet(installmgr.ConfigKeyTrayPid, func(currentValue interface{}) (interface{}, error) {
 		setPid := cast.ToInt(currentValue)
 		if setPid != os.Getpid() {

cmd/state-update-dialog/main.go

@@ -28,8 +28,10 @@ func main() {
 			exitCode = 1
 		}
 
-		if err := cfg.Close(); err != nil {
-			multilog.Error("Failed to close config after exiting systray: %v", err)
+		if cfg != nil {
+			if err := cfg.Close(); err != nil {
+				multilog.Error("Failed to close config after exiting systray: %v", err)
+			}
 		}
 
 		if err := events.WaitForEvents(1*time.Second, rollbar.Wait, authentication.LegacyClose, logging.Close); err != nil {
@@ -38,7 +40,8 @@ func main() {
 		os.Exit(exitCode)
 	}()
 
-	cfg, err := config.New()
+	var err error
+	cfg, err = config.New()
 	if err != nil {
 		multilog.Critical("Could not initialize config: %v", errs.JoinMessage(err))
 		fmt.Fprintf(os.Stderr, "Could not load config, if this problem persists please reinstall the State Tool. Error: %s\n", errs.JoinMessage(err))

cmd/state/errors.go

@@ -132,5 +132,9 @@ func unwrapError(err error) (int, error) {
 		}
 	}
 
+	if hasMarshaller {
+		return code, err
+	}
+
 	return code, &OutputError{err}
 }

cmd/state/main.go

@@ -44,6 +44,8 @@ import (
 )
 
 func main() {
+	startTime := time.Now()
+
 	var exitCode int
 	// Set up logging
 	rollbar.SetupRollbar(constants.StateToolRollbarToken)
@@ -60,13 +62,18 @@ func main() {
 			logging.Warning("Failed waiting for events: %v", err)
 		}
 
-		events.Close("config", cfg.Close)
+		if cfg != nil {
+			events.Close("config", cfg.Close)
+		}
+
+		profile.Measure("main", startTime)
 
 		// exit with exitCode
 		os.Exit(exitCode)
 	}()
 
-	cfg, err := config.New()
+	var err error
+	cfg, err = config.New()
 	if err != nil {
 		multilog.Critical("Could not initialize config: %v", errs.JoinMessage(err))
 		fmt.Fprintf(os.Stderr, "Could not load config, if this problem persists please reinstall the State Tool. Error: %s\n", errs.JoinMessage(err))