Revert "feat: Display packages in ok pkg install --interactive (#278)"

This reverts commit de8af27.
oslokommune · Oct 25, 2024 · 94fbac2 · 94fbac2
1 parent afc7fa4
commit 94fbac2
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 149 deletions.
diff --git a/pkg/pkg/install/interactive/interactive.go b/pkg/pkg/install/interactive/interactive.go
@@ -7,12 +7,6 @@ import (
 	"github.com/oslokommune/ok/pkg/pkg/common"
 )
 
-const (
-	outputFolderWidth = 45
-	templateWidth     = 40
-	varFilesWidth     = 80
-)
-
 func SelectPackagesToInstall(pkgManifestFilename string) ([]string, error) {
 	manifest, err := common.LoadPackageManifest(pkgManifestFilename)
 	if err != nil {
@@ -21,11 +15,8 @@ func SelectPackagesToInstall(pkgManifestFilename string) ([]string, error) {
 
 	options := make([]huh.Option[string], 0)
 
-	for _, pkg := range manifest.Packages {
-		displayText := createDisplayText(pkg)
-		value := pkg.OutputFolder
-
-		options = append(options, huh.NewOption[string](displayText, value))
+	for _, p := range manifest.Packages {
+		options = append(options, huh.NewOption(p.OutputFolder, p.OutputFolder))
 	}
 
 	var packages []string
@@ -47,17 +38,3 @@ func SelectPackagesToInstall(pkgManifestFilename string) ([]string, error) {
 
 	return packages, nil
 }
-
-func createDisplayText(pkg common.Package) string {
-	/*
-	   Format specifiers explained:
-	   %-*.*s formats a string with a specified width and precision.
-	   - The first * sets the minimum width, padding with spaces if shorter.
-	   - The second * sets the maximum length, truncating if longer.
-	*/
-	outputFolder := fmt.Sprintf("%-*.*s", outputFolderWidth, outputFolderWidth, pkg.OutputFolder)
-	template := fmt.Sprintf("%-*.*s", templateWidth, templateWidth, pkg.Template)
-	varFiles := fmt.Sprintf("%-*.*s", varFilesWidth, varFilesWidth, fmt.Sprint(pkg.VarFiles))
-
-	return fmt.Sprintf("%s %s %s", outputFolder, template, varFiles)
-}
diff --git a/test/terraform/config/app-hello.yml → test/config/app-hello.yml b/test/terraform/config/app-hello.yml → test/config/app-hello.yml
diff --git a/test/github-actions/config/common-config.yml → test/config/common-config.yml b/test/github-actions/config/common-config.yml → test/config/common-config.yml
diff --git a/test/terraform/config/networking.yml → test/config/networking.yml b/test/terraform/config/networking.yml → test/config/networking.yml
diff --git a/test/github-actions/_gp_my-app-a_test-dev_receive_dispatch_event.yml b/test/github-actions/_gp_my-app-a_test-dev_receive_dispatch_event.yml
diff --git a/test/github-actions/config/my-app-a-receive_dispatch_event.yml b/test/github-actions/config/my-app-a-receive_dispatch_event.yml
diff --git a/test/github-actions/config/packages.yml b/test/github-actions/config/packages.yml
diff --git a/test/terraform/packages.yml → test/packages.yml b/test/terraform/packages.yml → test/packages.yml
@@ -11,9 +11,3 @@ Packages:
     VarFiles:
       - "config/common-config.yml"
       - "config/networking.yml"
-  - Template: "networking"
-    Ref: "main"
-    OutputFolder: "out/networking2"
-    VarFiles:
-      - "config/common-config.yml"
-      - "config/networking.yml"
diff --git a/test/terraform/config/common-config.yml b/test/terraform/config/common-config.yml