Merge branch 'sync_skip_deletes' of https://github.com/atsign-foundat…

…ion/at_server into sync_skip_deletes
atsign-foundation · Nov 5, 2024 · b5bac00 · b5bac00
2 parents 832f142 + 6d706a7
commit b5bac00
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/at_server.yaml b/.github/workflows/at_server.yaml
@@ -118,7 +118,7 @@ jobs:
       # Only run on stable channel
       - if: ${{ matrix.dart-channel == 'stable' }}
         name: Install Syft
-        uses: anchore/sbom-action/download-syft@8d0a6505bf28ced3e85154d13dc6af83299e13f1 # v0.17.4
+        uses: anchore/sbom-action/download-syft@1ca97d9028b51809cf6d3c934c3e160716e1b605 # v0.17.5
       - if: ${{ matrix.dart-channel == 'stable' }}
         name: Generate SBOMs
         run: |

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -24,4 +24,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
+        uses: actions/dependency-review-action@a6993e2c61fd5dc440b409aa1d6904921c5e1894 # v4.3.5
diff --git a/packages/at_root_server/Dockerfile b/packages/at_root_server/Dockerfile
@@ -1,4 +1,4 @@
-FROM dart:3.5.2@sha256:93ce3d39d7ec4914f9035e853ebb6c09eb7c5ea20d06a62f28abb807d3513391 AS buildimage
+FROM dart:3.5.4@sha256:ca3fbf2ea7d95637c3524246050a6f8e23e59ff11d6d72663d151ebadf46cf09 AS buildimage
 ENV HOMEDIR=/atsign
 ENV BINARYDIR=/usr/local/at
 ENV USER_ID=1024

diff --git a/tests/at_functional_test/test/create_update_key_test.dart b/tests/at_functional_test/test/create_update_key_test.dart
@@ -19,7 +19,8 @@ void main() {
     await firstAtSignConnection.initiateConnectionWithListener(
         firstAtSign, firstAtSignHost, firstAtSignPort);
     String authResponse = await firstAtSignConnection.authenticateConnection();
-    expect(authResponse, 'data:success', reason: 'Authentication failed when executing test');
+    expect(authResponse, 'data:success',
+        reason: 'Authentication failed when executing test');
   });
 
   setUp(() {
@@ -50,7 +51,7 @@ void main() {
       expect(atData['metaData']['version'], 0);
       expect(
           DateTime.parse(atData['metaData']['createdAt'])
-                  .millisecondsSinceEpoch >
+                  .millisecondsSinceEpoch >=
               keyCreationDateTime.millisecondsSinceEpoch,
           true);
       expect(atData['metaData']['createdBy'], firstAtSign);
@@ -104,6 +105,7 @@ void main() {
       var commitIDValue = jsonDecode(jsonData[0]['value']);
       int noOfTests = 5;
       late String response;
+
       /// UPDATE VERB
       for (int i = 1; i <= noOfTests; i++) {
         response = await firstAtSignConnection.sendRequestToServer(
@@ -114,12 +116,15 @@ void main() {
       // sync
       response = await firstAtSignConnection.sendRequestToServer(
           'sync:from:${commitIDValue - 1}:limit:$noOfTests');
-      expect('public:location-$uniqueId$firstAtSign'.allMatches(response).length, 1);
+      expect(
+          'public:location-$uniqueId$firstAtSign'.allMatches(response).length,
+          1);
     });
 
     test('delete same key multiple times test', () async {
       int noOfTests = 3;
       late String response;
+
       /// Delete VERB
       for (int i = 1; i <= noOfTests; i++) {
         response = await firstAtSignConnection
@@ -134,6 +139,7 @@ void main() {
       late String response;
       var atKey = 'public:key-$uniqueId';
       var atValue = 'val';
+
       /// UPDATE VERB
       for (int i = 1, j = 1; i <= noOfTests; i++, j++) {
         response = await firstAtSignConnection

diff --git a/tools/build_secondary/Dockerfile b/tools/build_secondary/Dockerfile
@@ -1,4 +1,4 @@
-FROM dart:3.5.2@sha256:93ce3d39d7ec4914f9035e853ebb6c09eb7c5ea20d06a62f28abb807d3513391 AS buildimage
+FROM dart:3.5.4@sha256:ca3fbf2ea7d95637c3524246050a6f8e23e59ff11d6d72663d151ebadf46cf09 AS buildimage
 ENV HOMEDIR=/atsign
 ENV USER_ID=1024
 ENV GROUP_ID=1024

diff --git a/tools/build_secondary/Dockerfile.observe b/tools/build_secondary/Dockerfile.observe
@@ -1,4 +1,4 @@
-FROM dart:3.5.2@sha256:93ce3d39d7ec4914f9035e853ebb6c09eb7c5ea20d06a62f28abb807d3513391 AS buildimage
+FROM dart:3.5.4@sha256:ca3fbf2ea7d95637c3524246050a6f8e23e59ff11d6d72663d151ebadf46cf09 AS buildimage
 ENV HOMEDIR=/atsign
 ENV USER_ID=1024
 ENV GROUP_ID=1024

diff --git a/tools/build_virtual_environment/ve/Dockerfile.vip b/tools/build_virtual_environment/ve/Dockerfile.vip
@@ -1,4 +1,4 @@
-FROM dart:3.5.2@sha256:93ce3d39d7ec4914f9035e853ebb6c09eb7c5ea20d06a62f28abb807d3513391 AS buildimage
+FROM dart:3.5.4@sha256:ca3fbf2ea7d95637c3524246050a6f8e23e59ff11d6d72663d151ebadf46cf09 AS buildimage
 ENV USER_ID=1024
 ENV GROUP_ID=1024
 WORKDIR /app

diff --git a/tools/build_virtual_environment/ve_base/Dockerfile b/tools/build_virtual_environment/ve_base/Dockerfile
@@ -1,4 +1,4 @@
-FROM dart:3.5.2@sha256:93ce3d39d7ec4914f9035e853ebb6c09eb7c5ea20d06a62f28abb807d3513391 AS buildimage
+FROM dart:3.5.4@sha256:ca3fbf2ea7d95637c3524246050a6f8e23e59ff11d6d72663d151ebadf46cf09 AS buildimage
 ENV USER_ID=1024
 ENV GROUP_ID=1024
 WORKDIR /app
@@ -17,7 +17,7 @@ RUN \
   dart pub update ; \
   dart compile exe bin/install_PKAM_Keys.dart -o install_PKAM_Keys
 
-FROM debian:stable-20240926-slim@sha256:939e69ef5aa4dc178893a718ea567f1ca390df60793fd08c0bc7008362f72a57
+FROM debian:stable-20241016-slim@sha256:fffe16098bcefa876d01862a61f8f30ef4292c9485940e905d41a15d8459828b
 # was debian:stable-20221114-slim
 USER root