Skip to content

Commit

Permalink
Merge pull request #211 from aztfmod/2110-Update
Browse files Browse the repository at this point in the history
October 2021 Update
  • Loading branch information
arnaudlh authored Nov 1, 2021
2 parents b5d3571 + 7d35c6f commit 627e2fb
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
16 changes: 8 additions & 8 deletions .env
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
versionAzureCli=2.28.0
versionAzureCli=2.29.0
versionKubectl=1.22.1
versionGit=1:2.30.2-1ubuntu1
versionTflint=0.31.0
versionTflintazrs=0.12.0
versionVault=1.8.2
versionTflint=0.33.0
versionTflintazrs=0.13.2
versionVault=1.8.4
versionJq=1.6-2.1ubuntu1
versionDockerCompose=1.29.2
versionTfsec=0.57.1
versionTerraformDocs=0.14.1
versionTfsec=0.58.14
versionTerraformDocs=0.16.0
versionAnsible=2.10.7-1
versionPacker=1.7.5
versionCheckov=2.0.344
versionPacker=1.7.6
versionCheckov=2.0.489
versionMssqlTools=17.7.1.1
2 changes: 1 addition & 1 deletion .env.terraform
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0.13.7
0.14.11
0.15.5
1.0.6
1.0.7
1.0.9
11 changes: 6 additions & 5 deletions scripts/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,13 @@ function ignite {
function setup_rover_job {
job_id=$(date '+%Y%m%d%H%M%S%N')
job_path="${1}/rover_jobs/${job_id}"
modules_folder="${1}/modules"
providers_folder="${1}/providers"
mkdir -p "${job_path}"
mkdir -p "${modules_folder}"
mkdir -p "${providers_folder}"
ln -s ${modules_folder} ${job_path}/modules
ln -s ${providers_folder} ${job_path}/providers
echo ${job_path}
}

Expand Down Expand Up @@ -436,11 +442,6 @@ function workspace {
echo "@calling workspace function with $@"
get_storage_id

if [ "${id}" == "null" ]; then
display_launchpad_instructions
exit 1000
fi

case "${1}" in
"list")
workspace_list
Expand Down
4 changes: 2 additions & 2 deletions scripts/tfstate_azurerm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -557,13 +557,13 @@ function get_storage_id {
--subscription ${TF_VAR_tfstate_subscription_id} \
--query "[?tags.tfstate=='${TF_VAR_level}' && tags.environment=='${TF_VAR_environment}'].{id:id}[0]" -o json | jq -r .id)

if [[ ${id} == null ]] && [ "${caf_command}" != "launchpad" ]; then
if [[ -z ${id} ]] && [ "${caf_command}" != "launchpad" ]; then
# Check if other launchpad are installed
id=$(execute_with_backoff az storage account list \
--subscription ${TF_VAR_tfstate_subscription_id} \
--query "[?tags.tfstate=='${TF_VAR_level}'].{id:id}[0]" -o json | jq -r .id)

if [ ${id} == null ]; then
if [[ -z ${id} ]]; then
if [ ${TF_VAR_level} != "level0" ]; then
echo "You need to initialize that level first before using it or you do not have permission to that level."
else
Expand Down

0 comments on commit 627e2fb

Please sign in to comment.