chore: update test

Author: ecmadao

.gitignore

@@ -0,0 +1,3 @@
+vendor
+examples/.terraform
+examples/.terraform.lock.hcl

provider/internal/mock_client.go

@@ -76,16 +76,15 @@ func (c *mockClient) UpdateEnvironment(environmentID int, patch *api.Environment
 	}
 
 	if v := patch.Name; v != nil {
+		if existed := c.findEnvironmentByName(*v); existed != nil {
+			return nil, errors.Errorf("Environment %s already exists", env.Name)
+		}
 		env.Name = *v
 	}
 	if v := patch.Order; v != nil {
 		env.Order = *v
 	}
 
-	if existed := c.findEnvironmentByName(env.Name); existed != nil {
-		return nil, errors.Errorf("Environment %s already exists", env.Name)
-	}
-
 	delete(c.environmentMap, env.ID)
 	c.environmentMap[env.ID] = env
 

provider/resource_environment_test.go

@@ -2,6 +2,7 @@ package provider
 
 import (
 	"fmt"
+	"regexp"
 	"strconv"
 	"testing"
 
@@ -13,7 +14,12 @@ import (
 )
 
 func TestAccEnvironment(t *testing.T) {
-	envName := "dev"
+	identifier := "new_environment"
+	resourceName := fmt.Sprintf("bytebase_environment.%s", identifier)
+
+	name := "dev"
+	order := 1
+	nameUpdated := fmt.Sprintf("%s-updated", name)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
@@ -22,16 +28,47 @@ func TestAccEnvironment(t *testing.T) {
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckEnvironmentDestroy,
 		Steps: []resource.TestStep{
+			// resource create
+			{
+				Config: testAccCheckEnvironmentConfigBasic(identifier, name, order),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckEnvironmentExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "name", name),
+					resource.TestCheckResourceAttr(resourceName, "order", fmt.Sprintf("%d", order)),
+				),
+			},
+			// resource update
 			{
-				Config: testAccCheckEnvironmentConfigBasic(envName),
+				Config: testAccCheckEnvironmentConfigBasic(identifier, nameUpdated, order+1),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckEnvironmentExists("bytebase_environment.new"),
+					testAccCheckEnvironmentExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "name", nameUpdated),
+					resource.TestCheckResourceAttr(resourceName, "order", fmt.Sprintf("%d", order+1)),
 				),
 			},
 		},
 	})
 }
 
+func TestAccEnvironment_InvalidInput(t *testing.T) {
+	identifier := "another_environment"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckEnvironmentDestroy,
+		Steps: []resource.TestStep{
+			// Invalid environment name
+			{
+				Config:      testAccCheckEnvironmentConfigBasic(identifier, "", 0),
+				ExpectError: regexp.MustCompile("not be an empty string"),
+			},
+		},
+	})
+}
+
 func testAccCheckEnvironmentDestroy(s *terraform.State) error {
 	c := testAccProvider.Meta().(api.Client)
 
@@ -53,12 +90,13 @@ func testAccCheckEnvironmentDestroy(s *terraform.State) error {
 	return nil
 }
 
-func testAccCheckEnvironmentConfigBasic(envName string) string {
+func testAccCheckEnvironmentConfigBasic(identifier, envName string, order int) string {
 	return fmt.Sprintf(`
-	resource "bytebase_environment" "new" {
+	resource "bytebase_environment" "%s" {
 		name = "%s"
+		order = %d
 	}
-	`, envName)
+	`, identifier, envName, order)
 }
 
 func testAccCheckEnvironmentExists(n string) resource.TestCheckFunc {

provider/resource_instance_test.go

@@ -2,6 +2,7 @@ package provider
 
 import (
 	"fmt"
+	"regexp"
 	"strconv"
 	"testing"
 
@@ -13,10 +14,14 @@ import (
 )
 
 func TestAccInstance(t *testing.T) {
+	identifier := "new_instance"
+	resourceName := fmt.Sprintf("bytebase_instance.%s", identifier)
+
 	name := "dev instance"
 	engine := "POSTGRES"
 	host := "127.0.0.1"
-	env := "dev"
+	environment := "dev"
+	nameUpdated := fmt.Sprintf("%s-updated", name)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
@@ -25,16 +30,60 @@ func TestAccInstance(t *testing.T) {
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckInstanceDestroy,
 		Steps: []resource.TestStep{
+			// resource create
+			{
+				Config: testAccCheckInstanceConfigBasic(identifier, name, engine, host, environment),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckInstanceExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "name", name),
+					resource.TestCheckResourceAttr(resourceName, "engine", engine),
+					resource.TestCheckResourceAttr(resourceName, "host", host),
+					resource.TestCheckResourceAttr(resourceName, "environment", environment),
+				),
+			},
+			// resource updated
 			{
-				Config: testAccCheckInstanceConfigBasic(name, engine, host, env),
+				Config: testAccCheckInstanceConfigBasic(identifier, nameUpdated, engine, host, environment),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckInstanceExists("bytebase_instance.new"),
+					testAccCheckInstanceExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "name", nameUpdated),
+					resource.TestCheckResourceAttr(resourceName, "engine", engine),
+					resource.TestCheckResourceAttr(resourceName, "host", host),
+					resource.TestCheckResourceAttr(resourceName, "environment", environment),
 				),
 			},
 		},
 	})
 }
 
+func TestAccInstance_InvalidInput(t *testing.T) {
+	identifier := "another_instance"
+	engine := "POSTGRES"
+	name := "dev instance"
+	host := "127.0.0.1"
+	environment := "dev"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckInstanceDestroy,
+		Steps: []resource.TestStep{
+			// Invalid instance name
+			{
+				Config:      testAccCheckInstanceConfigBasic(identifier, "", engine, host, environment),
+				ExpectError: regexp.MustCompile("not be an empty string"),
+			},
+			// Invalid engine
+			{
+				Config:      testAccCheckInstanceConfigBasic(identifier, name, "engine", host, environment),
+				ExpectError: regexp.MustCompile("expected engine to be one of"),
+			},
+		},
+	})
+}
+
 func testAccCheckInstanceDestroy(s *terraform.State) error {
 	c := testAccProvider.Meta().(api.Client)
 
@@ -56,15 +105,15 @@ func testAccCheckInstanceDestroy(s *terraform.State) error {
 	return nil
 }
 
-func testAccCheckInstanceConfigBasic(name, engine, host, env string) string {
+func testAccCheckInstanceConfigBasic(identifier, name, engine, host, env string) string {
 	return fmt.Sprintf(`
-	resource "bytebase_instance" "new" {
+	resource "bytebase_instance" "%s" {
 		name = "%s"
 		engine = "%s"
 		host = "%s"
 		environment = "%s"
 	}
-	`, name, engine, host, env)
+	`, identifier, name, engine, host, env)
 }
 
 func testAccCheckInstanceExists(n string) resource.TestCheckFunc {