Skip to content

Commit be76220

Browse files
authored
Merge pull request #59 from vmvarela/fix/53-scim-buildtwopartid
fix(scim): use buildTwoPartID for data source IDs
2 parents 2c1658c + 0e0c26d commit be76220

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

github/data_source_github_enterprise_scim_group.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package github
22

33
import (
44
"context"
5-
"fmt"
65

76
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
87
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -39,7 +38,7 @@ func dataSourceGithubEnterpriseSCIMGroupRead(ctx context.Context, d *schema.Reso
3938
return diag.FromErr(err)
4039
}
4140

42-
d.SetId(fmt.Sprintf("%s/%s", enterprise, scimGroupID))
41+
d.SetId(buildTwoPartID(enterprise, scimGroupID))
4342

4443
if err := d.Set("schemas", group.Schemas); err != nil {
4544
return diag.FromErr(err)

github/data_source_github_enterprise_scim_user.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package github
22

33
import (
44
"context"
5-
"fmt"
65

76
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
87
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -39,7 +38,7 @@ func dataSourceGithubEnterpriseSCIMUserRead(ctx context.Context, d *schema.Resou
3938
return diag.FromErr(err)
4039
}
4140

42-
d.SetId(fmt.Sprintf("%s/%s", enterprise, scimUserID))
41+
d.SetId(buildTwoPartID(enterprise, scimUserID))
4342

4443
if err := d.Set("schemas", user.Schemas); err != nil {
4544
return diag.FromErr(err)

0 commit comments

Comments
 (0)