Clarify storage driver env vars

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

.drone.star

@@ -525,10 +525,79 @@ def accountsUITests(ctx, phoenixBranch, phoenixCommit, storage = 'owncloud'):
       'os': 'linux',
       'arch': 'amd64',
     },
+<<<<<<< HEAD
     'steps':
       generate('ocis') +
       build() +
       ocisServer(storage) + [
+=======
+    'steps': [
+      {
+        'name': 'build-ocis',
+        'image': 'webhippie/golang:1.13',
+        'pull': 'always',
+        'commands': [
+          'cd ocis',
+          'make build',
+          'mkdir -p /srv/app/ocis/bin',
+          'cp bin/ocis /srv/app/ocis/bin',
+        ],
+        'volumes': [
+          {
+            'name': 'gopath',
+            'path': '/srv/app'
+          },
+        ]
+      },
+      {
+        'name': 'ocis-server',
+        'image': 'webhippie/golang:1.13',
+        'pull': 'always',
+        'detach': True,
+        'environment' : {
+          #'OCIS_LOG_LEVEL': 'debug',
+          'STORAGE_HOME_DRIVER': '%s' % (storage),
+          'STORAGE_DRIVER_OCIS_ROOT': '/srv/app/tmp/ocis/storage/users',
+          'STORAGE_DRIVER_LOCAL_ROOT': '/srv/app/tmp/ocis/reva/root',
+          'STORAGE_DRIVER_OWNCLOUD_DATADIR': '/srv/app/tmp/ocis/owncloud/data',
+          'STORAGE_DRIVER_OWNCLOUD_REDIS_ADDR': 'redis:6379',
+          'STORAGE_OIDC_ISSUER': 'https://ocis-server:9200',
+          'STORAGE_LDAP_IDP': 'https://ocis-server:9200',
+          'PROXY_OIDC_ISSUER': 'https://ocis-server:9200',
+          'STORAGE_HOME_EXPOSE_DATA_SERVER': 'true',
+          'STORAGE_HOME_DATA_SERVER_URL': 'http://ocis-server:9155/data',
+          'STORAGE_DATAGATEWAY_PUBLIC_URL': 'https://ocis-server:9200/data',
+          'STORAGE_FRONTEND_PUBLIC_URL': 'https://ocis-server:9200',
+          'PHOENIX_WEB_CONFIG': '/drone/src/accounts/ui/tests/config/drone/ocis-config.json',
+          'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/accounts/ui/tests/config/drone/identifier-registration.yml',
+          'KONNECTD_ISS': 'https://ocis-server:9200',
+          'ACCOUNTS_STORAGE_DISK_PATH': '/srv/app/tmp/ocis-accounts', # Temporary workaround, don't use metadata storage
+        },
+        'commands': [
+          'mkdir -p /srv/app/tmp/reva',
+          # First run settings service because accounts need it to register the settings bundles
+          '/srv/app/ocis/bin/ocis settings &',
+
+          # Wait for the settings service to start
+          "while [[ \"$(curl -s -o /dev/null -w ''%{http_code}'' localhost:9190)\" != \"404\" ]]; do sleep 2; done",
+
+          # Now start the accounts service
+          '/srv/app/ocis/bin/ocis accounts &',
+
+          # Wait for the accounts service to start
+          "while [[ \"$(curl -s -o /dev/null -w ''%{http_code}'' localhost:9181)\" != \"404\" ]]; do sleep 2; done",
+
+          # Now run all the ocis services except the accounts and settings because they are already running
+          '/srv/app/ocis/bin/ocis server',
+        ],
+        'volumes': [
+          {
+            'name': 'gopath',
+            'path': '/srv/app'
+          },
+        ]
+      },
+>>>>>>> 5a7fb604 (Clarify storage driver env vars)
       {
         'name': 'WebUIAcceptanceTests',
         'image': 'owncloudci/nodejs:11',
@@ -1345,11 +1414,11 @@ def ocisServer(storage):
         #'OCIS_LOG_LEVEL': 'debug',
         'STORAGE_HOME_DRIVER': '%s' % (storage),
         'STORAGE_USERS_DRIVER': '%s' % (storage),
-        'STORAGE_STORAGE_OCIS_ROOT': '/srv/app/tmp/ocis/storage/users',
-        'STORAGE_STORAGE_LOCAL_ROOT': '/srv/app/tmp/ocis/local/root',
-        'STORAGE_STORAGE_OWNCLOUD_DATADIR': '/srv/app/tmp/ocis/owncloud/data',
+        'STORAGE_DRIVER_OCIS_ROOT': '/srv/app/tmp/ocis/storage/users',
+        'STORAGE_DRIVER_LOCAL_ROOT': '/srv/app/tmp/ocis/local/root',
         'STORAGE_METADATA_ROOT': '/srv/app/tmp/ocis/metadata',
-        'STORAGE_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379',
+        'STORAGE_DRIVER_OWNCLOUD_DATADIR': '/srv/app/tmp/ocis/owncloud/data',
+        'STORAGE_DRIVER_OWNCLOUD_REDIS_ADDR': 'redis:6379',
         'STORAGE_LDAP_IDP': 'https://ocis-server:9200',
         'STORAGE_OIDC_ISSUER': 'https://ocis-server:9200',
         'PROXY_OIDC_ISSUER': 'https://ocis-server:9200',

changelog/unreleased/update-storage-env-vars.md

@@ -0,0 +1,5 @@
+Change: Clarify storage driver env vars
+
+After renaming ocsi-reva to storage and combining the storage and data providers some env vars were confusingly named `STORAGE_STORAGE_...`. We are changing the prefix for driver related env vars to `STORAGE_DRIVER_...`. This makes changing the storage driver using eg.: `STORAGE_HOME_DRIVER=eos` and setting driver options using `STORAGE_DRIVER_EOS_LAYOUT=...` less confusing.
+
+https://github.com/owncloud/ocis/pull/729

docs/extensions/storage/storages.md

@@ -158,11 +158,11 @@ For a simple docker-compose setup, you can create a volume which will be used by
 The CERN eos storage has evolved with ownCloud and natively supports id based lookup, ETag propagation, subtree size accounting, sharing, trash and versions. To use it you need to change the default configuration of the `storage storage-home` command (or have a look at the Makefile ̀ eos-start` target):
 
 ```
-export STORAGE_STORAGE_HOME_DRIVER=eos
-export STORAGE_STORAGE_EOS_NAMESPACE=/eos
-export STORAGE_STORAGE_EOS_MASTER_URL="root://eos-mgm1.eoscluster.cern.ch:1094"
-export STORAGE_STORAGE_EOS_ENABLE_HOME=true
-export STORAGE_STORAGE_EOS_LAYOUT="dockertest/{{.Username}}"
+export STORAGE_HOME_DRIVER=eos
+export STORAGE_DRIVER_EOS_NAMESPACE=/eos
+export STORAGE_DRIVER_EOS_MASTER_URL="root://eos-mgm1.eoscluster.cern.ch:1094"
+export STORAGE_DRIVER_EOS_ENABLE_HOME=true
+export STORAGE_DRIVER_EOS_LAYOUT="dockertest/{{.Username}}"
 ```
 
 Running it locally also requires the `eos` and `xrootd` binaries. Running it using `make eos-start` will use CentOS based containers that already have the necessary packages installed.