Az.Tools.Predictor in PowerShell (#266)

* Add Predictor

* update az tools predictor

* Change color of InLinePrediction

* update CI name and checkout version

Co-authored-by: Darren Tu <[email protected]>

Author: darrentu

.github/workflows/blank.yml renamed to .github/workflows/CI.yml

@@ -25,7 +25,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Build base dockerfile
       - name: Build the base.Dockerfile

linux/powershell/PSCloudShellStartup.ps1

@@ -21,6 +21,10 @@ $script:CloudEnvironmentMap = @{
     dogfood = 'dogfood'
 }
 
+# For the Az.Tools.Predictor
+PSReadline\Set-PSReadLineOption -Colors @{ InLinePrediction = '#8d8d8d'}
+Microsoft.PowerShell.Core\Import-Module Az.Tools.Predictor -Force
+
 # Using the new set of az cmdlets
 Microsoft.PowerShell.Core\Import-Module Az.Accounts
 Az.Accounts\Enable-AzureRmAlias

linux/powershell/setupPowerShell.ps1

@@ -137,8 +137,8 @@ try {
         PowerShellGet\Install-Module -Name AzurePSDrive @prodAllUsers   
         PowerShellGet\Install-Module -Name GuestConfiguration -MaximumVersion $script:dockerfileDataObject.GuestConfigurationMaxVersion -ErrorAction SilentlyContinue @prodAllUsers
         PowerShellGet\Install-Module -Name Microsoft.PowerShell.UnixCompleters @prodAllUsers
-        PowerShellGet\Install-Module -AllowPreRelease -Force PSReadLine -Repository PSGallery # get psreadline beta
-        PowerShellGet\Install-Module -Name Az.Tools.Predictor -Repository PSGallery
+        PowerShellGet\Install-Module -Force PSReadLine @prodAllUsers
+        PowerShellGet\Install-Module -Name Az.Tools.Predictor @prodAllUsers
         PowerShellGet\Install-Module -Name ExchangeOnlineManagement -RequiredVersion 2.0.5 -Force
         PowerShellGet\Install-Module -Name Microsoft.PowerShell.SecretManagement @prodAllUsers
         PowerShellGet\Install-Module -Name Microsoft.PowerShell.SecretStore @prodAllUsers

linux/tools.Dockerfile

@@ -37,6 +37,19 @@ RUN bash ./tdnfinstall.sh gh
 RUN mkdir -p /usr/cloudshell
 WORKDIR /usr/cloudshell
 
+# Install Office 365 CLI templates
+RUN npm install -q -g @pnp/cli-microsoft365
+
+# Install Bicep CLI
+RUN curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64 \
+  && chmod +x ./bicep \
+  && mv ./bicep /usr/local/bin/bicep \
+  && bicep --help
+
+# Temp: fix ansible modules. Proper fix is to update base layer to use regular python for Ansible.
+RUN wget -nv -q https://raw.githubusercontent.com/ansible-collections/azure/dev/requirements-azure.txt \
+    && /opt/ansible/bin/python -m pip install -r /usr/share/ansible/collections/ansible_collections/azure/azcollection/requirements-azure.txt 
+    
 # Copy and run script to Install powershell modules and setup Powershell machine profile
 COPY ./linux/powershell/PSCloudShellUtility/ /usr/local/share/powershell/Modules/PSCloudShellUtility/
 COPY ./linux/powershell/ powershell
@@ -45,21 +58,12 @@ RUN /usr/bin/pwsh -File ./powershell/setupPowerShell.ps1 -image Top && rm -rf ./
 # install powershell warmup script
 COPY ./linux/powershell/Invoke-PreparePowerShell.ps1 linux/powershell/Invoke-PreparePowerShell.ps1
 
-# Install Office 365 CLI templates
-RUN npm install -q -g @pnp/cli-microsoft365
 
-# Install Bicep CLI
-RUN curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64 \
-  && chmod +x ./bicep \
-  && mv ./bicep /usr/local/bin/bicep \
-  && bicep --help
 
 # Remove su so users don't have su access by default. 
 RUN rm -f ./linux/Dockerfile && rm -f /bin/su
 
-# Temp: fix ansible modules. Proper fix is to update base layer to use regular python for Ansible.
-RUN wget -nv -q https://raw.githubusercontent.com/ansible-collections/azure/dev/requirements-azure.txt \
-    && /opt/ansible/bin/python -m pip install -r /usr/share/ansible/collections/ansible_collections/azure/azcollection/requirements-azure.txt 
+
 
 #Add soft links
 RUN ln -s /usr/bin/python3 /usr/bin/python