Merge branch 'main' into update_provision_tf_test

microsoft · May 15, 2024 · 67b43da · 67b43da
2 parents 970904f + 9ad95f1
commit 67b43da
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/scripts/install/providers/azdo/templates/pipeline-authorize.json b/scripts/install/providers/azdo/templates/pipeline-authorize.json
@@ -1,7 +1,7 @@
 {
   "pipelines": [
     {
-      "id": "__PIPELINE_ID__",
+      "id": __PIPELINE_ID__,
       "authorized": true
     }
   ]

diff --git a/scripts/install/providers/azdo/templates/pipeline-create.json b/scripts/install/providers/azdo/templates/pipeline-create.json
@@ -21,20 +21,23 @@
       "pollingJobId": null,
       "pollingInterval": 0,
       "pathFilters": [],
-      "branchFilters": ["+refs/heads/main"],
+      "branchFilters": [
+        "+refs/heads/main"
+      ],
       "defaultSettingsSourceType": 2,
       "isSettingsSourceOptionSupported": true,
       "settingsSourceType": 2,
       "triggerType": 2
     }
   ],
-  "variables": ["__ADO_PIPELINE_VARIABLES__"],
+  "variables": { __ADO_PIPELINE_VARIABLES__
+  },
   "queue": {
-    "id": "__ADO_POOL_ID__",
+    "id": __ADO_POOL_ID__,
     "name": "__ADO_POOL_NAME__",
     "url": "__AZDO_ORG_URI__/_apis/build/Queues/__ADO_POOL_ID__",
     "pool": {
-      "id": "__ADO_POOL_ID__",
+      "id": __ADO_POOL_ID__,
       "name": "__ADO_POOL_NAME__",
       "isHosted": true
     }

diff --git a/scripts/install/providers/azdo/templates/pipeline-variable.json b/scripts/install/providers/azdo/templates/pipeline-variable.json
@@ -1,7 +1,5 @@
-{
-  "__PIPELINE_VAR_NAME__": {
-    "value": "__PIPELINE_VAR_VALUE__",
-    "isSecret": "__PIPELINE_VAR_IS_SECRET__",
-    "allowOverride": "__PIPELINE_ALLOW_OVERRIDE__"
-  }
+"__PIPELINE_VAR_NAME__": {
+  "value": "__PIPELINE_VAR_VALUE__",
+  "isSecret": __PIPELINE_VAR_IS_SECRET__,
+  "allowOverride": __PIPELINE_ALLOW_OVERRIDE__
 }