pull updates with app license from DB, not from app archive

if the app archive fails to update, then the license may be out of date there

kotsadm/pkg/license/license.go

@@ -115,6 +115,7 @@ func createNewVersion(a *app.App, archiveDir string, registrySettings *registryt
 	return nil
 }
 
+// Gets the license as it was at a given app sequence
 func GetCurrentLicenseString(a *app.App) (string, error) {
 	archiveDir, err := version.GetAppVersionArchive(a.ID, a.CurrentSequence)
 	if err != nil {
@@ -129,7 +130,7 @@ func GetCurrentLicenseString(a *app.App) (string, error) {
 	return string(kotsLicense), nil
 }
 
-// GetLicense gets the license for an application with the given app id
+// GetLicense gets the current (latest) license for an application with the given app id
 func Get(appID string) (*kotsv1beta1.License, error) {
 	db := persistence.MustGetPGSession()
 	query := `select kots_license from app_version where app_id = $1 order by sequence desc limit 1`

kotsadm/pkg/updatechecker/updatechecker.go

@@ -3,7 +3,6 @@ package updatechecker
 import (
 	"fmt"
 	"os"
-	"path/filepath"
 	"sync"
 	"time"
 
@@ -186,8 +185,13 @@ func CheckForUpdates(appID string, deploy bool) (int64, error) {
 		return 0, errors.Wrap(err, "failed to load kotskinds from path")
 	}
 
+	latestLicense, err := license.Get(a.ID)
+	if err != nil {
+		return 0, errors.Wrap(err, "failed to get latest license")
+	}
+
 	getUpdatesOptions := kotspull.GetUpdatesOptions{
-		LicenseFile:    filepath.Join(archiveDir, "upstream", "userdata", "license.yaml"),
+		License:        latestLicense,
 		CurrentCursor:  kotsKinds.Installation.Spec.UpdateCursor,
 		CurrentChannel: kotsKinds.Installation.Spec.ChannelName,
 		Silent:         false,

kotsadm/pkg/upstream/upstream.go

@@ -12,6 +12,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/replicatedhq/kots/kotsadm/pkg/app"
 	"github.com/replicatedhq/kots/kotsadm/pkg/kotsutil"
+	"github.com/replicatedhq/kots/kotsadm/pkg/license"
 	"github.com/replicatedhq/kots/kotsadm/pkg/logger"
 	"github.com/replicatedhq/kots/kotsadm/pkg/preflight"
 	"github.com/replicatedhq/kots/kotsadm/pkg/registry"
@@ -82,8 +83,13 @@ func DownloadUpdate(appID string, archiveDir string, toCursor string) (sequence
 		return 0, errors.Wrap(err, "failed to get new app sequence")
 	}
 
+	latestLicense, err := license.Get(a.ID)
+	if err != nil {
+		return 0, errors.Wrap(err, "failed to get latest license")
+	}
+
 	pullOptions := kotspull.PullOptions{
-		LicenseFile:         filepath.Join(archiveDir, "upstream", "userdata", "license.yaml"),
+		LicenseObj:          latestLicense,
 		Namespace:           appNamespace,
 		ConfigFile:          filepath.Join(archiveDir, "upstream", "userdata", "config.yaml"),
 		InstallationFile:    filepath.Join(archiveDir, "upstream", "userdata", "installation.yaml"),

pkg/pull/peek.go

@@ -2,6 +2,7 @@ package pull
 
 import (
 	"github.com/pkg/errors"
+	kotsv1beta1 "github.com/replicatedhq/kots/kotskinds/apis/kots/v1beta1"
 	"github.com/replicatedhq/kots/pkg/logger"
 	"github.com/replicatedhq/kots/pkg/upstream"
 )
@@ -10,7 +11,7 @@ type GetUpdatesOptions struct {
 	HelmRepoURI    string
 	Namespace      string
 	LocalPath      string
-	LicenseFile    string
+	License        *kotsv1beta1.License
 	CurrentCursor  string
 	CurrentChannel string
 	Silent         bool
@@ -33,19 +34,8 @@ func GetUpdates(upstreamURI string, getUpdatesOptions GetUpdatesOptions) ([]upst
 	fetchOptions.CurrentCursor = getUpdatesOptions.CurrentCursor
 	fetchOptions.CurrentChannel = getUpdatesOptions.CurrentChannel
 
-	if getUpdatesOptions.LicenseFile != "" {
-		license, err := ParseLicenseFromFile(getUpdatesOptions.LicenseFile)
-		if err != nil {
-			if errors.Cause(err) == ErrSignatureInvalid {
-				return nil, ErrSignatureInvalid
-			}
-			if errors.Cause(err) == ErrSignatureMissing {
-				return nil, ErrSignatureMissing
-			}
-			return nil, errors.Wrap(err, "failed to parse license from file")
-		}
-
-		fetchOptions.License = license
+	if getUpdatesOptions.License != nil {
+		fetchOptions.License = getUpdatesOptions.License
 	}
 
 	log.ActionWithSpinner("Listing releases")

pkg/pull/pull.go

@@ -31,6 +31,7 @@ type PullOptions struct {
 	Namespace           string
 	Downstreams         []string
 	LocalPath           string
+	LicenseObj          *kotsv1beta1.License
 	LicenseFile         string
 	InstallationFile    string
 	AirgapRoot          string
@@ -117,7 +118,9 @@ func Pull(upstreamURI string, pullOptions PullOptions) (string, error) {
 		return "", errors.Wrap(err, "failed to find config files in local path")
 	}
 
-	if pullOptions.LicenseFile != "" {
+	if pullOptions.LicenseObj != nil {
+		fetchOptions.License = pullOptions.LicenseObj
+	} else if pullOptions.LicenseFile != "" {
 		license, err := ParseLicenseFromFile(pullOptions.LicenseFile)
 		if err != nil {
 			if errors.Cause(err) == ErrSignatureInvalid {