Merge pull request #9586 from fschade/cleanup-removals

chore!: remove deprecated configuration values
owncloud · Jul 16, 2024 · 5b3dd4d · 5b3dd4d
2 parents a59cfa0 + 31272dc
commit 5b3dd4d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/services/antivirus/pkg/config/config.go b/services/antivirus/pkg/config/config.go
@@ -73,7 +73,7 @@ type ClamAV struct {
 
 // ICAP provides configuration options for icap
 type ICAP struct {
-	DeprecatedTimeout int64         `yaml:"timeout" env:"ANTIVIRUS_ICAP_TIMEOUT" desc:"Timeout for the ICAP client." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"6.0" deprecationInfo:"Changing the envvar type for consistency reasons." deprecationReplacement:"ANTIVIRUS_ICAP_SCAN_TIMEOUT"`
+	DeprecatedTimeout int64         `yaml:"timeout" env:"ANTIVIRUS_ICAP_TIMEOUT" desc:"Timeout for the ICAP client." introductionVersion:"pre5.0" deprecationVersion:"5.0" removalVersion:"%%NEXT_PRODUCTION_VERSION%%" deprecationInfo:"Changing the envvar type for consistency reasons." deprecationReplacement:"ANTIVIRUS_ICAP_SCAN_TIMEOUT"`
 	Timeout           time.Duration `yaml:"scan_timeout" env:"ANTIVIRUS_ICAP_SCAN_TIMEOUT" desc:"Scan timeout for the ICAP client. Defaults to '5m' (5 minutes). See the Environment Variable Types description for more details." introductionVersion:"5.0"`
 	URL               string        `yaml:"url" env:"ANTIVIRUS_ICAP_URL" desc:"URL of the ICAP server." introductionVersion:"pre5.0"`
 	Service           string        `yaml:"service" env:"ANTIVIRUS_ICAP_SERVICE" desc:"The name of the ICAP service." introductionVersion:"pre5.0"`

diff --git a/services/clientlog/pkg/config/config.go b/services/clientlog/pkg/config/config.go
@@ -20,7 +20,7 @@ type Config struct {
 
 	TokenManager *TokenManager `yaml:"token_manager"`
 
-	RevaGateway string `yaml:"reva_gateway" env:"OCIS_REVA_GATEWAY;CLIENTLOG_REVA_GATEWAY" desc:"CS3 gateway used to look up user metadata" introductionVersion:"5.0" deprecationVersion:"6.0" removalVersion:"%%NEXT%%" deprecationInfo:"CLIENTLOG_REVA_GATEWAY removed for simplicity."`
+	RevaGateway string `yaml:"reva_gateway" env:"OCIS_REVA_GATEWAY;CLIENTLOG_REVA_GATEWAY" desc:"CS3 gateway used to look up user metadata" introductionVersion:"5.0" deprecationVersion:"6.0" removalVersion:"%%NEXT_PRODUCTION_VERSION%%" deprecationInfo:"CLIENTLOG_REVA_GATEWAY removed for simplicity."`
 	Events      Events `yaml:"events"`
 
 	ServiceAccount ServiceAccount `yaml:"service_account"`

diff --git a/services/collaboration/pkg/config/cs3api.go b/services/collaboration/pkg/config/cs3api.go
@@ -8,7 +8,7 @@ type CS3Api struct {
 
 // Gateway defines the available configuration for the CS3 API gateway
 type Gateway struct {
-	Name string `yaml:"name" env:"OCIS_REVA_GATEWAY;COLLABORATION_CS3API_GATEWAY_NAME" desc:"CS3 gateway used to look up user metadata." introductionVersion:"6.0.0" deprecationVersion:"6.0" removalVersion:"%%NEXT%%" deprecationInfo:"COLLABORATION_CS3API_GATEWAY_NAME removed for simplicity."`
+	Name string `yaml:"name" env:"OCIS_REVA_GATEWAY;COLLABORATION_CS3API_GATEWAY_NAME" desc:"CS3 gateway used to look up user metadata." introductionVersion:"6.0.0" deprecationVersion:"6.0" removalVersion:"%%NEXT_PRODUCTION_VERSION%%" deprecationInfo:"COLLABORATION_CS3API_GATEWAY_NAME removed for simplicity."`
 }
 
 // DataGateway defines the available configuration for the CS3 API data gateway

diff --git a/services/settings/pkg/settings/settings.go b/services/settings/pkg/settings/settings.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 
 	cs3permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1"
+
 	settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
 	settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
 	"github.com/owncloud/ocis/v2/services/settings/pkg/config"
@@ -13,11 +14,6 @@ var (
 	// Registry uses the strategy pattern as a registry
 	Registry = map[string]RegisterFunc{}
 
-	// ErrPermissionNotFound defines a new error for when a permission was not found
-	//
-	// Deprecated use the more generic ErrNotFound
-	ErrPermissionNotFound = errors.New("permission not found")
-
 	// ErrNotFound is the error to use when a resource was not found.
 	ErrNotFound = errors.New("not found")
 )