Merge pull request #96 from Azure/openai-embeddings

DevContainer and codespaces updates

.devcontainer/.zshrc

@@ -0,0 +1,108 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+export ZSH="/home/vscode/.oh-my-zsh"
+
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+ZSH_THEME="agnoster"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in $ZSH/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment the following line to disable bi-weekly auto-update checks.
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment the following line to automatically update without prompting.
+# DISABLE_UPDATE_PROMPT="true"
+
+# Uncomment the following line to change how often to auto-update (in days).
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# Caution: this setting can cause issues with multiline prompts (zsh 5.7.1 and newer seem to work)
+# See https://github.com/ohmyzsh/ohmyzsh/issues/5765
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(git)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+alias rover=/tf/rover/rover.sh
+alias t=/usr/bin/terraform
+alias k=/usr/bin/kubectl
+cd /tf/caf || true
+[ -f /tf/rover/.kubectl_aliases ] && source /tf/rover/.kubectl_aliases
+source /tf/rover/zsh-autosuggestions.zsh
+alias watch=\"watch \"

.devcontainer/devcontainer.json

@@ -1,41 +1,36 @@
 {
-    "name": "CAF Starter Terraform landing zones",
-
+    "name": "Azure CAF rover",
     // Update the 'dockerComposeFile' list if you have more compose files or use different names.
     "dockerComposeFile": "docker-compose.yml",
-
     // Container user to use in VSCode Online and GitHub Codespaces
-    "containerUser" : "vscode",
-    "remoteUser" : "vscode",
-
+    "remoteUser": "vscode",
     // The 'service' property is the name of the service for the container that VS Code should
     // use. Update this value and .devcontainer/docker-compose.yml to the real service name.
     "service": "rover",
-
     // The optional 'workspaceFolder' property is the path VS Code should open by default when
     // connected. This is typically a volume mount in .devcontainer/docker-compose.yml
     "workspaceFolder": "/tf/caf",
-
     // Use 'settings' to set *default* container specific settings.json values on container create.
     // You can edit these settings after create using File > Preferences > Settings > Remote.
     "settings": {
         "files.eol": "\n",
-        "terminal.integrated.shell.linux": "/bin/bash",
+        "terminal.integrated.defaultProfile.linux": "/bin/bash",
         "editor.tabSize": 2,
-        "terminal.integrated.scrollback": 8000,
+        "terminal.integrated.scrollback": 64000,
     },
-
     // Uncomment the next line if you want start specific services in your Docker Compose config.
     // "runServices": [],
-
     // Uncomment this like if you want to keep your containers running after VS Code shuts down.
     // "shutdownAction": "none",
-
     // Uncomment the next line to run commands after the container is created.
-    "postCreateCommand": "sudo cp -R /tmp/.ssh-localhost/* ~/.ssh && sudo chown -R $(whoami):$(whoami) /tf/caf && sudo chmod 400 ~/.ssh/* && git config --global core.editor vi && pre-commit install && pre-commit autoupdate",
+    //"postCreateCommand": "cp -R /tmp/.ssh-localhost/* ~/.ssh && sudo chmod 600 ~/.ssh/* && sudo chown -R $(whoami) /tf/caf && git config --global core.editor vim && pre-commit install && pre-commit autoupdate",
+    "postCreateCommand": "sudo cp -R /tmp/.ssh-localhost/* ~/.ssh && sudo chown -R $(whoami):$(whoami) /tf/caf ~/.ssh && sudo chmod 400 ~/.ssh/* && git config --global core.editor vi && pre-commit install && pre-commit autoupdate && sudo az aks install-cli",
+    "postStartCommand": "sudo chmod 666 /var/run/docker.sock",
     // Add the IDs of extensions you want installed when the container is created in the array below.
     "extensions": [
         "4ops.terraform",
-        "mutantdino.resourcemonitor"
+        "mutantdino.resourcemonitor",
+        "eamodio.gitlens",
+        "golang.go"
     ]
-}
+}

.devcontainer/docker-compose.yml

@@ -6,7 +6,8 @@
   version: '3.7'
   services:
     rover:
-      image: aztfmod/rover:1.0.1-2106.3012
+      # details about rover https://aztfmod.github.io/documentation/docs/rover/rover-intro
+      image: aztfmod/rover:1.5.4-2307.2804
       user: vscode
 
       labels:
@@ -15,15 +16,20 @@
       volumes:
         # This is where VS Code should expect to find your project's source code
         # and the value of "workspaceFolder" in .devcontainer/devcontainer.json
-        - ..:/tf/caf
-        - volume-caf-vscode:/home/vscode
-        - volume-caf-vscode-bashhistory:/commandhistory
-        - ~/.ssh:/tmp/.ssh-localhost:ro
-        - /var/run/docker.sock:/var/run/docker.sock
+         - ..:/tf/caf
+         - volume-caf-vscode:/home/vscode
+         - volume-caf-vscode-bashhistory:/commandhistory
+         - ~/.ssh:/tmp/.ssh-localhost:ro
+
+         - /var/run/docker.sock:/var/run/docker.sock
 
       # Overrides default command so things don't shut down after the process ends.
       command: /bin/sh -c "while sleep 1000; do :; done"
 
+      environment:
+      - HISTFILE=/commandhistory/.bash_history
+      - HISTSIZE=1000
+
   volumes:
     volume-caf-vscode:
       labels:

.gitignore

@@ -6,6 +6,7 @@
 *.dll
 *.so
 *.dylib
+.vs/
 
 # Test binary, built with `go test -c`
 *.test

.pre-commit-config.yaml

@@ -0,0 +1,15 @@
+# See http://pre-commit.com for more information
+# See http://pre-commit.com/hooks.html for more hooks
+repos:
+  # - repo: https://github.com/IamTheFij/docker-pre-commit
+  #   rev: v2.1.0
+  #   hooks:
+  #   - id: docker-compose-check
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: check-merge-conflict
+      #- id: trailing-whitespace
+      - id: check-yaml
+      - id: check-added-large-files
+      - id: detect-private-key