-
Notifications
You must be signed in to change notification settings - Fork 144
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add support for TF013 beta 3 * Remove workspace and transition settings to devcontainer * Add --clone-launchpad * Remove --clone-error writing to stdout download progress * Remove launchpad command Remove launchpad landing zone from rover * Cleanup dockerfile * Refactor the command logic for more scalability * Fix a destroy condition * Fix command conditions + cleanup * Fix rover clone * Fix a CI destroy condition * #56 * Add ssh server for Azure aci * Updating port for Azure bastion * Fix sshd port to 22 for aci * Regenerate sshd keys if missing * Make the sshd.sh executable * Run sshd in non-root container * Fix docker in non-root mode * Upgrade tools version Cleanup variables * Remove password for ssh Change ssh server config * Add terraform 0.12.29 * Add 0.13.0-rc1 docker image * Update changelog.md * Update changelog.md Co-authored-by: Arnaud Lheureux <arnaudlh@users.noreply.github.com> Co-authored-by: lolorol <lalesle@microsoft.com>
- Loading branch information
3 people
committed
Jul 24, 2020
1 parent
7f95fbb
commit e75b6fa
Showing
15 changed files
with
523 additions
and
386 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,10 @@ | ||
| versionTerraform=0.12.28 | ||
| versionAzureCli=2.7.0 | ||
| versionKubectl=v1.18.2 | ||
| versionGit=2.25.0 | ||
| versionTflint=v0.16.2 | ||
| versionTerraform=0.12.29 | ||
| versionAzureCli=2.9.1 | ||
| versionKubectl=v1.18.6 | ||
| versionGit=2.27.0 | ||
| versionTflint=v0.18.0 | ||
| versionJq=1.6 | ||
| versionDockerCompose=1.25.5 | ||
| versionLaunchpadOpensource=master | ||
| versionAzureCafTerraform=v.0.3.1 | ||
| versionTfsec=v0.21.0 | ||
| versionTfsec=v0.24.1 | ||
| versionTerraformDocs=v0.9.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,3 +9,4 @@ | |
| **/~*.* | ||
| **/*.log | ||
| version.txt | ||
| landingzones | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| #!/bin/bash | ||
|
|
||
| export clone_destination=${clone_destination:="/tf/caf/landingzones"} | ||
| export clone_folder=${clone_folder:="/"} | ||
| export clone_folder_strip=${clone_folder_strip:=2} | ||
| export clone_project_name=${clone_project_name:="Azure/caf-terraform-landingzones"} | ||
| export landingzone_branch=${landingzone_branch:="master"} | ||
|
|
||
| current_path=$(pwd) | ||
|
|
||
|
|
||
| function display_clone_instructions { | ||
|
|
||
| while (( "$#" )); do | ||
| case "${1}" in | ||
| --intro) | ||
| echo | ||
| echo "Rover clone is used to bring the landing zones dependencies you need to deploy your landing zone" | ||
| echo | ||
| shift 1 | ||
| ;; | ||
| --clone) | ||
| display_clone_instructions --intro --examples --clone-branch --clone-destination --clone-folder --clone-folder-strip | ||
| echo "--clone specify a GitHub organization and project in the for org/project" | ||
| echo " The default setting if not set is azure/caf-terraform-landingzones" | ||
| echo | ||
| shift 1 | ||
| ;; | ||
| --clone-branch) | ||
| echo "--clone-branch set the branch to pull the package." | ||
| echo " By default is not set use the master branch." | ||
| echo | ||
| shift 1 | ||
| ;; | ||
| --clone-destination) | ||
| echo "--clone-destination change the destination local folder." | ||
| echo " By default clone the package into the /tf/caf/landingzones folder of the rover" | ||
| echo | ||
| shift 1 | ||
| ;; | ||
| --clone-folder) | ||
| echo "--clone-folder specify the folder to extract from the original project" | ||
| echo | ||
| echo " Example: --clone-folder /landingzones/landingzone_caf_foundations will only extract the caf foundations landing zone" | ||
| echo | ||
| shift 1 | ||
| ;; | ||
| --clone-folder-strip) | ||
| echo "--clone-folder-strip is used strip the base folder structure from the original folder" | ||
| echo | ||
| echo " In the GitHub package of azure/caf-terraform-landingzones, the data are packaged in the following structure" | ||
| echo " caf-terraform-landingzones-master/landingzones/launchpad/main.tf" | ||
| echo " [project]-[branch]/landgingzones/[landingzone]" | ||
| echo " To reproduce a nice folder structure in the rover it it possible to set the --clone-folder-strip to 2 to remove [project]-[branch]/landingzones and only retrieve the third level folder" | ||
| echo "" | ||
| echo " Default to 2 when using azure/caf-terraform-landingzones and 1 for all other git projects" | ||
| echo | ||
| shift 1 | ||
| ;; | ||
| --examples) | ||
| echo "By default the rover will clone the azure/caf-terraform-landingzones into the local rover folder /tf/caf/landinzones" | ||
| echo | ||
| echo "Examples:" | ||
| echo " - Clone the launchpad: rover --clone-folder /landingzones/launchpad" | ||
| echo " - Clone the launchpad in different folder: rover --clone-destination /tf/caf/landingzones/public --clone-folder /landingzones/launchpad" | ||
| echo " - Clone the launchpad (branch vnext): rover --clone-folder-strip 2 --clone-destination /tf/rover/landingzones --clone-folder /landingzones/launchpad --clone-branch vnext" | ||
| echo | ||
| echo " - Clone the CAF foundations landingzone: rover --clone-folder /landingzones/landingzone_caf_foundations" | ||
| echo " - Clone the AKS landingzone: rover --clone aztfmod/landingzone_aks --clone-destination /tf/caf/landingzones/landingzone_aks" | ||
| echo | ||
| echo | ||
| shift 1 | ||
| ;; | ||
| esac | ||
| done | ||
| } | ||
|
|
||
|
|
||
| function clone_repository { | ||
| echo "@calling clone_repository" | ||
|
|
||
| url="https://codeload.github.com/${clone_project_name}/tar.gz/${landingzone_branch}" | ||
|
|
||
| echo | ||
| echo "clone_project_name : ${clone_project_name}" | ||
| echo "landingzone_branch : ${landingzone_branch}" | ||
| echo "clone_folder : ${clone_folder}" | ||
| echo "clone_folder_strip : ${clone_folder_strip}" | ||
| echo "clone_destination : ${clone_destination}" | ||
| echo "clone_url : ${url}" | ||
| echo "" | ||
|
|
||
| rm -rf ${clone_destination}/$(basename ${clone_folder}) | ||
| mkdir -p ${clone_destination} | ||
|
|
||
| curl https://codeload.github.com/${clone_project_name}/tar.gz/${landingzone_branch} --fail --silent --show-error | tar -zxv --strip=${clone_folder_strip} -C ${clone_destination} "$(basename ${clone_project_name})-${landingzone_branch}${clone_folder}" | ||
|
|
||
| echo | ||
| echo "Clone complete" | ||
| echo | ||
| } | ||
|
|
||
| function process_clone_parameter { | ||
| echo "@calling process_clone_parameter with $@" | ||
|
|
||
|
|
||
| case "${1}" in | ||
| --clone) | ||
| if [ $# -eq 1 ]; then | ||
| display_clone_instructions ${1} | ||
| exit 21 | ||
| else | ||
| export caf_command="clone" | ||
| export landingzone_branch=${landingzone_branch:="master"} | ||
| export clone_project_name=${2} | ||
| export clone_folder_strip=1 | ||
| fi | ||
| ;; | ||
| --clone-branch) | ||
| echo $# | ||
| if [ $# -eq 1 ]; then | ||
| display_clone_instructions ${1} | ||
| exit 22 | ||
| else | ||
| export landingzone_branch=${2} | ||
| fi | ||
| ;; | ||
| --clone-destination) | ||
| if [ $# -eq 1 ]; then | ||
| display_clone_instructions ${1} | ||
| exit 23 | ||
| else | ||
| export clone_destination=${2} | ||
| fi | ||
| ;; | ||
| --clone-folder) | ||
| if [ $# -eq 1 ]; then | ||
| display_clone_instructions ${1} | ||
| exit 24 | ||
| else | ||
| export clone_folder=${2} | ||
| fi | ||
| ;; | ||
| --clone-folder-strip) | ||
| if [ $# -eq 1 ]; then | ||
| display_clone_instructions ${1} | ||
| exit 24 | ||
| else | ||
| export clone_folder_strip=${2} | ||
| fi | ||
| ;; | ||
| esac | ||
| } |
Oops, something went wrong.