Skip to content

Commit

Permalink
[meshdirectory] New UI frontend with project branding (cs3org#1505)
Browse files Browse the repository at this point in the history
  • Loading branch information
mirekys authored and fbx committed Apr 19, 2021
1 parent 9be3551 commit 145a035
Show file tree
Hide file tree
Showing 13 changed files with 279 additions and 198 deletions.
32 changes: 16 additions & 16 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
def licenseScanStep():
return {
"name": "license-scan",
"image": "registry.cern.ch/docker.io/library/golang:1.13",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"environment": {
"FOSSA_API_KEY": {
"from_secret": "fossa_api_key",
Expand All @@ -18,7 +18,7 @@ def licenseScanStep():
def makeStep(target):
return {
"name": "build",
"image": "registry.cern.ch/docker.io/library/golang:1.13",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"commands": [
"make %s" % target,
]
Expand All @@ -27,7 +27,7 @@ def makeStep(target):
def lintStep():
return {
"name": "lint",
"image": "registry.cern.ch/docker.io/golangci/golangci-lint:v1.26",
"image": "registry.cern.ch/docker.io/golangci/golangci-lint:v1.38",
"commands": [
"golangci-lint run --timeout 2m0s",
],
Expand Down Expand Up @@ -108,7 +108,7 @@ def buildAndPublishDocker():
"steps": [
{
"name": "store-dev-release",
"image": "registry.cern.ch/docker.io/library/golang:1.13",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"environment": {
"USERNAME": {
"from_secret": "cbox_username",
Expand All @@ -131,7 +131,7 @@ def buildAndPublishDocker():
lintStep(),
{
"name": "license-check",
"image": "registry.cern.ch/docker.io/library/golang:1.13",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"failure": "ignore",
"environment":{
"FOSSA_API_KEY":{
Expand Down Expand Up @@ -228,7 +228,7 @@ def buildOnly():
lintStep(),
{
"name": "changelog",
"image": "registry.cern.ch/docker.io/library/golang:1.13",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"commands": [
"make release-deps && /go/bin/calens > /dev/null",
"make check-changelog-drone PR=$DRONE_PULL_REQUEST",
Expand All @@ -241,7 +241,7 @@ def buildOnly():
},
{
"name": "license-check",
"image": "registry.cern.ch/docker.io/library/golang:1.13",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"failure": "ignore",
"environment": {
"FOSSA_API_KEY": {
Expand Down Expand Up @@ -278,7 +278,7 @@ def release():
lintStep(),
{
"name": "create-dist",
"image": "registry.cern.ch/docker.io/library/golang:1.13",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"commands": [
"go run tools/create-artifacts/main.go -version ${DRONE_TAG} -commit ${DRONE_COMMIT} -goversion `go version | awk '{print $$3}'`",
],
Expand Down Expand Up @@ -378,7 +378,7 @@ def litmusOcisOldWebdav():
makeStep("build-ci"),
{
"name": "revad-services",
"image": "registry.cern.ch/docker.io/library/golang:1.13",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"detach": True,
"commands": [
"cd /drone/src/tests/oc-integration-tests/drone/",
Expand All @@ -391,7 +391,7 @@ def litmusOcisOldWebdav():
},
{
"name": "sleep-for-revad-start",
"image": "registry.cern.ch/docker.io/library/golang:1.13",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"commands": [
"sleep 5",
],
Expand Down Expand Up @@ -430,7 +430,7 @@ def litmusOcisNewWebdav():
makeStep("build-ci"),
{
"name": "revad-services",
"image": "registry.cern.ch/docker.io/library/golang:1.13",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"detach": True,
"commands": [
"cd /drone/src/tests/oc-integration-tests/drone/",
Expand All @@ -443,7 +443,7 @@ def litmusOcisNewWebdav():
},
{
"name": "sleep-for-revad-start",
"image": "registry.cern.ch/docker.io/library/golang:1.13",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"commands":[
"sleep 5",
],
Expand Down Expand Up @@ -483,7 +483,7 @@ def localIntegrationTestsOwncloud():
makeStep("build-ci"),
{
"name": "revad-services",
"image": "registry.cern.ch/docker.io/library/golang:1.13",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"detach": True,
"commands": [
"cd /drone/src/tests/oc-integration-tests/drone/",
Expand Down Expand Up @@ -543,7 +543,7 @@ def localIntegrationTestsOcis():
makeStep("build-ci"),
{
"name": "revad-services",
"image": "registry.cern.ch/docker.io/library/golang:1.13",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"detach": True,
"commands": [
"cd /drone/src/tests/oc-integration-tests/drone/",
Expand Down Expand Up @@ -606,7 +606,7 @@ def ocisIntegrationTests(parallelRuns):
makeStep("build-ci"),
{
"name": "revad-services",
"image": "registry.cern.ch/docker.io/library/golang:1.13",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"detach": True,
"commands": [
"cd /drone/src/tests/oc-integration-tests/drone/",
Expand Down Expand Up @@ -675,7 +675,7 @@ def owncloudIntegrationTests(parallelRuns):
makeStep("build-ci"),
{
"name": "revad-services",
"image": "registry.cern.ch/docker.io/library/golang:1.13",
"image": "registry.cern.ch/docker.io/library/golang:1.16",
"detach": True,
"commands": [
"cd /drone/src/tests/oc-integration-tests/drone/",
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.reva
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

FROM golang:1.13
FROM golang:1.16

WORKDIR /go/src/github/cs3org/reva
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.revad
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

FROM golang:1.13
FROM golang:1.16

WORKDIR /go/src/github/cs3org/reva
COPY . .
Expand Down
9 changes: 9 additions & 0 deletions changelog/unreleased/new-meshdirectory-ui.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Enhancement: New MeshDirectory HTTP service UI frontend with project branding

We replaced the temporary version of web frontend of the mesh directory http service with
a new redesigned & branded one. Because the new version is a more complex Vue SPA that contains image,
css and other assets, it is now served from a binary package distribution that was generated using the
[github.com/rakyll/statik](https://github.com/rakyll/statik) package. The `http.services.meshdirectory.static`
config option was obsoleted by this change.

https://github.com/cs3org/reva/issues/1502
16 changes: 0 additions & 16 deletions docs/content/en/docs/config/http/services/meshdirectory/_index.md

This file was deleted.

16 changes: 8 additions & 8 deletions docs/content/en/docs/config/packages/cbox/group/rest/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,63 +9,63 @@ description: >
# _struct: config_

{{% dir name="redis_address" type="string" default="localhost:6379" %}}
The address at which the redis server is running [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L69)
The address at which the redis server is running [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L68)
{{< highlight toml >}}
[cbox.group.rest]
redis_address = "localhost:6379"
{{< /highlight >}}
{{% /dir %}}

{{% dir name="group_members_cache_expiration" type="int" default=5 %}}
The time in minutes for which the members of a group would be cached [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L75)
The time in minutes for which the members of a group would be cached [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L74)
{{< highlight toml >}}
[cbox.group.rest]
group_members_cache_expiration = 5
{{< /highlight >}}
{{% /dir %}}

{{% dir name="id_provider" type="string" default="http://cernbox.cern.ch" %}}
The OIDC Provider [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L77)
The OIDC Provider [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L76)
{{< highlight toml >}}
[cbox.group.rest]
id_provider = "http://cernbox.cern.ch"
{{< /highlight >}}
{{% /dir %}}

{{% dir name="api_base_url" type="string" default="https://authorization-service-api-dev.web.cern.ch/api/v1.0" %}}
Base API Endpoint [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L79)
Base API Endpoint [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L78)
{{< highlight toml >}}
[cbox.group.rest]
api_base_url = "https://authorization-service-api-dev.web.cern.ch/api/v1.0"
{{< /highlight >}}
{{% /dir %}}

{{% dir name="client_id" type="string" default="-" %}}
Client ID needed to authenticate [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L81)
Client ID needed to authenticate [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L80)
{{< highlight toml >}}
[cbox.group.rest]
client_id = "-"
{{< /highlight >}}
{{% /dir %}}

{{% dir name="client_secret" type="string" default="-" %}}
Client Secret [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L83)
Client Secret [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L82)
{{< highlight toml >}}
[cbox.group.rest]
client_secret = "-"
{{< /highlight >}}
{{% /dir %}}

{{% dir name="oidc_token_endpoint" type="string" default="https://keycloak-dev.cern.ch/auth/realms/cern/api-access/token" %}}
Endpoint to generate token to access the API [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L86)
Endpoint to generate token to access the API [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L85)
{{< highlight toml >}}
[cbox.group.rest]
oidc_token_endpoint = "https://keycloak-dev.cern.ch/auth/realms/cern/api-access/token"
{{< /highlight >}}
{{% /dir %}}

{{% dir name="target_api" type="string" default="authorization-service-api" %}}
The target application for which token needs to be generated [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L88)
The target application for which token needs to be generated [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/cbox/group/rest/rest.go#L87)
{{< highlight toml >}}
[cbox.group.rest]
target_api = "authorization-service-api"
Expand Down
Loading

0 comments on commit 145a035

Please sign in to comment.