fix: add validation for connection_limit and valid_until (#29)

* fix: add validation for connection_limit and valid_until

* chore: update comment

* fix: ci

* chore: release 0.0.6-beta

Author: ecmadao

VERSION

@@ -1 +1 @@
-0.0.6-alpha
+0.0.6-beta

docs/resources/database_role.md

@@ -48,7 +48,7 @@ resource "bytebase_database_role" "admin" {
 
 - `password` (String) The password for the role.
 - `connection_limit` (Number) The connection limit for the role.
-- `valid_until` (String) The `valid_until` sets a date and time after which the role's password is no longer valid.
+- `valid_until` (String) The `valid_until` sets a date and time after which the role's password is no longer valid. Should be a timestamp in "2006-01-02T15:04:05+08:00" format.
 
 <a id="nestedblock--attribute"></a>
 

examples/environments/main.tf

@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "0.0.6-alpha"
+      version = "0.0.6-beta"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }

examples/instances/main.tf

@@ -2,7 +2,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "0.0.6-alpha"
+      version = "0.0.6-beta"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }

examples/role/main.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "0.0.6-alpha"
+      version = "0.0.6-beta"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }

examples/setup/main.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     bytebase = {
-      version = "0.0.6-alpha"
+      version = "0.0.6-beta"
       # For local development, please use "terraform.local/bytebase/bytebase" instead
       source = "registry.terraform.io/bytebase/bytebase"
     }

provider/resource_database_role.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -46,16 +47,18 @@ func resourceDatabaseRole() *schema.Resource {
 				Description: "The password.",
 			},
 			"connection_limit": {
-				Type:        schema.TypeInt,
-				Optional:    true,
-				Default:     -1,
-				Description: "Connection count limit for role",
+				Type:         schema.TypeInt,
+				Optional:     true,
+				Default:      -1,
+				ValidateFunc: validation.IntAtLeast(-1),
+				Description:  "Connection count limit for role",
 			},
 			"valid_until": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				Default:     "",
-				Description: "It sets a date and time after which the role's password is no longer valid.",
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "",
+				ValidateFunc: validateDatetime,
+				Description:  "It sets a date and time after which the role's password is no longer valid. Should be a timestamp in \"2006-01-02T15:04:05+08:00\" format.",
 			},
 			"attribute": {
 				Type:        schema.TypeList,
@@ -295,3 +298,18 @@ func parseRoleIdentifier(identifier string) (int, string, error) {
 
 	return instanceID, strings.Join(slice[1:], roleIdentifierSeparator), nil
 }
+
+func validateDatetime(val interface{}, _ string) (ws []string, es []error) {
+	raw := val.(string)
+	if raw == "" {
+		return nil, nil
+	}
+
+	if _, err := time.Parse(time.RFC3339, raw); err != nil {
+		if err.Error() == "day out of range" {
+			return ws, append(es, errors.Errorf("invalid timestamp %s, %s", raw, err.Error()))
+		}
+		return ws, append(es, errors.Errorf(`valid_until should in "2006-01-02T15:04:05+08:00" format with timezone`))
+	}
+	return nil, nil
+}

provider/resource_database_role_test.go

@@ -49,7 +49,7 @@ func TestAccRole(t *testing.T) {
 					name = "%s"
 					instance = bytebase_instance.%s.name
 					connection_limit = 99
-					valid_until = "2022-12-31"
+					valid_until = "2022-12-31T15:04:05+08:00"
 					attribute {}
 				}
 				`, mockInstanceResource("instance_2"), roleName, "instance_2"),
@@ -58,7 +58,7 @@ func TestAccRole(t *testing.T) {
 					resource.TestCheckResourceAttr("bytebase_database_role.test_role_2", "name", roleName),
 					resource.TestCheckResourceAttr("bytebase_database_role.test_role_2", "instance", "instance_2"),
 					resource.TestCheckResourceAttr("bytebase_database_role.test_role_2", "connection_limit", "99"),
-					resource.TestCheckResourceAttr("bytebase_database_role.test_role_2", "valid_until", "2022-12-31"),
+					resource.TestCheckResourceAttr("bytebase_database_role.test_role_2", "valid_until", "2022-12-31T15:04:05+08:00"),
 					resource.TestCheckResourceAttr("bytebase_database_role.test_role_2", "attribute.#", "1"),
 				),
 			},