Feature/qa minorfixes

.azure-pipelines/_template_build_solution.yml

@@ -33,9 +33,9 @@ jobs:
     - script: python -u automation/scripts/utils_build_parameter_file.py --environments ${{ parameters.environments }}
       displayName: 'Build parameter files'
       env:
-        TENANT_ID: $(SPN_TENANT_ID)
-        CLIENT_ID: $(SPN_CLIENT_ID)
-        CLIENT_SECRET: $(SPN_CLIENT_SECRET)
+        FAB_TENANT_ID: $(SPN_TENANT_ID)
+        FAB_SPN_CLIENT_ID: $(SPN_CLIENT_ID)
+        FAB_SPN_CLIENT_SECRET: $(SPN_CLIENT_SECRET)
 
     - task: UseDotNet@2
       inputs:

.azure-pipelines/_template_release_solution.yml

@@ -45,9 +45,9 @@ jobs:
     - script: python -u automation/scripts/fabric_release.py --environment ${{ parameters.environment }} --repo_path "$(Pipeline.Workspace)/solution"
       displayName: 'Run Fabric release script'
       env:
-        TENANT_ID: $(SPN_TENANT_ID)
-        CLIENT_ID: $(SPN_CLIENT_ID)
-        CLIENT_SECRET: $(SPN_CLIENT_SECRET)
+        FAB_TENANT_ID: $(SPN_TENANT_ID)
+        FAB_SPN_CLIENT_ID: $(SPN_CLIENT_ID)
+        FAB_SPN_CLIENT_SECRET: $(SPN_CLIENT_SECRET)
 
     - task: Bash@3
       name: generate_connectionstring
@@ -64,10 +64,10 @@ jobs:
           CONNECTION_STRING=$(cat conn.txt)
           echo "##vso[task.setvariable variable=connection_string]$CONNECTION_STRING"
       env:
-        TENANT_ID: $(SPN_TENANT_ID)
-        CLIENT_ID: $(SPN_CLIENT_ID)
-        CLIENT_SECRET: $(SPN_CLIENT_SECRET)
-
+        FAB_TENANT_ID: $(SPN_TENANT_ID)
+        FAB_SPN_CLIENT_ID: $(SPN_CLIENT_ID)
+        FAB_SPN_CLIENT_SECRET: $(SPN_CLIENT_SECRET)
+        
     - task: Bash@3
       displayName: 'Install sqlpackage'
       inputs:

.github/workflows/_template_build_solution.yml

@@ -1,13 +1,8 @@
 name: _Build Solution
 
 on:
-  workflow_call:
-    inputs:
-      environments:
-          required: true
-          type: string
-          description: 'A commaseperated list of environments to build for. E.g., "dev,tst,prd"'
-
+  workflow_call
+
 jobs:
   build:
     runs-on: windows-latest
@@ -17,10 +12,10 @@ jobs:
       PYTHONUNBUFFERED: 1
       DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: true
       VSO_FORCE_UTF8_OUTPUT: true
-      TENANT_ID: ${{ secrets.SPN_TENANT_ID }}
-      CLIENT_ID: ${{ secrets.SPN_CLIENT_ID }}
-      CLIENT_SECRET: ${{ secrets.SPN_CLIENT_SECRET }}
-
+      FAB_TENANT_ID: ${{ secrets.SPN_TENANT_ID }}
+      FAB_SPN_CLIENT_ID: ${{ secrets.SPN_CLIENT_ID }}
+      FAB_SPN_CLIENT_SECRET: ${{ secrets.SPN_CLIENT_SECRET }}
+      
     steps: 
       - name: Checkout repository
         uses: actions/checkout@v4

.github/workflows/_template_release_solution.yml

@@ -16,9 +16,9 @@ jobs:
       PYTHONUNBUFFERED: 1
       DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: true
       VSO_FORCE_UTF8_OUTPUT: true
-      TENANT_ID: ${{ secrets.SPN_TENANT_ID }}
-      CLIENT_ID: ${{ secrets.SPN_CLIENT_ID }}
-      CLIENT_SECRET: ${{ secrets.SPN_CLIENT_SECRET }}
+      FAB_TENANT_ID: ${{ secrets.SPN_TENANT_ID }}
+      FAB_SPN_CLIENT_ID: ${{ secrets.SPN_CLIENT_ID }}
+      FAB_SPN_CLIENT_SECRET: ${{ secrets.SPN_CLIENT_SECRET }}
 
     steps:
 
@@ -52,8 +52,8 @@ jobs:
         shell: bash
         run: |
           python automation/scripts/generate_connection_string.py \
-            --client_id "${CLIENT_ID}" \
-            --client_secret "${CLIENT_SECRET}" \
+            --client_id "${FAB_SPN_CLIENT_ID}" \
+            --client_secret "${FAB_SPN_CLIENT_SECRET}" \
             --environment "${{ inputs.environment }}" \
             --layer "Core" \
             --database "Metadata" \

.github/workflows/feature_fabric_branch.yml

@@ -13,9 +13,9 @@ jobs:
       PYTHONUNBUFFERED: 1
       DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: true
       VSO_FORCE_UTF8_OUTPUT: true
-      TENANT_ID: ${{ secrets.SPN_TENANT_ID }}
-      CLIENT_ID: ${{ secrets.SPN_CLIENT_ID }}
-      CLIENT_SECRET: ${{ secrets.SPN_CLIENT_SECRET }}
+      FAB_TENANT_ID: ${{ secrets.SPN_TENANT_ID }}
+      FAB_SPN_CLIENT_ID: ${{ secrets.SPN_CLIENT_ID }}
+      FAB_SPN_CLIENT_SECRET: ${{ secrets.SPN_CLIENT_SECRET }}
 
     steps:
       - name: Checkout code

.github/workflows/feature_fabric_cleanup.yml

@@ -16,9 +16,9 @@ jobs:
       PYTHONUNBUFFERED: 1
       DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: true
       VSO_FORCE_UTF8_OUTPUT: true'
-      TENANT_ID: ${{ secrets.SPN_TENANT_ID }}
-      CLIENT_ID: ${{ secrets.SPN_CLIENT_ID }}
-      CLIENT_SECRET: ${{ secrets.SPN_CLIENT_SECRET }}
+      FAB_TENANT_ID: ${{ secrets.SPN_TENANT_ID }}
+      FAB_SPN_CLIENT_ID: ${{ secrets.SPN_CLIENT_ID }}
+      FAB_SPN_CLIENT_SECRET: ${{ secrets.SPN_CLIENT_SECRET }}
 
     steps:
       - name: Checkout code

.github/workflows/feature_fabric_update.yml

@@ -15,9 +15,9 @@ jobs:
       PYTHONUNBUFFERED: 1
       DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: true
       VSO_FORCE_UTF8_OUTPUT: true
-      TENANT_ID: ${{ secrets.SPN_TENANT_ID }}
-      CLIENT_ID: ${{ secrets.SPN_CLIENT_ID }}
-      CLIENT_SECRET: ${{ secrets.SPN_CLIENT_SECRET }}
+      FAB_TENANT_ID: ${{ secrets.SPN_TENANT_ID }}
+      FAB_SPN_CLIENT_ID: ${{ secrets.SPN_CLIENT_ID }}
+      FAB_SPN_CLIENT_SECRET: ${{ secrets.SPN_CLIENT_SECRET }}
 
     if: github.event.created == false
     steps:

.github/workflows/run_fabric_job.yml

@@ -14,9 +14,9 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      TENANT_ID: ${{ secrets.SPN_TENANT_ID }}
-      CLIENT_ID: ${{ secrets.SPN_CLIENT_ID }}
-      CLIENT_SECRET: ${{ secrets.SPN_CLIENT_SECRET }}
+      FAB_TENANT_ID: ${{ secrets.SPN_TENANT_ID }}
+      FAB_SPN_CLIENT_ID: ${{ secrets.SPN_CLIENT_ID }}
+      FAB_SPN_CLIENT_SECRET: ${{ secrets.SPN_CLIENT_SECRET }}
 
     steps:
       - name: Checkout code

.github/workflows/solution_cleanup.yml

@@ -24,9 +24,9 @@ jobs:
       PYTHONUNBUFFERED: 1
       DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: true
       VSO_FORCE_UTF8_OUTPUT: true
-      TENANT_ID: ${{ secrets.SPN_TENANT_ID }}
-      CLIENT_ID: ${{ secrets.SPN_CLIENT_ID }}
-      CLIENT_SECRET: ${{ secrets.SPN_CLIENT_SECRET }}
+      FAB_TENANT_ID: ${{ secrets.SPN_TENANT_ID }}
+      FAB_SPN_CLIENT_ID: ${{ secrets.SPN_CLIENT_ID }}
+      FAB_SPN_CLIENT_SECRET: ${{ secrets.SPN_CLIENT_SECRET }}
 
     steps:
       - name: Checkout

automation/scripts/fabric_feature_maintainance.py

@@ -6,9 +6,9 @@
 
 # Get arguments 
 parser = argparse.ArgumentParser(description="Fabric feature maintainance arguments")
-parser.add_argument("--tenant_id", required=False, default=os.environ.get('TENANT_ID'), help="Azure Active Directory (Microsoft Entra ID) tenant ID used for authenticating with Fabric APIs. Defaults to the TENANT_ID environment variable.")
-parser.add_argument("--client_id", required=False, default=os.environ.get('CLIENT_ID'), help="Client ID of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_ID environment variable.")
-parser.add_argument("--client_secret", required=False, default=os.environ.get('CLIENT_SECRET'), help="Client secret of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_SECRET environment variable.")
+parser.add_argument("--tenant_id", required=False, default=os.environ.get('FAB_TENANT_ID'), help="Azure Active Directory (Microsoft Entra ID) tenant ID used for authenticating with Fabric APIs. Defaults to the TENANT_ID environment variable.")
+parser.add_argument("--client_id", required=False, default=os.environ.get('FAB_SPN_CLIENT_ID'), help="Client ID of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_ID environment variable.")
+parser.add_argument("--client_secret", required=False, default=os.environ.get('FAB_SPN_CLIENT_SECRET'), help="Client secret of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_SECRET environment variable.")
 parser.add_argument("--branch_name", required=False, default=default_branch_name, help="The name of the Git feature branch to operate on. Used for workspace setup, automation, and CI/CD logic. Defaults to a predefined variable `branch_name`.")
 parser.add_argument("--action", required=False, default="create", help="Action to perform: `create` to set up a new feature branch and workspace, `update` to synchronize repos and workspaces, `delete` to clean up. Default is `create`.")
 

automation/scripts/fabric_release.py

@@ -26,9 +26,9 @@
 parser.add_argument("--item_types", required=False, default=default_item_types_in_scope, help="Comma seperated list of item types in scope. Must match Fabric ItemTypes exactly.")
 parser.add_argument("--repo_path", required=False, default=default_solution_path, help="Path the the solution repository where items are stored.")
 parser.add_argument("--unpublish_items", required=False, default=True, help="Whether to unpublish orphan items that are no longer in the repository. Default is True.")
-parser.add_argument("--tenant_id", required=False, default=os.environ.get('TENANT_ID'), help="Azure Active Directory (Microsoft Entra ID) tenant ID used for authenticating with Fabric APIs. Defaults to the TENANT_ID environment variable.")
-parser.add_argument("--client_id", required=False, default=os.environ.get('CLIENT_ID'), help="Client ID of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_ID environment variable.")
-parser.add_argument("--client_secret", required=False, default=os.environ.get('CLIENT_SECRET'), help="Client secret of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_SECRET environment variable.")
+parser.add_argument("--tenant_id", required=False, default=os.environ.get('FAB_TENANT_ID'), help="Azure Active Directory (Microsoft Entra ID) tenant ID used for authenticating with Fabric APIs. Defaults to the TENANT_ID environment variable.")
+parser.add_argument("--client_id", required=False, default=os.environ.get('FAB_SPN_CLIENT_ID'), help="Client ID of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_ID environment variable.")
+parser.add_argument("--client_secret", required=False, default=os.environ.get('FAB_SPN_CLIENT_SECRET'), help="Client secret of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_SECRET environment variable.")
 
 args = parser.parse_args()
 tenant_id = args.tenant_id

automation/scripts/fabric_setup.py

@@ -18,9 +18,9 @@
 parser = argparse.ArgumentParser(description="Fabric IaC setup arguments")
 parser.add_argument("--environment", required=False, default=default_environment, help="Environment to setup. Default is dev.")
 parser.add_argument("--action", required=False, default=action, help="Indicates the action to perform (Create/Delete). Default is Create.")
-parser.add_argument("--tenant_id", required=False, default=os.environ.get('TENANT_ID'), help="Azure Active Directory (Microsoft Entra ID) tenant ID used for authenticating with Fabric APIs. Defaults to the TENANT_ID environment variable.")
-parser.add_argument("--client_id", required=False, default=os.environ.get('CLIENT_ID'), help="Client ID of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_ID environment variable.")
-parser.add_argument("--client_secret", required=False, default=os.environ.get('CLIENT_SECRET'), help="Client secret of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_SECRET environment variable.")
+parser.add_argument("--tenant_id", required=False, default=os.environ.get('FAB_TENANT_ID'), help="Azure Active Directory (Microsoft Entra ID) tenant ID used for authenticating with Fabric APIs. Defaults to the TENANT_ID environment variable.")
+parser.add_argument("--client_id", required=False, default=os.environ.get('FAB_SPN_CLIENT_ID'), help="Client ID of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_ID environment variable.")
+parser.add_argument("--client_secret", required=False, default=os.environ.get('FAB_SPN_CLIENT_SECRET'), help="Client secret of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_SECRET environment variable.")
 parser.add_argument("--github_pat", required=False, default=os.environ.get('GITHUB_PAT'), help="Github Personal Access Token. Used when source control provider is GitHub. Defaults to the FAB_GITHUB_PAT environment variable.")
 
 args = parser.parse_args()

automation/scripts/generate_connection_string.py

@@ -11,9 +11,9 @@
 parser.add_argument("--layer", required=True, help="Name of layer to generate connection string for.")
 parser.add_argument("--database", required=True, help="Name of database to generate connection string for.")
 parser.add_argument('--output_file', required=True, help="Path to output file where the connection string will be saved.")
-parser.add_argument("--tenant_id", required=False, default=os.environ.get('TENANT_ID'), help="Azure Active Directory (Microsoft Entra ID) tenant ID used for authenticating with Fabric APIs. Defaults to the TENANT_ID environment variable.")
-parser.add_argument("--client_id", required=False, default=os.environ.get('CLIENT_ID'), help="Client ID of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_ID environment variable.")
-parser.add_argument("--client_secret", required=False, default=os.environ.get('CLIENT_SECRET'), help="Client secret of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_SECRET environment variable.")
+parser.add_argument("--tenant_id", required=False, default=os.environ.get('FAB_TENANT_ID'), help="Azure Active Directory (Microsoft Entra ID) tenant ID used for authenticating with Fabric APIs. Defaults to the TENANT_ID environment variable.")
+parser.add_argument("--client_id", required=False, default=os.environ.get('FAB_SPN_CLIENT_ID'), help="Client ID of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_ID environment variable.")
+parser.add_argument("--client_secret", required=False, default=os.environ.get('FAB_SPN_CLIENT_SECRET'), help="Client secret of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_SECRET environment variable.")
 
 args = parser.parse_args()
 environment = args.environment

automation/scripts/utils_build_parameter_file.py

@@ -13,9 +13,9 @@
 parser = argparse.ArgumentParser(description="Fabric IaC setup arguments")
 parser.add_argument("--environments", required=False, default="dev,tst,prd", help="Comma seperated list of environments to include in parameter file.")
 parser.add_argument("--source_environment", required=False, default="dev", help="The source environment serving as source for the values being replaced.")
-parser.add_argument("--tenant_id", required=False, default=os.environ.get('TENANT_ID'), help="Azure Active Directory (Microsoft Entra ID) tenant ID used for authenticating with Fabric APIs. Defaults to the TENANT_ID environment variable.")
-parser.add_argument("--client_id", required=False, default=os.environ.get('CLIENT_ID'), help="Client ID of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_ID environment variable.")
-parser.add_argument("--client_secret", required=False, default=os.environ.get('CLIENT_SECRET'), help="Client secret of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_SECRET environment variable.")
+parser.add_argument("--tenant_id", required=False, default=os.environ.get('FAB_TENANT_ID'), help="Azure Active Directory (Microsoft Entra ID) tenant ID used for authenticating with Fabric APIs. Defaults to the TENANT_ID environment variable.")
+parser.add_argument("--client_id", required=False, default=os.environ.get('FAB_SPN_CLIENT_ID'), help="Client ID of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_ID environment variable.")
+parser.add_argument("--client_secret", required=False, default=os.environ.get('FAB_SPN_CLIENT_SECRET'), help="Client secret of the Azure AD application registered for accessing Fabric APIs. Defaults to the CLIENT_SECRET environment variable.")
 
 args = parser.parse_args()
 environments = args.environments.split(",")