fix: incorrect validation of product & binary names (#28)

* fix: incorrect validation of product & binary names

* installer: add E2E test for the public API too

Author: radeksimko

installer_test.go

@@ -1 +1,29 @@
 package install
+
+import (
+	"context"
+	"testing"
+
+	"github.com/hashicorp/hc-install/internal/testutil"
+	"github.com/hashicorp/hc-install/product"
+	"github.com/hashicorp/hc-install/releases"
+	"github.com/hashicorp/hc-install/src"
+)
+
+func TestInstaller_Ensure(t *testing.T) {
+	testutil.EndToEndTest(t)
+
+	// most of this logic is already tested within individual packages
+	// so this is just a simple E2E test to ensure the public API
+	// also works and continues working
+
+	i := NewInstaller()
+	_, err := i.Ensure(context.Background(), []src.Source{
+		&releases.LatestVersion{
+			Product: product.Terraform,
+		},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+}

internal/validators/productname.go internal/validators/validators.go

@@ -3,8 +3,8 @@ package validators
 import "regexp"
 
 var (
-	productNameRe = regexp.MustCompile(`/[a-z0-9-]+/`)
-	binaryNameRe  = regexp.MustCompile(`/[a-zA-Z0-9-_.]+/`)
+	productNameRe = regexp.MustCompile(`^[a-z0-9-]+$`)
+	binaryNameRe  = regexp.MustCompile(`^[a-zA-Z0-9-_.]+$`)
 )
 
 // IsProductNameValid provides early user-facing validation of a product name

internal/validators/validators_test.go

@@ -0,0 +1,65 @@
+package validators
+
+import "testing"
+
+func TestIsProductNameValid(t *testing.T) {
+	testCases := []struct {
+		name          string
+		expectedValid bool
+	}{
+		{
+			"terraform",
+			true,
+		},
+		{
+			"in.valid",
+			false,
+		},
+	}
+	for _, tc := range testCases {
+		isValid := IsProductNameValid(tc.name)
+		if !isValid && tc.expectedValid {
+			t.Fatalf("expected %q to be valid", tc.name)
+		}
+		if isValid && !tc.expectedValid {
+			t.Fatalf("expected %q to be invalid", tc.name)
+		}
+	}
+}
+
+func TestIsBinaryNameValid(t *testing.T) {
+	testCases := []struct {
+		name          string
+		expectedValid bool
+	}{
+		{
+			"terraform",
+			true,
+		},
+		{
+			"Terraform",
+			true,
+		},
+		{
+			"va_lid",
+			true,
+		},
+		{
+			"va.lid",
+			true,
+		},
+		{
+			"in/valid",
+			false,
+		},
+	}
+	for _, tc := range testCases {
+		isValid := IsBinaryNameValid(tc.name)
+		if !isValid && tc.expectedValid {
+			t.Fatalf("expected %q to be valid", tc.name)
+		}
+		if isValid && !tc.expectedValid {
+			t.Fatalf("expected %q to be invalid", tc.name)
+		}
+	}
+}