Merge branch 'master' into initialization-responsibility

settings/package.json

@@ -63,7 +63,7 @@
     "rollup-plugin-node-globals": "^1.4.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-vue": "^6.0.0",
+    "rollup-plugin-vue": "^5.1.9",
     "swagger-vue-generator": "^1.0.6",
     "url-search-params-polyfill": "^8.1.0",
     "vue-template-compiler": "^2.6.11",

settings/pkg/command/version.go

@@ -19,7 +19,7 @@ func PrintVersion(cfg *config.Config) *cli.Command {
 		Usage: "Print the versions of the running instances",
 		Flags: flagset.ListSettingsWithConfig(cfg),
 		Action: func(c *cli.Context) error {
-			reg := *registry.GetRegistry()
+			reg := registry.GetRegistry()
 			services, err := reg.GetService(cfg.GRPC.Namespace + "." + cfg.Service.Name)
 			if err != nil {
 				fmt.Println(fmt.Errorf("could not get settings services from the registry: %v", err))

settings/pkg/proto/v0/settings.pb.micro_test.go

@@ -450,17 +450,17 @@ func TestSaveGetIntValue(t *testing.T) {
 		{
 			name:  "negative",
 			value: proto.Value_IntValue{IntValue: -42},
-			// https://github.com/owncloud/ocis/settings/issues/57
+			// no validation for SaveValue https://github.com/owncloud/ocis/issues/1445
 		},
 		{
 			name:  "less than Min",
 			value: proto.Value_IntValue{IntValue: 0},
-			// https://github.com/owncloud/ocis/settings/issues/57
+			// no validation for SaveValue https://github.com/owncloud/ocis/issues/1445
 		},
 		{
 			name:  "more than Max",
 			value: proto.Value_IntValue{IntValue: 128},
-			// https://github.com/owncloud/ocis/settings/issues/57
+			// no validation for SaveValue https://github.com/owncloud/ocis/issues/1445
 		},
 	}
 	for _, tt := range tests {
@@ -502,7 +502,7 @@ func TestSaveGetIntValue(t *testing.T) {
 
 /**
 try to save a wrong type of the value
-https://github.com/owncloud/ocis/settings/issues/57
+no validation for SaveValue https://github.com/owncloud/ocis/issues/1445
 */
 func TestSaveGetIntValueIntoString(t *testing.T) {
 	teardown := setup()
@@ -538,7 +538,7 @@ func TestSaveGetIntValueIntoString(t *testing.T) {
 	assert.Equal(t, "forty two", getValueResponse.Value.Value.GetStringValue())
 }
 
-// https://github.com/owncloud/ocis/settings/issues/18
+// no plausibility check in settings of bundle https://github.com/owncloud/ocis/issues/1455
 func TestSaveBundleWithInvalidSettings(t *testing.T) {
 	var tests = []proto.Setting{
 		{
@@ -747,7 +747,6 @@ func TestSaveBundleWithInvalidSettings(t *testing.T) {
 	}
 }
 
-// https://github.com/owncloud/ocis/settings/issues/19
 func TestGetBundleNoSideEffectsOnDisk(t *testing.T) {
 	teardown := setup()
 	defer teardown()