Fix up bad merge

hashicorp · Sep 20, 2023 · be6fb53 · be6fb53
1 parent 96313a0
commit be6fb53
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/internal/services/conditionalaccess/conditional_access_policy_resource.go b/internal/services/conditionalaccess/conditional_access_policy_resource.go
@@ -390,17 +390,17 @@ func conditionalAccessPolicyResource() *pluginsdk.Resource {
 							AtLeastOneOf: []string{"grant_controls.0.built_in_controls", "grant_controls.0.terms_of_use"},
 							Elem: &pluginsdk.Schema{
 								Type: pluginsdk.TypeString,
+								ValidateFunc: validation.StringInSlice([]string{
+									msgraph.ConditionalAccessGrantControlApprovedApplication,
+									msgraph.ConditionalAccessGrantControlBlock,
+									msgraph.ConditionalAccessGrantControlCompliantApplication,
+									msgraph.ConditionalAccessGrantControlCompliantDevice,
+									msgraph.ConditionalAccessGrantControlDomainJoinedDevice,
+									msgraph.ConditionalAccessGrantControlMfa,
+									msgraph.ConditionalAccessGrantControlPasswordChange,
+									msgraph.ConditionalAccessGrantControlUnknownFutureValue,
+								}, false),
 							},
-							ValidateFunc: validation.StringInSlice([]string{
-								msgraph.ConditionalAccessGrantControlApprovedApplication,
-								msgraph.ConditionalAccessGrantControlBlock,
-								msgraph.ConditionalAccessGrantControlCompliantApplication,
-								msgraph.ConditionalAccessGrantControlCompliantDevice,
-								msgraph.ConditionalAccessGrantControlDomainJoinedDevice,
-								msgraph.ConditionalAccessGrantControlMfa,
-								msgraph.ConditionalAccessGrantControlPasswordChange,
-								msgraph.ConditionalAccessGrantControlUnknownFutureValue,
-							}, false),
 						},
 
 						"custom_authentication_factors": {

diff --git a/internal/services/groups/group_data_source_test.go b/internal/services/groups/group_data_source_test.go
@@ -67,10 +67,10 @@ func TestAccGroupDataSource_byCaseInsensitiveDisplayName(t *testing.T) {
 func TestAccGroupDataSource_byMailNickname(t *testing.T) {
 	data := acceptance.BuildTestData(t, "data.azuread_group", "test")
 
-	data.DataSourceTest(t, []resource.TestStep{
+	data.DataSourceTest(t, []acceptance.TestStep{
 		{
 			Config: GroupDataSource{}.mailNickname(data),
-			Check: resource.ComposeTestCheckFunc(
+			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).Key("display_name").HasValue(fmt.Sprintf("acctestGroup-%d", data.RandomInteger)),
 			),
 		},
@@ -80,10 +80,10 @@ func TestAccGroupDataSource_byMailNickname(t *testing.T) {
 func TestAccGroupDataSource_byMailNicknameWithSecurity(t *testing.T) {
 	data := acceptance.BuildTestData(t, "data.azuread_group", "test")
 
-	data.DataSourceTest(t, []resource.TestStep{
+	data.DataSourceTest(t, []acceptance.TestStep{
 		{
 			Config: GroupDataSource{}.mailNicknameSecurity(data),
-			Check: resource.ComposeTestCheckFunc(
+			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).Key("display_name").HasValue(fmt.Sprintf("acctestGroup-%d", data.RandomInteger)),
 			),
 		},
@@ -93,10 +93,10 @@ func TestAccGroupDataSource_byMailNicknameWithSecurity(t *testing.T) {
 func TestAccGroupDataSource_byMailNicknameWithSecurityNotMail(t *testing.T) {
 	data := acceptance.BuildTestData(t, "data.azuread_group", "test")
 
-	data.DataSourceTest(t, []resource.TestStep{
+	data.DataSourceTest(t, []acceptance.TestStep{
 		{
 			Config: GroupDataSource{}.mailNicknameSecurityNotMail(data),
-			Check: resource.ComposeTestCheckFunc(
+			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).Key("display_name").HasValue(fmt.Sprintf("acctestGroup-%d", data.RandomInteger)),
 			),
 		},