Merge pull request #22 from arkahna/fix/firewall-rule-output-is-noisy

Fixed firewall rules logging
arkahna · Aug 3, 2022 · 0801fcf · 0801fcf
2 parents 04981c7 + c33ebb1
commit 0801fcf
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 59 deletions.
diff --git a/libs/nx-terraform/CHANGELOG.md b/libs/nx-terraform/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @arkahna/nx-terraform
 
+## 0.34.5
+
+### Patch Changes
+
+- Removed output from cli commands adding / removing firewall rules, it's noisy
+
 ## 0.34.4
 
 ### Patch Changes

diff --git a/libs/nx-terraform/package.json b/libs/nx-terraform/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@arkahna/nx-terraform",
-    "version": "0.34.4",
+    "version": "0.34.5",
     "main": "src/index.js",
     "generators": "./generators.json",
     "executors": "./executors.json",

diff --git a/libs/nx-terraform/src/common/addFirewallRules.ts b/libs/nx-terraform/src/common/addFirewallRules.ts
@@ -42,22 +42,18 @@ export async function addFirewallRules({
         try {
             console.log(`Adding firewall rule to ${storageAccountName}`)
             storageAccountsToRemoveFirewallRules.push(storageAccountName)
-            await execa(
-                'az',
-                [
-                    'storage',
-                    'account',
-                    'network-rule',
-                    'add',
-                    '-g',
-                    resourceGroupName,
-                    '--account-name',
-                    storageAccountName,
-                    '--ip-address',
-                    publicIpv4,
-                ],
-                { stdio: 'inherit' },
-            )
+            await execa('az', [
+                'storage',
+                'account',
+                'network-rule',
+                'add',
+                '-g',
+                resourceGroupName,
+                '--account-name',
+                storageAccountName,
+                '--ip-address',
+                publicIpv4,
+            ])
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
         } catch (err: any) {
             console.error('Failed to add network rule to storage', err)
@@ -78,19 +74,15 @@ export async function addFirewallRules({
         try {
             console.log(`Adding firewall rule to ${keyVaultName}`)
             keyVaultsToRemoveFirewallRules.push(keyVaultName)
-            await execa(
-                'az',
-                [
-                    'keyvault',
-                    'network-rule',
-                    'add',
-                    '--name',
-                    keyVaultName,
-                    '--ip-address',
-                    publicIpv4,
-                ],
-                { stdio: 'inherit' },
-            )
+            await execa('az', [
+                'keyvault',
+                'network-rule',
+                'add',
+                '--name',
+                keyVaultName,
+                '--ip-address',
+                publicIpv4,
+            ])
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
         } catch (err: any) {
             console.error('Failed to add network rule to keyvault', err)

diff --git a/libs/nx-terraform/src/common/removeFirewallRules.ts b/libs/nx-terraform/src/common/removeFirewallRules.ts
@@ -15,42 +15,34 @@ export async function removeFirewallRules({
     const ipWithCdir = `${publicIpv4}/32`
     for (const keyVaultName of removeIpFromKeyVaults) {
         try {
-            await execa(
-                'az',
-                [
-                    'keyvault',
-                    'network-rule',
-                    'remove',
-                    '--name',
-                    keyVaultName,
-                    '--ip-address',
-                    ipWithCdir,
-                ],
-                { stdio: 'inherit' },
-            )
+            await execa('az', [
+                'keyvault',
+                'network-rule',
+                'remove',
+                '--name',
+                keyVaultName,
+                '--ip-address',
+                ipWithCdir,
+            ])
         } catch (err) {
             console.error('Failed to remove network rule from keyvault', err)
         }
     }
 
     for (const storageAccount of removeIpFromStorageAccounts) {
         try {
-            await execa(
-                'az',
-                [
-                    'storage',
-                    'account',
-                    'network-rule',
-                    'remove',
-                    '-g',
-                    resourceGroupName,
-                    '--account-name',
-                    storageAccount,
-                    '--ip-address',
-                    publicIpv4,
-                ],
-                { stdio: 'inherit' },
-            )
+            await execa('az', [
+                'storage',
+                'account',
+                'network-rule',
+                'remove',
+                '-g',
+                resourceGroupName,
+                '--account-name',
+                storageAccount,
+                '--ip-address',
+                publicIpv4,
+            ])
         } catch (err) {
             console.error(
                 `Failed to remove network rule from storage account ${storageAccount}`,