Update shell scripts for API register (#15)

Azure-Samples · May 9, 2024 · 0a6bacd · 0a6bacd
1 parent 421b61d
commit 0a6bacd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/register-api.yml b/.github/workflows/register-api.yml
@@ -1,4 +1,4 @@
-name: Register API Definition to Azure API Center
+name: Register API
 
 on:
   workflow_dispatch:

diff --git a/infra/scripts/New-ApiRegistration.ps1 b/infra/scripts/New-ApiRegistration.ps1
@@ -67,11 +67,11 @@ if (($ResourceId -eq "") -and ($ResourceGroup -eq "" -or $ApiCenterService -eq "
     Write-Host "`ResourceId` must be provided, or both `ResourceGroup` and `ApiCenterService` must be provided"
     Exit 0
 }
-if ($FileLocation -eq "" -and $ApiManagementId -eq "") {
+if (($FileLocation -eq "") -and ($ApiManagementId -eq "")) {
     Write-Host "`FileLocation` must be provided"
     Exit 0
 }
-if ($ApiManagementId -notlike "/subscriptions/*") {
+if (($FileLocation -eq "") -and ($ApiManagementId -notlike "/subscriptions/*")) {
     Write-Host "`ApiManagementId` must be a valid resource ID"
     Exit 0
 }
@@ -99,5 +99,5 @@ if ($ApiManagementId -eq "") {
     $registered = az apic service import-from-apim `
     -g $ResourceGroup `
     -s $ApiCenterService `
-    --source-resource-ids "$APIM_ID/apis/*"
+    --source-resource-ids "$ApiManagementId/apis/*"
 }
diff --git a/infra/scripts/new-apiregistration.sh b/infra/scripts/new-apiregistration.sh
@@ -94,7 +94,7 @@ if [ -z "$FILE_LOCATION" ] && [ -z "$API_MANAGEMENT_ID" ] ; then
     echo "'file-lcation' must be provided"
     exit 0
 fi
-if [[ "$API_MANAGEMENT_ID" != /subscriptions/* ]] ; then
+if [ -z "$FILE_LOCATION" ] && [[ "$API_MANAGEMENT_ID" != /subscriptions/* ]] ; then
     echo "'api-management-id' must be a valid resource ID"
     exit 0
 fi