From eccba91abc4d5c3cfb46321267b5c3f40d5bd5f3 Mon Sep 17 00:00:00 2001
From: Percy Wegmann <percy@tailscale.com>
Date: Fri, 23 Aug 2024 09:03:51 -0500
Subject: [PATCH] tailscale: use V2 client for acl data source

Updates tailscale/corp#21867

Signed-off-by: Percy Wegmann <percy@tailscale.com>
---
 tailscale/data_source_acl.go      |  4 +--
 tailscale/data_source_acl_test.go | 49 +++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 tailscale/data_source_acl_test.go

diff --git a/tailscale/data_source_acl.go b/tailscale/data_source_acl.go
index 326a3ed6..b30e9cab 100644
--- a/tailscale/data_source_acl.go
+++ b/tailscale/data_source_acl.go
@@ -29,9 +29,9 @@ func dataSourceACL() *schema.Resource {
 }
 
 func dataSourceACLRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	client := m.(*Clients).V1
+	client := m.(*Clients).V2
 
-	acl, err := client.RawACL(ctx)
+	acl, err := client.PolicyFile().Raw(ctx)
 	if err != nil {
 		return diagnosticsError(err, "Failed to fetch ACL")
 	}
diff --git a/tailscale/data_source_acl_test.go b/tailscale/data_source_acl_test.go
new file mode 100644
index 00000000..0b6679a3
--- /dev/null
+++ b/tailscale/data_source_acl_test.go
@@ -0,0 +1,49 @@
+package tailscale_test
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+
+	"github.com/tailscale/hujson"
+	"github.com/tailscale/terraform-provider-tailscale/tailscale"
+)
+
+func TestAccTailscaleACL(t *testing.T) {
+	resourceName := "data.tailscale_acl.acl"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: testAccProviderFactories(t),
+		Steps: []resource.TestStep{
+			{
+				Config: `data "tailscale_acl" "acl" {}`,
+				Check: func(s *terraform.State) error {
+					client := testAccProvider.Meta().(*tailscale.Clients).V2
+					acl, err := client.PolicyFile().Raw(context.Background())
+					if err != nil {
+						return fmt.Errorf("unable to get ACL: %s", err)
+					}
+
+					huj, err := hujson.Parse([]byte(acl))
+					if err != nil {
+						return fmt.Errorf("Failed to parse ACL as HuJSON: %s", err)
+					}
+					expected := huj.String()
+
+					rs := s.RootModule().Resources[resourceName].Primary
+					actual := rs.Attributes["hujson"]
+					if diff := cmp.Diff(expected, actual); diff != "" {
+						return fmt.Errorf("wrong ACL (-got, +want): %s", diff)
+					}
+
+					return nil
+				},
+			},
+		},
+	})
+}