fix: (IAC-506) Modified if-else logic to be readable and avoid duplicates (#245)

stturc · web-flow · commit 6d1296a6271f · 2022-07-21T15:53:10.000-04:00
* fix: (IAC-506) Added if-else logic to avoid duplicate exports
diff --git a/files/cloud-init/nfs/cloud-config b/files/cloud-init/nfs/cloud-config
@@ -56,8 +56,13 @@ runcmd:
   #
   # Update /etc/exports - NOTE: The CIDR provided works for the whole VPC
   #
-  - echo "/export         ${aks_cidr_block}(rw,no_root_squash,async,insecure,fsid=0,crossmnt,no_subtree_check)" >> /etc/exports
-  - echo "/export         ${misc_cidr_block}(rw,no_root_squash,async,insecure,fsid=0,crossmnt,no_subtree_check)" >> /etc/exports
+  - if [ "${aks_cidr_block}" != "${misc_cidr_block}" ]
+  - then
+  -   echo "/export         ${aks_cidr_block}(rw,no_root_squash,async,insecure,fsid=0,crossmnt,no_subtree_check)" >> /etc/exports
+  -   echo "/export         ${misc_cidr_block}(rw,no_root_squash,async,insecure,fsid=0,crossmnt,no_subtree_check)" >> /etc/exports
+  - else
+  -   echo "/export         ${aks_cidr_block}(rw,no_root_squash,async,insecure,fsid=0,crossmnt,no_subtree_check)" >> /etc/exports
+  - fi
   #
   # Restart nfs-server service
   #

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,13 @@ runcmd:`
`56`	`56`	`#`
`57`	`57`	`# Update /etc/exports - NOTE: The CIDR provided works for the whole VPC`
`58`	`58`	`#`
`59`		`- - echo "/export ${aks_cidr_block}(rw,no_root_squash,async,insecure,fsid=0,crossmnt,no_subtree_check)" >> /etc/exports`
`60`		`- - echo "/export ${misc_cidr_block}(rw,no_root_squash,async,insecure,fsid=0,crossmnt,no_subtree_check)" >> /etc/exports`
	`59`	`+ - if [ "${aks_cidr_block}" != "${misc_cidr_block}" ]`
	`60`	`+ - then`
	`61`	`+ - echo "/export ${aks_cidr_block}(rw,no_root_squash,async,insecure,fsid=0,crossmnt,no_subtree_check)" >> /etc/exports`
	`62`	`+ - echo "/export ${misc_cidr_block}(rw,no_root_squash,async,insecure,fsid=0,crossmnt,no_subtree_check)" >> /etc/exports`
	`63`	`+ - else`
	`64`	`+ - echo "/export ${aks_cidr_block}(rw,no_root_squash,async,insecure,fsid=0,crossmnt,no_subtree_check)" >> /etc/exports`
	`65`	`+ - fi`
`61`	`66`	`#`
`62`	`67`	`# Restart nfs-server service`
`63`	`68`	`#`