[full-ci] Remove glauth and accounts services

.drone.star

@@ -43,7 +43,6 @@ DEFAULT_NODEJS_VERSION = "14"
 config = {
     "modules": [
         # if you add a module here please also add it to the root level Makefile
-        "extensions/accounts",
         "extensions/app-provider",
         "extensions/app-registry",
         "extensions/audit",
@@ -52,7 +51,6 @@ config = {
         "extensions/auth-machine",
         "extensions/frontend",
         "extensions/gateway",
-        "extensions/glauth",
         "extensions/graph-explorer",
         "extensions/graph",
         "extensions/groups",
@@ -97,10 +95,6 @@ config = {
         "skipExceptParts": [],
         "earlyFail": True,
     },
-    "accountsUITests": {
-        "skip": True,
-        "earlyFail": True,
-    },
     "settingsUITests": {
         "skip": True,
         "earlyFail": True,
@@ -304,9 +298,6 @@ def testPipelines(ctx):
     if "skip" not in config["uiTests"] or not config["uiTests"]["skip"]:
         pipelines += uiTests(ctx)
 
-    if "skip" not in config["accountsUITests"] or not config["accountsUITests"]["skip"]:
-        pipelines.append(accountsUITests(ctx))
-
     if "skip" not in config["settingsUITests"] or not config["settingsUITests"]["skip"]:
         pipelines.append(settingsUITests(ctx))
 
@@ -754,70 +745,6 @@ def uiTestPipeline(ctx, filterTags, early_fail, runPart = 1, numberOfParts = 1,
         },
     }
 
-def accountsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4):
-    early_fail = config["accountsUITests"]["earlyFail"] if "earlyFail" in config["accountsUITests"] else False
-
-    return {
-        "kind": "pipeline",
-        "type": "docker",
-        "name": "accountsUITests",
-        "platform": {
-            "os": "linux",
-            "arch": "amd64",
-        },
-        "steps": skipIfUnchanged(ctx, "acceptance-tests") + restoreBuildArtifactCache(ctx, "ocis-binary-amd64", "ocis/bin/ocis") +
-                 ocisServer(storage, accounts_hash_difficulty, [stepVolumeOC10Tests]) + waitForSeleniumService() + waitForMiddlewareService() + [
-            {
-                "name": "WebUIAcceptanceTests",
-                "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION,
-                "environment": {
-                    "SERVER_HOST": "https://ocis-server:9200",
-                    "BACKEND_HOST": "https://ocis-server:9200",
-                    "RUN_ON_OCIS": "true",
-                    "OCIS_REVA_DATA_ROOT": "/srv/app/tmp/ocis/owncloud/data",
-                    "WEB_UI_CONFIG": "/drone/src/tests/config/drone/ocis-config.json",
-                    "TEST_TAGS": "not @skipOnOCIS and not @skip",
-                    "LOCAL_UPLOAD_DIR": "/uploads",
-                    "NODE_TLS_REJECT_UNAUTHORIZED": 0,
-                    "WEB_PATH": "/srv/app/web",
-                    "FEATURE_PATH": "/drone/src/extensions/accounts/ui/tests/acceptance/features",
-                    "MIDDLEWARE_HOST": "http://middleware:3000",
-                },
-                "commands": [
-                    ". /drone/src/.drone.env",
-                    # we need to have Web around for some general step definitions (eg. how to log in)
-                    "git clone -b $WEB_BRANCH --single-branch --no-tags https://github.com/owncloud/web.git /srv/app/web",
-                    "cd /srv/app/web",
-                    "git checkout $WEB_COMMITID",
-                    # TODO: settings/package.json has all the acceptance test dependencies
-                    # they shouldn't be needed since we could also use them from web:/tests/acceptance/package.json
-                    "cd /drone/src/extensions/accounts",
-                    "yarn install --immutable",
-                    "make test-acceptance-webui",
-                ],
-                "volumes": [stepVolumeOC10Tests] +
-                           [{
-                               "name": "uploads",
-                               "path": "/uploads",
-                           }],
-            },
-        ] + failEarly(ctx, early_fail),
-        "services": selenium() + middlewareService(),
-        "volumes": [stepVolumeOC10Tests] +
-                   [{
-                       "name": "uploads",
-                       "temp": {},
-                   }],
-        "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]),
-        "trigger": {
-            "ref": [
-                "refs/heads/master",
-                "refs/tags/v*",
-                "refs/pull/**",
-            ],
-        },
-    }
-
 def settingsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4):
     early_fail = config["settingsUITests"]["earlyFail"] if "earlyFail" in config["settingsUITests"] else False
 
@@ -1717,7 +1644,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
             "SHARING_USER_OWNCLOUDSQL_DB_PORT": 3306,
             "SHARING_USER_OWNCLOUDSQL_DB_NAME": "owncloud",
             # General oCIS config
-            # OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idp and accounts. These are replaced by external services
+            # OCIS_RUN_EXTENSIONS specifies to start all extensions except idm, idp and accounts. These are replaced by external services
             "OCIS_RUN_EXTENSIONS": "app-registry,app-provider,audit,auth-basic,auth-bearer,auth-machine,frontend,gateway,graph,graph-explorer,groups,nats,notifications,ocdav,ocs,proxy,search,settings,sharing,storage-system,storage-publiclink,storage-shares,storage-users,store,thumbnails,users,web,webdav",
             "OCIS_LOG_LEVEL": "info",
             "OCIS_URL": OCIS_URL,

.vscode/launch.json

@@ -22,7 +22,7 @@
                 // demo users
                 "IDM_CREATE_DEMO_USERS": "true",
                 // OCIS_RUN_EXTENSIONS allows to start a subset of extensions even in the supervised mode
-                //"OCIS_RUN_EXTENSIONS": "settings,storage-system,glauth,graph,graph-explorer,idp,ocs,store,thumbnails,web,webdav,frontend,gateway,users,groups,auth-basic,auth-bearer,storage-authmachine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,accounts,proxy,ocdav",
+                //"OCIS_RUN_EXTENSIONS": "settings,storage-system,graph,graph-explorer,idp,idm,ocs,store,thumbnails,web,webdav,frontend,gateway,users,groups,auth-basic,auth-bearer,storage-authmachine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,proxy,ocdav",
 
                 /*
                  * Keep secrets and passwords in one block to allow easy uncommenting

Makefile

@@ -16,7 +16,6 @@ L10N_MODULES := $(shell find . -path '*.tx*' -name 'config' | sed 's|/[^/]*$$||'
 
 # if you add a module here please also add it to the .drone.star file
 OCIS_MODULES = \
-	extensions/accounts \
 	extensions/app-provider \
 	extensions/app-registry \
 	extensions/audit \
@@ -25,7 +24,6 @@ OCIS_MODULES = \
 	extensions/auth-machine \
 	extensions/frontend \
 	extensions/gateway \
-	extensions/glauth \
 	extensions/graph \
 	extensions/graph-explorer \
 	extensions/groups \

changelog/unreleased/glauth-accounts-rm.md

@@ -0,0 +1,7 @@
+Change: The `glauth` and `accounts` services are removed
+
+After switching the default configuration to libregraph/idm we could remove
+the glauth and accounts services from the source code (they were already disabled
+by default with the previous release)
+
+https://github.com/owncloud/ocis/pull/3685

deployments/examples/oc10_ocis_parallel/docker-compose.yml

@@ -119,7 +119,7 @@ services:
       # ownCloud storage readonly
       OCIS_STORAGE_READ_ONLY: "false" # TODO: conflict with OWNCLOUDSQL -> https://github.com/owncloud/ocis/issues/2303
       # General oCIS config
-      # OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idp and accounts. These are replaced by external services
+      # OCIS_RUN_EXTENSIONS specifies to start all extensions except idm, idp and accounts. These are replaced by external services
       OCIS_RUN_EXTENSIONS: app-registry,app-provider,audit,auth-basic,auth-bearer,auth-machine,frontend,gateway,graph,graph-explorer,groups,nats,notifications,ocdav,ocs,proxy,search,settings,sharing,storage-system,storage-publiclink,storage-shares,storage-users,store,thumbnails,users,web,webdav
       OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose
       OCIS_URL: https://${CLOUD_DOMAIN:-cloud.owncloud.test}

deployments/examples/ocis_individual_services/monitoring_tracing/docker-compose-additions.yml

@@ -19,14 +19,6 @@ services:
       OCIS_TRACING_ENDPOINT: jaeger-agent:6831
       # metrics
 
-  glauth:
-    environment:
-      # tracing
-      OCIS_TRACING_ENABLED: "true"
-      OCIS_TRACING_TYPE: jaeger
-      OCIS_TRACING_ENDPOINT: jaeger-agent:6831
-      # metrics
-      GLAUTH_DEBUG_ADDR: 0.0.0.0:9129
   idp:
     environment:
       # tracing

docs/extensions/port-ranges.md

@@ -30,11 +30,11 @@ We also suggest to use the last port in your extensions' range as a debug/metric
 | 9110-9114  | [ocs](https://github.com/owncloud/ocis/tree/master/ocs)                       |
 | 9115-9119  | [webdav](https://github.com/owncloud/ocis/tree/master/webdav)                 |
 | 9120-9124  | [graph](https://github.com/owncloud/ocis/tree/master/graph)                   |
-| 9125-9129  | [glauth](https://github.com/owncloud/ocis/tree/master/devldap)                |
+| 9125-9129  | FREE (formerly used by glauth)                                                |
 | 9130-9134  | [konnectd](https://github.com/owncloud/ocis/tree/master/konnectd)             |
 | 9135-9139  | [graph-explorer](https://github.com/owncloud/ocis/tree/master/graph-explorer) |
 | 9140-9179  | [reva/storage](https://github.com/owncloud/ocis/tree/master/storage)          |
-| 9180-9184  | [accounts](https://github.com/owncloud/ocis/tree/master/accounts)             |
+| 9180-9184  | FREE (formerly used by accounts)                                              |
 | 9185-9189  | [thumbnails](https://github.com/owncloud/ocis/tree/master/thumbnails)         |
 | 9190-9194  | [settings](https://github.com/owncloud/ocis/tree/master/settings)             |
 | 9195-9199  | [store](https://github.com/owncloud/ocis/tree/master/store)                   |
@@ -45,7 +45,7 @@ We also suggest to use the last port in your extensions' range as a debug/metric
 | 9220-9224  | search                                                                          |
 | 9225-9229  | photoprism (state: PoC)                                                       |
 | 9230-9234  | [nats](https://github.com/owncloud/ocis/tree/master/nats)                     |
-| 9235-9239  | idm TBD                                                                       |
+| 9235-9239  | [idm](https://github.com/owncloud/ocis/tree/master/proxy)                     |
 | 9240-9244  | [app-registry](https://github.com/owncloud/ocis/tree/master/extensions/app-registry)     |
 | 9245-9249  | FREE                                                                          |
 | 9250-9254  | oCIS Runtime                                                                  |