Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

perf: don't return entire resource data from provider when loading resources #2852

Merged
merged 2 commits into from
Jan 31, 2024
Merged

perf: don't return entire resource data from provider when loading resources #2852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
842b060
perf: don't return entire resource data when loading provider resource
tim775 Jan 31, 2024
48c2d19
refactor: cleanup cruft
tim775 Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 7 additions & 10 deletions internal/apiclient/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func NewPolicyAPIClient(ctx *config.RunContext) (*PolicyAPIClient, error) {

// UploadPolicyData sends a filtered set of a project's resource information to Infracost Cloud and
// potentially adds PolicySha and PastPolicySha to the project's metadata.
func (c *PolicyAPIClient) UploadPolicyData(project *schema.Project) error {
func (c *PolicyAPIClient) UploadPolicyData(project *schema.Project, rds, pastRds []*schema.ResourceData) error {
if project.Metadata == nil {
project.Metadata = &schema.ProjectMetadata{}
}
Expand All @@ -54,7 +54,7 @@ func (c *PolicyAPIClient) UploadPolicyData(project *schema.Project) error {
return err
}

filteredResources := c.filterResources(project.PartialResources)
filteredResources := c.filterResources(rds)
if len(filteredResources) > 0 {
sha, err := c.uploadProjectPolicyData(filteredResources)
if err != nil {
Expand All @@ -65,7 +65,7 @@ func (c *PolicyAPIClient) UploadPolicyData(project *schema.Project) error {
project.Metadata.PolicySha = "0" // set a fake sha so we can tell policy checks actually ran
}

filteredPastResources := c.filterResources(project.PartialPastResources)
filteredPastResources := c.filterResources(pastRds)
if len(filteredPastResources) > 0 {
sha, err := c.uploadProjectPolicyData(filteredPastResources)
if err != nil {
Expand Down Expand Up @@ -159,14 +159,11 @@ type policy2InfracostMetadataCall struct {
EndLine int64 `json:"endLine"`
}

func (c *PolicyAPIClient) filterResources(partials []*schema.PartialResource) []policy2Resource {
func (c *PolicyAPIClient) filterResources(rds []*schema.ResourceData) []policy2Resource {
var p2rs []policy2Resource
for _, partial := range partials {
if partial != nil && partial.ResourceData != nil {
rd := partial.ResourceData
if f, ok := c.allowLists[rd.Type]; ok {
p2rs = append(p2rs, filterResource(rd, f))
}
for _, rd := range rds {
if f, ok := c.allowLists[rd.Type]; ok {
p2rs = append(p2rs, filterResource(rd, f))
}
}

Expand Down
4 changes: 2 additions & 2 deletions internal/prices/usages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func FetchUsageData(ctx *config.RunContext, project *schema.Project) (schema.Usa
coreResources := make(map[string]schema.CoreResource)
for _, rb := range project.AllPartialResources() {
if rb.CoreResource != nil {
coreResources[rb.ResourceData.Address] = rb.CoreResource
coreResources[rb.Address] = rb.CoreResource
}
}

Expand Down Expand Up @@ -184,7 +184,7 @@ func UploadCloudResourceIDs(ctx *config.RunContext, project *schema.Project) err
for _, partial := range project.AllPartialResources() {
for _, resourceID := range partial.CloudResourceIDs {
resourceIDs = append(resourceIDs, apiclient.ResourceIDAddress{
Address: partial.ResourceData.Address,
Address: partial.Address,
ResourceID: resourceID},
)
}
Expand Down
35 changes: 14 additions & 21 deletions internal/providers/terraform/hcl_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,26 @@ func (p *HCLProvider) LoadResources(usage schema.UsageMap) ([]*schema.Project, e
return []*schema.Project{p.newProject(j)}, nil
}

project := p.parseResources(j, usage)
project := p.newProject(j)
parsedConf, err := p.planJSONParser.parseJSON(j.JSON, usage)
if err != nil {
project.Metadata.AddErrorWithCode(err, schema.DiagJSONParsingFailure)

return []*schema.Project{project}, nil
}
if p.ctx.RunContext.VCSMetadata.HasChanges() {
j := j
project.Metadata.VCSCodeChanged = &j.Module.HasChanges
}

project.AddProviderMetadata(parsedConf.ProviderMetadata)
project.Metadata.RemoteModuleCalls = parsedConf.RemoteModuleCalls

project.PartialPastResources = parsedConf.PastResources
project.PartialResources = parsedConf.CurrentResources

if p.policyClient != nil {
err := p.policyClient.UploadPolicyData(project)
err := p.policyClient.UploadPolicyData(project, parsedConf.CurrentResourceDatas, parsedConf.PastResourceDatas)
if err != nil {
p.logger.Err(err).Msgf("failed to upload policy data %s", project.Name)
}
Expand All @@ -212,25 +224,6 @@ func (p *HCLProvider) LoadResources(usage schema.UsageMap) ([]*schema.Project, e
return []*schema.Project{project}, nil
}

func (p *HCLProvider) parseResources(parsed HCLProject, usage schema.UsageMap) *schema.Project {
project := p.newProject(parsed)

parsedConf, err := p.planJSONParser.parseJSON(parsed.JSON, usage)
if err != nil {
project.Metadata.AddErrorWithCode(err, schema.DiagJSONParsingFailure)

return project
}

project.AddProviderMetadata(parsedConf.ProviderMetadata)
project.Metadata.RemoteModuleCalls = parsedConf.RemoteModuleCalls

project.PartialPastResources = parsedConf.PastResources
project.PartialResources = parsedConf.CurrentResources

return project
}

func (p *HCLProvider) newProject(parsed HCLProject) *schema.Project {
metadata := config.DetectProjectMetadata(parsed.Module.RootPath)
metadata.Type = p.Type()
Expand Down