@pnp/cli-microsoft365 6.9.0-beta.bb31388 → 6.9.0-beta.d0c3c93

package/.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/powershell:7.1.0-ubuntu-focal
+FROM mcr.microsoft.com/powershell:alpine-3.17
 
 LABEL name="CLI for Microsoft 365 Development" \
   description="Development container for contributing to CLI for Microsoft 365" \
@@ -17,22 +17,15 @@ LABEL name="CLI for Microsoft 365 Development" \
 ENV NPM_CONFIG_PREFIX=/home/cli-microsoft365-dev/.npm-global \
   PATH=$PATH:/home/cli-microsoft365-dev/.npm-global/bin
 
-RUN apt-get update && apt-get install -y \
+RUN apk add --no-cache \
   git \
   curl \
   sudo \
+  shadow \
   zsh \
   jq \
-  vim \
-  python3.8 \
-  python3-pip \
-  && curl -sL https://deb.nodesource.com/setup_18.x | sudo -E bash - \
-  && apt-get install nodejs -y \
-  && rm -rf /var/lib/apt/lists/*
-
-COPY ../docs/pip_requirements.txt .
-
-RUN pip install -r pip_requirements.txt
+  nodejs \
+  npm
 
 RUN useradd \
   --user-group \
@@ -45,15 +38,15 @@ USER cli-microsoft365-dev
 
 WORKDIR /home/cli-microsoft365
 
-RUN zsh -c "$(curl https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" --unattended \
- && git clone https://github.com/denysdovhan/spaceship-prompt.git "$HOME/.oh-my-zsh/custom/themes/spaceship-prompt" --depth=1 \
- && ln -s "$HOME/.oh-my-zsh/custom/themes/spaceship-prompt/spaceship.zsh-theme" "$HOME/.oh-my-zsh/custom/themes/spaceship.zsh-theme" \
- && cp "$HOME/.oh-my-zsh/templates/zshrc.zsh-template" $HOME/.zshrc \
- && git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting \
- && git clone https://github.com/zsh-users/zsh-autosuggestions $HOME/.oh-my-zsh/custom/plugins/zsh-autosuggestions \
+RUN git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh \
+ && cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc \
+ && git clone https://github.com/denysdovhan/spaceship-prompt.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/spaceship-prompt --depth=1 \
+ && ln -s ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/spaceship-prompt/spaceship.zsh-theme ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/spaceship.zsh-theme \
  && sed -i "11s/ZSH_THEME=\"robbyrussell\"/ZSH_THEME=\"spaceship\"/" ~/.zshrc \
- && sed -i "27s/# DISABLE_AUTO_UPDATE=\"true\"/DISABLE_AUTO_UPDATE=\"true\"/" ~/.zshrc \
+ && git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting \
+ && git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions \
  && sed -i "73s/plugins=(git)/plugins=(git zsh-autosuggestions zsh-syntax-highlighting)/" ~/.zshrc \
+ && sed -i "27s/# DISABLE_AUTO_UPDATE=\"true\"/DISABLE_AUTO_UPDATE=\"true\"/" ~/.zshrc \
  && sed -i "50s/# COMPLETION_WAITING_DOTS/COMPLETION_WAITING_DOTS/" ~/.zshrc
 
 CMD [ "/bin/zsh", "-l" ]

package/.devcontainer/devcontainer.json

@@ -2,22 +2,29 @@
   "name": "CLI for Microsoft 365",
   "dockerFile": "Dockerfile",
   "context": "..",
-  "settings": {
-    "terminal.integrated.profiles.linux": {
-      "zsh": {
-        "path": "/bin/zsh",
-        "args": [
-          "-l"
-        ]
-      }
-    },
-    "terminal.integrated.defaultProfile.linux": "zsh"
+  "postCreateCommand": {
+    "cli": "npm i && npm run clean && npm run build && npm link",
+    "docs": "cd docs && npm i"
   },
-  "postCreateCommand": "npm i && npm run clean && npm run build && npm link",
-  "extensions": [
-    "dbaeumer.vscode-eslint",
-    "hbenl.vscode-test-explorer",
-    "hbenl.vscode-mocha-test-adapter",
-    "eamodio.gitlens"
-  ]
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "dbaeumer.vscode-eslint",
+        "hbenl.vscode-test-explorer",
+        "hbenl.vscode-mocha-test-adapter",
+        "eamodio.gitlens"
+      ],
+      "settings": {
+        "terminal.integrated.profiles.linux": {
+          "zsh": {
+            "path": "/bin/zsh",
+            "args": [
+              "-l"
+            ]
+          }
+        },
+        "terminal.integrated.defaultProfile.linux": "zsh"
+      }
+    }
+  }
 }

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/powershell:alpine-3.12
+FROM mcr.microsoft.com/powershell:alpine-3.17
 
 ARG CLI_VERSION=latest
 
@@ -43,11 +43,14 @@ RUN bash -c 'echo "export PATH=$PATH:/home/cli-microsoft365/.npm-global/bin:/hom
   && bash -c 'echo "export CLIMICROSOFT365_ENV=\"docker\"" >> ~/.bash_profile' \
   && bash -c 'npm i -g @pnp/cli-microsoft365@${CLI_VERSION} --production --quiet --no-progress' \ 
   && bash -c 'echo "source /etc/profile.d/bash_completion.sh" >> ~/.bash_profile' \
+  && bash -c 'echo "alias \"m365?\"=\"m365_chili\"" >> ~/.bash_profile' \
   && bash -c 'echo ". .bashrc" >> ~/.bash_profile' \
   && bash -c 'npm cache clean --force' \
   && bash -c 'm365 cli completion sh setup' \
-  && pwsh -c 'm365 cli completion pwsh setup --profile $profile'
+  && pwsh -c 'm365 cli completion pwsh setup --profile $profile' \
+  && pwsh -c 'Add-Content -Path $PROFILE -Value "`r`Set-Alias -Name m365? -Value m365_chili"'
 
+RUN pip install setuptools==58
 RUN pip install jmespath-terminal
 
 CMD [ "bash", "-l" ]

package/dist/cli/Cli.js

@@ -801,6 +801,22 @@ class Cli {
             return response;
         });
     }
+    static handleMultipleResultsFound(promptMessage, errorMessage, values) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const interactive = Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.interactive, false);
+            if (!interactive) {
+                throw errorMessage;
+            }
+            const response = yield Cli.prompt({
+                type: 'list',
+                name: 'select',
+                default: 0,
+                message: promptMessage,
+                choices: Object.keys(values)
+            });
+            return values[response.select];
+        });
+    }
     static removeShortOptions(args) {
         const filteredArgs = JSON.parse(JSON.stringify(args));
         const optionsToRemove = Object.getOwnPropertyNames(args.options)