Skip to content

Commit a2ad853

Browse files
committed
rename action name and other variables
1 parent df3dabb commit a2ad853

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/testNginxForAzureDeployV1.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
NGINX_ROOT_CONFIG_FILE: nginx.conf
1212
TEST_RESOURCE_GROUP_NAME: github-action-test-rg
1313
NGINX_RESOURCE_LOCATION: westcentralus
14-
NGINX_CERT_DETAILS: '[{"nginxCertName": "server4", "keyvaultSecret": "https://isolated-kv.vault.azure.net/secrets/server", "certificateVirtualPath": "/etc/ssl/certs/server4.crt", "keyVirtualPath": "/etc/ssl/certs/server4.key" }, {"nginxCertName": "server5", "keyvaultSecret": "https://isolated-kv.vault.azure.net/secrets/acr-auth", "certificateVirtualPath": "/etc/ssl/certs/server5.crt", "keyVirtualPath": "/etc/ssl/certs/server5.key" }]'
14+
NGINX_CERTIFICATES: '[{"certificateName": "server4", "keyvaultSecret": "https://isolated-kv.vault.azure.net/secrets/server", "certificateVirtualPath": "/etc/ssl/certs/server4.crt", "keyVirtualPath": "/etc/ssl/certs/server4.key" }, {"certificateName": "server5", "keyvaultSecret": "https://isolated-kv.vault.azure.net/secrets/acr-auth", "certificateVirtualPath": "/etc/ssl/certs/server5.crt", "keyVirtualPath": "/etc/ssl/certs/server5.key" }]'
1515

1616

1717
permissions:
@@ -37,7 +37,7 @@ jobs:
3737
resource-group-name: $TEST_RESOURCE_GROUP_NAME
3838
nginx-deployment-name: $NGINX_DEPLOYMENT_NAME
3939
nginx-deployment-location: $NGINX_RESOURCE_LOCATION
40-
nginx-certificate-details: $NGINX_CERT_DETAILS
40+
nginx-certificate-details: $NGINX_CERTIFICATES
4141
- name: 'Sync NGINX configuration to NGINX on Azure instance - single file'
4242
uses: nginxinc/nginx-for-azure-deploy-action@v1
4343
with:
@@ -66,4 +66,4 @@ jobs:
6666
nginx-root-config-file: $NGINX_ROOT_CONFIG_FILE
6767
transformed-nginx-config-directory-path: $NGINX_TRANSFORMED_CONFIG_DIR_PATH
6868
nginx-deployment-location: $NGINX_RESOURCE_LOCATION
69-
nginx-certificate-details: $NGINX_CERT_DETAILS
69+
nginx-certificate-details: $NGINX_CERTIFICATES

action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'NGINX configuration and certificate sync'
1+
name: 'NGINX For Azure Deployment Sync'
22
description: 'The action synchronizes NGINX configuration from a Git repository and/or certificates already on Azure keyvault to an NGINX for Azure deployment'
33
inputs:
44
subscription-id:
@@ -29,7 +29,7 @@ inputs:
2929
required: false
3030
default: ''
3131
nginx-certificate-details:
32-
description: 'An array of JSON objects each with keys nginx_cert_name, keyvault_secret, certificate_virtual_path and key_virtual_path. Example: [{"nginxCertName": "server1", "keyvaultSecret": "https://...", "certificateVirtualPath": "/etc/ssl/certs/server1.crt", "keyVirtualPath": "/etc/ssl/certs/server1.key" }, {"name": "server2", "keyvaultSecret": "https://...", "certificateVirtualPath": "/etc/ssl/certs/server2.crt", "keyVirtualPath": "/etc/ssl/certs/server2.key" }] '
32+
description: 'An array of JSON objects each with keys nginx_cert_name, keyvault_secret, certificate_virtual_path and key_virtual_path. Example: [{"certificateName": "server1", "keyvaultSecret": "https://...", "certificateVirtualPath": "/etc/ssl/certs/server1.crt", "keyVirtualPath": "/etc/ssl/certs/server1.key" }, {"name": "server2", "keyvaultSecret": "https://...", "certificateVirtualPath": "/etc/ssl/certs/server2.crt", "keyVirtualPath": "/etc/ssl/certs/server2.key" }] '
3333
required: false
3434
runs:
3535
using: "composite"

src/deploy-certificate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ az account set -s "$subscription_id" --verbose
7272
count=$(echo $certificates | jq '. | length')
7373
for (( i=0; i<count; i++ ));
7474
do
75-
nginx_cert_name=$(echo $certificates | jq -r '.['"$i"'].nginxCertName')
75+
nginx_cert_name=$(echo $certificates | jq -r '.['"$i"'].certificateName')
7676
nginx_cert_file=$(echo $certificates | jq -r '.['"$i"'].certificateVirtualPath')
7777
nginx_key_file=$(echo $certificates | jq -r '.['"$i"'].keyVirtualPath')
7878
keyvault_secret=$(echo $certificates | jq -r '.['"$i"'].keyvaultSecret')

0 commit comments

Comments
 (0)