Skip to content

Commit 5bfd361

Browse files
committed
Refactor deployment scripts to use a unified Python execution script and remove deprecated scripts
1 parent 13d0f41 commit 5bfd361

8 files changed

Lines changed: 94 additions & 460 deletions

File tree

.devcontainer/post-create.sh

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,6 @@ else
4646
echo "⚠️ Warning: ./requirements.txt not found"
4747
fi
4848

49-
# Verify that other requirements files exist (for reference)
50-
if [ -f "./src/requirements.txt" ]; then
51-
echo "✅ Source requirements.txt found"
52-
else
53-
echo "ℹ️ Info: ./src/requirements.txt not found (optional)"
54-
fi
55-
56-
if [ -f "./infra/scripts/databricks/requirements.txt" ]; then
57-
echo "✅ Databricks script requirements.txt found"
58-
else
59-
echo "ℹ️ Info: ./infra/scripts/databricks/requirements.txt not found (optional)"
60-
fi
61-
6249
# Install additional development tools
6350
echo "🛠️ Installing development tools..."
6451
if ! python3 -m pip install --user \

.github/workflows/assign-workspace-admins.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ jobs:
4747
run: |
4848
echo "Running fabric workspace administrators assignment..."
4949
50-
# Run the PowerShell script to add administrators to all workspaces
51-
pwsh ./Run-FabricWorkspaceAdministratorsPythonScript.ps1 \
52-
-FabricAdminsByObjectId '${{ env.AZURE_FABRIC_WORKSPACE_ADMINISTRATORS }}' \
50+
# Run the unified PowerShell script to add administrators to all workspaces
51+
pwsh ./Run-PythonScript.ps1 \
52+
-ScriptPath "infra/scripts/fabric/add_fabric_workspace_admins.py" \
53+
-ScriptArguments @("--fabricAdminsByObjectId", '${{ env.AZURE_FABRIC_WORKSPACE_ADMINISTRATORS }}') \
5354
-SkipPythonVirtualEnvironment \
5455
-SkipPythonDependencies \
5556
-SkipPipUpgrade

.github/workflows/azure-dev.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,13 @@ jobs:
180180
echo " FABRIC_ACTIVATOR_NAME: ${FABRIC_ACTIVATOR_NAME:-'(using default)'}"
181181
echo ""
182182
183-
# Run the PowerShell provisioning script with environment variables
184-
pwsh ./Run-DeployFabricRtiPythonScript.ps1 \
183+
# Run the unified PowerShell provisioning script with environment variables
184+
pwsh ./Run-PythonScript.ps1 \
185+
-ScriptPath "infra/scripts/fabric/deploy_fabric_rti.py" \
185186
-SkipPythonVirtualEnvironment \
186187
-SkipPythonDependencies \
188+
-SkipPipUpgrade \
189+
-SkipPythonDependencies \
187190
-SkipPipUpgrade
188191
189192
echo "✅ RTI fabric items provisioning completed"

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ This solution accelerator provides the architecture and working solution for rea
1111
<br/>
1212

1313
<div align="center">
14+
1415
[**SOLUTION OVERVIEW**](#solution-overview) \| [**QUICK DEPLOY**](#quick-deploy) \| [**BUSINESS SCENARIO**](#business-use-case) \| [**SUPPORTING DOCUMENTATION**](#supporting-documentation)
1516

1617
</div>
@@ -19,6 +20,7 @@ This solution accelerator provides the architecture and working solution for rea
1920
<h2><img src="./docs/images/readme/solution-overview.png" width="48" />
2021
Solution overview
2122
</h2>
23+
2224
This solution accelerator provides a working solution for manufacturing asset performance monitoring, real-time anomaly detection, and anomaly notification. The manufacturing facility telemetry data is synthetically generated with the `Telemetry Data Simulator`. This architecture can be extended to other industries as long as the appropriate data is generated or actual operations data is ingested into the `Event Hub`, and related component configurations and Kusto Query Language (KQL) code are updated accordingly. For a brief description of the architecture, please refer to [Solution Architecture Overview](./docs/TechnicalArchitecture.md).
2325

2426
### Solution architecture
@@ -96,16 +98,16 @@ Follow these steps to deploy the solution to your own Azure subscription:
9698

9799
<br/>
98100

99-
**One-command deployment** - Deploy everything with [Azure Developer CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/install-azd):
101+
**One-command deployment** - Deploy everything with [Azure Developer CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/install-azd) and [Azure CLI](https://learn.microsoft.com/cli/azure/install-azure-cli):
100102

101103
```bash
102104
# Clone and navigate to repository
103105
git clone https://github.com/microsoft/real-time-intelligence-operations-solution-accelerator.git
104106
cd real-time-intelligence-operations-solution-accelerator
105107

106108
# Authenticate (required)
107-
azd auth login
108-
az login
109+
azd auth login # Required to deploy with azd up
110+
az login # Required to use the Azure CLI commands that connect Azure resources to Fabric workspace
109111

110112
# Recommended: set email to recieve alerts
111113
azd env set FABRIC_ACTIVATOR_ALERTS_EMAIL "myteam@company.com"

azure.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ hooks:
99
postprovision:
1010
windows:
1111
shell: pwsh
12-
run: ./infra/scripts/utils/Run-DeployFabricRtiPythonScript.ps1
12+
run: ./infra/scripts/utils/Run-PythonScript.ps1 -ScriptPath "infra/scripts/fabric/deploy_fabric_rti.py"
1313
interactive: true
1414
continueOnError: false
1515
posix:
1616
shell: pwsh
17-
run: ./infra/scripts/utils/Run-DeployFabricRtiPythonScript.ps1 -SkipPythonVirtualEnvironment
17+
run: ./infra/scripts/utils/Run-PythonScript.ps1 -ScriptPath "infra/scripts/fabric/deploy_fabric_rti.py" -SkipPythonVirtualEnvironment
1818
interactive: true
1919
continueOnError: false
2020
predown:
2121
windows:
2222
shell: pwsh
23-
run: ./infra/scripts/utils/Run-RemoveFabricRtiPythonScript.ps1
23+
run: ./infra/scripts/utils/Run-PythonScript.ps1 -ScriptPath "infra/scripts/fabric/remove_fabric_rti.py"
2424
interactive: true
2525
continueOnError: false
2626
posix:
2727
shell: pwsh
28-
run: ./infra/scripts/utils/Run-RemoveFabricRtiPythonScript.ps1 -SkipPythonVirtualEnvironment
28+
run: ./infra/scripts/utils/Run-PythonScript.ps1 -ScriptPath "infra/scripts/fabric/remove_fabric_rti.py" -SkipPythonVirtualEnvironment
2929
interactive: true
3030
continueOnError: false

infra/scripts/utils/Run-DeployFabricRtiPythonScript.ps1

Lines changed: 0 additions & 138 deletions
This file was deleted.

0 commit comments

Comments
 (0)