From 430e1369205ee9b2a384cc51b5066223cb7b7311 Mon Sep 17 00:00:00 2001
From: Weimin Yu <weiminyu@google.com>
Date: Mon, 11 Apr 2022 15:22:42 -0400
Subject: [PATCH] Remove dos.xml from the configs (#1587)

* Remove dos.xml from the configs

We don't have dos config right now, and applying dos from "gcloud app
deploy" is deprecated and has started causing problems.

If we add dos configs, it should be using "gcloud app firewall-rules".
---
 .../registry/env/common/default/WEB-INF/dos.xml  | 16 ----------------
 .../registry/env/common/pubapi/WEB-INF/dos.xml   | 16 ----------------
 release/cloudbuild-deploy.yaml                   |  2 +-
 3 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 core/src/main/java/google/registry/env/common/default/WEB-INF/dos.xml
 delete mode 100644 core/src/main/java/google/registry/env/common/pubapi/WEB-INF/dos.xml

diff --git a/core/src/main/java/google/registry/env/common/default/WEB-INF/dos.xml b/core/src/main/java/google/registry/env/common/default/WEB-INF/dos.xml
deleted file mode 100644
index 14af3ba15..000000000
--- a/core/src/main/java/google/registry/env/common/default/WEB-INF/dos.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<blacklistentries>
-
-  <!-- Example IPv4 CIDR Subnet
-  <blacklist>
-    <subnet>1.2.3.4/24</subnet>
-    <description>An IPv4 subnet</description>
-  </blacklist> -->
-
-  <!-- Example IPv6 CIDR Subnet
-  <blacklist>
-    <subnet>abcd::123:4567/48</subnet>
-    <description>An IPv6 subnet</description>
-  </blacklist> -->
-
-</blacklistentries>
diff --git a/core/src/main/java/google/registry/env/common/pubapi/WEB-INF/dos.xml b/core/src/main/java/google/registry/env/common/pubapi/WEB-INF/dos.xml
deleted file mode 100644
index 14af3ba15..000000000
--- a/core/src/main/java/google/registry/env/common/pubapi/WEB-INF/dos.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<blacklistentries>
-
-  <!-- Example IPv4 CIDR Subnet
-  <blacklist>
-    <subnet>1.2.3.4/24</subnet>
-    <description>An IPv4 subnet</description>
-  </blacklist> -->
-
-  <!-- Example IPv6 CIDR Subnet
-  <blacklist>
-    <subnet>abcd::123:4567/48</subnet>
-    <description>An IPv6 subnet</description>
-  </blacklist> -->
-
-</blacklistentries>
diff --git a/release/cloudbuild-deploy.yaml b/release/cloudbuild-deploy.yaml
index 0e4fcc070..a66042bcd 100644
--- a/release/cloudbuild-deploy.yaml
+++ b/release/cloudbuild-deploy.yaml
@@ -45,7 +45,7 @@ steps:
     fi
     gsutil cp gs://$PROJECT_ID-deploy/${TAG_NAME}/${_ENV}.tar .
     tar -xvf ${_ENV}.tar
-    for filename in cron dispatch dos index queue; do
+    for filename in cron dispatch index queue; do
       gcloud -q --project $project_id app deploy \
         default/WEB-INF/appengine-generated/$filename.yaml
     done