Skip to content

Commit 17e7bc0

Browse files
authored
Merge branch 'main' into dependabot/uv/cryptography-46.0.6
2 parents 724eeca + 82df3ce commit 17e7bc0

22 files changed

+695
-320
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
kind: breaking
2+
body: Remove default credential fallback; explicit token credential is now required
3+
time: 2026-03-29T15:07:39.9569937+03:00
4+
custom:
5+
Author: shirasassoon
6+
AuthorLink: https://github.com/shirasassoon
7+
Issue: "909"
8+
IssueLink: https://github.com/microsoft/fabric-cicd/issues/909
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
kind: fixed
2+
body: Ignore paramater file when not explicitly defined in config file
3+
time: 2026-03-30T13:13:18.023121+03:00
4+
custom:
5+
Author: aviatco
6+
AuthorLink: https://github.com/aviatco
7+
Issue: "866"
8+
IssueLink: https://github.com/microsoft/fabric-cicd/issues/866

.github/agents/new-item-type.agent.md

Lines changed: 70 additions & 77 deletions
Large diffs are not rendered by default.

.github/workflows/validate.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,13 @@ jobs:
154154
const prAuthor = context.payload.pull_request.user.login;
155155
const repo = context.repo;
156156
157+
// Skip validation for dependabot
158+
if (prAuthor === 'dependabot[bot]') {
159+
console.log('✅ Dependabot PR detected. Skipping linked issue validation.');
160+
core.setOutput('skip_validation', 'true');
161+
return;
162+
}
163+
157164
console.log(`Checking collaborator role for PR author: ${prAuthor}`);
158165
159166
try {

devtools/debug_api.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# The following is intended for developers of fabric-cicd to debug and call Fabric REST APIs locally from the github repo
55

6-
from azure.identity import ClientSecretCredential, DefaultAzureCredential
6+
from azure.identity import AzureCliCredential, AzurePowerShellCredential, ClientSecretCredential
77

88
from fabric_cicd import change_log_level, constants
99
from fabric_cicd._common._fabric_endpoint import FabricEndpoint
@@ -13,20 +13,21 @@
1313
# change_log_level()
1414

1515
if __name__ == "__main__":
16-
# Replace None correct value when using SPN auth
16+
# Azure CLI auth - comment out to use a different auth method
17+
token_credential = AzureCliCredential()
18+
19+
# Uncomment to use PowerShell auth
20+
# token_credential = AzurePowerShellCredential()
21+
22+
# Uncomment to use SPN auth
1723
# client_id = "your-client-id"
1824
# client_secret = "your-client-secret"
1925
# tenant_id = "your-tenant-id"
20-
token_credential = (
21-
None # ClientSecretCredential(client_id=client_id, client_secret=client_secret, tenant_id=tenant_id)
22-
)
26+
# token_credential = ClientSecretCredential(client_id=client_id, client_secret=client_secret, tenant_id=tenant_id)
2327

2428
# Create endpoint object
25-
fe = FabricEndpoint( # if credential is not defined, use DefaultAzureCredential
26-
token_credential=(
27-
DefaultAzureCredential() if token_credential is None else validate_token_credential(token_credential)
28-
)
29-
)
29+
fe = FabricEndpoint(token_credential=validate_token_credential(token_credential))
30+
3031
# Set workspace id variable if needed in API url
3132
workspace_id = "8f5c0cec-a8ea-48cd-9da4-871dc2642f4c"
3233

devtools/debug_local config.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import sys
77
from pathlib import Path
88

9-
from azure.identity import ClientSecretCredential
9+
from azure.identity import AzureCliCredential, AzurePowerShellCredential, ClientSecretCredential
1010

1111
root_directory = Path(__file__).resolve().parent.parent
1212
sys.path.insert(0, str(root_directory / "src"))
@@ -19,6 +19,12 @@
1919
# In this example, the config file sits within the root/sample/workspace directory
2020
config_file = str(root_directory / "sample" / "workspace" / "config.yml")
2121

22+
# Azure CLI auth - comment out to use a different auth method
23+
token_credential = AzureCliCredential()
24+
25+
# Uncomment to use PowerShell auth
26+
# token_credential = AzurePowerShellCredential()
27+
2228
# Uncomment to use SPN auth
2329
# client_id = "your-client-id"
2430
# client_secret = "your-client-secret"
@@ -31,8 +37,8 @@
3137
config_file_path=config_file,
3238
# Comment out if environment is not needed
3339
environment="dev",
34-
# Uncomment to use SPN auth
35-
# token_credential=token_credential,
40+
# Explicit token credential required for auth (choose one of the options above)
41+
token_credential=token_credential,
3642
# Uncomment to override specific config values (pass in a dictionary of override values)
3743
# config_override=config_override_dict
3844
)

devtools/debug_local.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import sys
77
from pathlib import Path
88

9-
from azure.identity import ClientSecretCredential
9+
from azure.identity import AzureCliCredential, AzurePowerShellCredential, ClientSecretCredential
1010

1111
root_directory = Path(__file__).resolve().parent.parent
1212
sys.path.insert(0, str(root_directory / "src"))
@@ -51,6 +51,12 @@
5151
"SparkJobDefinition",
5252
]
5353

54+
# Azure CLI auth - comment out to use a different auth method
55+
token_credential = AzureCliCredential()
56+
57+
# Uncomment to use PowerShell auth
58+
# token_credential = AzurePowerShellCredential()
59+
5460
# Uncomment to use SPN auth
5561
# client_id = "your-client-id"
5662
# client_secret = "your-client-secret"
@@ -65,8 +71,8 @@
6571
environment=environment,
6672
repository_directory=repository_directory,
6773
item_type_in_scope=item_type_in_scope,
68-
# Uncomment to use SPN auth
69-
# token_credential=token_credential,
74+
# Explicit token credential required for auth (choose one of the options above)
75+
token_credential=token_credential,
7076
)
7177

7278
# Uncomment to publish

devtools/debug_trace_deployment.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import sys
1010
from pathlib import Path
1111

12+
from azure.identity import AzureCliCredential
13+
1214
root_directory = Path(__file__).resolve().parent.parent
1315
sys.path.insert(0, str(root_directory / "src"))
1416

@@ -27,7 +29,6 @@ def main():
2729
raise ValueError(msg)
2830

2931
environment = "PPE"
30-
3132
repository_directory = str(root_directory / "sample" / "workspace")
3233
item_type_in_scope = [
3334
"Dataflow",
@@ -49,13 +50,15 @@ def main():
4950
"VariableLibrary",
5051
"Warehouse",
5152
]
53+
token_credential = AzureCliCredential()
5254
for flag in ["enable_shortcut_publish", "continue_on_shortcut_failure"]:
5355
fabric_cicd.append_feature_flag(flag)
5456
target_workspace = fabric_cicd.FabricWorkspace(
5557
workspace_id=workspace_id,
5658
environment=environment,
5759
repository_directory=str(repository_directory),
5860
item_type_in_scope=item_type_in_scope,
61+
token_credential=token_credential,
5962
)
6063
fabric_cicd.publish_all_items(target_workspace)
6164

0 commit comments

Comments
 (0)