Fix dependencies and broken unit test, add missing validation

hashicorp · May 19, 2021 · b2de421 · b2de421
1 parent 4cd4d74
commit b2de421
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 44 deletions.
diff --git a/internal/services/applications/application_app_role_resource.go b/internal/services/applications/application_app_role_resource.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/hashicorp/terraform-provider-azuread/internal/clients"
 	"github.com/hashicorp/terraform-provider-azuread/internal/services/applications/parse"
+	applicationsValidate "github.com/hashicorp/terraform-provider-azuread/internal/services/applications/validate"
 	"github.com/hashicorp/terraform-provider-azuread/internal/tf"
 	"github.com/hashicorp/terraform-provider-azuread/internal/validate"
 )
@@ -81,8 +82,9 @@ func applicationAppRoleResource() *schema.Resource {
 			},
 
 			"value": {
-				Type:     schema.TypeString,
-				Optional: true,
+				Type:             schema.TypeString,
+				Optional:         true,
+				ValidateDiagFunc: applicationsValidate.RoleScopeClaimValue,
 			},
 		},
 	}

diff --git a/internal/services/applications/application_oauth2_permission_scope_resource.go b/internal/services/applications/application_oauth2_permission_scope_resource.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/hashicorp/terraform-provider-azuread/internal/clients"
 	"github.com/hashicorp/terraform-provider-azuread/internal/services/applications/parse"
+	applicationsValidate "github.com/hashicorp/terraform-provider-azuread/internal/services/applications/validate"
 	"github.com/hashicorp/terraform-provider-azuread/internal/tf"
 	"github.com/hashicorp/terraform-provider-azuread/internal/validate"
 )
@@ -101,7 +102,7 @@ func applicationOAuth2PermissionScopeResource() *schema.Resource {
 			"value": {
 				Type:             schema.TypeString,
 				Required:         true,
-				ValidateDiagFunc: validate.NoEmptyStrings,
+				ValidateDiagFunc: applicationsValidate.RoleScopeClaimValue,
 			},
 		},
 	}

diff --git a/internal/services/applications/validate/tokens_test.go b/internal/services/applications/validate/tokens_test.go
@@ -36,8 +36,8 @@ func TestRoleScopeClaimValue(t *testing.T) {
 		},
 		{
 			Value:    "",
-			TestName: "Invalid_MinLength",
-			ErrCount: 1,
+			TestName: "Valid_Empty",
+			ErrCount: 0,
 		},
 		{
 			Value:    acctest.RandString(121),

diff --git a/vendor/github.com/dimchansky/utfbom/.travis.yml b/vendor/github.com/dimchansky/utfbom/.travis.yml
diff --git a/vendor/github.com/mitchellh/copystructure/README.md b/vendor/github.com/mitchellh/copystructure/README.md