Merge pull request #125 from cloudfoundry/ci/update-allowed-ips

Update allowed ips to reflect additional Concourse worker range.

Author: ragaskar

ci/pipelines/stemcells-windows.yml

@@ -703,7 +703,7 @@ jobs:
       GOVCLOUD_AWS_DEFAULT_REGION: ((AWS_GOVCLOUD_PACKER_REGION))
       GOVCLOUD_AWS_SECRET_ACCESS_KEY: ((packer_user_gov_aws_access_key.password))
       WINDOWS_STEMCELLS_GCP_CREDENTIALS_JSON: *gcp_account_json
-      ALLOWED_IP_ADDRESSES: 35.197.92.68 34.169.1.255 34.82.52.87 34.168.69.249 34.82.182.73
+      ALLOWED_CIDRS: 35.197.92.68/32 34.169.1.255/32 34.82.52.87/32 34.168.69.249/32 34.82.182.73/32 34.145.18.128/26
   - put: main-version
     inputs: detect
     params:

ci/tasks/firewall-rules/configure-windows-firewall-rules.sh

@@ -8,8 +8,8 @@ set -x
 # Set firewall rules in the GCP project if needed
 if [ "${CONFIGURE_GCP:-}" == "true" ]; then
   comma_separated_external_ips=""
-  for external_ip in ${ALLOWED_IP_ADDRESSES}; do
-    comma_separated_external_ips="${external_ip}/32,${comma_separated_external_ips}"
+  for allowed_cidr in ${ALLOWED_CIDRS}; do
+    comma_separated_external_ips="${allowed_cidr},${comma_separated_external_ips}"
   done
   comma_separated_external_ips="${comma_separated_external_ips%,}"
 
@@ -22,8 +22,8 @@ fi
 
 # Set firewall rules in the AWS project
 aws_ip_ranges=""
-for external_ip in ${ALLOWED_IP_ADDRESSES}; do
-  aws_ip_ranges="{CidrIp=${external_ip}/32},${aws_ip_ranges}"
+for allowed_cidr in ${ALLOWED_CIDRS}; do
+  aws_ip_ranges="{CidrIp=${allowed_cidr}},${aws_ip_ranges}"
 done
 aws_ip_ranges="${aws_ip_ranges%,}"
 

ci/tasks/firewall-rules/configure-windows-firewall-rules.yml

@@ -14,7 +14,7 @@ params:
   GOVCLOUD_AWS_DEFAULT_REGION:
   GOVCLOUD_AWS_SECRET_ACCESS_KEY:
   WINDOWS_STEMCELLS_GCP_CREDENTIALS_JSON:
-  ALLOWED_IP_ADDRESSES:
+  ALLOWED_CIDRS:
 
 run:
   path: bosh-windows-stemcell-builder-ci/ci/tasks/firewall-rules/configure-windows-firewall-rules.sh