feat: Update the service property in routeros_radius to support m…

…ultiple values

docs/resources/radius.md

@@ -5,7 +5,7 @@
 ```terraform
 resource "routeros_radius" "user_manager" {
   address = "127.0.0.1"
-  service = "ppp,login"
+  service = ["ppp", "login"]
 }
 ```
 

examples/resources/routeros_radius/resource.tf

@@ -1,4 +1,4 @@
 resource "routeros_radius" "user_manager" {
   address = "127.0.0.1"
-  service = "ppp,login"
+  service = ["ppp", "login"]
 }

routeros/resource_radius.go

@@ -74,9 +74,14 @@ func ResourceRadius() *schema.Resource {
 			Description: "The shared secret to access the RADIUS server.",
 		},
 		"service": {
-			Type:     schema.TypeString,
+			Type:     schema.TypeSet,
 			Optional: true,
-			Description: "A comma-separated list of router services that will use the RADIUS server. Possible values: " +
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+				ValidateFunc: validation.StringInSlice([]string{"hotspot", "login", "ppp", "wireless",
+					"dhcp", "ipsec", "dot1x"}, false),
+			},
+			Description: "A set of router services that will use the RADIUS server. Possible values: " +
 				"`hotspot`, `login`, `ppp`, `wireless`, `dhcp`, `ipsec`, `dot1x`.",
 		},
 		"src_address": {
@@ -105,6 +110,14 @@ func ResourceRadius() *schema.Resource {
 		},
 
 		Schema: resSchema,
+		SchemaVersion: 1,
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type: ResourceRadiusV0().CoreConfigSchema().ImpliedType(),
+				Upgrade: stateMigrationScalarToList("service"),
+				Version: 0,
+			},
+		},
 	}
 }
 

routeros/resource_radius_v0.go

@@ -0,0 +1,109 @@
+package routeros
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+)
+
+// https://help.mikrotik.com/docs/display/ROS/RADIUS#RADIUS-RADIUSClient
+func ResourceRadiusV0() *schema.Resource {
+	resSchema := map[string]*schema.Schema{
+		MetaResourcePath: PropResourcePath("/radius"),
+		MetaId:           PropId(Id),
+
+		"accounting_backup": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "An option whether the configuration is for the backup RADIUS server.",
+		},
+		"accounting_port": {
+			Type:         schema.TypeInt,
+			Optional:     true,
+			Default:      1813,
+			Description:  "RADIUS server port used for accounting.",
+			ValidateFunc: validation.IntBetween(0, 65535),
+		},
+		"address": {
+			Type:         schema.TypeString,
+			Required:     true,
+			Description:  "IPv4 or IPv6 address of RADIUS server.",
+			ValidateFunc: validation.IsIPAddress,
+		},
+		"authentication_port": {
+			Type:         schema.TypeInt,
+			Optional:     true,
+			Default:      1812,
+			Description:  "RADIUS server port used for authentication.",
+			ValidateFunc: validation.IntBetween(0, 65535),
+		},
+		"called_id": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "RADIUS calling station identifier.",
+		},
+		"certificate": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Default:     "none",
+			Description: "Certificate to use for communication with RADIUS Server with RadSec enabled.",
+		},
+		KeyComment:  PropCommentRw,
+		KeyDisabled: PropDisabledRw,
+		"domain": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Microsoft Windows domain of client passed to RADIUS servers that require domain validation.",
+		},
+		"protocol": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "udp",
+			Description:  "An option specifies the protocol to use when communicating with the RADIUS Server.",
+			ValidateFunc: validation.StringInSlice([]string{"radsec", "udp"}, false),
+		},
+		"realm": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Explicitly stated realm (user domain), so the users do not have to provide proper ISP domain name in the user name.",
+		},
+		"secret": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Sensitive:   true,
+			Description: "The shared secret to access the RADIUS server.",
+		},
+		"service": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Description: "A comma-separated list of router services that will use the RADIUS server. Possible values: " +
+				"`hotspot`, `login`, `ppp`, `wireless`, `dhcp`, `ipsec`, `dot1x`.",
+		},
+		"src_address": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Description:  "Source IPv4/IPv6 address of the packets sent to the RADIUS server.",
+			ValidateFunc: validation.IsIPAddress,
+		},
+		"timeout": {
+			Type:             schema.TypeString,
+			Optional:         true,
+			Default:          "300ms",
+			Description:      "A timeout, after which the request should be resent.",
+			DiffSuppressFunc: TimeEquall,
+		},
+	}
+
+	return &schema.Resource{
+		CreateContext: DefaultCreate(resSchema),
+		ReadContext:   DefaultRead(resSchema),
+		UpdateContext: DefaultUpdate(resSchema),
+		DeleteContext: DefaultDelete(resSchema),
+
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
+
+		Schema: resSchema,
+	}
+}