Curated packages bugfixes (#2045)

* Fix some minor issues * Add License during cluster creation * Add License in controller and package installation * Add formatting curated packages license * Gofumpt resolution * Fix PR Review Comments * Fix PR Review Comments
aws · May 6, 2022 · ac57fbd · ac57fbd
1 parent e1fae51
commit ac57fbd
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 26 deletions.
diff --git a/cmd/eksctl-anywhere/cmd/applypackages.go b/cmd/eksctl-anywhere/cmd/applypackages.go
@@ -43,7 +43,7 @@ var applyPackagesCommand = &cobra.Command{
 
 func applyPackages(ctx context.Context) error {
 	kubeConfig := kubeconfig.FromEnvironment()
-	deps, err := newDependenciesForPackages(ctx, kubeConfig)
+	deps, err := curatedpackages.NewDependenciesForPackages(ctx, kubeConfig)
 	if err != nil {
 		return fmt.Errorf("unable to initialize executables: %v", err)
 	}

diff --git a/cmd/eksctl-anywhere/cmd/common.go b/cmd/eksctl-anywhere/cmd/common.go
@@ -1,10 +1,7 @@
 package cmd
 
 import (
-	"context"
-
 	"github.com/aws/eks-anywhere/pkg/cluster"
-	"github.com/aws/eks-anywhere/pkg/dependencies"
 	"github.com/aws/eks-anywhere/pkg/kubeconfig"
 	"github.com/aws/eks-anywhere/pkg/version"
 	"github.com/aws/eks-anywhere/release/api/v1alpha1"
@@ -28,13 +25,3 @@ func getKubeconfigPath(clusterName, override string) string {
 	}
 	return override
 }
-
-func newDependenciesForPackages(ctx context.Context, paths ...string) (*dependencies.Dependencies, error) {
-	return dependencies.NewFactory().
-		WithExecutableMountDirs(paths...).
-		WithExecutableBuilder().
-		WithManifestReader().
-		WithKubectl().
-		WithHelm().
-		Build(ctx)
-}
diff --git a/cmd/eksctl-anywhere/cmd/createpackages.go b/cmd/eksctl-anywhere/cmd/createpackages.go
@@ -43,7 +43,7 @@ var createPackagesCommand = &cobra.Command{
 
 func createPackages(ctx context.Context) error {
 	kubeConfig := kubeconfig.FromEnvironment()
-	deps, err := newDependenciesForPackages(ctx, kubeConfig)
+	deps, err := curatedpackages.NewDependenciesForPackages(ctx, kubeConfig)
 	if err != nil {
 		return fmt.Errorf("unable to initialize executables: %v", err)
 	}

diff --git a/cmd/eksctl-anywhere/cmd/deletepackages.go b/cmd/eksctl-anywhere/cmd/deletepackages.go
@@ -28,7 +28,7 @@ var deletePackageCommand = &cobra.Command{
 
 func deleteResources(ctx context.Context, args []string) error {
 	kubeConfig := kubeconfig.FromEnvironment()
-	deps, err := newDependenciesForPackages(ctx, kubeConfig)
+	deps, err := curatedpackages.NewDependenciesForPackages(ctx, kubeConfig)
 	if err != nil {
 		return fmt.Errorf("unable to initialize executables: %v", err)
 	}

diff --git a/cmd/eksctl-anywhere/cmd/describepackages.go b/cmd/eksctl-anywhere/cmd/describepackages.go
@@ -30,7 +30,7 @@ var describePackagesCommand = &cobra.Command{
 
 func describeResources(ctx context.Context, args []string) error {
 	kubeConfig := kubeconfig.FromEnvironment()
-	deps, err := newDependenciesForPackages(ctx, kubeConfig)
+	deps, err := curatedpackages.NewDependenciesForPackages(ctx, kubeConfig)
 	if err != nil {
 		return fmt.Errorf("unable to initialize executables: %v", err)
 	}

diff --git a/cmd/eksctl-anywhere/cmd/generatepackage.go b/cmd/eksctl-anywhere/cmd/generatepackage.go
@@ -50,7 +50,7 @@ func runGeneratePackages(cmd *cobra.Command, args []string) error {
 
 func generatePackages(ctx context.Context, args []string) error {
 	kubeConfig := kubeconfig.FromEnvironment()
-	deps, err := newDependenciesForPackages(ctx, kubeConfig)
+	deps, err := curatedpackages.NewDependenciesForPackages(ctx, kubeConfig)
 	if err != nil {
 		return fmt.Errorf("unable to initialize executables: %v", err)
 	}

diff --git a/cmd/eksctl-anywhere/cmd/get.go b/cmd/eksctl-anywhere/cmd/get.go
@@ -10,6 +10,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/aws/eks-anywhere/pkg/constants"
+	"github.com/aws/eks-anywhere/pkg/curatedpackages"
 	"github.com/aws/eks-anywhere/pkg/features"
 	"github.com/aws/eks-anywhere/pkg/kubeconfig"
 )
@@ -39,7 +40,7 @@ func preRunPackages(cmd *cobra.Command, args []string) error {
 func getResources(ctx context.Context, resourceType string, output string, args []string) error {
 	kubeConfig := kubeconfig.FromEnvironment()
 
-	deps, err := newDependenciesForPackages(ctx)
+	deps, err := curatedpackages.NewDependenciesForPackages(ctx, kubeConfig)
 	if err != nil {
 		return fmt.Errorf("unable to initialize executables: %v", err)
 	}
@@ -56,9 +57,9 @@ func getResources(ctx context.Context, resourceType string, output string, args
 		return fmt.Errorf("kubectl execution failure: \n%v", err)
 	}
 	if len(stdOut.Bytes()) == 0 {
-		fmt.Printf("No resources found in %v namespace", constants.EksaPackagesName)
+		fmt.Printf("No resources found in %v namespace\n", constants.EksaPackagesName)
 		return nil
 	}
-	fmt.Println(&stdOut)
+	fmt.Print(&stdOut)
 	return nil
 }
diff --git a/cmd/eksctl-anywhere/cmd/installpackagecontroller.go b/cmd/eksctl-anywhere/cmd/installpackagecontroller.go
@@ -47,7 +47,7 @@ func runInstallPackageController(cmd *cobra.Command, args []string) error {
 func installPackageController(ctx context.Context) error {
 	kubeConfig := kubeconfig.FromEnvironment()
 
-	deps, err := newDependenciesForPackages(ctx, kubeConfig)
+	deps, err := curatedpackages.NewDependenciesForPackages(ctx, kubeConfig)
 	if err != nil {
 		return fmt.Errorf("unable to initialize executables: %v", err)
 	}

diff --git a/cmd/eksctl-anywhere/cmd/installpackages.go b/cmd/eksctl-anywhere/cmd/installpackages.go
@@ -55,7 +55,7 @@ func runInstallPackages(cmd *cobra.Command, args []string) error {
 
 func installPackages(ctx context.Context, args []string) error {
 	kubeConfig := kubeconfig.FromEnvironment()
-	deps, err := newDependenciesForPackages(ctx, kubeConfig)
+	deps, err := curatedpackages.NewDependenciesForPackages(ctx, kubeConfig)
 	if err != nil {
 		return fmt.Errorf("unable to initialize executables: %v", err)
 	}

diff --git a/cmd/eksctl-anywhere/cmd/listpackages.go b/cmd/eksctl-anywhere/cmd/listpackages.go
@@ -51,7 +51,7 @@ var listPackagesCommand = &cobra.Command{
 
 func listPackages(ctx context.Context) error {
 	kubeConfig := kubeconfig.FromEnvironment()
-	deps, err := newDependenciesForPackages(ctx, kubeConfig)
+	deps, err := curatedpackages.NewDependenciesForPackages(ctx, kubeConfig)
 	if err != nil {
 		return fmt.Errorf("unable to initialize executables: %v", err)
 	}

diff --git a/cmd/eksctl-anywhere/cmd/upgradepackages.go b/cmd/eksctl-anywhere/cmd/upgradepackages.go
@@ -42,7 +42,7 @@ var upgradePackagesCommand = &cobra.Command{
 
 func upgradePackages(ctx context.Context) error {
 	kubeConfig := kubeconfig.FromEnvironment()
-	deps, err := newDependenciesForPackages(ctx, kubeConfig)
+	deps, err := curatedpackages.NewDependenciesForPackages(ctx, kubeConfig)
 	if err != nil {
 		return fmt.Errorf("unable to initialize executables: %v", err)
 	}

diff --git a/pkg/curatedpackages/bundle.go b/pkg/curatedpackages/bundle.go
@@ -112,7 +112,7 @@ func (b *BundleReader) UpgradeBundle(ctx context.Context, controller *packagesv1
 	if err != nil {
 		return err
 	}
-	params := []string{"create", "-f", "-", "--kubeconfig", b.kubeConfig}
+	params := []string{"apply", "-f", "-", "--kubeconfig", b.kubeConfig}
 	_, err = b.kubectl.CreateFromYaml(ctx, controllerYaml, params...)
 	if err != nil {
 		return err

diff --git a/pkg/curatedpackages/curatedpackages.go b/pkg/curatedpackages/curatedpackages.go
@@ -15,6 +15,15 @@ import (
 	releasev1 "github.com/aws/eks-anywhere/release/api/v1alpha1"
 )
 
+const (
+	LICENSE = `The EKS Anywhere package controller and the EKS Anywhere Curated Packages
+(referred to as “features”) are provided as “preview features” subject to the AWS Service Terms,
+(including Section 2 (Betas and Previews)) of the same. During the EKS Anywhere Curated Packages Public Preview,
+the AWS Service Terms are extended to provide customers access to these features free of charge.
+These features will be subject to a service charge and fee structure at ”General Availability“ of the features.`
+	WIDTH = 112
+)
+
 func NewRegistry(deps *dependencies.Dependencies, registryName, kubeVersion, username, password string) (BundleRegistry, error) {
 	if registryName != "" {
 		registry := NewCustomRegistry(
@@ -75,3 +84,18 @@ func NewDependenciesForPackages(ctx context.Context, paths ...string) (*dependen
 		WithHelm().
 		Build(ctx)
 }
+
+func PrintLicense() {
+	// Currently, use the width of the longest line to repeat the dashes
+	// Sample Output
+	//----------------------------------------------------------------------------------------------------------------
+	//The EKS Anywhere package controller and the EKS Anywhere Curated Packages
+	//(referred to as “features”) are provided as “preview features” subject to the AWS Service Terms,
+	//(including Section 2 (Betas and Previews)) of the same. During the EKS Anywhere Curated Packages Public Preview,
+	//the AWS Service Terms are extended to provide customers access to these features free of charge.
+	//These features will be subject to a service charge and fee structure at ”General Availability“ of the features.
+	//----------------------------------------------------------------------------------------------------------------
+	fmt.Println(strings.Repeat("-", WIDTH))
+	fmt.Println(LICENSE)
+	fmt.Println(strings.Repeat("-", WIDTH))
+}
diff --git a/pkg/curatedpackages/packageclient.go b/pkg/curatedpackages/packageclient.go
@@ -106,6 +106,7 @@ func (pc *PackageClient) packageMap() map[string]packagesv1.BundlePackage {
 }
 
 func (pc *PackageClient) InstallPackage(ctx context.Context, bp *packagesv1.BundlePackage, customName string, kubeConfig string) error {
+	PrintLicense()
 	p := convertBundlePackageToPackage(*bp, customName, pc.bundle.APIVersion)
 	displayPackage := NewDisplayablePackage(&p)
 	params := []string{"create", "-f", "-", "--kubeconfig", kubeConfig}
@@ -122,6 +123,7 @@ func (pc *PackageClient) InstallPackage(ctx context.Context, bp *packagesv1.Bund
 }
 
 func (pc *PackageClient) ApplyPackages(ctx context.Context, fileName string, kubeConfig string) error {
+	PrintLicense()
 	params := []string{"apply", "-f", fileName, "--kubeconfig", kubeConfig}
 	stdOut, err := pc.kubectl.ExecuteCommand(ctx, params...)
 	if err != nil {
@@ -133,6 +135,7 @@ func (pc *PackageClient) ApplyPackages(ctx context.Context, fileName string, kub
 }
 
 func (pc *PackageClient) CreatePackages(ctx context.Context, fileName string, kubeConfig string) error {
+	PrintLicense()
 	params := []string{"create", "-f", fileName, "--kubeconfig", kubeConfig}
 	stdOut, err := pc.kubectl.ExecuteCommand(ctx, params...)
 	if err != nil {

diff --git a/pkg/curatedpackages/packagecontrollerclient.go b/pkg/curatedpackages/packagecontrollerclient.go
@@ -34,6 +34,7 @@ func NewPackageControllerClient(chartInstaller ChartInstaller, kubectl KubectlRu
 }
 
 func (pc *PackageControllerClient) InstallController(ctx context.Context) error {
+	PrintLicense()
 	ociUri := fmt.Sprintf("%s%s", "oci://", pc.uri)
 	return pc.chartInstaller.InstallChartFromName(ctx, ociUri, pc.kubeConfig, pc.chartName, pc.chartVersion)
 }

diff --git a/pkg/workflows/create.go b/pkg/workflows/create.go
@@ -68,6 +68,7 @@ func (c *Create) Run(ctx context.Context, clusterSpec *cluster.Spec, validator i
 	}
 
 	if packagesLocation != "" {
+		curatedpackages.PrintLicense()
 		err = installCuratedPackages(ctx, clusterSpec, packagesLocation)
 	}
 	return err