Fix AKSCONFIG variable check

Signed-off-by: Michael Shen <[email protected]>
Azure · May 8, 2024 · 6ffbb32 · 6ffbb32
1 parent 2e01baa
commit 6ffbb32
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/.github/workflows/dev-infrastructure.yml b/.github/workflows/dev-infrastructure.yml
@@ -9,12 +9,12 @@ on:
     branches:
       - main
     paths:
-      - 'dev-infrastructure/**'
+      - "dev-infrastructure/**"
 
 jobs:
   validate_bicep:
     permissions:
-      contents: 'read'
+      contents: "read"
     runs-on: ubuntu-latest
 
     steps:
@@ -24,13 +24,14 @@ jobs:
           fetch-depth: 1
           sparse-checkout: dev-infrastructure
 
-      - name: 'az bicep format and lint'
-        working-directory: './dev-infrastructure'
+      - name: "az bicep format and lint"
+        working-directory: "./dev-infrastructure"
         run: |
+          az bicep upgrade
           make fmt
           make lint
 
       - name: Check for uncommitted changes
-        working-directory: './dev-infrastructure'
+        working-directory: "./dev-infrastructure"
         run: |
           git diff --exit-code || (echo "::error::Uncommitted changes detected in OpenAPI spec. Please regenerate and commit them." && exit 1)
diff --git a/dev-infrastructure/Makefile b/dev-infrastructure/Makefile
@@ -27,19 +27,11 @@ lint:
 	az bicep lint --file $$file; \
 	done
 
-show:
-	@echo "Resource group      : $(RESOURCEGROUP)"
-	@echo "VPN resource group  : $(VPNRESOURCEGROUP)"
-	@echo "AddressSpace prefix : $(PREFIX)"
-	@echo "AKS version         : $(AKSVERSION)"
-	@echo "Location            : $(LOCATION)"
-	@echo "AKS VNet Name       : $(AKSVNETNAME)"
-	@echo "DNSZone/deployment  : $(DEPLOYMENTNAME)"
-
 setsubscription:
-	ifndef AKSCONFIG
-	$(error "Must set AKSCONFIG")
-	endif
+	if [[ -z $$AKSCONFIG ]]; then \
+		echo "Must set AKSCONFIG"; \
+		exit 1; \
+	fi
 	az account set --subscription $(HCPDEVSUBSCRIPTION)
 	az account show