Merge pull request #685 from terraform-routeros/vaerh/ros7.18

Fix resource schemas for new version v7.18
terraform-routeros · Mar 4, 2025 · 5a68ab6 · 5a68ab6
2 parents c1cf166 + cd54ce8
commit 5a68ab6
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/.github/workflows/go-mod-cache.yml b/.github/workflows/go-mod-cache.yml
@@ -7,11 +7,11 @@ concurrency:
 on:
   pull_request:
     branches:
-      - 'main'
-      - 'devel'
+      - "main"
+      - "devel"
     paths:
-      - 'main.go'
-      - 'routeros/*.go'
+      - "main.go"
+      - "routeros/*.go"
 
 jobs:
   go-cache:
@@ -25,14 +25,14 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: 1.23.4
-        id: go  
-      
+        id: go
+
       - name: Get dependencies
         shell: bash
-        run:  go mod download all
+        run: go mod download all
 
       - name: Cache Go Modules
-        uses: actions/cache@v4.1.1
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build

diff --git a/routeros/resource_ip_dhcp_client.go b/routeros/resource_ip_dhcp_client.go
@@ -25,7 +25,7 @@ func ResourceDhcpClient() *schema.Resource {
 		},
 		"script": {
 			Type:        schema.TypeString,
-			Optional:     true,
+			Optional:    true,
 			Description: "A script.",
 		},
 		KeyComment: PropCommentRw,
@@ -44,6 +44,12 @@ func ResourceDhcpClient() *schema.Resource {
 				return false
 			},
 		},
+		"default_route_tables": {
+			Type:             schema.TypeString,
+			Optional:         true,
+			Description:      "Default route tables.",
+			DiffSuppressFunc: AlwaysPresentNotUserProvided,
+		},
 		"dhcp_options": {
 			Type:        schema.TypeString,
 			Optional:    true,

diff --git a/routeros/resource_tool_bandwidth_server.go b/routeros/resource_tool_bandwidth_server.go
@@ -20,6 +20,22 @@ func ResourceToolBandwidthServer() *schema.Resource {
 		MetaResourcePath: PropResourcePath("/tool/bandwidth-server"),
 		MetaId:           PropId(Id),
 
+		"allowed_addresses4": {
+			Type:        schema.TypeSet,
+			Optional:    true,
+			Description: "IPv4 allowed networks.",
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
+		"allowed_addresses6": {
+			Type:        schema.TypeSet,
+			Optional:    true,
+			Description: "Ipv6 allowed networks.",
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
 		"allocate_udp_ports_from": {
 			Type:             schema.TypeInt,
 			Optional:         true,