Skip to content

Commit

Permalink
r/system: add web_management_session_* arguments
Browse files Browse the repository at this point in the history 
in services block
Fix #594
  • Loading branch information
@jeremmfr
jeremmfr committed Dec 15, 2023
1 parent c510c5e commit 3756f74
Show file tree
Hide file tree
Showing 4 changed files with 100 additions and 10 deletions.
4 changes: 4 additions & 0 deletions .changes/issue-594.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<!-- markdownlint-disable-file MD013 MD041 -->
ENHANCEMENTS:

* **resource/junos_system**: add `web_management_session_idle_timeout` and `web_management_session_limit` arguments in `services` block (Fix [#594](https://github.com/jeremmfr/terraform-provider-junos/issues/594))
4 changes: 4 additions & 0 deletions docs/resources/system.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ The following arguments are supported:
- **web_management_https** (Optional, Block)
Declare `web-management https` configuration.
See [below for nested schema](#web_management_https-arguments-for-services).
- **web_management_session_idle_timeout** (Optional, Number)
Default timeout of web-management sessions (1..1440 minutes).
- **web_management_session_limit** (Optional, Number)
Maximum number of web-management sessions to allow (1..1024).
- **syslog** (Optional, Block)
Declare `syslog` configuration.
- **archive** (Optional, Block)
Expand Down
100 changes: 90 additions & 10 deletions internal/providerfwk/resource_system.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,22 @@ func (rsc *system) Schema(
},
"services": schema.SingleNestedBlock{
Description: "Declare `services` configuration.",
Attributes: map[string]schema.Attribute{
"web_management_session_idle_timeout": schema.Int64Attribute{
Optional: true,
Description: "Default timeout of web-management sessions (minutes).",
Validators: []validator.Int64{
int64validator.Between(1, 1440),
},
},
"web_management_session_limit": schema.Int64Attribute{
Optional: true,
Description: "Maximum number of web-management sessions to allow.",
Validators: []validator.Int64{
int64validator.Between(1, 1024),
},
},
},
Blocks: map[string]schema.Block{
"netconf_ssh": schema.SingleNestedBlock{
Description: "Declare `netconf ssh` configuration.",
Expand Down Expand Up @@ -1934,16 +1950,23 @@ func (block *systemBlockPortsConfig) isEmpty() bool {
}
}

//nolint:lll
type systemBlockServices struct {
NetconfSSH *systemBlockServicesBlockNetconfSSH `tfsdk:"netconf_ssh"`
NetconfTraceoptions *systemBlockServicesBlockNetconfTraceoptions `tfsdk:"netconf_traceoptions"`
SSH *systemBlockServicesBlockSSH `tfsdk:"ssh"`
WebManagementHTTP *systemBlockServicesBlockWebManagementHTTP `tfsdk:"web_management_http"`
WebManagementHTTPS *systemBlockServicesBlockWebManagementHTTPS `tfsdk:"web_management_https"`
WebManagementSessionIdleTimeout types.Int64 `tfsdk:"web_management_session_idle_timeout"`
WebManagementSessionLimit types.Int64 `tfsdk:"web_management_session_limit"`
NetconfSSH *systemBlockServicesBlockNetconfSSH `tfsdk:"netconf_ssh"`
NetconfTraceoptions *systemBlockServicesBlockNetconfTraceoptions `tfsdk:"netconf_traceoptions"`
SSH *systemBlockServicesBlockSSH `tfsdk:"ssh"`
WebManagementHTTP *systemBlockServicesBlockWebManagementHTTP `tfsdk:"web_management_http"`
WebManagementHTTPS *systemBlockServicesBlockWebManagementHTTPS `tfsdk:"web_management_https"`
}

func (block *systemBlockServices) isEmpty() bool {
switch {
case !block.WebManagementSessionIdleTimeout.IsNull():
return false
case !block.WebManagementSessionLimit.IsNull():
return false
case block.NetconfSSH != nil:
return false
case block.NetconfTraceoptions != nil:
Expand All @@ -1959,16 +1982,23 @@ func (block *systemBlockServices) isEmpty() bool {
}
}

//nolint:lll
type systemBlockServicesConfig struct {
NetconfSSH *systemBlockServicesBlockNetconfSSH `tfsdk:"netconf_ssh"`
NetconfTraceoptions *systemBlockServicesBlockNetconfTraceoptionsConfig `tfsdk:"netconf_traceoptions"`
SSH *systemBlockServicesBlockSSHConfig `tfsdk:"ssh"`
WebManagementHTTP *systemBlockServicesBlockWebManagementHTTPConfig `tfsdk:"web_management_http"`
WebManagementHTTPS *systemBlockServicesBlockWebManagementHTTPSConfig `tfsdk:"web_management_https"`
WebManagementSessionIdleTimeout types.Int64 `tfsdk:"web_management_session_idle_timeout"`
WebManagementSessionLimit types.Int64 `tfsdk:"web_management_session_limit"`
NetconfSSH *systemBlockServicesBlockNetconfSSH `tfsdk:"netconf_ssh"`
NetconfTraceoptions *systemBlockServicesBlockNetconfTraceoptionsConfig `tfsdk:"netconf_traceoptions"`
SSH *systemBlockServicesBlockSSHConfig `tfsdk:"ssh"`
WebManagementHTTP *systemBlockServicesBlockWebManagementHTTPConfig `tfsdk:"web_management_http"`
WebManagementHTTPS *systemBlockServicesBlockWebManagementHTTPSConfig `tfsdk:"web_management_https"`
}

func (block *systemBlockServicesConfig) isEmpty() bool {
switch {
case !block.WebManagementSessionIdleTimeout.IsNull():
return false
case !block.WebManagementSessionLimit.IsNull():
return false
case block.NetconfSSH != nil:
return false
case block.NetconfTraceoptions != nil:
Expand Down Expand Up @@ -2686,6 +2716,26 @@ func (rsc *system) ValidateConfig( //nolint:gocognit
}
}
}
if !config.Services.WebManagementSessionIdleTimeout.IsNull() {
if config.Services.WebManagementHTTP == nil && config.Services.WebManagementHTTPS == nil {
resp.Diagnostics.AddAttributeError(
path.Root("services").AtName("web_management_session_idle_timeout"),
tfdiag.MissingConfigErrSummary,
"web_management_http or web_management_https block must be specified"+
" with web_management_session_idle_timeout in services block",
)
}
}
if !config.Services.WebManagementSessionLimit.IsNull() {
if config.Services.WebManagementHTTP == nil && config.Services.WebManagementHTTPS == nil {
resp.Diagnostics.AddAttributeError(
path.Root("services").AtName("web_management_session_limit"),
tfdiag.MissingConfigErrSummary,
"web_management_http or web_management_https block must be specified"+
" with web_management_session_limit in services block",
)
}
}
if config.Services.WebManagementHTTPS != nil {
if config.Services.WebManagementHTTPS.LocalCertificate.IsNull() &&
config.Services.WebManagementHTTPS.PkiLocalCertificate.IsNull() &&
Expand Down Expand Up @@ -3422,6 +3472,24 @@ func (block *systemBlockServices) configSet() (
configSet := make([]string, 0)
setPrefix := "set system services "

if !block.WebManagementSessionIdleTimeout.IsNull() {
if block.WebManagementHTTP == nil && block.WebManagementHTTPS == nil {
return configSet, path.Root("services").AtName("web_management_session_idle_timeout"),
fmt.Errorf("web_management_http or web_management_https block must be specified" +
" with web_management_session_idle_timeout in services block")
}
configSet = append(configSet, setPrefix+"web-management session idle-timeout "+
utils.ConvI64toa(block.WebManagementSessionIdleTimeout.ValueInt64()))
}
if !block.WebManagementSessionLimit.IsNull() {
if block.WebManagementHTTP == nil && block.WebManagementHTTPS == nil {
return configSet, path.Root("services").AtName("web_management_session_limit"),
fmt.Errorf("web_management_http or web_management_https block must be specified" +
" with web_management_session_limit in services block")
}
configSet = append(configSet, setPrefix+"web-management session session-limit "+
utils.ConvI64toa(block.WebManagementSessionLimit.ValueInt64()))
}
if block.NetconfSSH != nil {
if block.NetconfSSH.isEmpty() {
return configSet, path.Root("services").AtName("netconf_ssh").AtName("*"),
Expand Down Expand Up @@ -3815,6 +3883,16 @@ func (rscData *systemData) read(
rscData.Services = &systemBlockServices{}
}
switch {
case balt.CutPrefixInString(&itemTrim, "services web-management session idle-timeout "):
rscData.Services.WebManagementSessionIdleTimeout, err = tfdata.ConvAtoi64Value(itemTrim)
if err != nil {
return err
}
case balt.CutPrefixInString(&itemTrim, "services web-management session session-limit "):
rscData.Services.WebManagementSessionLimit, err = tfdata.ConvAtoi64Value(itemTrim)
if err != nil {
return err
}
case bchk.StringHasOneOfPrefixes(itemTrim, systemBlockServicesBlockNetconfSSH{}.junosLines()):
if rscData.Services.NetconfSSH == nil {
rscData.Services.NetconfSSH = &systemBlockServicesBlockNetconfSSH{}
Expand Down Expand Up @@ -4215,6 +4293,8 @@ func (block *systemBlockPorts) read(itemTrim string) (err error) {

func (systemBlockServices) junosLines() []string {
s := make([]string, 0, 50)
s = append(s, "services web-management session idle-timeout")
s = append(s, "services web-management session session-limit")
s = append(s, systemBlockServicesBlockNetconfSSH{}.junosLines()...)
s = append(s, "services netconf traceoptions")
s = append(s, systemBlockServicesBlockSSH{}.junosLines()...)
Expand Down
2 changes: 2 additions & 0 deletions internal/providerfwk/testdata/TestAccResourceSystem_basic/1/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ resource "junos_system" "testacc_system" {
root_login = "deny"
tcp_forwarding = true
}
web_management_session_idle_timeout = 600
web_management_session_limit = 100
web_management_http {
interface = ["fxp0.0"]
port = 80
Expand Down

0 comments on commit 3756f74

Please sign in to comment.