Get latest license on app install (#280)

* Get latest license on app install

ffi/main.go

@@ -3,19 +3,17 @@ package main
 import "C"
 
 import (
-	"encoding/base64"
 	"fmt"
 	"io/ioutil"
-	"net/http"
 	"os"
 	"path/filepath"
 
 	"github.com/pkg/errors"
 	kotsv1beta1 "github.com/replicatedhq/kots/kotskinds/apis/kots/v1beta1"
 	kotsscheme "github.com/replicatedhq/kots/kotskinds/client/kotsclientset/scheme"
+	kotslicense "github.com/replicatedhq/kots/pkg/license"
 	"github.com/replicatedhq/kots/pkg/pull"
 	"github.com/replicatedhq/kots/pkg/upstream"
-	"github.com/replicatedhq/kots/pkg/version"
 	"k8s.io/client-go/kubernetes/scheme"
 )
 
@@ -142,45 +140,12 @@ func GetLatestLicense(socket, licenseData string) {
 		}
 		license := obj.(*kotsv1beta1.License)
 
-		url := fmt.Sprintf("%s/release/%s/license", license.Spec.Endpoint, license.Spec.AppSlug)
-
-		req, err := http.NewRequest("GET", url, nil)
-		if err != nil {
-			fmt.Printf("failed to call newrequest: %s\n", err.Error())
-			ffiResult = NewFFIResult(-1).WithError(err)
-			return
-		}
-		req.Header.Add("User-Agent", fmt.Sprintf("KOTS/%s", version.Version()))
-		req.Header.Set("Authorization", fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s", license.Spec.LicenseID, license.Spec.LicenseID)))))
-
-		resp, err := http.DefaultClient.Do(req)
-		if err != nil {
-			fmt.Printf("failed to execute get request: %s\n", err.Error())
-			ffiResult = NewFFIResult(-1).WithError(err)
-			return
-		}
-		defer resp.Body.Close()
-
-		if resp.StatusCode >= 400 {
-			fmt.Printf("unexpected result from get request: %d\n", resp.StatusCode)
-			ffiResult = NewFFIResult(-1).WithError(err)
-			return
-		}
-
-		body, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			fmt.Printf("failed to load response")
-			ffiResult = NewFFIResult(-1).WithError(err)
-			return
-		}
-
-		obj, _, err = decode(body, nil, nil)
+		latestLicense, err := kotslicense.GetLatestLicense(license)
 		if err != nil {
-			fmt.Printf("failed to decode latest license data: %s\n", err.Error())
+			fmt.Printf("failed to get latest license: %s\n", err.Error())
 			ffiResult = NewFFIResult(-1).WithError(err)
 			return
 		}
-		latestLicense := obj.(*kotsv1beta1.License)
 
 		marshalledLicense := upstream.MustMarshalLicense(latestLicense)
 		ffiResult = NewFFIResult(1).WithData(string(marshalledLicense))

integration/replicated/generate.go

@@ -114,7 +114,7 @@ func generateExpectedFilesystem(namespace, rawArchivePath string) ([]byte, error
 	pullOptions := pull.PullOptions{
 		RootDir:             tmpRootDir,
 		LocalPath:           rawArchivePath,
-		Namespace: namespace,
+		Namespace:           namespace,
 		ExcludeKotsKinds:    true,
 		ExcludeAdminConsole: true,
 		CreateAppDir:        false,

integration/replicated/pull_test.go

@@ -61,7 +61,7 @@ func Test_PullReplicated(t *testing.T) {
 			pullOptions := pull.PullOptions{
 				RootDir:             actualDir,
 				LicenseFile:         path.Join(test.testDir, "license.yaml"),
-				Namespace: namespace,
+				Namespace:           namespace,
 				ExcludeAdminConsole: true,
 				ExcludeKotsKinds:    true,
 				Silent:              true,

pkg/k8sdoc/types.go

@@ -1,7 +1,5 @@
 package k8sdoc
 
-import ()
-
 type Doc struct {
 	APIVersion string   `yaml:"apiVersion"`
 	Kind       string   `yaml:"kind"`

pkg/kotsadm/types/deployoptions.go

@@ -1,9 +1,5 @@
 package types
 
-import (
-	"k8s.io/api/core/v1"
-)
-
 type DeployOptions struct {
 	Namespace              string
 	Kubeconfig             string

pkg/license/license.go

@@ -0,0 +1,48 @@
+package license
+
+import (
+	"encoding/base64"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+
+	"github.com/pkg/errors"
+	kotsv1beta1 "github.com/replicatedhq/kots/kotskinds/apis/kots/v1beta1"
+	"github.com/replicatedhq/kots/kotskinds/client/kotsclientset/scheme"
+	"github.com/replicatedhq/kots/pkg/version"
+)
+
+func GetLatestLicense(license *kotsv1beta1.License) (*kotsv1beta1.License, error) {
+	url := fmt.Sprintf("%s/license/%s", license.Spec.Endpoint, license.Spec.AppSlug)
+
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to call newrequest")
+	}
+	req.Header.Add("User-Agent", fmt.Sprintf("KOTS/%s", version.Version()))
+	req.Header.Set("Authorization", fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s", license.Spec.LicenseID, license.Spec.LicenseID)))))
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to execute get request")
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode >= 400 {
+		return nil, errors.Wrap(err, "unexpected result from get request")
+	}
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to load response")
+	}
+
+	decode := scheme.Codecs.UniversalDeserializer().Decode
+	obj, _, err := decode(body, nil, nil)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to decode latest license data")
+	}
+	latestLicense := obj.(*kotsv1beta1.License)
+
+	return latestLicense, nil
+}

pkg/upstream/replicated.go

@@ -20,6 +20,7 @@ import (
 	"github.com/pkg/errors"
 	kotsv1beta1 "github.com/replicatedhq/kots/kotskinds/apis/kots/v1beta1"
 	"github.com/replicatedhq/kots/pkg/crypto"
+	kotslicense "github.com/replicatedhq/kots/pkg/license"
 	"github.com/replicatedhq/kots/pkg/template"
 	"github.com/replicatedhq/kots/pkg/upstream/types"
 	"github.com/replicatedhq/kots/pkg/util"
@@ -181,7 +182,11 @@ func downloadReplicated(u *url.URL, localPath string, rootDir string, useAppDir
 
 	// Add the license to the upstream, if one was propvided
 	if license != nil {
-		release.Manifests["userdata/license.yaml"] = MustMarshalLicense(license)
+		latestLicense, err := kotslicense.GetLatestLicense(license)
+		if err != nil {
+			return nil, errors.Wrap(err, "failed to get latest license")
+		}
+		release.Manifests["userdata/license.yaml"] = MustMarshalLicense(latestLicense)
 	}
 
 	files, err := releaseToFiles(release)