Skip to content

Commit 5ad3215

Browse files
authored
Merge branch 'main' into simonfaltum/deadcode-check
2 parents f5922c5 + 2705046 commit 5ad3215

36 files changed

Lines changed: 240 additions & 65 deletions

File tree

.github/OWNERS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
/acceptance/labs/ @alexott @nfx
1717

1818
# Apps
19-
/cmd/apps/ @databricks/eng-apps-devex
20-
/cmd/workspace/apps/ @databricks/eng-apps-devex
21-
/libs/apps/ @databricks/eng-apps-devex
22-
/acceptance/apps/ @databricks/eng-apps-devex
19+
/cmd/apps/ team:eng-apps-devex
20+
/cmd/workspace/apps/ team:eng-apps-devex
21+
/libs/apps/ team:eng-apps-devex
22+
/acceptance/apps/ team:eng-apps-devex
2323

2424
# Auth
2525
/cmd/auth/ team:platform
@@ -60,4 +60,4 @@
6060
/internal/ team:platform
6161

6262
# Experimental
63-
/experimental/aitools/ @databricks/eng-apps-devex @lennartkats-db
63+
/experimental/aitools/ team:eng-apps-devex @lennartkats-db

.github/OWNERTEAMS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
# Team aliases for OWNERS file.
22
# Use "team:<name>" in OWNERS to reference a team defined here.
33
# Format: team:<name> @member1 @member2 ...
4+
#
5+
# Keep these in sync with actual GitHub team rosters. GITHUB_TOKEN can't
6+
# resolve org team membership via the API, so this file is the source of
7+
# truth for the maintainer-approval workflow.
8+
#
9+
# GitHub team pages:
10+
# bundle: https://github.com/orgs/databricks/teams/cli-maintainers
11+
# platform: https://github.com/orgs/databricks/teams/cli-platform
12+
# eng-apps-devex: https://github.com/orgs/databricks/teams/eng-apps-devex
413

514
team:bundle @andrewnester @anton-107 @denik @janniklasrose @pietern @shreyas-goenka
615
team:platform @simonfaltum @renaudhartert-db @hectorcast-db @parthban-db @tanmay-db @Divyansh-db @tejaskochar-db @mihaimitrea-db @chrisst @rauchy
16+
team:eng-apps-devex @fjakobs @jamesbroadhead @Shridhad @atilafassina @keugenek @arsenyinfo @igrekun @pkosiec @MarioCadenas @pffigueiredo @ditadi @calvarjorge

.github/workflows/maintainer-approval.test.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,23 @@ const runModule = require("./maintainer-approval");
88

99
// --- Test helpers ---
1010

11-
function makeTmpOwners(content) {
11+
function makeTmpOwners(content, ownerTeamsContent) {
1212
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "approval-test-"));
1313
const ghDir = path.join(tmpDir, ".github");
1414
fs.mkdirSync(ghDir);
1515
fs.writeFileSync(path.join(ghDir, "OWNERS"), content);
16+
if (ownerTeamsContent) {
17+
fs.writeFileSync(path.join(ghDir, "OWNERTEAMS"), ownerTeamsContent);
18+
}
1619
return tmpDir;
1720
}
1821

22+
const OWNERTEAMS_CONTENT = "team:eng-apps-devex @teamdev1 @teamdev2\n";
23+
1924
const OWNERS_CONTENT = [
2025
"* @maintainer1 @maintainer2",
2126
"/cmd/pipelines/ @jefferycheng1 @kanterov",
22-
"/cmd/apps/ @databricks/eng-apps-devex",
27+
"/cmd/apps/ team:eng-apps-devex",
2328
"/bundle/ @bundleowner",
2429
].join("\n");
2530

@@ -121,7 +126,7 @@ describe("maintainer-approval", () => {
121126

122127
before(() => {
123128
originalWorkspace = process.env.GITHUB_WORKSPACE;
124-
tmpDir = makeTmpOwners(OWNERS_CONTENT);
129+
tmpDir = makeTmpOwners(OWNERS_CONTENT, OWNERTEAMS_CONTENT);
125130
process.env.GITHUB_WORKSPACE = tmpDir;
126131
});
127132

@@ -283,13 +288,12 @@ describe("maintainer-approval", () => {
283288
assert.equal(github._checkRuns.length, 0);
284289
});
285290

286-
it("team member approved -> success for team-owned path", async () => {
291+
it("OWNERTEAMS member approved -> success for team-owned path", async () => {
287292
const github = makeGithub({
288293
reviews: [
289294
{ state: "APPROVED", user: { login: "teamdev1" } },
290295
],
291296
files: [{ filename: "cmd/apps/main.go" }],
292-
teamMembers: { "eng-apps-devex": ["teamdev1"] },
293297
});
294298
const core = makeCore();
295299
const context = makeContext();
@@ -300,13 +304,12 @@ describe("maintainer-approval", () => {
300304
assert.equal(github._checkRuns[0].conclusion, "success");
301305
});
302306

303-
it("non-team-member approval for team-owned path -> pending", async () => {
307+
it("non-OWNERTEAMS-member approval for team-owned path -> pending", async () => {
304308
const github = makeGithub({
305309
reviews: [
306310
{ state: "APPROVED", user: { login: "outsider" } },
307311
],
308312
files: [{ filename: "cmd/apps/main.go" }],
309-
teamMembers: { "eng-apps-devex": [] },
310313
});
311314
const core = makeCore();
312315
const context = makeContext();

.golangci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ linters:
2020
- copyloopvar
2121
- forbidigo
2222
- depguard
23+
- usestdlibvars
2324
settings:
2425
depguard:
2526
rules:

.release_metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"timestamp": "2026-04-08 08:53:45+0000"
2+
"timestamp": "2026-04-15 13:43:07+0000"
33
}

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Version changelog
22

3+
## Release v0.297.0 (2026-04-15)
4+
5+
### CLI
6+
* Auth commands now accept a profile name as a positional argument ([#4840](https://github.com/databricks/cli/pull/4840))
7+
8+
* Add `auth logout` command for clearing cached OAuth tokens and optionally removing profiles ([#4613](https://github.com/databricks/cli/pull/4613), [#4616](https://github.com/databricks/cli/pull/4616), [#4647](https://github.com/databricks/cli/pull/4647))
9+
10+
### Bundles
11+
* Added support for lifecycle.started option for apps ([#4672](https://github.com/databricks/cli/pull/4672))
12+
* engine/direct: Fix permissions for resources.models ([#4941](https://github.com/databricks/cli/pull/4941))
13+
* Fix resource references not correctly resolved in apps config section ([#4964](https://github.com/databricks/cli/pull/4964))
14+
* Allow run_as for dashboards with embed_credentials set to false ([#4961](https://github.com/databricks/cli/pull/4961))
15+
* direct: Pass changed fields into update mask for apps instead of wildcard ([#4963](https://github.com/databricks/cli/pull/4963))
16+
* engine/direct: Fix deploy of configurations with dots in maps keys ([#4977](https://github.com/databricks/cli/pull/4977))
17+
18+
319
## Release v0.296.0 (2026-04-08)
420

521
### Notable Changes

NEXT_CHANGELOG.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
# NEXT CHANGELOG
22

3-
## Release v0.297.0
3+
## Release v0.298.0
44

55
### Notable Changes
66

77
### CLI
8-
* Auth commands now accept a profile name as a positional argument ([#4840](https://github.com/databricks/cli/pull/4840))
9-
10-
* Add `auth logout` command for clearing cached OAuth tokens and optionally removing profiles ([#4613](https://github.com/databricks/cli/pull/4613), [#4616](https://github.com/databricks/cli/pull/4616), [#4647](https://github.com/databricks/cli/pull/4647))
118

129
### Bundles
13-
* Added support for lifecycle.started option for apps ([#4672](https://github.com/databricks/cli/pull/4672))
14-
* engine/direct: Fix permissions for resources.models ([#4941](https://github.com/databricks/cli/pull/4941))
15-
* Fix resource references not correctly resolved in apps config section ([#4964](https://github.com/databricks/cli/pull/4964))
16-
* Allow run_as for dashboards with embed_credentials set to false ([#4961](https://github.com/databricks/cli/pull/4961))
17-
* direct: Pass changed fields into update mask for apps instead of wildcard ([#4963](https://github.com/databricks/cli/pull/4963))
1810

1911
### Dependency updates
2012

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
bundle:
2+
name: test-bundle
3+
4+
variables:
5+
AZURE:
6+
type: complex
7+
default:
8+
subscription: test-sub-123
9+
10+
resources:
11+
schemas:
12+
my_schema:
13+
catalog_name: main
14+
name: test-schema
15+
16+
pipelines:
17+
my_pipeline:
18+
name: test-pipeline
19+
libraries:
20+
- file:
21+
path: pipeline.py
22+
configuration:
23+
europris.swipe.egress_streaming_schema: "${resources.schemas.my_schema.catalog_name}.${resources.schemas.my_schema.name}"
24+
europris.azure.subscription: ${var.AZURE.subscription}

acceptance/bundle/deploy/pipeline-config-dots/out.test.toml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
2+
>>> [CLI] bundle validate
3+
Name: test-bundle
4+
Target: default
5+
Workspace:
6+
User: [USERNAME]
7+
Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
8+
9+
Validation OK!
10+
11+
>>> [CLI] bundle deploy
12+
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
13+
Deploying resources...
14+
Updating deployment state...
15+
Deployment complete!
16+
17+
>>> [CLI] bundle destroy --auto-approve
18+
The following resources will be deleted:
19+
delete resources.pipelines.my_pipeline
20+
delete resources.schemas.my_schema
21+
22+
This action will result in the deletion of the following UC schemas. Any underlying data may be lost:
23+
delete resources.schemas.my_schema
24+
25+
This action will result in the deletion of the following Lakeflow Spark Declarative Pipelines along with the
26+
Streaming Tables (STs) and Materialized Views (MVs) managed by them:
27+
delete resources.pipelines.my_pipeline
28+
29+
All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
30+
31+
Deleting files...
32+
Destroy complete!

0 commit comments

Comments
 (0)