Merge pull request #423 from hnousiainen/htn_disaster_recovery

client: support disaster recovery pair handling

Author: ettanany

aiven/client/cli.py

@@ -1506,7 +1506,7 @@ def _get_connection_info_pg(self, service_name: str) -> PGConnectionInfo:
     @arg.project
     @arg.service_name
     @arg("-r", "--route", choices=("dynamic", "privatelink", "public"))
-    @arg("--usage", choices=("primary", "replica"))
+    @arg("--usage", choices=("primary", "replica", "disaster_recovery"))
     @arg("-p", "--privatelink-connection-id")
     @arg("--replica", action="store_true")
     @arg("-u", "--username", default="avnadmin")
@@ -1521,7 +1521,7 @@ def service__connection_info__psql(self) -> None:
     @arg.project
     @arg.service_name
     @arg("-r", "--route", choices=("dynamic", "privatelink", "public"))
-    @arg("--usage", choices=("primary", "replica"))
+    @arg("--usage", choices=("primary", "replica", "disaster_recovery"))
     @arg("-p", "--privatelink-connection-id")
     @arg("--replica", action="store_true")
     @arg("-u", "--username", default="avnadmin")
@@ -1535,7 +1535,7 @@ def service__connection_info__pg__uri(self) -> None:
     @arg.project
     @arg.service_name
     @arg("-r", "--route", choices=("dynamic", "privatelink", "public"))
-    @arg("--usage", choices=("primary", "replica"))
+    @arg("--usage", choices=("primary", "replica", "disaster_recovery"))
     @arg("-p", "--privatelink-connection-id")
     @arg("--replica", action="store_true")
     @arg("-u", "--username", default="avnadmin")
@@ -4022,6 +4022,10 @@ def _get_plan(self) -> str:
         "--read-replica-for",
         help="Creates a read replica for given source service. Only applicable for certain service types",
     )
+    @arg(
+        "--disaster-recovery-copy-for",
+        help="Cretes a disaster recovery copy for given source service. Only applicable for certain service types",
+    )
     @arg(
         "--enable-termination-protection",
         action="store_true",
@@ -4062,6 +4066,13 @@ def service__create(self) -> None:
                         "source_service": self.args.read_replica_for,
                     }
                 )
+        elif self.args.disaster_recovery_copy_for:
+            service_integrations.append(
+                {
+                    "integration_type": "disaster_recovery",
+                    "source_service": self.args.disaster_recovery_copy_for,
+                }
+            )
         elif self.args.recovery_target_time and self.args.service_to_fork_from:
             user_config["service_to_fork_from"] = self.args.service_to_fork_from
             user_config["recovery_target_time"] = self.args.recovery_target_time
@@ -4290,6 +4301,11 @@ def _get_maintenance(self) -> Mapping[str, str] | None:
         action="store_true",
         help="Do not put the service into a project VPC even if the project has one in the selected cloud",
     )
+    @arg(
+        "--disaster-recovery-role",
+        help="Set disaster recovery role",
+        choices=["active", "passive", "failed"],
+    )
     @arg.force
     def service__update(self) -> None:
         """Update service settings"""
@@ -4345,6 +4361,7 @@ def service__update(self) -> None:
                 termination_protection=termination_protection,
                 project_vpc_id=project_vpc_id,
                 schema_registry_authorization=schema_registry_authorization,
+                disaster_recovery_role=self.args.disaster_recovery_role,
             )
         except client.Error as ex:
             try:

aiven/client/client.py

@@ -1472,6 +1472,7 @@ def update_service(
         termination_protection: bool | None = None,
         project_vpc_id: object | str = UNDEFINED,
         schema_registry_authorization: bool | None = None,
+        disaster_recovery_role: str | None = None,
     ) -> Mapping:
         user_config = user_config or {}
         body: dict[str, Any] = {}
@@ -1495,6 +1496,8 @@ def update_service(
             body["termination_protection"] = termination_protection
         if schema_registry_authorization is not None:
             body["schema_registry_authz"] = schema_registry_authorization
+        if disaster_recovery_role is not None:
+            body["disaster_recovery_role"] = disaster_recovery_role
         path = self.build_path("project", project, "service", service)
         return self.verify(self.put, path, body=body, result_key="service")