Remove app engine deps from Lock flyway change (#1911)

appengine_war.gradle

@@ -103,6 +103,7 @@ explodeWar.doLast {
     file("${it.explodedAppDirectory}/WEB-INF/lib/tools.jar").setWritable(true)
 }
 
+appengineDeployAll.finalizedBy ':cloudSchedulerDeployer'
 rootProject.deploy.dependsOn appengineDeployAll
 rootProject.stage.dependsOn appengineStage
 tasks['war'].dependsOn ':console-webapp:buildConsoleWebappProd'

build.gradle

@@ -558,6 +558,21 @@ task coreDev {
 
 javadocDependentTasks.each { tasks.javadoc.dependsOn(it) }
 
+// Runs the script, which deploys cloud scheduler tasks based on the config
+task cloudSchedulerDeployer {
+  doLast {
+    def env = environment
+    if (!prodOrSandboxEnv) {
+      exec {
+        commandLine 'go', 'run',
+                "${rootDir}/release/builder/cloudSchedulerDeployer.go",
+                "${rootDir}/core/src/main/java/google/registry/env/${env}/default/WEB-INF/cloud-scheduler-tasks.xml",
+                "domain-registry-${env}"
+      }
+    }
+  }
+}
+
 // disable javadoc in subprojects, these will break because they don't have
 // the correct classpath (see above).
 gradle.taskGraph.whenReady { graph ->

core/build.gradle

@@ -1028,6 +1028,7 @@ test {
   // TODO(weiminyu): Remove dependency on sqlIntegrationTest
 }.dependsOn(fragileTest, outcastTest, standardTest, registryToolIntegrationTest, sqlIntegrationTest)
 
+
 // When we override tests, we also break the cleanTest command.
 cleanTest.dependsOn(cleanFragileTest, cleanOutcastTest, cleanStandardTest,
                     cleanRegistryToolIntegrationTest, cleanSqlIntegrationTest)

db/src/main/resources/sql/er_diagram/brief_er_diagram.html

@@ -261,11 +261,11 @@ td.section {
     </tr>
     <tr>
      <td class="property_name">generated on</td>
-     <td class="property_value">2023-03-16 20:10:49.374346</td>
+     <td class="property_value">2023-03-20 14:44:21.58276</td>
     </tr>
     <tr>
      <td class="property_name">last flyway file</td>
-     <td id="lastFlywayFile" class="property_value">V141__add_ttl_columns_to_tld.sql</td>
+     <td id="lastFlywayFile" class="property_value">V142__drop_request_log_id.sql</td>
     </tr>
    </tbody>
   </table>
@@ -274,19 +274,19 @@ td.section {
   <svg viewbox="0.00 0.00 4029.00 3227.50" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="erDiagram" style="overflow: hidden; width: 100%; height: 800px"><g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 3223.5)">
     <title>SchemaCrawler_Diagram</title>
     <polygon fill="white" stroke="transparent" points="-4,4 -4,-3223.5 4025,-3223.5 4025,4 -4,4" />
-    <text text-anchor="start" x="3752.5" y="-29.8" font-family="Helvetica,sans-Serif" font-size="14.00">
+    <text text-anchor="start" x="3760.5" y="-29.8" font-family="Helvetica,sans-Serif" font-size="14.00">
      generated by
     </text>
-    <text text-anchor="start" x="3835.5" y="-29.8" font-family="Helvetica,sans-Serif" font-size="14.00">
+    <text text-anchor="start" x="3843.5" y="-29.8" font-family="Helvetica,sans-Serif" font-size="14.00">
      SchemaCrawler 16.10.1
     </text>
-    <text text-anchor="start" x="3751.5" y="-10.8" font-family="Helvetica,sans-Serif" font-size="14.00">
+    <text text-anchor="start" x="3759.5" y="-10.8" font-family="Helvetica,sans-Serif" font-size="14.00">
      generated on
     </text>
-    <text text-anchor="start" x="3835.5" y="-10.8" font-family="Helvetica,sans-Serif" font-size="14.00">
-     2023-03-16 20:10:49.374346
+    <text text-anchor="start" x="3843.5" y="-10.8" font-family="Helvetica,sans-Serif" font-size="14.00">
+     2023-03-20 14:44:21.58276
     </text>
-    <polygon fill="none" stroke="#888888" points="3748,-4 3748,-44 4013,-44 4013,-4 3748,-4" /> <!-- allocationtoken_a08ccbef -->
+    <polygon fill="none" stroke="#888888" points="3756,-4 3756,-44 4013,-44 4013,-4 3756,-4" /> <!-- allocationtoken_a08ccbef -->
     <g id="node1" class="node">
      <title>allocationtoken_a08ccbef</title>
      <polygon fill="#ebcef2" stroke="transparent" points="1091.5,-494 1091.5,-513 1277.5,-513 1277.5,-494 1091.5,-494" />

db/src/main/resources/sql/flyway.txt

@@ -139,3 +139,4 @@ V138__drop_dns_refresh_request_time_column.sql
 V139__add_allowed_epp_actions_column.sql
 V140__rename_process_time_column_in_dns_refresh_request_table.sql
 V141__add_ttl_columns_to_tld.sql
+V142__drop_request_log_id.sql

db/src/main/resources/sql/flyway/V142__drop_request_log_id.sql

@@ -0,0 +1,16 @@
+-- Copyright 2022 The Nomulus Authors. All Rights Reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+ALTER TABLE "Lock" DROP COLUMN request_log_id;
+

db/src/main/resources/sql/schema/nomulus.golden.sql

@@ -674,8 +674,7 @@ CREATE TABLE public."Lock" (
     resource_name text NOT NULL,
     scope text NOT NULL,
     acquired_time timestamp with time zone NOT NULL,
-    expiration_time timestamp with time zone NOT NULL,
-    request_log_id text
+    expiration_time timestamp with time zone NOT NULL
 );