From db7acaa4ad5963cd5462146f697a34312c7eba19 Mon Sep 17 00:00:00 2001
From: Brandon Croft <brandon.croft@gmail.com>
Date: Wed, 7 Dec 2022 23:56:10 -0700
Subject: [PATCH] Fixes project names being validated as IDs

---
 CHANGELOG.md                 | 4 +++-
 project.go                   | 7 -------
 projects_integration_test.go | 6 +++---
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 332987eca..5b918f817 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,9 @@
-# Unreleased
+# v1.15.1
 
 ## Bug Fixes
 
+* Project names were being incorrectly validated as ID's @brandonc [#608](https://github.com/hashicorp/go-tfe/pull/608)
+
 ## Enhancements
 
 # v1.15.0
diff --git a/project.go b/project.go
index d153c76c1..337036093 100644
--- a/project.go
+++ b/project.go
@@ -203,16 +203,9 @@ func (o ProjectCreateOptions) valid() error {
 	if !validString(&o.Name) {
 		return ErrRequiredName
 	}
-
-	if !validStringID(&o.Name) {
-		return ErrInvalidName
-	}
 	return nil
 }
 
 func (o ProjectUpdateOptions) valid() error {
-	if o.Name != nil && !validStringID(o.Name) {
-		return ErrInvalidName
-	}
 	return nil
 }
diff --git a/projects_integration_test.go b/projects_integration_test.go
index 326b50613..282a1a7aa 100644
--- a/projects_integration_test.go
+++ b/projects_integration_test.go
@@ -123,7 +123,7 @@ func TestProjectsCreate(t *testing.T) {
 			Name: badIdentifier,
 		})
 		assert.Nil(t, w)
-		assert.EqualError(t, err, ErrInvalidName.Error())
+		assert.Contains(t, err.Error(), "invalid attribute\n\nName may only contain")
 	})
 
 	t.Run("when options has an invalid organization", func(t *testing.T) {
@@ -149,7 +149,7 @@ func TestProjectsUpdate(t *testing.T) {
 		defer kTestCleanup()
 
 		kAfter, err := client.Projects.Update(ctx, kBefore.ID, ProjectUpdateOptions{
-			Name: String("new_project_name"),
+			Name: String("new project name!"),
 		})
 		require.NoError(t, err)
 
@@ -165,7 +165,7 @@ func TestProjectsUpdate(t *testing.T) {
 			Name: String(badIdentifier),
 		})
 		assert.Nil(t, kAfter)
-		assert.EqualError(t, err, ErrInvalidName.Error())
+		assert.Contains(t, err.Error(), "invalid attribute\n\nName may only contain")
 	})
 
 	t.Run("without a valid projects ID", func(t *testing.T) {