Skip to content

Commit f6a7185

Browse files
committed
fix: simplify resource ID to plain numeric config ID
Drop the org name from the compound resource ID since it was never used — Read/Update/Delete all get the org from meta.(*Owner).name. This aligns with the convention used by other org-scoped resources (organization_ruleset, organization_webhook, organization_custom_role, etc.).
1 parent 8d0c624 commit f6a7185

2 files changed

Lines changed: 5 additions & 14 deletions

File tree

github/resource_github_organization_security_configuration.go

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -324,11 +324,7 @@ func resourceGithubOrganizationSecurityConfigurationCreate(ctx context.Context,
324324
return diag.FromErr(err)
325325
}
326326

327-
id, err := buildID(org, strconv.FormatInt(configuration.GetID(), 10))
328-
if err != nil {
329-
return diag.FromErr(err)
330-
}
331-
d.SetId(id)
327+
d.SetId(strconv.FormatInt(configuration.GetID(), 10))
332328

333329
if diags := setCodeSecurityConfigurationState(d, configuration); diags.HasError() {
334330
return diags
@@ -488,14 +484,9 @@ func resourceGithubOrganizationSecurityConfigurationDelete(ctx context.Context,
488484
}
489485

490486
func resourceGithubOrganizationSecurityConfigurationImport(_ context.Context, d *schema.ResourceData, _ any) ([]*schema.ResourceData, error) {
491-
_, configIDStr, err := parseID2(d.Id())
492-
if err != nil {
493-
return nil, fmt.Errorf("invalid import specified: supplied import must be written as <organization>:<configuration_id>. Parse error: %w", err)
494-
}
495-
496-
configID, err := strconv.ParseInt(configIDStr, 10, 64)
487+
configID, err := strconv.ParseInt(d.Id(), 10, 64)
497488
if err != nil {
498-
return nil, fmt.Errorf("invalid configuration_id %q: %w", configIDStr, err)
489+
return nil, fmt.Errorf("invalid configuration_id %q: %w", d.Id(), err)
499490
}
500491

501492
if err = d.Set("configuration_id", int(configID)); err != nil {

website/docs/r/organization_security_configuration.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ The `secret_scanning_delegated_bypass_options` block supports:
9090

9191
## Import
9292

93-
GitHub Organization Code Security Configurations can be imported using the organization name and the configuration ID separated by a colon, e.g.
93+
GitHub Organization Code Security Configurations can be imported using the configuration ID, e.g.
9494

9595
```text
96-
$ terraform import github_organization_security_configuration.example my-org:123
96+
$ terraform import github_organization_security_configuration.example 123
9797
```

0 commit comments

Comments
 (0)