sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5597 from wkloucek/settings-roles-merge-fix

Browse Source 
fix settings service bunldes config merge problems
This commit is contained in:
Michael Barz
2023-02-20 13:42:38 +01:00
committed by GitHub
parent 30faae2ae4 d34730d45a
commit b3435edb89
3 changed files with 103 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
protogen/gen/ocis/messages/settings/v0/settings.pb.go
+1 -1
View File
@@ -1190,7 +1190,7 @@ type Value struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id"` // @gotags: yaml:"id"
BundleId string `protobuf:"bytes,2,opt,name=bundle_id,json=bundleId,proto3" json:"bundle_id,omitempty" yaml:"bundle_id"` // @gotags: yaml:"bundle_id"
// setting_id is the id of the setting from within its bundle.
SettingId string `protobuf:"bytes,3,opt,name=setting_id,json=settingId,proto3" json:"setting_id,omitempty" yaml:"settings_id"` // @gotags: yaml:"settings_id"
SettingId string `protobuf:"bytes,3,opt,name=setting_id,json=settingId,proto3" json:"setting_id,omitempty" yaml:"setting_id"` // @gotags: yaml:"setting_id"
AccountUuid string `protobuf:"bytes,4,opt,name=account_uuid,json=accountUuid,proto3" json:"account_uuid,omitempty" yaml:"account_uuid"` // @gotags: yaml:"account_uuid"
Resource *Resource `protobuf:"bytes,5,opt,name=resource,proto3" json:"resource,omitempty" yaml:"resource"` // @gotags: yaml:"resource"
// Types that are assignable to Value:
protogen/gen/ocis/services/settings/v0/settings.swagger.json
+96 -49
View File
@@ -598,7 +598,8 @@
"type": "array",
"items": {
"$ref": "#/definitions/v0ListOptionValue"
}
},
"title": "@gotags: yaml:\"values\""
}
}
},
@@ -607,33 +608,40 @@
"properties": {
"id": {
"type": "string",
"description": "id is the id of the Value. It is generated on saving it."
"description": "id is the id of the Value. It is generated on saving it.\n\n@gotags: yaml:\"id\""
},
"bundleId": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"bundle_id\""
},
"settingId": {
"type": "string",
"description": "setting_id is the id of the setting from within its bundle."
"description": "setting_id is the id of the setting from within its bundle.\n\n@gotags: yaml:\"setting_id\""
},
"accountUuid": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"account_uuid\""
},
"resource": {
"$ref": "#/definitions/v0Resource"
"$ref": "#/definitions/v0Resource",
"title": "@gotags: yaml:\"resource\""
},
"boolValue": {
"type": "boolean"
"type": "boolean",
"title": "@gotags: yaml:\"bool_value\""
},
"intValue": {
"type": "string",
"format": "int64"
"format": "int64",
"title": "@gotags: yaml:\"int_value\""
},
"stringValue": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"string_value\""
},
"listValue": {
"$ref": "#/definitions/settingsv0ListValue"
"$ref": "#/definitions/settingsv0ListValue",
"title": "@gotags: yaml:\"list_value\""
}
}
},
@@ -680,10 +688,12 @@
"type": "object",
"properties": {
"default": {
"type": "boolean"
"type": "boolean",
"title": "@gotags: yaml:\"default\""
},
"label": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"label\""
}
}
},
@@ -691,28 +701,35 @@
"type": "object",
"properties": {
"id": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"id\""
},
"name": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"name\""
},
"type": {
"$ref": "#/definitions/v0BundleType"
"$ref": "#/definitions/v0BundleType",
"title": "@gotags: yaml:\"type\""
},
"extension": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"extension\""
},
"displayName": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"display_name\""
},
"settings": {
"type": "array",
"items": {
"$ref": "#/definitions/v0Setting"
}
},
"title": "@gotags: yaml:\"settings\""
},
"resource": {
"$ref": "#/definitions/v0Resource"
"$ref": "#/definitions/v0Resource",
"title": "@gotags: yaml:\"resource\""
}
}
},
@@ -803,22 +820,27 @@
"properties": {
"default": {
"type": "string",
"format": "int64"
"format": "int64",
"title": "@gotags: yaml:\"default\""
},
"min": {
"type": "string",
"format": "int64"
"format": "int64",
"title": "@gotags: yaml:\"min\""
},
"max": {
"type": "string",
"format": "int64"
"format": "int64",
"title": "@gotags: yaml:\"max\""
},
"step": {
"type": "string",
"format": "int64"
"format": "int64",
"title": "@gotags: yaml:\"step\""
},
"placeholder": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"placeholder\""
}
}
},
@@ -848,13 +870,16 @@
"type": "object",
"properties": {
"value": {
"$ref": "#/definitions/v0ListOptionValue"
"$ref": "#/definitions/v0ListOptionValue",
"title": "@gotags: yaml:\"value\""
},
"default": {
"type": "boolean"
"type": "boolean",
"title": "@gotags: yaml:\"default\""
},
"displayValue": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"display_value\""
}
}
},
@@ -862,11 +887,13 @@
"type": "object",
"properties": {
"stringValue": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"string_value\""
},
"intValue": {
"type": "string",
"format": "int64"
"format": "int64",
"title": "@gotags: yaml:\"int_value\""
}
}
},
@@ -956,7 +983,8 @@
"type": "array",
"items": {
"$ref": "#/definitions/v0ListOption"
}
},
"title": "@gotags: yaml:\"options\""
}
}
},
@@ -964,10 +992,12 @@
"type": "object",
"properties": {
"operation": {
"$ref": "#/definitions/v0PermissionOperation"
"$ref": "#/definitions/v0PermissionOperation",
"title": "@gotags: yaml:\"operation\""
},
"constraint": {
"$ref": "#/definitions/PermissionConstraint"
"$ref": "#/definitions/PermissionConstraint",
"title": "@gotags: yaml:\"constraint\""
}
}
},
@@ -1066,37 +1096,48 @@
"type": "object",
"properties": {
"id": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"id\""
},
"name": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"name\""
},
"displayName": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"display_name\""
},
"description": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"description\""
},
"intValue": {
"$ref": "#/definitions/v0Int"
"$ref": "#/definitions/v0Int",
"title": "@gotags: yaml:\"int_value\""
},
"stringValue": {
"$ref": "#/definitions/v0String"
"$ref": "#/definitions/v0String",
"title": "@gotags: yaml:\"string_value\""
},
"boolValue": {
"$ref": "#/definitions/v0Bool"
"$ref": "#/definitions/v0Bool",
"title": "@gotags: yaml:\"bool_value\""
},
"singleChoiceValue": {
"$ref": "#/definitions/v0SingleChoiceList"
"$ref": "#/definitions/v0SingleChoiceList",
"title": "@gotags: yaml:\"single_choice_value\""
},
"multiChoiceValue": {
"$ref": "#/definitions/v0MultiChoiceList"
"$ref": "#/definitions/v0MultiChoiceList",
"title": "@gotags: yaml:\"multi_choice_value\""
},
"permissionValue": {
"$ref": "#/definitions/v0Permission"
"$ref": "#/definitions/v0Permission",
"title": "@gotags: yaml:\"permission_value\""
},
"resource": {
"$ref": "#/definitions/v0Resource"
"$ref": "#/definitions/v0Resource",
"title": "@gotags: yaml:\"resource\""
}
}
},
@@ -1107,7 +1148,8 @@
"type": "array",
"items": {
"$ref": "#/definitions/v0ListOption"
}
},
"title": "@gotags: yaml:\"options\""
}
}
},
@@ -1115,21 +1157,26 @@
"type": "object",
"properties": {
"default": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"default\""
},
"required": {
"type": "boolean"
"type": "boolean",
"title": "@gotags: yaml:\"required\""
},
"minLength": {
"type": "integer",
"format": "int32"
"format": "int32",
"title": "@gotags: yaml:\"min_length\""
},
"maxLength": {
"type": "integer",
"format": "int32"
"format": "int32",
"title": "@gotags: yaml:\"max_length\""
},
"placeholder": {
"type": "string"
"type": "string",
"title": "@gotags: yaml:\"placeholder\""
}
}
},
services/settings/pkg/config/defaults/defaultconfig.go
+6 -1
View File
@@ -6,6 +6,7 @@ import (
"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
"github.com/owncloud/ocis/v2/ocis-pkg/shared"
v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
"github.com/owncloud/ocis/v2/services/settings/pkg/config"
rdefaults "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults"
)
@@ -52,7 +53,7 @@ func DefaultConfig() *config.Config {
StorageAddress: "127.0.0.1:9215",
SystemUserIDP: "internal",
},
Bundles: rdefaults.GenerateBundlesDefaultRoles(),
Bundles: []*v0.Bundle{},
}
}
@@ -122,6 +123,10 @@ func EnsureDefaults(cfg *config.Config) {
}
func Sanitize(cfg *config.Config) {
if len(cfg.Bundles) == 0 {
cfg.Bundles = rdefaults.GenerateBundlesDefaultRoles()
}
// sanitize config
if cfg.HTTP.Root != "/" {
cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")