Merge pull request #857 from microsoft/vNext-Dev

Merging 1.2 features into Main

Author: lon-tierney

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/vscode/devcontainers/python:3.10-bullseye
+FROM mcr.microsoft.com/vscode/devcontainers/python:3.10-bookworm
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -22,7 +22,7 @@ RUN sudo apt-get update \
     && sudo apt-get -y install --no-install-recommends apt-utils dialog nano bash-completion sudo bsdmainutils cmake \
     #
     # Verify git, process tools, lsb-release (common in install instructions for CLIs) installed
-    && sudo apt-get -y install git iproute2 procps lsb-release figlet build-essential
+    && sudo apt-get -y install git iproute2 procps lsb-release figlet build-essential dnsutils openvpn
 
 # Save command line history
 RUN echo "export HISTFILE=/home/$USERNAME/commandhistory/.bash_history" >> "/home/$USERNAME/.bashrc" \
@@ -34,11 +34,11 @@ RUN echo "export HISTFILE=/home/$USERNAME/commandhistory/.bash_history" >> "/hom
 # docker-client
 RUN sudo apt-get update \
     # libgl dependencies and install Docker CE CLI
-    && sudo apt-get install ffmpeg libsm6 libxext6 apt-transport-https ca-certificates curl gnupg-agent software-properties-common lsb-release -y \
-    && curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | sudo apt-key add - 2>/dev/null \
-    && sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" \
-    && sudo apt-get update \
-    && sudo apt-get install -y docker-ce-cli 
+    && sudo apt-get install apt-transport-https ca-certificates curl gnupg lsb-release -y \
+    && curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker.gpg \
+    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null \
+    && sudo apt-get update -y \
+    && sudo apt-get install -y docker-ce-cli
 
 ARG DOCKER_GROUP_ID
 COPY ./scripts/docker-client.sh /tmp/
@@ -49,7 +49,7 @@ RUN git clone https://github.com/magicmonty/bash-git-prompt.git ~/.bash-git-prom
     && echo "if [ -f \"$HOME/.bash-git-prompt/gitprompt.sh\" ]; then GIT_PROMPT_ONLY_IN_REPO=1 && source $HOME/.bash-git-prompt/gitprompt.sh; fi" >> "/home/$USERNAME/.bashrc"
 
 # terraform + tflint
-ARG TERRAFORM_VERSION=1.3.7
+ARG TERRAFORM_VERSION=1.8.5
 ARG TFLINT_VERSION=0.44.1
 RUN mkdir -p /tmp/docker-downloads \
     && curl -sSL -o /tmp/docker-downloads/terraform.zip https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
@@ -75,12 +75,6 @@ RUN echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-debian
     && apt-get update \
     && apt-get install -y azure-functions-core-tools-4
 
-# Install Powershell
-RUN apt-get update \
-    && apt-get install -y powershell \
-    # Alias Powershell
-    && echo "alias powershell=pwsh" >> "/home/$USERNAME/.bashrc"
-
 #Install npm and nodejs in the Docker dev container
 COPY ./scripts/nodejs.sh /tmp/
 RUN /tmp/nodejs.sh
@@ -100,5 +94,13 @@ RUN pip install azure-cosmos
 RUN pip install pyfiglet
 RUN pip install azure-identity
 RUN pip install azure-keyvault-secrets
+
 # Python Package for Backend Testing
-RUN pip install pytest
+RUN pip install pytest
+
+# Install skopeo - This must be at the end due to pulling from trixie
+RUN sudo DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install usrmerge
+
+RUN echo 'deb http://ftp.debian.org/debian trixie main' | sudo tee /etc/apt/sources.list.d/debian.trixie.list \
+    && sudo apt-get update \
+    && sudo apt-get install skopeo

.devcontainer/devcontainer.json

@@ -11,7 +11,7 @@
 	},
 	"forwardPorts": [ 7071 ],
 	"runArgs": [
-		"--network", "host" // use host networking so that the dev container can access the API when running the container locally
+		"--network", "host", "--cap-add", "NET_ADMIN" // use host networking so that the dev container can access the API when running the container locally
 	],
 
 	"mounts": [

.devcontainer/scripts/nodejs.sh

@@ -3,4 +3,4 @@ set -e
 
 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash
 source $NVM_DIR/nvm.sh
-nvm install v18.12.1
+nvm install v20.13.0

.gitignore

@@ -400,4 +400,8 @@ infra/sp_config/config.json
 #Upgrade & Migrate Support
 scripts/upgrade_repoint.config.json
 azcopy.tar.gz
-azcopy_dir
+azcopy_dir
+
+#Openvpn setting
+openvpn/*
+!openvpn/info.txt

.vscode/launch.json

@@ -86,8 +86,8 @@
             "request": "launch",
             "program": "debug_tests.py",
             "args": [
-                "--storage_account_connection_str",
-                "${env:STORAGE_ACCOUNT_CONNECTION_STR},",
+                "--storage_account_url",
+                "${env:AZURE_BLOB_STORAGE_ENDPOINT},",
                 "--search_service_endpoint",
                 "${env:SEARCH_SERVICE_ENDPOINT}",
                 "--search_index",
@@ -98,10 +98,9 @@
                 "60"
             ],
             "env": {
-                "STORAGE_ACCOUNT_CONNECTION_STR": "${env:BLOB_CONNECTION_STRING}",
+                "storage_account_url": "${env:AZURE_BLOB_STORAGE_ENDPOINT}",
                 "SEARCH_SERVICE_ENDPOINT": "${env:AZURE_SEARCH_SERVICE_ENDPOINT}",
-                "SEARCH_INDEX": "${env:AZURE_SEARCH_INDEX}",
-                "SEARCH_KEY": "${env:AZURE_SEARCH_SERVICE_KEY}"
+                "SEARCH_INDEX": "${env:AZURE_SEARCH_INDEX}"
             },
             "cwd": "${workspaceFolder}/tests",
             "envFile": "${workspaceFolder}/scripts/environments/infrastructure.debug.env",

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Contributing to Information Assistant
+# Contributing to Information Assistant copilot template
 
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a
 Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us

Makefile

@@ -9,7 +9,7 @@ help: ## Show this help
 		| awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%s\033[0m|%s\n", $$1, $$2}' \
         | column -t -s '|'
 
-deploy: build infrastructure extract-env deploy-enrichments deploy-search-indexes deploy-webapp deploy-functions ## Deploy infrastructure and application code
+deploy: build infrastructure extract-env deploy-search-indexes deploy-functions deploy-webapp deploy-enrichments ## Deploy infrastructure and application code
 
 build-deploy-webapp: build extract-env deploy-webapp ##Build and Deploy the Webapp
 build-deploy-enrichments: build extract-env deploy-enrichments ##Build and Deploy the Enrichment Webapp
@@ -18,15 +18,15 @@ build-deploy-functions: build extract-env deploy-functions ##Build and Deploy th
 build: ## Build application code
 	@./scripts/build.sh
 
-build-containers: extract-env
-	@./app/enrichment/docker-build.sh
-
 infrastructure: check-subscription ## Deploy infrastructure
 	@./scripts/inf-create.sh
 
-extract-env: extract-env-debug-webapp extract-env-debug-functions ## Extract infrastructure.env file from Terraform output
+extract-env: check-secure-mode-connectivity extract-env-debug-webapp extract-env-debug-functions ## Extract infrastructure.env file from Terraform output
 	 @./scripts/json-to-env.sh < inf_output.json > ./scripts/environments/infrastructure.env
 
+check-secure-mode-connectivity: ## Check secure mode connectivity
+	@./scripts/check-secure-mode-connectivity.sh
+
 deploy-webapp: extract-env ## Deploys the web app code to Azure App Service
 	@./scripts/deploy-webapp.sh
 

NOTICE.md

@@ -113,10 +113,6 @@ From the following locations:
 
 <https://github.com/remix-run/react-router>
 
-### @azure/storage-blob
-
-<https://github.com/Azure/azure-sdk-for-js>
-
 ### classnames
 
 <https://github.com/JedWatson/classnames>