Merge branch 'dev' into zhiwei/resource-lock

Author: zliang-akamai

.github/workflows/codeql.yml

@@ -26,13 +26,13 @@ jobs:
       uses: actions/checkout@v6
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
         queries: security-and-quality
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/e2e-test.yml

@@ -97,7 +97,7 @@ jobs:
 
       - name: Upload Test Report as Artifact
         if: always()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: test-report-file
           if-no-files-found: ignore
@@ -184,7 +184,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Download test report
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
         with:
           name: test-report-file
 

test/fixtures/databases_instances.json

@@ -11,7 +11,7 @@
       "engine": "mysql",
       "hosts": {
         "primary": "lin-123-456-mysql-mysql-primary.servers.linodedb.net",
-        "secondary": "lin-123-456-mysql-primary-private.servers.linodedb.net"
+        "standby": "lin-123-456-mysql-primary-private.servers.linodedb.net"
       },
       "id": 123,
       "instance_uri": "/v4/databases/mysql/instances/123",

test/fixtures/databases_mysql_instances.json

@@ -11,7 +11,7 @@
       "engine": "mysql",
       "hosts": {
         "primary": "lin-123-456-mysql-mysql-primary.servers.linodedb.net",
-        "secondary": "lin-123-456-mysql-primary-private.servers.linodedb.net"
+        "standby": "lin-123-456-mysql-primary-private.servers.linodedb.net"
       },
       "id": 123,
       "label": "example-db",

test/fixtures/databases_postgresql_instances.json

@@ -11,7 +11,7 @@
       "engine": "postgresql",
       "hosts": {
         "primary": "lin-0000-000-pgsql-primary.servers.linodedb.net",
-        "secondary": "lin-0000-000-pgsql-primary-private.servers.linodedb.net"
+        "standby": "lin-0000-000-pgsql-primary-private.servers.linodedb.net"
       },
       "id": 123,
       "label": "example-db",

test/unit/groups/database_test.py

@@ -54,7 +54,7 @@ def test_get_databases(self):
             "lin-123-456-mysql-mysql-primary.servers.linodedb.net",
         )
         self.assertEqual(
-            dbs[0].hosts.secondary,
+            dbs[0].hosts.standby,
             "lin-123-456-mysql-primary-private.servers.linodedb.net",
         )
         self.assertEqual(dbs[0].id, 123)
@@ -1280,7 +1280,7 @@ def test_get_mysql_instances(self):
             "lin-123-456-mysql-mysql-primary.servers.linodedb.net",
         )
         self.assertEqual(
-            dbs[0].hosts.secondary,
+            dbs[0].hosts.standby,
             "lin-123-456-mysql-primary-private.servers.linodedb.net",
         )
         self.assertEqual(dbs[0].id, 123)
@@ -1361,7 +1361,7 @@ def test_get_postgresql_instances(self):
             "lin-0000-000-pgsql-primary.servers.linodedb.net",
         )
         self.assertEqual(
-            dbs[0].hosts.secondary,
+            dbs[0].hosts.standby,
             "lin-0000-000-pgsql-primary-private.servers.linodedb.net",
         )
         self.assertEqual(dbs[0].id, 123)

test/unit/objects/database_test.py

@@ -143,7 +143,7 @@ def test_create_backup(self):
             # We don't care about errors here; we just want to
             # validate the request.
             try:
-                db.backup_create("mybackup", target="secondary")
+                db.backup_create("mybackup", target="standby")
             except Exception as e:
                 logger.warning(
                     "An error occurred while validating the request: %s", e
@@ -154,7 +154,7 @@ def test_create_backup(self):
                 m.call_url, "/databases/mysql/instances/123/backups"
             )
             self.assertEqual(m.call_data["label"], "mybackup")
-            self.assertEqual(m.call_data["target"], "secondary")
+            self.assertEqual(m.call_data["target"], "standby")
 
     def test_backup_restore(self):
         """
@@ -410,7 +410,7 @@ def test_create_backup(self):
             # We don't care about errors here; we just want to
             # validate the request.
             try:
-                db.backup_create("mybackup", target="secondary")
+                db.backup_create("mybackup", target="standby")
             except Exception as e:
                 logger.warning(
                     "An error occurred while validating the request: %s", e
@@ -421,7 +421,7 @@ def test_create_backup(self):
                 m.call_url, "/databases/postgresql/instances/123/backups"
             )
             self.assertEqual(m.call_data["label"], "mybackup")
-            self.assertEqual(m.call_data["target"], "secondary")
+            self.assertEqual(m.call_data["target"], "standby")
 
     def test_backup_restore(self):
         """