Skip to content

AWS registration: Fix to allow empty IOA resources for commercial accounts in gov #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2025
Merged

AWS registration: Fix to allow empty IOA resources for commercial accounts in gov #148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 0 additions & 93 deletions internal/fcs/cloud_aws_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"fmt"
"regexp"
"strings"
"time"

"github.com/crowdstrike/gofalcon/falcon/client"
"github.com/crowdstrike/gofalcon/falcon/client/cloud_aws_registration"
Expand All @@ -33,7 +32,6 @@ import (
"github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/hashicorp/terraform-plugin-log/tflog"
"golang.org/x/exp/maps"
)

type cloudAWSAccountResource struct {
Expand Down Expand Up @@ -569,11 +567,6 @@ func (r *cloudAWSAccountResource) Create(
}
}

// if IDP or realtime visibility are enabled wait until we get all values back
if state.IDP.Enabled.ValueBool() || state.RealtimeVisibility.Enabled.ValueBool() {
resp.Diagnostics.Append(r.pollMissingValues(ctx, &state)...)
}

// Set refreshed state
diags = resp.State.Set(ctx, state)
resp.Diagnostics.Append(diags...)
Expand Down Expand Up @@ -1451,89 +1444,3 @@ func (r *cloudAWSAccountResource) ValidateConfig(
return
}
}

// pollMissingValues waits for missing backend values [eventbus_arn, eventbus_name, cloudtrail_bucket_name] to be set.
func (r *cloudAWSAccountResource) pollMissingValues(
ctx context.Context,
config *cloudAWSAccountModel,
) diag.Diagnostics {
var diags diag.Diagnostics
missingValues := make(map[string]interface{})

if config.EventbusArn.ValueString() == "" {
missingValues["eventbus_arn"] = nil
}

if config.EventbusName.ValueString() == "" {
missingValues["eventbus_name"] = nil
}

if config.CloudTrailBucketName.ValueString() == "" {
missingValues["cloudtrail_bucket_name"] = nil
}

if len(missingValues) == 0 {
return diags
}

pollCtx, cancel := context.WithTimeout(ctx, 5*time.Minute)
defer cancel()

ticker := time.NewTicker(10 * time.Second)
defer ticker.Stop()

for {
select {
case <-ticker.C:
account, diag := r.getCSPMAccount(pollCtx, config.AccountID.ValueString())
if diag.HasError() {
return diag
}

if _, ok := missingValues["eventbus_arn"]; ok && account.AwsEventbusArn != "" {
config.EventbusArn = types.StringValue(account.AwsEventbusArn)
delete(missingValues, "eventbus_arn")
}

if _, ok := missingValues["eventbus_name"]; ok && account.EventbusName != "" {
config.EventbusName = types.StringValue(account.EventbusName)
delete(missingValues, "eventbus_name")
}

if _, ok := missingValues["cloudtrail_bucket_name"]; ok &&
account.AwsCloudtrailBucketName != "" {
config.CloudTrailBucketName = types.StringValue(account.AwsCloudtrailBucketName)
delete(missingValues, "cloudtrail_bucket_name")
}

if len(missingValues) == 0 {
return diags
}

fields := strings.Join(maps.Keys(missingValues), ", ")
tflog.Debug(
pollCtx,
fmt.Sprintf("[%s] not yet available, polling again in 10s...", fields),
)

case <-pollCtx.Done():
if pollCtx.Err() != context.DeadlineExceeded {
return diags
}

if len(missingValues) == 0 {
return diags
}

fields := strings.Join(maps.Keys(missingValues), ", ")
diags.AddError(
"Timed out waiting for missing fields to populate",
fmt.Sprintf(
"Timed out on create waiting for missing fields [%s] to return from API.",
fields,
),
)
return diags
}
}
}
Loading