run acceptance-2 tests

gmgigi96 · Oct 2, 2023 · 3152bed · 3152bed
1 parent 65a3374
commit 3152bed
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 58 deletions.
diff --git a/internal/grpc/services/authprovider/authprovider.go b/internal/grpc/services/authprovider/authprovider.go
@@ -129,7 +129,7 @@ func (s *service) Authenticate(ctx context.Context, req *provider.AuthenticateRe
 		}, nil
 	case errtypes.NotFound:
 		return &provider.AuthenticateResponse{
-			Status: status.NewNotFound(ctx, "unknown client id"),
+			Status: status.NewNotFound(ctx, "unknown client id: "+err.Error()),
 		}, nil
 	default:
 		err = errors.Wrap(err, "authsvc: error in Authenticate")

diff --git a/pkg/auth/manager/ldap/ldap.go b/pkg/auth/manager/ldap/ldap.go
@@ -142,6 +142,7 @@ func (am *mgr) Authenticate(ctx context.Context, clientID, clientSecret string)
 		return nil, nil, err
 	}
 
+	log.Debug().Interface("entries", sr.Entries).Send()
 	if len(sr.Entries) != 1 {
 		return nil, nil, errtypes.NotFound(clientID)
 	}

diff --git a/tests/docker/docker-compose.yml b/tests/docker/docker-compose.yml
@@ -111,12 +111,12 @@ services:
   # permissions-ocis-ci:
   #   extends: revad
   #   command: -c /etc/revad/permissions-ocis-ci.toml
-  # storage-users-ocis:
-  #   extends: revad
-  #   hostname: storage-users
-  #   command: -c /etc/revad/storage-users-ocis.toml
-  #   volumes:
-  #     - shared-volume:/var/tmp
+  storage-users-ocis:
+    extends: revad
+    hostname: storage-users
+    command: -c /etc/revad/storage-users-ocis.toml
+    volumes:
+      - shared-volume:/var/tmp
   frontend-global:
     extends: revad
     hostname: frontend
@@ -176,53 +176,53 @@ services:
       interval: 5s
       timeout: 5s
       retries: 5
-  # storage-publiclink:
-  #   extends: revad
-  #   command: -c /etc/revad/storage-publiclink.toml
-  #   volumes:
-  #     - shared-volume:/var/tmp
-  # ldap-users:
-  #   extends: revad
-  #   hostname: users
-  #   command: -c /etc/revad/ldap-users.toml
-  #   volumes:
-  #     - shared-volume:/var/tmp
-  #   depends_on:
-  #     ldap:
-  #       condition: service_healthy
-  # acceptance-2:
-  #   extends: acceptance
-  #   environment:
-  #     TEST_SERVER_URL: http://frontend:20080
-  #     STORAGE_DRIVER: OCIS
-  #     TEST_WITH_LDAP: 'true'
-  #     REVA_LDAP_HOSTNAME: ldap
-  #     TEST_REVA: 'true'
-  #     SEND_SCENARIO_LINE_REFERENCES: 'true'
-  #     BEHAT_FILTER_TAGS: ~@provisioning_api-app-required&&~@skipOnOcis-OCIS-Storage&&~@personalSpace&&~@skipOnGraph&&~@carddav&&~@skipOnReva&&~@skipOnRevaMaster
-  #     DIVIDE_INTO_NUM_PARTS: ${PARTS:-1}
-  #     RUN_PART: ${PART:-1}
-  #     EXPECTED_FAILURES_FILE: /mnt/acceptance/expected-failures-on-OCIS-storage.md
-  #     BEHAT_YML: tests/acceptance/config/behat-core.yml
-  #     ACCEPTANCE_TEST_TYPE: core-api
-  #   volumes:
-  #     - shared-volume:/var/tmp
-  #   working_dir: /mnt/ocis
-  #   depends_on:
-  #     gateway:
-  #       condition: service_healthy
-  #     frontend:
-  #       condition: service_healthy
-  #     storage-home-ocis:
-  #       condition: service_healthy
-  #     shares:
-  #       condition: service_healthy
-  #     storage-users-ocis:
-  #       condition: service_healthy
-  #     storage-publiclink:
-  #       condition: service_healthy
-  #     ldap-users:
-  #       condition: service_healthy
+  storage-publiclink:
+    extends: revad
+    command: -c /etc/revad/storage-publiclink.toml
+    volumes:
+      - shared-volume:/var/tmp
+  ldap-users:
+    extends: revad
+    hostname: users
+    command: -c /etc/revad/ldap-users.toml
+    volumes:
+      - shared-volume:/var/tmp
+    depends_on:
+      ldap:
+        condition: service_healthy
+  acceptance-2:
+    extends: acceptance
+    environment:
+      TEST_SERVER_URL: http://frontend:20080
+      # STORAGE_DRIVER: OCIS
+      TEST_WITH_LDAP: 'true'
+      REVA_LDAP_HOSTNAME: ldap
+      TEST_REVA: 'true'
+      SEND_SCENARIO_LINE_REFERENCES: 'true'
+      BEHAT_FILTER_TAGS: ~@provisioning_api-app-required&&~@skipOnOcis-OCIS-Storage&&~@personalSpace&&~@skipOnGraph&&~@carddav&&~@skipOnReva&&~@skipOnRevaMaster
+      DIVIDE_INTO_NUM_PARTS: ${PARTS:-1}
+      RUN_PART: ${PART:-1}
+      EXPECTED_FAILURES_FILE: /mnt/acceptance/expected-failures-on-OCIS-storage.md
+      BEHAT_YML: tests/acceptance/config/behat-core.yml
+      ACCEPTANCE_TEST_TYPE: core-api
+    volumes:
+      - shared-volume:/var/tmp
+    working_dir: /mnt/ocis
+    depends_on:
+      gateway:
+        condition: service_healthy
+      frontend:
+        condition: service_healthy
+      storage-home-ocis:
+        condition: service_healthy
+      shares:
+        condition: service_healthy
+      storage-users-ocis:
+        condition: service_healthy
+      storage-publiclink:
+        condition: service_healthy
+      ldap-users:
+        condition: service_healthy
   # ceph:
   #   image: ceph/daemon
   #   environment:

diff --git a/tests/docker/scripts/eos-run.sh b/tests/docker/scripts/eos-run.sh
@@ -34,5 +34,8 @@ done
 eos vid set membership 0 +sudo
 eos vid set membership 99 +sudo
 eos vid set map -tident "*@storage-home-ocis" vuid:0 vgid:0
+eos vid set map -tident "*@storage-users-ocis" vuid:0 vgid:0
+eos vid set map -tident "*@storage-local-1" vuid:0 vgid:0
+eos vid set map -tident "*@storage-local-2" vuid:0 vgid:0
 
 tail -f /dev/null
diff --git a/tests/revad/storage-users-ocis.toml b/tests/revad/storage-users-ocis.toml
@@ -14,22 +14,36 @@ address = "0.0.0.0:11000"
 # This is a storage provider that grants direct access to the wrapped storage
 # we have a locally running dataprovider
 [grpc.services.storageprovider]
-driver = "local"
+driver = "eos"
 mount_path = "/users"
 mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
 data_server_url = "http://storage-users:11001/data"
 
 [grpc.services.storageprovider.drivers.local]
-root = "/var/tmp/reva/data"
+namespace = "/eos/user/"
+quota_node = "/eos/user/"
+master_url = "root://eosuser.example.org"
+slave_url = "root://eosuser.example.org"
+user_layout = "{{substr 0 1 .Username}}/{{.Username}}"
+share_folder = "/Shares"
+xrdcopy_binary = "/opt/eos/xrootd/bin/xrdcopy"
+cache_directory = "/var/tmp/reva"
 
 # we have a locally running dataprovider
 [http]
 address = "0.0.0.0:11001"
 
 [http.services.dataprovider]
-driver = "local"
+driver = "eos"
 temp_folder = "/var/tmp/reva/tmp"
 
 [http.services.dataprovider.drivers.local]
-root = "/var/tmp/reva/data"
+namespace = "/eos/user/"
+quota_node = "/eos/user/"
+master_url = "root://eosuser.example.org"
+slave_url = "root://eosuser.example.org"
+user_layout = "{{substr 0 1 .Username}}/{{.Username}}"
+share_folder = "/Shares"
+xrdcopy_binary = "/opt/eos/xrootd/bin/xrdcopy"
+cache_directory = "/var/tmp/reva"