Skip to content

Commit 7529dd0

Browse files
committed
differing resource group names
1 parent aefcd20 commit 7529dd0

5 files changed

Lines changed: 5 additions & 60 deletions

File tree

  • samples
    • function-app-managed-identity/python/terraform
    • function-app-storage-http/dotnet/terraform
    • web-app-cosmosdb-mongodb-api/python/terraform
    • web-app-managed-identity/python/terraform
    • web-app-sql-database/python/terraform

samples/function-app-managed-identity/python/terraform/deploy.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# Variables
4-
PREFIX='local'
4+
PREFIX='funcmi'
55
SUFFIX='test'
66
LOCATION='westeurope'
77
MANAGED_IDENTITY_TYPE='UserAssigned' # SystemAssigned or UserAssigned
@@ -57,17 +57,6 @@ export TF_LOG_PATH="$CURRENT_DIR/terraform-debug.log"
5757
echo "[DEBUG] Checking what tflocal does..."echo "[DEBUG] tflocal version: $($TERRAFORM version 2>&1 | head -1)"echo "[DEBUG] Contents of current directory before init:"ls -la . 2>&1 | head -20
5858
echo "[DEBUG] Terraform debug logging enabled: TF_LOG=DEBUG, TF_LOG_PATH=$TF_LOG_PATH"
5959

60-
# Clean up any existing Terraform state from previous runs
61-
if [[ $ENVIRONMENT == "LocalStack" ]]; then
62-
echo "Cleaning up any existing resources from previous runs..."
63-
if [ -f ".terraform/terraform.tfstate" ] || [ -f "terraform.tfstate" ]; then
64-
$TERRAFORM init -upgrade 2>/dev/null || true
65-
$TERRAFORM destroy -auto-approve 2>/dev/null || true
66-
rm -f terraform.tfstate* tfplan .terraform.lock.hcl 2>/dev/null || true
67-
rm -rf .terraform 2>/dev/null || true
68-
fi
69-
fi
70-
7160
echo "Initializing Terraform..."
7261
$TERRAFORM init -upgrade
7362

samples/function-app-storage-http/dotnet/terraform/deploy.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# Variables
4-
PREFIX='user' #system or user
4+
PREFIX='funchttp' #system or user
55
SUFFIX='test'
66
LOCATION='westeurope'
77
CURRENT_DIR="$(cd "$(dirname "$0")" && pwd)"
@@ -56,17 +56,6 @@ export TF_LOG_PATH="$CURRENT_DIR/terraform-debug.log"
5656
echo "[DEBUG] Checking what tflocal does..."echo "[DEBUG] tflocal version: $($TERRAFORM version 2>&1 | head -1)"echo "[DEBUG] Contents of current directory before init:"ls -la . 2>&1 | head -20
5757
echo "[DEBUG] Terraform debug logging enabled: TF_LOG=DEBUG, TF_LOG_PATH=$TF_LOG_PATH"
5858

59-
# Clean up any existing Terraform state from previous runs
60-
if [[ $ENVIRONMENT == "LocalStack" ]]; then
61-
echo "Cleaning up any existing resources from previous runs..."
62-
if [ -f ".terraform/terraform.tfstate" ] || [ -f "terraform.tfstate" ]; then
63-
$TERRAFORM init -upgrade 2>/dev/null || true
64-
$TERRAFORM destroy -auto-approve 2>/dev/null || true
65-
rm -f terraform.tfstate* tfplan .terraform.lock.hcl 2>/dev/null || true
66-
rm -rf .terraform 2>/dev/null || true
67-
fi
68-
fi
69-
7059
echo "Initializing Terraform..."
7160
$TERRAFORM init -upgrade
7261

samples/web-app-cosmosdb-mongodb-api/python/terraform/deploy.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# Variables
4-
PREFIX='local'
4+
PREFIX='webdb'
55
SUFFIX='test'
66
LOCATION='westeurope'
77
CURRENT_DIR="$(cd "$(dirname "$0")" && pwd)"
@@ -56,17 +56,6 @@ export TF_LOG_PATH="$CURRENT_DIR/terraform-debug.log"
5656
echo "[DEBUG] Checking what tflocal does..."echo "[DEBUG] tflocal version: $($TERRAFORM version 2>&1 | head -1)"echo "[DEBUG] Contents of current directory before init:"ls -la . 2>&1 | head -20
5757
echo "[DEBUG] Terraform debug logging enabled: TF_LOG=DEBUG, TF_LOG_PATH=$TF_LOG_PATH"
5858

59-
# Clean up any existing Terraform state from previous runs
60-
if [[ $ENVIRONMENT == "LocalStack" ]]; then
61-
echo "Cleaning up any existing resources from previous runs..."
62-
if [ -f ".terraform/terraform.tfstate" ] || [ -f "terraform.tfstate" ]; then
63-
$TERRAFORM init -upgrade 2>/dev/null || true
64-
$TERRAFORM destroy -auto-approve 2>/dev/null || true
65-
rm -f terraform.tfstate* tfplan .terraform.lock.hcl 2>/dev/null || true
66-
rm -rf .terraform 2>/dev/null || true
67-
fi
68-
fi
69-
7059
echo "Initializing Terraform..."
7160
$TERRAFORM init -upgrade
7261

samples/web-app-managed-identity/python/terraform/deploy.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# Variables
4-
PREFIX='local'
4+
PREFIX='webmi'
55
SUFFIX='test'
66
LOCATION='westeurope'
77
MANAGED_IDENTITY_TYPE='SystemAssigned' # SystemAssigned or UserAssigned
@@ -57,17 +57,6 @@ export TF_LOG_PATH="$CURRENT_DIR/terraform-debug.log"
5757
echo "[DEBUG] Checking what tflocal does..."echo "[DEBUG] tflocal version: $($TERRAFORM version 2>&1 | head -1)"echo "[DEBUG] Contents of current directory before init:"ls -la . 2>&1 | head -20
5858
echo "[DEBUG] Terraform debug logging enabled: TF_LOG=DEBUG, TF_LOG_PATH=$TF_LOG_PATH"
5959

60-
# Clean up any existing Terraform state from previous runs
61-
if [[ $ENVIRONMENT == "LocalStack" ]]; then
62-
echo "Cleaning up any existing resources from previous runs..."
63-
if [ -f ".terraform/terraform.tfstate" ] || [ -f "terraform.tfstate" ]; then
64-
$TERRAFORM init -upgrade 2>/dev/null || true
65-
$TERRAFORM destroy -auto-approve 2>/dev/null || true
66-
rm -f terraform.tfstate* tfplan .terraform.lock.hcl 2>/dev/null || true
67-
rm -rf .terraform 2>/dev/null || true
68-
fi
69-
fi
70-
7160
echo "Initializing Terraform..."
7261
$TERRAFORM init -upgrade
7362

samples/web-app-sql-database/python/terraform/deploy.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# Variables
4-
PREFIX='local'
4+
PREFIX='websql'
55
SUFFIX='test'
66
LOCATION='westeurope'
77
ADMIN_USER='sqladmin'
@@ -61,17 +61,6 @@ export TF_LOG_PATH="$CURRENT_DIR/terraform-debug.log"
6161
echo "[DEBUG] Checking what tflocal does..."echo "[DEBUG] tflocal version: $($TERRAFORM version 2>&1 | head -1)"echo "[DEBUG] Contents of current directory before init:"ls -la . 2>&1 | head -20
6262
echo "[DEBUG] Terraform debug logging enabled: TF_LOG=DEBUG, TF_LOG_PATH=$TF_LOG_PATH"
6363

64-
# Clean up any existing Terraform state from previous runs
65-
if [[ $ENVIRONMENT == "LocalStack" ]]; then
66-
echo "Cleaning up any existing resources from previous runs..."
67-
if [ -f ".terraform/terraform.tfstate" ] || [ -f "terraform.tfstate" ]; then
68-
$TERRAFORM init -upgrade 2>/dev/null || true
69-
$TERRAFORM destroy -auto-approve 2>/dev/null || true
70-
rm -f terraform.tfstate* tfplan .terraform.lock.hcl 2>/dev/null || true
71-
rm -rf .terraform 2>/dev/null || true
72-
fi
73-
fi
74-
7564
echo "Initializing Terraform..."
7665
$TERRAFORM init -upgrade
7766

0 commit comments

Comments
 (0)