feat: add token_expiration option for config system

Signed-off-by: Cyberm8 <cyberm8>

Author: cyberm8

client/config.go

@@ -32,6 +32,7 @@ func GetConfigSystem(d *schema.ResourceData) models.ConfigBodySystemPost {
 		ReadOnly:                   d.Get("read_only").(bool),
 		ScannerSkipUpdatePulltime:  d.Get("scanner_skip_update_pulltime").(bool),
 		RobotTokenDuration:         d.Get("robot_token_expiration").(int),
+		TokenExpiration:            d.Get("token_expiration").(int),
 		SessionTimeout:             d.Get("session_timeout").(int),
 		QuotaPerProjectEnable:      true,
 		RobotNamePrefix:            d.Get("robot_name_prefix").(string),

docs/resources/config_system.md

@@ -16,6 +16,7 @@ description: |-
 resource "harbor_config_system" "main" {
   project_creation_restriction     = "adminonly"
   session_timeout                  = 60
+  token_expiration                 = 30
   robot_token_expiration           = 30
   robot_name_prefix                = "harbor@"
   storage_per_project              = 100
@@ -33,6 +34,7 @@ resource "harbor_config_system" "main" {
 - `robot_name_prefix` (String) Robot account prefix.
 - `robot_token_expiration` (Number) The amount of time in days a robot account will expire.
 - `session_timeout` (Number) The session timeout for Harbor UI, in minutes. Defaults to 60.
+- `token_expiration` (Number) The expiration time of a token created by the token service, in minutes. Defaults to 30.
 - `scanner_skip_update_pulltime` (Boolean) Whether or not to skip update pull time for scanner.
 - `storage_per_project` (Number) Default quota space per project in GIB. Default is -1 (unlimited).
 - `audit_log_forward_endpoint` (String) The endpoint to forward audit logs to.

models/config.go

@@ -36,7 +36,6 @@ type ConfigBodyAuthPost struct {
 	OidcGroupFilter              string `json:"oidc_group_filter,omitempty"`
 	OidcGroupsClaim              string `json:"oidc_groups_claim,omitempty"`
 	LdapScope                    int    `json:"ldap_scope"`
-	TokenExpiration              int    `json:"token_expiration,omitempty"`
 	LdapGroupSearchScope         int    `json:"ldap_group_search_scope"`
 	LdapVerifyCert               bool   `json:"ldap_verify_cert"`
 	LdapGroupGID                 string `json:"ldap_group_gid,omitempty"`
@@ -47,6 +46,7 @@ type ConfigBodySystemPost struct {
 	ProjectCreationRestriction string `json:"project_creation_restriction,omitempty"`
 	ReadOnly                   bool   `json:"read_only"`
 	RobotTokenDuration         int    `json:"robot_token_duration,omitempty"`
+	TokenExpiration            int    `json:"token_expiration,omitempty"`
 	SessionTimeout             int    `json:"session_timeout,omitempty"`
 	QuotaPerProjectEnable      bool   `json:"quota_per_project_enable"`
 	RobotNamePrefix            string `json:"robot_name_prefix,omitempty"`
@@ -186,10 +186,6 @@ type ConfigBodyResponse struct {
 		Editable bool `json:"editable,omitempty"`
 		Value    int  `json:"value,omitempty"`
 	} `json:"ldap_scope,omitempty"`
-	TokenExpiration struct {
-		Editable bool `json:"editable,omitempty"`
-		Value    int  `json:"value,omitempty"`
-	} `json:"token_expiration,omitempty"`
 	LdapGroupSearchScope struct {
 		Editable bool `json:"editable,omitempty"`
 		Value    int  `json:"value,omitempty"`
@@ -210,6 +206,10 @@ type ConfigBodyResponse struct {
 		Editable bool `json:"editable,omitempty"`
 		Value    int  `json:"value,omitempty"`
 	} `json:"robot_token_duration,omitempty"`
+	TokenExpiration struct {
+		Editable bool `json:"editable,omitempty"`
+		Value    int  `json:"value,omitempty"`
+	} `json:"token_expiration,omitempty"`
 	SessionTimeout struct {
 		Editable bool `json:"editable,omitempty"`
 		Value    int  `json:"value,omitempty"`

provider/resource_config_system.go

@@ -28,6 +28,11 @@ func resourceConfigSystem() *schema.Resource {
 				Optional: true,
 				Default:  30,
 			},
+			"token_expiration": {
+				Type:     schema.TypeInt,
+				Optional: true,
+				Default:  30,
+			},
 			"session_timeout": {
 				Type:     schema.TypeInt,
 				Optional: true,
@@ -182,6 +187,7 @@ func resourceConfigSystemRead(d *schema.ResourceData, m interface{}) error {
 	d.Set("project_creation_restriction", jsonData.ProjectCreationRestriction.Value)
 	d.Set("read_only", jsonData.ReadOnly.Value)
 	d.Set("robot_token_expiration", jsonData.RobotTokenDuration.Value)
+	d.Set("token_expiration", jsonData.TokenExpiration.Value)
 	d.Set("session_timeout", jsonData.SessionTimeout.Value)
 	d.Set("robot_name_prefix", jsonData.RobotNamePrefix.Value)
 	d.Set("scanner_skip_update_pulltime", jsonData.ScannerSkipUpdatePulltime.Value)

provider/resource_config_system_test.go

@@ -45,6 +45,8 @@ func TestAccConfigSystem(t *testing.T) {
 						resourceConfigSystemMain, "read_only", "false"),
 					resource.TestCheckResourceAttr(
 						resourceConfigSystemMain, "robot_token_expiration", "30"),
+					resource.TestCheckResourceAttr(
+						resourceConfigSystemMain, "token_expiration", "30"),
 					resource.TestCheckResourceAttr(
 						resourceConfigSystemMain, "session_timeout", "60"),
 					resource.TestCheckResourceAttr(
@@ -65,6 +67,7 @@ func testAccCheckConfigSystem() string {
 		project_creation_restriction     = "adminonly"
 		read_only                        = false
 		robot_token_expiration           = 30
+		token_expiration                 = 30
 		session_timeout                  = 60
 		robot_name_prefix                = "robot$"
 		scanner_skip_update_pulltime     = false