Infrastructure/zot
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2025-01-20 22:52:51 -05:00
Code Issues Activity

feat(mgmt): mgmt extention no longer depends on UI being enabled (#1728)

Browse source 
It is now enabled based only on search configuration

Signed-off-by: Andrei Aaron <aaaron@luxoft.com>
This commit is contained in:
Andrei Aaron 2023-08-26 23:32:41 +03:00 • committed by GitHub
parent 289acfabbd
commit 28858f695f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/api/config/config.go
View file

@ -326,7 +326,7 @@ func (c *Config) AreUserPrefsEnabled() bool {
}
func (c *Config) IsMgmtEnabled() bool {
return c.IsSearchEnabled() && c.IsUIEnabled()
return c.IsSearchEnabled()
}
func (c *Config) IsImageTrustEnabled() bool {

4
pkg/api/controller_test.go
View file

@ -8538,17 +8538,17 @@ func TestDistSpecExtensions(t *testing.T) {
So(err, ShouldBeNil)
t.Log(extensionList.Extensions)
So(len(extensionList.Extensions), ShouldEqual, 1)
So(len(extensionList.Extensions[0].Endpoints), ShouldEqual, 1)
So(len(extensionList.Extensions[0].Endpoints), ShouldEqual, 2)
So(extensionList.Extensions[0].Name, ShouldEqual, "_zot")
So(extensionList.Extensions[0].URL, ShouldContainSubstring, "_zot.md")
So(extensionList.Extensions[0].Description, ShouldNotBeEmpty)
// Verify the endpoints below are enabled by search
So(extensionList.Extensions[0].Endpoints, ShouldContain, constants.FullSearchPrefix)
So(extensionList.Extensions[0].Endpoints, ShouldContain, constants.FullMgmt)
// Verify the endpoints below are not enabled since trust is not enabled
So(extensionList.Extensions[0].Endpoints, ShouldNotContain, constants.FullCosign)
So(extensionList.Extensions[0].Endpoints, ShouldNotContain, constants.FullNotation)
// Verify the endpoints below are not enabled since the UI is not enabled
So(extensionList.Extensions[0].Endpoints, ShouldNotContain, constants.FullMgmt)
So(extensionList.Extensions[0].Endpoints, ShouldNotContain, constants.FullUserPrefs)
})

7
pkg/cli/extensions_test.go
View file

@ -813,9 +813,6 @@ func TestServeMgmtExtension(t *testing.T) {
"output": "%s"
},
"extensions": {
"ui": {
"enable": true
},
"search": {
"enable": true
}
@ -837,7 +834,7 @@ func TestServeMgmtExtension(t *testing.T) {
So(found, ShouldBeTrue)
})
Convey("Mgmt disabled - UI unconfigured", t, func(c C) {
Convey("Mgmt disabled - search unconfigured", t, func(c C) {
content := `{
"storage": {
"rootDirectory": "%s"
@ -852,7 +849,7 @@ func TestServeMgmtExtension(t *testing.T) {
},
"extensions": {
"search": {
"enable": true
"enable": false
}
}
}`