Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.16.1
3.16.2
2 changes: 2 additions & 0 deletions docs/data-sources/setting.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,9 @@ Optional:
- `external_url` (String) The URL user visits Bytebase. The external URL is used for: 1. Constructing the correct callback URL when configuring the VCS provider. The callback URL points to the frontend; 2. Creating the correct webhook endpoint when configuring the project GitOps workflow. The webhook endpoint points to the backend.
- `maximum_role_expiration_in_seconds` (Number) The max duration in seconds for role expired. If the value is less than or equal to 0, we will remove the setting. AKA no limit.
- `password_restriction` (Block List, Max: 1) Password restriction settings. (see [below for nested schema](#nestedblock--workspace_profile--password_restriction))
- `access_token_duration_in_seconds` (Number) The duration for access token in seconds. Default is 3600 (1 hour). The duration should be at least 60 (one minute).
- `query_timeout_in_seconds` (Number) The maximum time allowed for a query to run in SQL Editor, in seconds. No limit when the value <= 0.
- `refresh_token_duration_in_seconds` (Number) The duration for refresh token in seconds. Default is 604800 (7 days). The duration should be at least 3600 (one hour).
- `sql_result_size` (Number) The size limit in bytes for SQL query results. The default value is 100MB.
- `watermark` (Boolean) Whether to display watermark on pages. Requires ENTERPRISE license.

Expand Down
2 changes: 2 additions & 0 deletions docs/resources/setting.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,9 @@ Optional:
- `external_url` (String) The URL user visits Bytebase. The external URL is used for: 1. Constructing the correct callback URL when configuring the VCS provider. The callback URL points to the frontend; 2. Creating the correct webhook endpoint when configuring the project GitOps workflow. The webhook endpoint points to the backend.
- `maximum_role_expiration_in_seconds` (Number) The max duration in seconds for role expired. If the value is less than or equal to 0, we will remove the setting. AKA no limit.
- `password_restriction` (Block List, Max: 1) Password restriction settings. (see [below for nested schema](#nestedblock--workspace_profile--password_restriction))
- `access_token_duration_in_seconds` (Number) The duration for access token in seconds. Default is 3600 (1 hour). The duration should be at least 60 (one minute).
- `query_timeout_in_seconds` (Number) The maximum time allowed for a query to run in SQL Editor, in seconds. No limit when the value <= 0.
- `refresh_token_duration_in_seconds` (Number) The duration for refresh token in seconds. Default is 604800 (7 days). The duration should be at least 3600 (one hour).
- `sql_result_size` (Number) The size limit in bytes for SQL query results. The default value is 100MB.
- `watermark` (Boolean) Whether to display watermark on pages. Requires ENTERPRISE license.

Expand Down
2 changes: 1 addition & 1 deletion examples/approval/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.16.1"
version = "3.16.2"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "terraform.local/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/database/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
terraform {
required_providers {
bytebase = {
version = "3.16.1"
version = "3.16.2"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/database_group/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.16.1"
version = "3.16.2"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/environments/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.16.1"
version = "3.16.2"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/groups/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.16.1"
version = "3.16.2"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/iamPolicy/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.16.1"
version = "3.16.2"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/instances/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
terraform {
required_providers {
bytebase = {
version = "3.16.1"
version = "3.16.2"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/policies/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.16.1"
version = "3.16.2"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/projects/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
terraform {
required_providers {
bytebase = {
version = "3.16.1"
version = "3.16.2"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/roles/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.16.1"
version = "3.16.2"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/settings/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.16.1"
version = "3.16.2"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/setup/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.16.1"
version = "3.16.2"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/sql_review/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.16.1"
version = "3.16.2"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/users/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
terraform {
required_providers {
bytebase = {
version = "3.16.1"
version = "3.16.2"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
18 changes: 18 additions & 0 deletions provider/data_source_setting.go
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,18 @@ func getWorkspaceProfileSetting(computed bool) *schema.Schema {
Optional: true,
Description: "The maximum time allowed for a query to run in SQL Editor, in seconds. No limit when the value <= 0.",
},
"refresh_token_duration_in_seconds": {
Type: schema.TypeInt,
Optional: true,
ValidateFunc: validation.IntAtLeast(3600),
Description: "The duration for refresh token in seconds. Default is 604800 (7 days). The duration should be at least 3600 (one hour).",
},
"access_token_duration_in_seconds": {
Type: schema.TypeInt,
Optional: true,
ValidateFunc: validation.IntAtLeast(60),
Description: "The duration for access token in seconds. Default is 3600 (1 hour). The duration should be at least 60 (one minute).",
},
"password_restriction": {
Type: schema.TypeList,
Optional: true,
Expand Down Expand Up @@ -692,6 +704,12 @@ func flattenWorkspaceProfileSetting(setting *v1pb.WorkspaceProfileSetting) []int
if v := setting.GetQueryTimeout(); v != nil {
raw["query_timeout_in_seconds"] = int(v.Seconds)
}
if v := setting.GetRefreshTokenDuration(); v != nil {
raw["refresh_token_duration_in_seconds"] = int(v.Seconds)
}
if v := setting.GetAccessTokenDuration(); v != nil {
raw["access_token_duration_in_seconds"] = int(v.Seconds)
}

// Handle password_restriction field
if v := setting.GetPasswordRestriction(); v != nil {
Expand Down
14 changes: 14 additions & 0 deletions provider/resource_setting.go
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,18 @@ func convertToV1WorkspaceProfileSetting(d *schema.ResourceData) (*v1pb.Workspace
}
updateMasks = append(updateMasks, "value.workspace_profile.query_timeout")
}
if config := workspaceRawConfig.GetAttr("refresh_token_duration_in_seconds"); !config.IsNull() {
workspacePrfile.RefreshTokenDuration = &durationpb.Duration{
Seconds: int64(raw["refresh_token_duration_in_seconds"].(int)),
}
updateMasks = append(updateMasks, "value.workspace_profile.refresh_token_duration")
}
if config := workspaceRawConfig.GetAttr("access_token_duration_in_seconds"); !config.IsNull() {
workspacePrfile.AccessTokenDuration = &durationpb.Duration{
Seconds: int64(raw["access_token_duration_in_seconds"].(int)),
}
updateMasks = append(updateMasks, "value.workspace_profile.access_token_duration")
}
if config := workspaceRawConfig.GetAttr("password_restriction"); !config.IsNull() {
if pwRestrictionList, ok := raw["password_restriction"].([]interface{}); ok && len(pwRestrictionList) > 0 {
pwRaw := pwRestrictionList[0].(map[string]interface{})
Expand Down Expand Up @@ -597,6 +609,8 @@ func resourceSettingDelete(ctx context.Context, d *schema.ResourceData, m interf
"value.workspace_profile.enable_audit_log_stdout",
"value.workspace_profile.sql_result_size",
"value.workspace_profile.query_timeout",
"value.workspace_profile.refresh_token_duration",
"value.workspace_profile.access_token_duration",
}
case v1pb.Setting_DATA_CLASSIFICATION:
setting.Value = &v1pb.SettingValue{
Expand Down
2 changes: 1 addition & 1 deletion tutorials/0-provider.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
bytebase = {
version = "3.16.1"
version = "3.16.2"
# For local development, please use "terraform.local/bytebase/bytebase" instead
source = "registry.terraform.io/bytebase/bytebase"
}
Expand Down
Loading