Skip to content

Commit 2e9e587

Browse files
committed
cleanup
Signed-off-by: sk593 <shruthikumar@microsoft.com>
1 parent 627b9d8 commit 2e9e587

3 files changed

Lines changed: 8 additions & 29 deletions

File tree

.github/scripts/cleanup-azure-resources.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,6 @@
2323

2424
set -euo pipefail
2525

26-
STATE_FILE="${AZURE_TEST_STATE_FILE:-.azure-test-state}"
27-
28-
if [[ -f "$STATE_FILE" ]]; then
29-
# shellcheck disable=SC1090
30-
source "$STATE_FILE"
31-
fi
32-
3326
AZURE_RESOURCE_GROUP="${AZURE_RESOURCE_GROUP:-}"
3427

3528
if [[ -z "$AZURE_RESOURCE_GROUP" ]]; then

.github/scripts/configure-azure-provider.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ AZURE_LOCATION="${AZURE_LOCATION:-westus3}"
5454
AZURE_RESOURCE_GROUP="${AZURE_RESOURCE_GROUP:-}"
5555
AZURE_WORKSPACE_NAME="${AZURE_WORKSPACE_NAME:-default}"
5656
AZURE_ENVIRONMENT_NAME="${AZURE_ENVIRONMENT_NAME:-default}"
57-
AZURE_TEST_STATE_FILE="${AZURE_TEST_STATE_FILE:-.azure-test-state}"
58-
RADIUS_GROUP_NAME="${RADIUS_GROUP_NAME:-default}"
5957

6058
if [[ -z "$AZURE_RESOURCE_GROUP" ]]; then
6159
echo "Error: AZURE_RESOURCE_GROUP must be provided" >&2
@@ -79,13 +77,4 @@ rad credential register azure wi \
7977
--tenant-id "$AZURE_TENANT_ID" \
8078
--client-id "$AZURE_CLIENT_ID"
8179

82-
cat <<EOF >"$AZURE_TEST_STATE_FILE"
83-
AZURE_RESOURCE_GROUP=$AZURE_RESOURCE_GROUP
84-
AZURE_LOCATION=$AZURE_LOCATION
85-
AZURE_WORKSPACE_NAME=$AZURE_WORKSPACE_NAME
86-
AZURE_ENVIRONMENT_NAME=$AZURE_ENVIRONMENT_NAME
87-
AZURE_SUBSCRIPTION_ID=$AZURE_SUBSCRIPTION_ID
88-
RADIUS_GROUP_NAME=$RADIUS_GROUP_NAME
89-
EOF
90-
91-
printf "\033[34;1m=>\033[0m Azure provider configured. State written to %s\n" "$AZURE_TEST_STATE_FILE"
80+
printf "\033[34;1m=>\033[0m Azure provider configured successfully\n"

.github/workflows/validate-azure-recipes.yaml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ jobs:
2929
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
3030
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
3131
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
32-
AZURE_AUTH_MODE: wi
3332
steps:
3433
- name: Checkout
35-
uses: actions/checkout@v5
34+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
3635

3736
- name: Azure Login
38-
uses: azure/login@v2
37+
uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
3938
with:
4039
client-id: ${{ secrets.AZURE_CLIENT_ID }}
4140
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -48,12 +47,10 @@ jobs:
4847
LOCATION="westus3"
4948
fi
5049
RG="rrttest-${{ github.run_id }}-${{ github.run_attempt }}"
51-
STATE_FILE=".azure-test-state"
5250
echo "AZURE_LOCATION=$LOCATION" >> "$GITHUB_ENV"
5351
echo "AZURE_RESOURCE_GROUP=$RG" >> "$GITHUB_ENV"
5452
echo "AZURE_WORKSPACE_NAME=default" >> "$GITHUB_ENV"
5553
echo "AZURE_ENVIRONMENT_NAME=default" >> "$GITHUB_ENV"
56-
echo "AZURE_TEST_STATE_FILE=$STATE_FILE" >> "$GITHUB_ENV"
5754
5855
- name: Create Azure Resource Group
5956
run: |
@@ -71,14 +68,14 @@ jobs:
7168
done
7269
7370
- name: Setup Node
74-
uses: actions/setup-node@v6
71+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
7572
with:
76-
node-version: 16
73+
node-version: 22
7774

7875
- name: Set up ORAS
79-
uses: oras-project/setup-oras@v1
76+
uses: oras-project/setup-oras@22ce207df3b08e061f537244349aac6ae1d214f6
8077
with:
81-
version: '1.2.0'
78+
version: '1.2.4'
8279

8380
- name: Install Radius CLI
8481
run: make install-radius-cli RAD_VERSION="${{ inputs.version || 'edge' }}"
@@ -117,7 +114,7 @@ jobs:
117114
118115
- name: Upload Radius pod logs
119116
if: always()
120-
uses: actions/upload-artifact@v4
117+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
121118
with:
122119
name: radius-pod-logs
123120
path: radius-pod-logs

0 commit comments

Comments
 (0)