update data source

Signed-off-by: ziyeqf <51212351+ziyeqf@users.noreply.github.com>
hashicorp · Nov 1, 2023 · 74d1b5d · 74d1b5d
1 parent 6a99ee5
commit 74d1b5d
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/internal/services/authorization/role_definition_data_source.go b/internal/services/authorization/role_definition_data_source.go
@@ -153,11 +153,6 @@ func (a ArmRoleDefinitionDataSource) Read() sdk.ResourceFunc {
 			}
 
 			defId := config.RoleDefinitionId
-			scope := config.Scope
-
-			if scope == "" {
-				scope = commonids.NewSubscriptionID(metadata.Client.Account.SubscriptionId).ID()
-			}
 
 			// search by name
 			var id roledefinitions.ScopedRoleDefinitionId
@@ -169,7 +164,7 @@ func (a ArmRoleDefinitionDataSource) Read() sdk.ResourceFunc {
 					return fmt.Errorf("internal error: context had no deadline")
 				}
 				err := pluginsdk.Retry(time.Until(deadline), func() *pluginsdk.RetryError {
-					roleDefinitions, err := client.List(ctx, commonids.NewScopeID(scope), roledefinitions.ListOperationOptions{
+					roleDefinitions, err := client.List(ctx, commonids.NewScopeID(config.Scope), roledefinitions.ListOperationOptions{
 						Filter: pointer.To(fmt.Sprintf("roleName eq '%s'", config.Name)),
 					})
 					if err != nil {
@@ -185,14 +180,14 @@ func (a ArmRoleDefinitionDataSource) Read() sdk.ResourceFunc {
 						return pluginsdk.NonRetryableError(fmt.Errorf("loading Role Definition List: values[0].ID is nil '%s'", config.Name))
 					}
 
-					id = roledefinitions.NewScopedRoleDefinitionID(scope, *(*roleDefinitions.Model)[0].Name)
+					id = roledefinitions.NewScopedRoleDefinitionID(config.Scope, *(*roleDefinitions.Model)[0].Name)
 					return nil
 				})
 				if err != nil {
 					return err
 				}
 			} else {
-				id = roledefinitions.NewScopedRoleDefinitionID(scope, defId)
+				id = roledefinitions.NewScopedRoleDefinitionID(config.Scope, defId)
 			}
 
 			resp, err := client.Get(ctx, id)
@@ -219,7 +214,9 @@ func (a ArmRoleDefinitionDataSource) Read() sdk.ResourceFunc {
 				state.AssignableScopes = pointer.From(props.AssignableScopes)
 			}
 
-			metadata.SetID(id)
+			// when `config.Scope` is "", the id starts with two "/"
+			// so we take the id from response to keep consistency
+			metadata.ResourceData.SetId(*role.Id)
 			return metadata.Encode(&state)
 		},
 	}