Implement EC install CLI command integration test

.gitignore

@@ -7,6 +7,7 @@ pkg/goods/images
 .pre-commit-config.yaml
 vendor
 e2e/kots-release-install/license.yaml
+tests/*/ec-dryrun.yaml
 /bin/
 /build/
 /output/

Makefile

@@ -250,6 +250,10 @@ e2e-tests: embedded-release
 e2e-test:
 	go test -timeout 60m -ldflags="$(LD_FLAGS)" -v ./e2e -run ^$(TEST_NAME)$$
 
+.PHONY: dryrun-tests
+dryrun-tests:
+	@./scripts/dryrun-tests.sh
+
 .PHONY: build-ttl.sh
 build-ttl.sh:
 	$(MAKE) -C local-artifact-mirror build-ttl.sh \

e2e/cluster/docker/cluster.go → cluster/docker/cluster.go

@@ -84,7 +84,10 @@ func (c *Cluster) WaitForReady() {
 func (c *Cluster) Cleanup(envs ...map[string]string) {
 	c.generateSupportBundle(envs...)
 	c.copyPlaywrightReport()
+	c.Destroy()
+}
 
+func (c *Cluster) Destroy() {
 	for _, node := range c.Nodes {
 		node.Destroy()
 	}

e2e/cluster/interface.go → cluster/interface.go

@@ -1,8 +1,8 @@
 package cluster
 
 import (
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/docker"
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/lxd"
+	"github.com/replicatedhq/embedded-cluster/cluster/docker"
+	"github.com/replicatedhq/embedded-cluster/cluster/lxd"
 )
 
 var (

cmd/embedded-cluster/main.go

@@ -2,15 +2,14 @@ package main
 
 import (
 	"context"
-	"fmt"
 	"os"
 	"os/signal"
 	"path"
 	"syscall"
 
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli/v2"
 
+	"github.com/replicatedhq/embedded-cluster/pkg/cmd"
 	"github.com/replicatedhq/embedded-cluster/pkg/logging"
 )
 
@@ -22,25 +21,9 @@ func main() {
 	)
 	defer cancel()
 	logging.SetupLogging()
+
 	name := path.Base(os.Args[0])
-	var app = &cli.App{
-		Name:    name,
-		Usage:   fmt.Sprintf("Install and manage %s", name),
-		Suggest: true,
-		Commands: []*cli.Command{
-			installCommand(),
-			shellCommand(),
-			nodeCommands,
-			versionCommand,
-			joinCommand,
-			resetCommand(),
-			materializeCommand(),
-			updateCommand(),
-			restoreCommand(),
-			adminConsoleCommand(),
-			supportBundleCommand(),
-		},
-	}
+	app := cmd.NewApp(name)
 	if err := app.RunContext(ctx, os.Args); err != nil {
 		logrus.Fatal(err)
 	}

e2e/host-support-bundle_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/docker"
+	"github.com/replicatedhq/embedded-cluster/cluster/docker"
 )
 
 func TestHostCollectSupportBundleInCluster(t *testing.T) {

e2e/install_test.go

@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/docker"
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/lxd"
+	"github.com/replicatedhq/embedded-cluster/cluster/docker"
+	"github.com/replicatedhq/embedded-cluster/cluster/lxd"
 	"github.com/replicatedhq/embedded-cluster/pkg/certs"
 )
 

e2e/local-artifact-mirror_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/docker"
+	"github.com/replicatedhq/embedded-cluster/cluster/docker"
 )
 
 func TestLocalArtifactMirror(t *testing.T) {

e2e/materialize_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/docker"
+	"github.com/replicatedhq/embedded-cluster/cluster/docker"
 )
 
 func TestMaterialize(t *testing.T) {

e2e/preflights_test.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/docker"
+	"github.com/replicatedhq/embedded-cluster/cluster/docker"
 	"github.com/replicatedhq/embedded-cluster/pkg/preflights"
 )
 

e2e/proxy_test.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/lxd"
+	"github.com/replicatedhq/embedded-cluster/cluster/lxd"
 	"github.com/replicatedhq/embedded-cluster/pkg/versions"
 	"github.com/stretchr/testify/require"
 )

e2e/reset_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/docker"
+	"github.com/replicatedhq/embedded-cluster/cluster/docker"
 )
 
 // This test creates 4 nodes, installs on the first one and then generate 2 join tokens

e2e/restore_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/docker"
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/lxd"
+	"github.com/replicatedhq/embedded-cluster/cluster/docker"
+	"github.com/replicatedhq/embedded-cluster/cluster/lxd"
 )
 
 func TestSingleNodeDisasterRecovery(t *testing.T) {

e2e/sudo_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/lxd"
+	"github.com/replicatedhq/embedded-cluster/cluster/lxd"
 )
 
 func TestCommandsRequireSudo(t *testing.T) {

e2e/support-bundle_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/docker"
+	"github.com/replicatedhq/embedded-cluster/cluster/docker"
 	"github.com/stretchr/testify/assert"
 )
 

e2e/unsupported-overrides_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/docker"
+	"github.com/replicatedhq/embedded-cluster/cluster/docker"
 )
 
 func TestUnsupportedOverrides(t *testing.T) {

e2e/version_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/replicatedhq/embedded-cluster/e2e/cluster/lxd"
+	"github.com/replicatedhq/embedded-cluster/cluster/lxd"
 	"github.com/replicatedhq/embedded-cluster/kinds/types"
 	"github.com/stretchr/testify/require"
 )

pkg/addons/embeddedclusteroperator/embeddedclusteroperator.go

@@ -17,6 +17,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/kinds/types"
 	"github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole"
 	"github.com/replicatedhq/embedded-cluster/pkg/defaults"
+	"github.com/replicatedhq/embedded-cluster/pkg/dryrun"
 	"github.com/replicatedhq/embedded-cluster/pkg/kubeutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/metrics"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
@@ -167,6 +168,10 @@ func (e *EmbeddedClusterOperator) createVersionMetadataConfigmap(ctx context.Con
 	// the result as a suffix for the config map name.
 	slugver := slug.Make(strings.TrimPrefix(versions.Version, "v"))
 	configmap := &corev1.ConfigMap{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "v1",
+			Kind:       "ConfigMap",
+		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      fmt.Sprintf("version-metadata-%s", slugver),
 			Namespace: e.namespace,
@@ -256,6 +261,10 @@ func (e *EmbeddedClusterOperator) Outro(ctx context.Context, provider *defaults.
 	}
 
 	installation := ecv1beta1.Installation{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: ecv1beta1.GroupVersion.String(),
+			Kind:       "Installation",
+		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name: time.Now().Format("20060102150405"),
 			Labels: map[string]string{
@@ -281,14 +290,17 @@ func (e *EmbeddedClusterOperator) Outro(ctx context.Context, provider *defaults.
 		return fmt.Errorf("unable to create installation: %w", err)
 	}
 
-	// we wait for the installation to exist here because items do not show up in the apiserver instantaneously after being created
-	gotInstallation, err := waitForInstallationToExist(ctx, cli, installation.Name)
-	if err != nil {
-		return fmt.Errorf("unable to wait for installation to exist: %w", err)
-	}
-	gotInstallation.Status.State = ecv1beta1.InstallationStateKubernetesInstalled
-	if err := cli.Status().Update(ctx, gotInstallation); err != nil {
-		return fmt.Errorf("unable to update installation status: %w", err)
+	// TODO: figure out why fake client doesn't work here
+	if !dryrun.Enabled() {
+		// we wait for the installation to exist here because items do not show up in the apiserver instantaneously after being created
+		gotInstallation, err := waitForInstallationToExist(ctx, cli, installation.Name)
+		if err != nil {
+			return fmt.Errorf("unable to wait for installation to exist: %w", err)
+		}
+		gotInstallation.Status.State = ecv1beta1.InstallationStateKubernetesInstalled
+		if err := cli.Status().Update(ctx, gotInstallation); err != nil {
+			return fmt.Errorf("unable to update installation status: %w", err)
+		}
 	}
 
 	return nil

cmd/embedded-cluster/admin_console.go → pkg/cmd/admin_console.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"

pkg/cmd/app.go

@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/urfave/cli/v2"
+)
+
+func NewApp(name string) *cli.App {
+	return &cli.App{
+		Name:    name,
+		Usage:   fmt.Sprintf("Install and manage %s", name),
+		Suggest: true,
+		Commands: []*cli.Command{
+			installCommand(),
+			shellCommand(),
+			nodeCommands,
+			versionCommand,
+			joinCommand,
+			resetCommand(),
+			materializeCommand(),
+			updateCommand(),
+			restoreCommand(),
+			adminConsoleCommand(),
+			supportBundleCommand(),
+		},
+	}
+}

cmd/embedded-cluster/flags.go → pkg/cmd/flags.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"