Skip to content

Commit 4ca0573

Browse files
tas50claude
andcommitted
🧹 Restore enabledStandards and permissionSetArn as deprecated fields
Adds back aws.securityhub.hub.enabledStandards and aws.identitycenter.accountAssignment.permissionSetArn with deprecation comments pointing to their typed replacements (standardSubscriptions and permissionSet respectively). This preserves backwards compatibility for existing consumers. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent ca0e721 commit 4ca0573

File tree

5 files changed

+72
-10
lines changed

5 files changed

+72
-10
lines changed

providers/aws/resources/aws.lr

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3082,6 +3082,9 @@ private aws.securityhub.hub @defaults("arn region") {
30823082
subscribedAt string
30833083
// Region where the Security Hub is enabled
30843084
region string
3085+
// List of enabled security standards (CIS, PCI-DSS, AWS Foundational, etc.)
3086+
// Deprecated: use standardSubscriptions() instead
3087+
enabledStandards() []dict
30853088
// Typed standard subscriptions with control details
30863089
standardSubscriptions() []aws.securityhub.standardSubscription
30873090
// Active findings (non-archived) in this hub
@@ -11970,6 +11973,9 @@ private aws.identitycenter.accountAssignment @defaults("accountId principalType
1197011973
id string
1197111974
// AWS account ID
1197211975
accountId string
11976+
// ARN of the permission set
11977+
// Deprecated: use permissionSet() instead
11978+
permissionSetArn string
1197311979
// Permission set for this assignment
1197411980
permissionSet() aws.identitycenter.permissionSet
1197511981
// Type of principal: USER or GROUP

providers/aws/resources/aws.lr.go

Lines changed: 31 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

providers/aws/resources/aws.lr.versions

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2875,6 +2875,7 @@ aws.identitycenter.accountAssignment 13.6.3
28752875
aws.identitycenter.accountAssignment.accountId 13.6.3
28762876
aws.identitycenter.accountAssignment.id 13.6.3
28772877
aws.identitycenter.accountAssignment.permissionSet 13.12.1
2878+
aws.identitycenter.accountAssignment.permissionSetArn 13.12.1
28782879
aws.identitycenter.accountAssignment.principalId 13.6.3
28792880
aws.identitycenter.accountAssignment.principalType 13.6.3
28802881
aws.identitycenter.group 13.12.1
@@ -4686,6 +4687,7 @@ aws.securityhub.hub 11.15.2
46864687
aws.securityhub.hub.arn 11.15.2
46874688
aws.securityhub.hub.automationRules 13.12.1
46884689
aws.securityhub.hub.enabledProducts 13.12.1
4690+
aws.securityhub.hub.enabledStandards 13.12.1
46894691
aws.securityhub.hub.findings 13.12.1
46904692
aws.securityhub.hub.insights 13.12.1
46914693
aws.securityhub.hub.members 13.12.1

providers/aws/resources/aws_identitycenter.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,11 +335,12 @@ func (a *mqlAwsIdentitycenterInstance) accountAssignments() ([]any, error) {
335335

336336
mqlAssignment, err := CreateResource(a.MqlRuntime, "aws.identitycenter.accountAssignment",
337337
map[string]*llx.RawData{
338-
"__id": llx.StringData(assignId),
339-
"id": llx.StringData(assignId),
340-
"accountId": llx.StringDataPtr(assignment.AccountId),
341-
"principalType": llx.StringData(string(assignment.PrincipalType)),
342-
"principalId": llx.StringDataPtr(assignment.PrincipalId),
338+
"__id": llx.StringData(assignId),
339+
"id": llx.StringData(assignId),
340+
"accountId": llx.StringDataPtr(assignment.AccountId),
341+
"permissionSetArn": llx.StringDataPtr(assignment.PermissionSetArn),
342+
"principalType": llx.StringData(string(assignment.PrincipalType)),
343+
"principalId": llx.StringDataPtr(assignment.PrincipalId),
343344
})
344345
if err != nil {
345346
return nil, err

providers/aws/resources/aws_securityhub.go

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,33 @@ func (a *mqlAwsSecurityhubHub) id() (string, error) {
9090
return a.Arn.Data, nil
9191
}
9292

93+
func (a *mqlAwsSecurityhubHub) enabledStandards() ([]any, error) {
94+
region := a.Region.Data
95+
conn := a.MqlRuntime.Connection.(*connection.AwsConnection)
96+
svc := conn.Securityhub(region)
97+
ctx := context.Background()
98+
99+
res := []any{}
100+
paginator := securityhub.NewGetEnabledStandardsPaginator(svc, &securityhub.GetEnabledStandardsInput{})
101+
for paginator.HasMorePages() {
102+
page, err := paginator.NextPage(ctx)
103+
if err != nil {
104+
if Is400AccessDeniedError(err) {
105+
return res, nil
106+
}
107+
return nil, err
108+
}
109+
for _, std := range page.StandardsSubscriptions {
110+
d, err := convert.JsonToDict(std)
111+
if err != nil {
112+
return nil, err
113+
}
114+
res = append(res, d)
115+
}
116+
}
117+
return res, nil
118+
}
119+
93120
func (a *mqlAwsSecurityhubHub) standardSubscriptions() ([]any, error) {
94121
region := a.Region.Data
95122
conn := a.MqlRuntime.Connection.(*connection.AwsConnection)

0 commit comments

Comments
 (0)