limit scope of pr

katbyte · katbyte · commit 6fe7f700182e · 2026-03-10T12:23:22.000-07:00
diff --git a/internal/services/authorization/client_config_data_source_test.go b/internal/services/authorization/client_config_data_source_test.go
@@ -4,6 +4,7 @@
 package authorization_test
 
 import (
+	"os"
 	"regexp"
 	"testing"
 
@@ -15,16 +16,18 @@ type ClientConfigDataSource struct{}
 
 func TestAccClientConfigDataSource_basic(t *testing.T) {
 	data := acceptance.BuildTestData(t, "data.azurerm_client_config", "current")
-	clientData := data.Client()
+	clientId := os.Getenv("ARM_CLIENT_ID")
+	tenantId := os.Getenv("ARM_TENANT_ID")
+	subscriptionId := os.Getenv("ARM_SUBSCRIPTION_ID")
 	objectIdRegex := regexp.MustCompile("^[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}$")
 
 	data.DataSourceTest(t, []acceptance.TestStep{
 		{
 			Config: ClientConfigDataSource{}.basic(),
 			Check: acceptance.ComposeTestCheckFunc(
-				check.That(data.ResourceName).Key("client_id").HasValue(clientData.Default.ClientID),
-				check.That(data.ResourceName).Key("tenant_id").HasValue(clientData.TenantID),
-				check.That(data.ResourceName).Key("subscription_id").HasValue(clientData.SubscriptionID),
+				check.That(data.ResourceName).Key("client_id").HasValue(clientId),
+				check.That(data.ResourceName).Key("tenant_id").HasValue(tenantId),
+				check.That(data.ResourceName).Key("subscription_id").HasValue(subscriptionId),
 				check.That(data.ResourceName).Key("object_id").MatchesRegex(objectIdRegex),
 			),
 		},
diff --git a/internal/services/containers/container_registry_task_resource_test.go b/internal/services/containers/container_registry_task_resource_test.go
@@ -947,7 +947,6 @@ resource "azurerm_container_registry_task" "test" {
 
 func (r ContainerRegistryTaskResource) fileTaskStepRegistryCredentialPassword(data acceptance.TestData) string {
 	template := r.template(data)
-	clientData := data.Client()
 	return fmt.Sprintf(`
 %s
 
@@ -980,7 +979,7 @@ resource "azurerm_container_registry_task" "test" {
     }
   }
 }
-`, template, data.RandomInteger, data.RandomInteger, r.url, r.token, clientData.Default.ClientID, clientData.Default.ClientSecret)
+`, template, data.RandomInteger, data.RandomInteger, r.url, r.token, os.Getenv("ARM_CLIENT_ID"), os.Getenv("ARM_CLIENT_SECRET"))
 }
 
 func (r ContainerRegistryTaskResource) fileTaskStepRegistryCredentialIdentity(data acceptance.TestData, tag string) string {
diff --git a/internal/services/containers/kubernetes_cluster_data_source_test.go b/internal/services/containers/kubernetes_cluster_data_source_test.go
@@ -5,6 +5,7 @@ package containers_test
 
 import (
 	"fmt"
+	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
@@ -91,11 +92,13 @@ func TestAccDataSourceKubernetesCluster_roleBasedAccessControlAAD(t *testing.T)
 	t.Skip("Azure AD Integration (legacy) (https://aka.ms/aks/aad-legacy) is deprecated, the cluster could not be created with the Azure AD integration (legacy) enabled.")
 	data := acceptance.BuildTestData(t, "data.azurerm_kubernetes_cluster", "test")
 	r := KubernetesClusterDataSource{}
-	clientData := data.Client()
+	clientId := os.Getenv("ARM_CLIENT_ID")
+	clientSecret := os.Getenv("ARM_CLIENT_SECRET")
+	tenantId := os.Getenv("ARM_TENANT_ID")
 
 	data.DataSourceTest(t, []acceptance.TestStep{
 		{
-			Config: r.roleBasedAccessControlAADConfig(data, clientData.Default.ClientID, clientData.Default.ClientSecret, clientData.TenantID),
+			Config: r.roleBasedAccessControlAADConfig(data, clientId, clientSecret, tenantId),
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).Key("role_based_access_control_enabled").HasValue("true"),
 				check.That(data.ResourceName).Key("azure_active_directory_role_based_access_control.#").HasValue("1"),
diff --git a/internal/services/graphservices/graph_services_account_resource_test.go b/internal/services/graphservices/graph_services_account_resource_test.go
@@ -6,6 +6,7 @@ package graphservices_test
 import (
 	"context"
 	"fmt"
+	"os"
 	"testing"
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
@@ -120,7 +121,6 @@ func (r AccountTestResource) Exists(ctx context.Context, clients *clients.Client
 }
 
 func (r AccountTestResource) basic(data acceptance.TestData) string {
-	clientData := data.Client()
 	return fmt.Sprintf(`
 %s
 
@@ -129,7 +129,7 @@ resource "azurerm_graph_services_account" "test" {
   application_id      = "%[3]s"
   resource_group_name = azurerm_resource_group.test.name
 }
-`, r.template(data), data.RandomInteger, clientData.Default.ClientID)
+`, r.template(data), data.RandomInteger, os.Getenv("ARM_CLIENT_ID"))
 }
 
 func (r AccountTestResource) requiresImport(data acceptance.TestData) string {
@@ -145,7 +145,6 @@ resource "azurerm_graph_services_account" "import" {
 }
 
 func (r AccountTestResource) complete(data acceptance.TestData) string {
-	clientData := data.Client()
 	return fmt.Sprintf(`
 %s
 
@@ -158,7 +157,7 @@ resource "azurerm_graph_services_account" "test" {
     some_key    = "some-value"
   }
 }
-`, r.template(data), data.RandomInteger, clientData.Default.ClientID)
+`, r.template(data), data.RandomInteger, os.Getenv("ARM_CLIENT_ID"))
 }
 
 func (r AccountTestResource) template(data acceptance.TestData) string {
diff --git a/internal/services/hybridcompute/arc_machine_data_source_test.go b/internal/services/hybridcompute/arc_machine_data_source_test.go
@@ -6,6 +6,7 @@ package hybridcompute_test
 import (
 	"fmt"
 	"math/rand"
+	"os"
 	"testing"
 
 	"github.com/hashicorp/go-uuid"
@@ -40,12 +41,12 @@ func generateRandomPassword(n int) string {
 func TestAccArcMachine_basic(t *testing.T) {
 	data := acceptance.BuildTestData(t, "data.azurerm_arc_machine", "test")
 	d := ArcMachineDataSource{}
-	clientData := data.Client()
+	clientSecret := os.Getenv("ARM_CLIENT_SECRET")
 	randomUUID, _ := uuid.GenerateUUID()
 	password := generateRandomPassword(15)
 	data.DataSourceTest(t, []acceptance.TestStep{
 		{
-			Config: d.basic(data, clientData.Default.ClientSecret, randomUUID, password),
+			Config: d.basic(data, clientSecret, randomUUID, password),
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).Key("agent.#").HasValue("1"),
 				check.That(data.ResourceName).Key("mssql_discovered").HasValue("false"),
diff --git a/internal/services/hybridcompute/arc_machine_extension_resource_test.go b/internal/services/hybridcompute/arc_machine_extension_resource_test.go
@@ -6,6 +6,7 @@ package hybridcompute_test
 import (
 	"context"
 	"fmt"
+	"os"
 	"regexp"
 	"testing"
 
@@ -190,7 +191,7 @@ resource "azurerm_arc_machine_extension" "test" {
 }
 
 func (r ArcMachineExtensionResource) template(data acceptance.TestData) string {
-	clientData := data.Client()
+	secret := os.Getenv("ARM_CLIENT_SECRET")
 	randomUUID, _ := uuid.GenerateUUID()
 	password := generateRandomPassword(10)
 	return fmt.Sprintf(`
@@ -334,5 +335,5 @@ data "azurerm_arc_machine" "test" {
     azurerm_linux_virtual_machine.test
   ]
 }
-`, randomUUID, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, password, password, clientData.Default.ClientSecret)
+`, randomUUID, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, password, password, secret)
 }
diff --git a/internal/services/springcloud/spring_cloud_api_portal_resource_test.go b/internal/services/springcloud/spring_cloud_api_portal_resource_test.go
@@ -6,6 +6,7 @@ package springcloud_test
 import (
 	"context"
 	"fmt"
+	"os"
 	"testing"
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
@@ -49,11 +50,12 @@ func TestAccSpringCloudAPIPortal_requiresImport(t *testing.T) {
 
 func TestAccSpringCloudAPIPortal_complete(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_spring_cloud_api_portal", "test")
-	clientData := data.Client()
+	clientId := os.Getenv("ARM_CLIENT_ID")
+	clientSecret := os.Getenv("ARM_CLIENT_SECRET")
 	r := SpringCloudAPIPortalResource{}
 	data.ResourceTest(t, r, []acceptance.TestStep{
 		{
-			Config: r.complete(data, clientData.Default.ClientID, clientData.Default.ClientSecret),
+			Config: r.complete(data, clientId, clientSecret),
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
 			),
@@ -64,7 +66,8 @@ func TestAccSpringCloudAPIPortal_complete(t *testing.T) {
 
 func TestAccSpringCloudAPIPortal_update(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_spring_cloud_api_portal", "test")
-	clientData := data.Client()
+	clientId := os.Getenv("ARM_CLIENT_ID")
+	clientSecret := os.Getenv("ARM_CLIENT_SECRET")
 	r := SpringCloudAPIPortalResource{}
 	data.ResourceTest(t, r, []acceptance.TestStep{
 		{
@@ -75,7 +78,7 @@ func TestAccSpringCloudAPIPortal_update(t *testing.T) {
 		},
 		data.ImportStep(),
 		{
-			Config: r.complete(data, clientData.Default.ClientID, clientData.Default.ClientSecret),
+			Config: r.complete(data, clientId, clientSecret),
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
 			),
diff --git a/internal/services/springcloud/spring_cloud_dev_tool_portal_resource_test.go b/internal/services/springcloud/spring_cloud_dev_tool_portal_resource_test.go
@@ -6,6 +6,7 @@ package springcloud_test
 import (
 	"context"
 	"fmt"
+	"os"
 	"testing"
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
@@ -50,10 +51,11 @@ func TestAccSpringCloudDevToolPortal_requiresImport(t *testing.T) {
 func TestAccSpringCloudDevToolPortal_complete(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_spring_cloud_dev_tool_portal", "test")
 	r := SpringCloudDevToolPortalResource{}
-	clientData := data.Client()
+	clientId := os.Getenv("ARM_CLIENT_ID")
+	clientSecret := os.Getenv("ARM_CLIENT_SECRET")
 	data.ResourceTest(t, r, []acceptance.TestStep{
 		{
-			Config: r.complete(data, clientData.Default.ClientID, clientData.Default.ClientSecret),
+			Config: r.complete(data, clientId, clientSecret),
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
 			),
@@ -64,7 +66,8 @@ func TestAccSpringCloudDevToolPortal_complete(t *testing.T) {
 
 func TestAccSpringCloudDevToolPortal_update(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_spring_cloud_dev_tool_portal", "test")
-	clientData := data.Client()
+	clientId := os.Getenv("ARM_CLIENT_ID")
+	clientSecret := os.Getenv("ARM_CLIENT_SECRET")
 	r := SpringCloudDevToolPortalResource{}
 	data.ResourceTest(t, r, []acceptance.TestStep{
 		{
@@ -75,7 +78,7 @@ func TestAccSpringCloudDevToolPortal_update(t *testing.T) {
 		},
 		data.ImportStep(),
 		{
-			Config: r.complete(data, clientData.Default.ClientID, clientData.Default.ClientSecret),
+			Config: r.complete(data, clientId, clientSecret),
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
 			),
diff --git a/internal/services/springcloud/spring_cloud_gateway_resource_test.go b/internal/services/springcloud/spring_cloud_gateway_resource_test.go
@@ -6,6 +6,7 @@ package springcloud_test
 import (
 	"context"
 	"fmt"
+	"os"
 	"testing"
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
@@ -50,10 +51,11 @@ func TestAccSpringCloudGateway_requiresImport(t *testing.T) {
 func TestAccSpringCloudGateway_complete(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_spring_cloud_gateway", "test")
 	r := SpringCloudGatewayResource{}
-	clientData := data.Client()
+	clientId := os.Getenv("ARM_CLIENT_ID")
+	clientSecret := os.Getenv("ARM_CLIENT_SECRET")
 	data.ResourceTest(t, r, []acceptance.TestStep{
 		{
-			Config: r.complete(data, clientData.Default.ClientID, clientData.Default.ClientSecret),
+			Config: r.complete(data, clientId, clientSecret),
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
 			),
@@ -78,7 +80,8 @@ func TestAccSpringCloudGateway_clientAuth(t *testing.T) {
 
 func TestAccSpringCloudGateway_update(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_spring_cloud_gateway", "test")
-	clientData := data.Client()
+	clientId := os.Getenv("ARM_CLIENT_ID")
+	clientSecret := os.Getenv("ARM_CLIENT_SECRET")
 	r := SpringCloudGatewayResource{}
 	data.ResourceTest(t, r, []acceptance.TestStep{
 		{
@@ -89,7 +92,7 @@ func TestAccSpringCloudGateway_update(t *testing.T) {
 		},
 		data.ImportStep(),
 		{
-			Config: r.complete(data, clientData.Default.ClientID, clientData.Default.ClientSecret),
+			Config: r.complete(data, clientId, clientSecret),
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
 			),
diff --git a/internal/services/storagemover/storage_mover_agent_resource_test.go b/internal/services/storagemover/storage_mover_agent_resource_test.go
@@ -6,6 +6,7 @@ package storagemover_test
 import (
 	"context"
 	"fmt"
+	"os"
 	"testing"
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
@@ -103,7 +104,6 @@ func (r StorageMoverAgentTestResource) Exists(ctx context.Context, clients *clie
 
 func (r StorageMoverAgentTestResource) template(data acceptance.TestData) string {
 	randomUUID, _ := uuid.GenerateUUID()
-	clientData := data.Client()
 	return fmt.Sprintf(`
 
 data "azurerm_client_config" "current" {}
@@ -244,7 +244,7 @@ data "azurerm_arc_machine" "test" {
 }
 
 
-`, data.RandomInteger, data.Locations.Primary, randomUUID, clientData.Default.ClientSecret)
+`, data.RandomInteger, data.Locations.Primary, randomUUID, os.Getenv("ARM_CLIENT_SECRET"))
 }
 
 func (r StorageMoverAgentTestResource) basic(data acceptance.TestData) string {
diff --git a/internal/services/web/app_service_custom_hostname_binding_resource.go b/internal/services/web/app_service_custom_hostname_binding_resource.go
@@ -144,7 +144,7 @@ func resourceAppServiceCustomHostnameBindingCreate(d *pluginsdk.ResourceData, me
 		return fmt.Errorf("cannot read Hostname Binding %q (App Service %q / Resource Group %q) ID", hostname, appServiceName, resourceGroup)
 	}
 
-	d.SetId(pointer.From(read.ID))
+	d.SetId(*read.ID)
 
 	return resourceAppServiceCustomHostnameBindingRead(d, meta)
 }

Original file line number	Diff line number	Diff line change
`@@ -947,7 +947,6 @@ resource "azurerm_container_registry_task" "test" {`
`947`	`947`
`948`	`948`	`func (r ContainerRegistryTaskResource) fileTaskStepRegistryCredentialPassword(data acceptance.TestData) string {`
`949`	`949`	`template := r.template(data)`
`950`		`- clientData := data.Client()`
`951`	`950`	return fmt.Sprintf(`
`952`	`951`	`%s`
`953`	`952`
`@@ -980,7 +979,7 @@ resource "azurerm_container_registry_task" "test" {`
`980`	`979`	`}`
`981`	`980`	`}`
`982`	`981`	`}`
`983`		-`, template, data.RandomInteger, data.RandomInteger, r.url, r.token, clientData.Default.ClientID, clientData.Default.ClientSecret)
	`982`	+`, template, data.RandomInteger, data.RandomInteger, r.url, r.token, os.Getenv("ARM_CLIENT_ID"), os.Getenv("ARM_CLIENT_SECRET"))
`984`	`983`	`}`
`985`	`984`
`986`	`985`	`func (r ContainerRegistryTaskResource) fileTaskStepRegistryCredentialIdentity(data acceptance.TestData, tag string) string {`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ package graphservices_test`
`6`	`6`	`import (`
`7`	`7`	`"context"`
`8`	`8`	`"fmt"`
	`9`	`+ "os"`
`9`	`10`	`"testing"`
`10`	`11`
`11`	`12`	`"github.com/hashicorp/go-azure-helpers/lang/pointer"`
`@@ -120,7 +121,6 @@ func (r AccountTestResource) Exists(ctx context.Context, clients *clients.Client`
`120`	`121`	`}`
`121`	`122`
`122`	`123`	`func (r AccountTestResource) basic(data acceptance.TestData) string {`
`123`		`- clientData := data.Client()`
`124`	`124`	return fmt.Sprintf(`
`125`	`125`	`%s`
`126`	`126`
`@@ -129,7 +129,7 @@ resource "azurerm_graph_services_account" "test" {`
`129`	`129`	`application_id = "%[3]s"`
`130`	`130`	`resource_group_name = azurerm_resource_group.test.name`
`131`	`131`	`}`
`132`		-`, r.template(data), data.RandomInteger, clientData.Default.ClientID)
	`132`	+`, r.template(data), data.RandomInteger, os.Getenv("ARM_CLIENT_ID"))
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`func (r AccountTestResource) requiresImport(data acceptance.TestData) string {`
`@@ -145,7 +145,6 @@ resource "azurerm_graph_services_account" "import" {`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`func (r AccountTestResource) complete(data acceptance.TestData) string {`
`148`		`- clientData := data.Client()`
`149`	`148`	return fmt.Sprintf(`
`150`	`149`	`%s`
`151`	`150`
`@@ -158,7 +157,7 @@ resource "azurerm_graph_services_account" "test" {`
`158`	`157`	`some_key = "some-value"`
`159`	`158`	`}`
`160`	`159`	`}`
`161`		-`, r.template(data), data.RandomInteger, clientData.Default.ClientID)
	`160`	+`, r.template(data), data.RandomInteger, os.Getenv("ARM_CLIENT_ID"))
`162`	`161`	`}`
`163`	`162`
`164`	`163`	`func (r AccountTestResource) template(data acceptance.TestData) string {`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ package hybridcompute_test`
`6`	`6`	`import (`
`7`	`7`	`"context"`
`8`	`8`	`"fmt"`
	`9`	`+ "os"`
`9`	`10`	`"regexp"`
`10`	`11`	`"testing"`
`11`	`12`
`@@ -190,7 +191,7 @@ resource "azurerm_arc_machine_extension" "test" {`
`190`	`191`	`}`
`191`	`192`
`192`	`193`	`func (r ArcMachineExtensionResource) template(data acceptance.TestData) string {`
`193`		`- clientData := data.Client()`
	`194`	`+ secret := os.Getenv("ARM_CLIENT_SECRET")`
`194`	`195`	`randomUUID, _ := uuid.GenerateUUID()`
`195`	`196`	`password := generateRandomPassword(10)`
`196`	`197`	return fmt.Sprintf(`
`@@ -334,5 +335,5 @@ data "azurerm_arc_machine" "test" {`
`334`	`335`	`azurerm_linux_virtual_machine.test`
`335`	`336`	`]`
`336`	`337`	`}`
`337`		-`, randomUUID, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, password, password, clientData.Default.ClientSecret)
	`338`	+`, randomUUID, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, password, password, secret)
`338`	`339`	`}`