r/system_syslog_file: use new provider via framework

fix reading 'archive size' when value is a multiple of 1024 (k,m,g)
jeremmfr · Dec 16, 2023 · 9ad7433 · 9ad7433
1 parent 62289d5
commit 9ad7433
Show file tree

Hide file tree

Showing 20 changed files with 1,486 additions and 1,017 deletions.
diff --git a/.changes/issue-593.md b/.changes/issue-593.md
@@ -3,7 +3,16 @@ FEATURES:
 
 ENHANCEMENTS:
 
+* **resource/junos_system_syslog_file**: resource now use new [terraform-plugin-framework](https://github.com/hashicorp/terraform-plugin-framework)  
+  some of config errors are now sent during Plan instead of during Apply  
+  optional boolean attributes doesn't accept value *false*  
+  optional string attributes doesn't accept *empty* value  
+  the resource schema has been upgraded to have one-blocks in single mode instead of list
 * **resource/junos_system_syslog_host**: resource now use new [terraform-plugin-framework](https://github.com/hashicorp/terraform-plugin-framework)  
   optional boolean attributes doesn't accept value *false*  
   optional string attributes doesn't accept *empty* value  
   the resource schema has been upgraded to have one-blocks in single mode instead of list
+
+BUG FIXES:
+
+* **resource/junos_system_syslog_file**: fix reading `archive size` when value is a multiple of 1024 (k,m,g)
diff --git a/docs/resources/security.md b/docs/resources/security.md
@@ -302,7 +302,7 @@ The following arguments are supported:
 - **automatic_interval** (Optional, Number)  
   Automatic interval (1..336 hours).
 - **automatic_start_time** (Optional, String)  
-  Automatic start time `YYYY-MM-DD.HH:MM:SS`.
+  Automatic start time (YYYY-MM-DD.HH:MM:SS).
 - **install_ignore_version_check** (Optional, Boolean)  
   Skip version check when attack database gets installed.
 - **proxy_profile** (Optional, String)  

diff --git a/docs/resources/system_syslog_file.md b/docs/resources/system_syslog_file.md
@@ -78,20 +78,8 @@ The following arguments are supported:
 - **no_binary_data** (Optional, Boolean)  
   Don't mark file as if it contains binary data.  
   Conflict with `binary_data`.
-- **world_readable** (Optional, Boolean)  
-  Allow any user to read the log file.  
-  Conflict with `no_world_readable`.
-- **no_world_readable** (Optional, Boolean)  
-  Don't allow any user to read the log file.  
-  Conflict with `world_readable`.
 - **files** (Optional, Number)  
-  Number of files to be archived (1..1000)
-- **size** (Optional, Number)  
-  Size of files to be archived (65536..1073741824 bytes)
-- **start_time** (Optional, String)  
-  Start time for file transmission (yyyy-mm-dd.hh:mm)
-- **transfer_interval** (Optional, Number)  
-  Frequency at which to transfer files to archive sites (5..2880 minutes)
+  Number of files to be archived (1..1000).
 - **sites** (Optional, Block List)  
   For each url, configure an archive site (first declaration is primary URL, failover for others).
   - **url** (Required, String)  
@@ -100,6 +88,18 @@ The following arguments are supported:
     Password for login into the archive site.
   - **routing_instance** (Optional, String)  
     Routing instance.
+- **size** (Optional, Number)  
+  Size of files to be archived (65536..1073741824 bytes).
+- **start_time** (Optional, String)  
+  Start time for file transmission (YYYY-MM-DD.HH:MM:SS).
+- **transfer_interval** (Optional, Number)  
+  Frequency at which to transfer files to archive sites (5..2880 minutes).
+- **world_readable** (Optional, Boolean)  
+  Allow any user to read the log file.  
+  Conflict with `no_world_readable`.
+- **no_world_readable** (Optional, Boolean)  
+  Don't allow any user to read the log file.  
+  Conflict with `world_readable`.
 
 **WARNING** All severities need to be
 `alert`, `any`, `critical`, `emergency`, `error`, `info`, `none`, `notice` or `warning`.

diff --git a/internal/providerfwk/provider.go b/internal/providerfwk/provider.go
@@ -279,6 +279,7 @@ func (p *junosProvider) Resources(_ context.Context) []func() resource.Resource
 		newStaticRouteResource,
 		newSwitchOptionsResource,
 		newSystemResource,
+		newSystemSyslogFileResource,
 		newSystemSyslogHostResource,
 	}
 }

diff --git a/internal/providerfwk/resource_security.go b/internal/providerfwk/resource_security.go
@@ -629,7 +629,7 @@ func (rsc *security) Schema(
 					},
 					"automatic_start_time": schema.StringAttribute{
 						Optional:    true,
-						Description: "Automatic start time `YYYY-MM-DD.HH:MM:SS`.",
+						Description: "Automatic start time (YYYY-MM-DD.HH:MM:SS).",
 						Validators: []validator.String{
 							stringvalidator.RegexMatches(
 								regexp.MustCompile(`^\d{4}\-\d\d?\-\d\d?\.\d{2}:\d{2}:\d{2}$`),