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.

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

chore: optimize the format by using files from config tree. #1962

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

i4ki
Copy link
Contributor

@i4ki i4ki commented Nov 20, 2024

What this PR does / why we need it:

Format the files from the configuration tree instead of re-scanning the filesystem.

Which issue(s) this PR fixes:

none

Special notes for your reviewer:

Does this PR introduce a user-facing change?

no

@i4ki i4ki requested a review from a team as a code owner November 20, 2024 02:58
Copy link

github-actions bot commented Nov 20, 2024

2024/11/20 03:06:27 Terraform detected version: 1.9.8
toolsetPath: /tmp/cmd-terramate-test-2239750594
=== RUN   TestInteropCloudSyncPreview
=== RUN   TestInteropCloudSyncPreview/preview:_basic-drift
    interoperability_test.go:46: using GITHUB_EVENT_FILE=/home/runner/work/_temp/_github_workflow/event.json
=== RUN   TestInteropCloudSyncPreview/preview:_basic-drift-uppercase-id
    interoperability_test.go:46: using GITHUB_EVENT_FILE=/home/runner/work/_temp/_github_workflow/event.json
--- PASS: TestInteropCloudSyncPreview (11.06s)
    --- PASS: TestInteropCloudSyncPreview/preview:_basic-drift (5.98s)
    --- PASS: TestInteropCloudSyncPreview/preview:_basic-drift-uppercase-id (5.09s)
=== RUN   TestInteropSyncDeployment
=== RUN   TestInteropSyncDeployment/deployment:_empty
=== RUN   TestInteropSyncDeployment/deployment:_empty-uppercase-id
--- PASS: TestInteropSyncDeployment (34.50s)
    --- PASS: TestInteropSyncDeployment/deployment:_empty (17.52s)
    --- PASS: TestInteropSyncDeployment/deployment:_empty-uppercase-id (16.98s)
=== RUN   TestInteropDrift
=== RUN   TestInteropDrift/drift:_basic-drift
=== RUN   TestInteropDrift/drift:_basic-drift-uppercase-id
--- PASS: TestInteropDrift (56.65s)
    --- PASS: TestInteropDrift/drift:_basic-drift (28.20s)
    --- PASS: TestInteropDrift/drift:_basic-drift-uppercase-id (28.45s)
PASS
ok  	github.com/terramate-io/terramate/e2etests/cloud/interop	171.082s

@i4ki i4ki changed the title chore: optimize the recursive fmt by using files from config tree. chore: optimize the format by using files from config tree. Nov 20, 2024
Copy link

github-actions bot commented Nov 20, 2024

metric: time/op
ChangeDetection-4: old 4.06ms ± 5%: new 4.00ms ± 3%: delta: -1.46%
ChangeDetectionTFAndTG-4: old 13.1ms ± 2%: new 13.0ms ± 2%: delta: 0.00%
CloudReadLines-4: old 1.03ms ± 3%: new 1.00ms ± 4%: delta: -2.90%
CloudReadLine-4: old 7.28ms ± 1%: new 7.27ms ± 2%: delta: 0.00%
ListFiles-4: old 86.7µs ± 1%: new 87.4µs ± 1%: delta: 0.85%
Generate-4: old 1.56s ± 4%: new 1.56s ± 3%: delta: 0.00%
GenerateRegex-4: old 1.07s ± 5%: new 1.06s ± 4%: delta: 0.00%
TokensForExpressionComplex-4: old 1.25ms ± 1%: new 1.26ms ± 1%: delta: 0.50%
TokensForExpressionPlainStringNoNewline-4: old 792ns ± 1%: new 794ns ± 1%: delta: 0.28%
TokensForExpressionStringWith100Newlines-4: old 23.9µs ± 1%: new 24.0µs ± 1%: delta: 0.40%
TokensForExpressionObjectWith100KeysWithNumberValues-4: old 1.45ms ± 0%: new 1.45ms ± 1%: delta: 0.41%
TokensForExpression-4: old 1.26ms ± 0%: new 1.27ms ± 1%: delta: 0.74%
PartialEvalComplex-4: old 542µs ± 1%: new 539µs ± 1%: delta: -0.53%
PartialEvalSmallString-4: old 3.93µs ± 1%: new 3.92µs ± 0%: delta: 0.00%
PartialEvalHugeString-4: old 1.92ms ± 0%: new 1.92ms ± 1%: delta: 0.30%
PartialEvalHugeInterpolatedString-4: old 4.95ms ± 1%: new 4.94ms ± 2%: delta: 0.00%
PartialEvalObject-4: old 26.8µs ± 1%: new 26.8µs ± 1%: delta: 0.00%
TmAllTrueLiteralList-4: old 618µs ± 1%: new 620µs ± 1%: delta: 0.41%
TmAllTrueFuncall-4: old 20.2µs ± 1%: new 20.3µs ± 1%: delta: 0.28%
TmAnyTrueLiteralList-4: old 4.86ms ± 1%: new 4.87ms ± 1%: delta: 0.35%
TmAnyTrueFuncall-4: old 20.6µs ± 1%: new 20.7µs ± 0%: delta: 0.39%
TmTernary-4: old 2.52µs ± 0%: new 2.52µs ± 0%: delta: -0.25%
TmTryUnknownFunc-4: old 2.29µs ± 0%: new 2.28µs ± 1%: delta: -0.45%
TmTryUnknownVariable-4: old 2.19µs ± 1%: new 2.18µs ± 2%: delta: -0.39%
TmTryUnknownObjectKey-4: old 2.50µs ± 0%: new 2.50µs ± 1%: delta: 0.00%
metric: alloc/op
ChangeDetection-4: old 357kB ± 0%: new 357kB ± 0%: delta: 0.00%
ChangeDetectionTFAndTG-4: old 4.80MB ± 0%: new 4.80MB ± 0%: delta: 0.00%
CloudReadLines-4: old 3.12MB ± 0%: new 3.12MB ± 0%: delta: 0.00%
CloudReadLine-4: old 3.37MB ± 0%: new 3.37MB ± 0%: delta: 0.00%
ListFiles-4: old 27.6kB ± 0%: new 27.6kB ± 0%: delta: 0.00%
Generate-4: old 2.24GB ± 0%: new 2.24GB ± 0%: delta: 0.00%
GenerateRegex-4: old 926MB ± 0%: new 926MB ± 0%: delta: 0.00%
TokensForExpressionComplex-4: old 394kB ± 0%: new 394kB ± 0%: delta: 0.00%
TokensForExpressionPlainStringNoNewline-4: old 512B ± 0%: new 512B ± 0%: delta: 0.00%
TokensForExpressionStringWith100Newlines-4: old 12.5kB ± 0%: new 12.5kB ± 0%: delta: 0.00%
TokensForExpressionObjectWith100KeysWithNumberValues-4: old 395kB ± 0%: new 395kB ± 0%: delta: 0.00%
TokensForExpression-4: old 394kB ± 0%: new 395kB ± 0%: delta: 0.00%
PartialEvalComplex-4: old 361kB ± 0%: new 361kB ± 0%: delta: 0.00%
PartialEvalSmallString-4: old 1.95kB ± 0%: new 1.95kB ± 0%: delta: 0.00%
PartialEvalHugeString-4: old 196kB ± 0%: new 196kB ± 0%: delta: 0.00%
PartialEvalHugeInterpolatedString-4: old 4.31MB ± 0%: new 4.31MB ± 0%: delta: 0.00%
PartialEvalObject-4: old 19.4kB ± 0%: new 19.4kB ± 0%: delta: 0.00%
TmAllTrueLiteralList-4: old 321kB ± 0%: new 321kB ± 0%: delta: 0.00%
TmAllTrueFuncall-4: old 10.6kB ± 0%: new 10.6kB ± 0%: delta: 0.00%
TmAnyTrueLiteralList-4: old 2.09MB ± 0%: new 2.09MB ± 0%: delta: 0.00%
TmAnyTrueFuncall-4: old 10.7kB ± 0%: new 10.7kB ± 0%: delta: 0.00%
TmTernary-4: old 1.18kB ± 0%: new 1.18kB ± 0%: delta: 0.00%
TmTryUnknownFunc-4: old 784B ± 0%: new 784B ± 0%: delta: 0.00%
TmTryUnknownVariable-4: old 768B ± 0%: new 768B ± 0%: delta: 0.00%
TmTryUnknownObjectKey-4: old 952B ± 0%: new 952B ± 0%: delta: 0.00%
metric: allocs/op
ChangeDetection-4: old 2.43k ± 0%: new 2.43k ± 0%: delta: 0.01%
ChangeDetectionTFAndTG-4: old 33.6k ± 0%: new 33.6k ± 0%: delta: 0.00%
CloudReadLines-4: old 5.54k ± 0%: new 5.54k ± 0%: delta: 0.00%
CloudReadLine-4: old 60.0k ± 0%: new 60.0k ± 0%: delta: 0.00%
ListFiles-4: old 335 ± 0%: new 335 ± 0%: delta: 0.00%
Generate-4: old 25.7M ± 0%: new 25.7M ± 0%: delta: 0.00%
GenerateRegex-4: old 18.4M ± 0%: new 18.4M ± 0%: delta: -0.00%
TokensForExpressionComplex-4: old 4.83k ± 0%: new 4.83k ± 0%: delta: 0.00%
TokensForExpressionPlainStringNoNewline-4: old 20.0 ± 0%: new 20.0 ± 0%: delta: 0.00%
TokensForExpressionStringWith100Newlines-4: old 227 ± 0%: new 227 ± 0%: delta: 0.00%
TokensForExpressionObjectWith100KeysWithNumberValues-4: old 3.19k ± 0%: new 3.19k ± 0%: delta: 0.00%
TokensForExpression-4: old 4.83k ± 0%: new 4.83k ± 0%: delta: 0.00%
PartialEvalComplex-4: old 3.78k ± 0%: new 3.78k ± 0%: delta: 0.00%
PartialEvalSmallString-4: old 26.0 ± 0%: new 26.0 ± 0%: delta: 0.00%
PartialEvalHugeString-4: old 38.0 ± 0%: new 38.0 ± 0%: delta: 0.00%
PartialEvalHugeInterpolatedString-4: old 26.1k ± 0%: new 26.1k ± 0%: delta: 0.00%
PartialEvalObject-4: old 183 ± 0%: new 183 ± 0%: delta: 0.00%
TmAllTrueLiteralList-4: old 5.94k ± 0%: new 5.94k ± 0%: delta: 0.00%
TmAllTrueFuncall-4: old 275 ± 0%: new 275 ± 0%: delta: 0.00%
TmAnyTrueLiteralList-4: old 59.6k ± 0%: new 59.6k ± 0%: delta: 0.00%
TmAnyTrueFuncall-4: old 277 ± 0%: new 277 ± 0%: delta: 0.00%
TmTernary-4: old 27.0 ± 0%: new 27.0 ± 0%: delta: 0.00%
TmTryUnknownFunc-4: old 21.0 ± 0%: new 21.0 ± 0%: delta: 0.00%
TmTryUnknownVariable-4: old 20.0 ± 0%: new 20.0 ± 0%: delta: 0.00%
TmTryUnknownObjectKey-4: old 23.0 ± 0%: new 23.0 ± 0%: delta: 0.00%

soerenmartius
soerenmartius previously approved these changes Nov 20, 2024
Copy link
Contributor

@soerenmartius soerenmartius left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@@ -2404,6 +2406,7 @@ func (c *cli) gitSafeguardRemoteEnabled() bool {
}

func (c *cli) wd() string { return c.prj.wd }
func (c *cli) wd2() prj.Path { return prj.PrjAbsPath(c.rootdir(), c.wd()) }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not more closely to what the function does?

Suggested change
func (c *cli) wd2() prj.Path { return prj.PrjAbsPath(c.rootdir(), c.wd()) }
func (c *cli) absPathWD() prj.Path { return prj.PrjAbsPath(c.rootdir(), c.wd()) }

@@ -1276,6 +1278,7 @@ var = [
}

func TestFormatHCL(t *testing.T) {
t.Skip("not yet")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this expected to be fixed in this PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I swear I marked this PR "draft" before leaving the PC yesterday 😞

@i4ki i4ki marked this pull request as draft November 20, 2024 13:17
Base automatically changed from i4k-fix-tmgen-fmt to main November 20, 2024 14:07
@i4ki i4ki dismissed soerenmartius’s stale review November 20, 2024 14:07

The base branch was changed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants