[full-ci] Set OCS version to up to date values #2918

kulmann · 2021-12-23T16:19:08Z

Description

This PR sets the OCS version fields to up to date values and already includes the "product" field, which hopefully gets merged in reva soonish cs3org/reva#2397

With these enhancements we'll be able to see the backend version in the browser console when we merged and released that in web: owncloud/web#6190

I guess setting the hardcoded version information during a release might be feasible for now. I didn't find any place where the current version is written down at the moment. In web we have it in the package.json so I was able to include it from there during bundling. Would be nice to have it a little less dirty here as well. Ideas for where to put the current oCIS version are welcome, I'll happily include that in this PR.

Related Issue

Enhances show web ui version number to users web#5954
Fixes status does not have new "product" data item #3317

Results

Dev Debug Build

{
    "installed": true,
    "maintenance": false,
    "needsDbUpgrade": false,
    "version": "0.0.0.0",
    "versionstring": "0.0.0+dev",
    "edition": "Community",
    "productname": "Infinite Scale",
    "product": "Infinite Scale"
}

Local dev build `make -C ocis clean build`

{
    "installed": true,
    "maintenance": false,
    "needsDbUpgrade": false,
    "version": "0.0.0.0",
    "versionstring": "0.0.0+1538222a0",
    "edition": "Community",
    "productname": "Infinite Scale",
    "product": "Infinite Scale"
}

1538222a0 is the git commitID

This is valid semver build metadata https://semver.org/#spec-item-10

Pre Releases

go build -v -tags '' -ldflags '-X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn -s -w -X "github.com/owncloud/ocis/v2/ocis-pkg/version.String=v2.0.0-beta1" -X "github.com/owncloud/ocis/v2/ocis-pkg/version.Date=20220507"' -o bin/ocis ./cmd/ocis

{
    "installed": true,
    "maintenance": false,
    "needsDbUpgrade": false,
    "version": "2.0.0.0",
    "versionstring": "2.0.0-beta1",
    "edition": "Community",
    "productname": "Infinite Scale",
    "product": "Infinite Scale"
}

Final Releases

go build -v -tags '' -ldflags '-X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn -s -w -X "github.com/owncloud/ocis/v2/ocis-pkg/version.String=2.0.0" -X "github.com/owncloud/ocis/v2/ocis-pkg/version.Date=20220507"' -o bin/ocis ./cmd/ocis

{
    "installed": true,
    "maintenance": false,
    "needsDbUpgrade": false,
    "version": "2.0.0.0",
    "versionstring": "2.0.0",
    "edition": "Community",
    "productname": "Infinite Scale",
    "product": "Infinite Scale"
}

Screenshot from the web console

Motivation and Context

Make bug reports a little bit easier / more precise.

How Has This Been Tested?

Only manually, since it's no code change but only hardcoded values.

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)
Technical debt
Tests only (no source changes)

Checklist:

Code changes
Unit tests added
Acceptance tests added
Documentation ticket raised:

ownclouders · 2021-12-23T16:37:25Z

💥 Acceptance test Core-API-Tests-ocis-storage-2 failed. Further test are cancelled...

storage/pkg/command/frontend.go

wkloucek · 2022-01-04T11:52:46Z

I fixed the imports, but otherwise looks great.

Building oCIS like in the CI:
go build -v -tags '' -ldflags '-X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn -s -w -X "github.com/owncloud/ocis/ocis-pkg/version.String=1.16.0" -X "github.com/owncloud/ocis/ocis-pkg/version.Date=20220104"' -o bin/ocis ./cmd/ocis

and querying the version like curl -k 'https://localhost:9200/ocs/v1.php/cloud/capabilities?format=json' -u einstein:relativity | jq '.ocs.data.version'

will return following for tags:

{
  "major": 1,
  "minor": 16,
  "micro": 0,
  "string": "1.16.0",
  "edition": "Community",
  "product": "oCIS"
}

will return following for non tagged builds:

{
  "major": 0,
  "minor": 0,
  "micro": 0,
  "string": "32318ee70",
  "edition": "Community",
  "product": "oCIS"
}

wkloucek

👍

sonarcloud · 2022-01-04T13:18:37Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

0.0% Coverage
0.0% Duplication

kulmann · 2022-01-04T13:21:15Z

Argh. Currently blocked by https://github.com/owncloud/owncloud-sdk/blob/a97a50faf747a9a6d7025cec0b30493489228762/src/helperFunctions.js#L198

wkloucek · 2022-01-31T08:04:12Z

@kulmann is this still on your roadmap? I would love to see this merged, after we update oC Web the next time (and the needed changes have been done in the SDK).

kulmann · 2022-01-31T08:10:50Z

@kulmann is this still on your roadmap? I would love to see this merged, after we update oC Web the next time (and the needed changes have been done in the SDK).

Yes, we're currently working on bringing the most recent version of the sdk to web. When that finally worked I'll check if we can avoid the version check in sdk and then make this enhancement here possible.

phil-davis · 2022-02-21T09:06:08Z

Note: ocs.data.capabilities.core.productname has "ownCloud" for the oC10 product. Should that be set to "oCIS" on the oCIS implementation?

And if so, then the information will be duplicated in ocs.data.version.product

It seems odd to me to have that productname value inside core capabilities - it is not really a "capability", or maybe it is, "I am capable of being an "ownCloud". If so, then productname of the oCIS implementation is still "ownCloud" (I am a feature-equivalent implementation of the "set of capabilities" called "ownCloud").

Maybe oC10 should publish an ocs.data.version.product to make life easier for clients that want to report the product and major/minor/micro version details?

phil-davis · 2022-02-21T09:15:42Z

In oC10 there is also:

$ curl -u admin:admin http://172.17.0.1:8080/status.php
{"installed":true,"maintenance":false,"needsDbUpgrade":false,"version":"10.9.2.0","versionstring":"10.9.2 prealpha","edition":"Enterprise","productname":"ownCloud"}

And that has productname. If we want to call it "product" now, then we could make that endpoint return both productname and product fields in oC10, with the same value. That would also make life easy for any clients.

And we could also publish that stuff at an endpoint http://172.17.0.1:8080/status (without .php) so that clients can eventually switch to the endpoint without .php - but maybe that has all been discussed in issues elsewhere?

micbar · 2022-03-03T19:00:10Z

@kulmann @phil-davis proceed?

kulmann · 2022-03-03T20:17:56Z

@kulmann @phil-davis proceed?

Thanks for the reminder. Created owncloud/owncloud-sdk#1016 just now. That needs to be merged and released, then sdk bumped in web, then web released and bumped in oCIS, and then we can update this PR here. Will try to sneak in an intermediate release within the sprint to not keep this open for too long.

kulmann · 2022-03-03T22:19:56Z

Note: ocs.data.capabilities.core.productname has "ownCloud" for the oC10 product. Should that be set to "oCIS" on the oCIS implementation?

And if so, then the information will be duplicated in ocs.data.version.product

It seems odd to me to have that productname value inside core capabilities - it is not really a "capability", or maybe it is, "I am capable of being an "ownCloud". If so, then productname of the oCIS implementation is still "ownCloud" (I am a feature-equivalent implementation of the "set of capabilities" called "ownCloud").

Maybe oC10 should publish an ocs.data.version.product to make life easier for clients that want to report the product and major/minor/micro version details?

To be honest I have no clue why we have those two different sections with versioning information. I added the version string to the core capability as well. You're right, it's probably a good idea to announce the product in ocs.data.version.product for oc10 as well. I have the impression that this section is more appropriate for that kind of information. Will make a PR.

kulmann · 2022-03-03T22:20:10Z

Also, rebased to current master.

phil-davis · 2022-03-10T03:30:06Z

Related oC10 core PR is owncloud/core#39851

kulmann · 2022-03-14T08:50:10Z

@phil-davis or @individual-it could someone from your team take a look why there are so many unexpected passes in the CI runs of this PR? thanks 🙏

SwikritiT · 2022-03-15T05:52:34Z

@phil-davis or @individual-it could someone from your team take a look why there are so many unexpected passes in the CI runs of this PR? thanks pray

I'll take a look on this

SwikritiT · 2022-03-15T10:00:14Z

@kulmann The passing tests are sharing related tests relating to permissions
In current master the Viewer role doesn't have the share permission

Neither does the custom permission

But In this PR the share permission is available in both

So all the tests that had the Viewer role with share permission are passing. Similar with custom-permissions.
If this is intended then I can add a commit removing all the passing tests.

The related issues of passing tests are:
#2260
#1277
#1922

micbar · 2022-05-06T11:47:02Z

yes guys, I get your point 😓

phil-davis · 2022-05-06T16:39:20Z

https://drone.owncloud.com/owncloud/ocis/11550/42/6

-'{"installed":true,"maintenance":false,"needsDbUpgrade":false,"version":"79b929c88.0","versionstring":"79b929c88","edition":"Community","productname":"oCIS","product":"oCIS"}'
      +'{"installed":true,"maintenance":false,"needsDbUpgrade":false,"version":"79b929c88.0","versionstring":"79b929c88","edition":"Community","productname":"Infinite Scale","product":"ocis"}'

Getting really close. "productname" is "oCIS" in capabilities and "Infinite Scale" in status.php
And "product" is "oCIS" or "ocis" (different case)

Needed to use github.com/Masterminds/semver/v3 instead of v1 to be able to extract major, minor and patch version from a version string. Falling back to 0.0.0 in any error case (e.g. if the version.String is a hash)

micbar · 2022-05-07T14:01:16Z

@phil-davis Another improvement, the semver checking needs to be more tolerant.
owncloud/core#40058

micbar · 2022-05-07T18:02:33Z

@phil-davis This gets a green testsuite now. I will merge this as soon as the core pipeline is also green.

sonarcloud · 2022-05-07T20:32:26Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
1 Code Smell

0.0% Coverage
0.0% Duplication

Merge: bae3834 071db57 Author: Jörn Friedrich Dreyer <jfd@owncloud.com> Date: Sat May 7 21:17:54 2022 +0000 Merge pull request #2918 from owncloud/ocs-version-update [full-ci] Set OCS version to up to date values

kulmann self-assigned this Dec 23, 2021

wkloucek reviewed Jan 4, 2022

View reviewed changes

storage/pkg/command/frontend.go Outdated Show resolved Hide resolved

kulmann force-pushed the ocs-version-update branch 2 times, most recently from 40fd0d9 to 32318ee Compare January 4, 2022 11:43

kulmann marked this pull request as ready for review January 4, 2022 11:54

wkloucek approved these changes Jan 4, 2022

View reviewed changes

kulmann mentioned this pull request Jan 31, 2022

Get rid of backend version checks owncloud/owncloud-sdk#976

Closed

wkloucek force-pushed the ocs-version-update branch from 7224dc4 to d1d01d0 Compare February 21, 2022 08:10

kulmann mentioned this pull request Mar 3, 2022

Add X-Request-ID to headers unconditionally owncloud/owncloud-sdk#1016

Merged

kulmann force-pushed the ocs-version-update branch from d1d01d0 to 926c5e1 Compare March 3, 2022 22:16

kulmann changed the title ~~Set OCS version to up to date values~~ [full-ci] Set OCS version to up to date values Mar 8, 2022

kulmann force-pushed the ocs-version-update branch 2 times, most recently from 332d6aa to 659affe Compare March 12, 2022 20:09

individual-it added the QA:team label Mar 14, 2022

micbar force-pushed the ocs-version-update branch from ad7936b to 5b3d71a Compare May 6, 2022 15:02

butonic approved these changes May 6, 2022

View reviewed changes

micbar force-pushed the ocs-version-update branch 2 times, most recently from b41ce06 to 79b929c Compare May 6, 2022 15:53

micbar force-pushed the ocs-version-update branch 2 times, most recently from ee8f0d5 to 99c145c Compare May 7, 2022 09:34

kulmann and others added 2 commits May 7, 2022 15:40

Update reva and use ocis-pkg version string in capabilities

4ce35ac

Needed to use github.com/Masterminds/semver/v3 instead of v1 to be able to extract major, minor and patch version from a version string. Falling back to 0.0.0 in any error case (e.g. if the version.String is a hash)

make status values configurable

5f0c635

micbar force-pushed the ocs-version-update branch from 99c145c to c0c8fa6 Compare May 7, 2022 13:59

micbar force-pushed the ocs-version-update branch from c0c8fa6 to 546ddc9 Compare May 7, 2022 17:18

micbar force-pushed the ocs-version-update branch 3 times, most recently from 010944d to 1538222 Compare May 7, 2022 19:39

bump core commitID

071db57

micbar force-pushed the ocs-version-update branch from 1538222 to 071db57 Compare May 7, 2022 20:24

micbar requested review from butonic, wkloucek, pmaier1 and dragotin May 7, 2022 20:36

butonic approved these changes May 7, 2022

View reviewed changes

butonic merged commit 8f1ecd3 into master May 7, 2022

delete-merged-branch bot deleted the ocs-version-update branch May 7, 2022 21:17

micbar mentioned this pull request May 8, 2022

Release 2.0.0-beta1 #3627

Closed

45 tasks

wkloucek mentioned this pull request Jun 13, 2022

fix version info #3953

Merged

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[full-ci] Set OCS version to up to date values #2918

[full-ci] Set OCS version to up to date values #2918

kulmann commented Dec 23, 2021 •

edited

Loading

ownclouders commented Dec 23, 2021 •

edited

Loading

wkloucek commented Jan 4, 2022

wkloucek left a comment

sonarcloud bot commented Jan 4, 2022

kulmann commented Jan 4, 2022

wkloucek commented Jan 31, 2022

kulmann commented Jan 31, 2022

phil-davis commented Feb 21, 2022 •

edited

Loading

phil-davis commented Feb 21, 2022

micbar commented Mar 3, 2022

kulmann commented Mar 3, 2022 •

edited

Loading

kulmann commented Mar 3, 2022

kulmann commented Mar 3, 2022

phil-davis commented Mar 10, 2022

kulmann commented Mar 14, 2022

SwikritiT commented Mar 15, 2022

SwikritiT commented Mar 15, 2022 •

edited

Loading

micbar commented May 6, 2022

phil-davis commented May 6, 2022

micbar commented May 7, 2022

micbar commented May 7, 2022

sonarcloud bot commented May 7, 2022

[full-ci] Set OCS version to up to date values #2918

[full-ci] Set OCS version to up to date values #2918

Conversation

kulmann commented Dec 23, 2021 • edited Loading

Description

Related Issue

Results

Dev Debug Build

Local dev build make -C ocis clean build

Pre Releases

Final Releases

Screenshot from the web console

Motivation and Context

How Has This Been Tested?

Types of changes

Checklist:

ownclouders commented Dec 23, 2021 • edited Loading

wkloucek commented Jan 4, 2022

wkloucek left a comment

Choose a reason for hiding this comment

sonarcloud bot commented Jan 4, 2022

kulmann commented Jan 4, 2022

wkloucek commented Jan 31, 2022

kulmann commented Jan 31, 2022

phil-davis commented Feb 21, 2022 • edited Loading

phil-davis commented Feb 21, 2022

micbar commented Mar 3, 2022

kulmann commented Mar 3, 2022 • edited Loading

kulmann commented Mar 3, 2022

kulmann commented Mar 3, 2022

phil-davis commented Mar 10, 2022

kulmann commented Mar 14, 2022

SwikritiT commented Mar 15, 2022

SwikritiT commented Mar 15, 2022 • edited Loading

micbar commented May 6, 2022

phil-davis commented May 6, 2022

micbar commented May 7, 2022

micbar commented May 7, 2022

sonarcloud bot commented May 7, 2022

kulmann commented Dec 23, 2021 •

edited

Loading

Local dev build `make -C ocis clean build`

ownclouders commented Dec 23, 2021 •

edited

Loading

phil-davis commented Feb 21, 2022 •

edited

Loading

kulmann commented Mar 3, 2022 •

edited

Loading

SwikritiT commented Mar 15, 2022 •

edited

Loading