Skip to content

Commit 7148fde

Browse files
authored
Remove terraform.Write/Interpolate calls from 'bundle summary --force-pull' (#3803)
## Why Noticed, that one test show different output depending on this flag. Related: #3169 ## Tests Extended synced_database_tables/basic to run summary with and without flag and compare the output.
1 parent a3bea05 commit 7148fde

File tree

5 files changed

+50
-29
lines changed

5 files changed

+50
-29
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Name: deploy-lakebase-synced-table-[UNIQUE_NAME]
2+
Target: default
3+
Workspace:
4+
User: [USERNAME]
5+
Path: /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-synced-table-[UNIQUE_NAME]/default
6+
Resources:
7+
Database catalogs:
8+
my_catalog:
9+
Name: my_catalog_[UNIQUE_NAME]
10+
URL: [DATABRICKS_URL]/explore/data/my_catalog_[UNIQUE_NAME]
11+
Database instances:
12+
my_instance:
13+
Name: test-db-synced-table-[UNIQUE_NAME]
14+
URL: [DATABRICKS_URL]/compute/database-instances/test-db-synced-table-[UNIQUE_NAME]
15+
Synced database tables:
16+
my_synced_table:
17+
Name: ${resources.database_catalogs.my_catalog.name}.${resources.database_catalogs.my_catalog.database_name}.my_synced_table
18+
URL: [DATABRICKS_URL]/explore/data/$%7Bresources.database_catalogs.my_catalog.name%7D.$%7Bresources.database_catalogs.my_catalog.database_name%7D.my_synced_table

acceptance/bundle/resources/synced_database_tables/basic/output.txt

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,4 @@
11

2-
>>> [CLI] bundle validate
3-
Name: deploy-lakebase-synced-table-[UNIQUE_NAME]
4-
Target: default
5-
Workspace:
6-
User: [USERNAME]
7-
Path: /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-synced-table-[UNIQUE_NAME]/default
8-
9-
Validation OK!
10-
11-
>>> [CLI] bundle deploy
12-
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-synced-table-[UNIQUE_NAME]/default/files...
13-
Deploying resources...
14-
Updating deployment state...
15-
Deployment complete!
16-
172
>>> [CLI] bundle summary
183
Name: deploy-lakebase-synced-table-[UNIQUE_NAME]
194
Target: default
@@ -28,12 +13,33 @@ Resources:
2813
Database instances:
2914
my_instance:
3015
Name: test-db-synced-table-[UNIQUE_NAME]
31-
URL: [DATABRICKS_URL]/compute/database-instances/test-db-synced-table-[UNIQUE_NAME]
16+
URL: (not deployed)
3217
Synced database tables:
3318
my_synced_table:
3419
Name: ${resources.database_catalogs.my_catalog.name}.${resources.database_catalogs.my_catalog.database_name}.my_synced_table
3520
URL: [DATABRICKS_URL]/explore/data/$%7Bresources.database_catalogs.my_catalog.name%7D.$%7Bresources.database_catalogs.my_catalog.database_name%7D.my_synced_table
3621

22+
>>> [CLI] bundle validate
23+
Name: deploy-lakebase-synced-table-[UNIQUE_NAME]
24+
Target: default
25+
Workspace:
26+
User: [USERNAME]
27+
Path: /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-synced-table-[UNIQUE_NAME]/default
28+
29+
Validation OK!
30+
31+
>>> [CLI] bundle deploy
32+
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-synced-table-[UNIQUE_NAME]/default/files...
33+
Deploying resources...
34+
Updating deployment state...
35+
Deployment complete!
36+
37+
>>> [CLI] bundle summary
38+
39+
>>> [CLI] bundle summary --force-pull
40+
41+
>>> diff.py out.summary.txt tmp.summary.txt
42+
3743
>>> [CLI] bundle destroy --auto-approve
3844
The following resources will be deleted:
3945
delete database_catalog my_catalog

acceptance/bundle/resources/synced_database_tables/basic/script

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ cleanup() {
55
}
66
trap cleanup EXIT
77

8+
# test on fresh bundles
9+
trace $CLI bundle summary
10+
811
trace $CLI bundle validate
912
trace $CLI bundle deploy
10-
trace $CLI bundle summary
13+
trace $CLI bundle summary > out.summary.txt
14+
15+
# once again to test --force-pull flag (expect the same output; used to produce different output due to terraform.Interpolate() call)
16+
trace $CLI bundle summary --force-pull > tmp.summary.txt
17+
trace diff.py out.summary.txt tmp.summary.txt
18+
rm tmp.summary.txt

acceptance/bundle/resources/synced_database_tables/basic/test.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Local = true
22
Cloud = true
3+
Badness = "post deployment, bundle summary should print actual name that is fully resolved"
34

45
RecordRequests = false
56

cmd/bundle/summary.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -132,18 +132,6 @@ func prepareBundleForSummary(cmd *cobra.Command, forcePull, includeLocations boo
132132

133133
if forcePull || noCache {
134134
bundle.ApplyContext(ctx, b, statemgmt.StatePull())
135-
136-
if logdiag.HasError(ctx) {
137-
return nil
138-
}
139-
140-
if !b.DirectDeployment {
141-
bundle.ApplySeqContext(ctx, b,
142-
terraform.Interpolate(),
143-
terraform.Write(),
144-
)
145-
}
146-
147135
if logdiag.HasError(ctx) {
148136
return nil
149137
}

0 commit comments

Comments
 (0)