github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: drop property

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2021-03-04 22:16:21 -05:00
parent 1b325435b8
commit a6e4949264
2 changed files with 18 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/registry/registry.go
View File

@@ -3,18 +3,16 @@ package registry
var (
// DefaultProperties is a map of all valid network properties with corresponding default property values
DefaultProperties = map[string]string{
"create-repository": "false",
"disable-delete-warning": "false",
"image-repo": "",
"push-on-release": "false",
"server": "",
"create-repository": "false",
"image-repo": "",
"push-on-release": "false",
"server": "",
}
// GlobalProperties is a map of all valid global network properties
GlobalProperties = map[string]bool{
"create-repository": true,
"disable-delete-warning": true,
"push-on-release": true,
"server": true,
"create-repository": true,
"push-on-release": true,
"server": true,
}
)

46
plugins/registry/report.go
View File

@@ -11,20 +11,17 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {
}
flags := map[string]common.ReportFunc{
"--registry-computed-create-repository": reportComputedCreateRepository,
"--registry-global-create-repository": reportGlobalCreateRepository,
"--registry-create-repository": reportCreateRepository,
"--registry-computed-disable-delete-warning": reportComputedDisableDeleteWarning,
"--registry-global-disable-delete-warning": reportGlobalDisableDeleteWarning,
"--registry-disable-delete-warning": reportDisableDeleteWarning,
"--registry-image-repo": reportImageRepo,
"--registry-computed-push-on-release": reportComputedPushOnRelease,
"--registry-global-push-on-release": reportGlobalPushOnRelease,
"--registry-push-on-release": reportPushOnRelease,
"--registry-computed-server": reportComputedServer,
"--registry-global-server": reportGlobalServer,
"--registry-server": reportServer,
"--registry-tag-version": reportTagVersion,
"--registry-computed-create-repository": reportComputedCreateRepository,
"--registry-global-create-repository": reportGlobalCreateRepository,
"--registry-create-repository": reportCreateRepository,
"--registry-image-repo": reportImageRepo,
"--registry-computed-push-on-release": reportComputedPushOnRelease,
"--registry-global-push-on-release": reportGlobalPushOnRelease,
"--registry-push-on-release": reportPushOnRelease,
"--registry-computed-server": reportComputedServer,
"--registry-global-server": reportGlobalServer,
"--registry-server": reportServer,
"--registry-tag-version": reportTagVersion,
}
flagKeys := []string{}
@@ -59,27 +56,6 @@ func reportCreateRepository(appName string) string {
return common.PropertyGet("registry", appName, "create-repository")
}
func reportComputedDisableDeleteWarning(appName string) string {
value := reportDisableDeleteWarning(appName)
if value == "" {
value = reportGlobalDisableDeleteWarning(appName)
}
if value == "" {
value = DefaultProperties["disable-delete-warning"]
}
return value
}
func reportGlobalDisableDeleteWarning(appName string) string {
return common.PropertyGet("registry", "--global", "disable-delete-warning")
}
func reportDisableDeleteWarning(appName string) string {
return common.PropertyGet("registry", appName, "disable-delete-warning")
}
func reportImageRepo(appName string) string {
return common.PropertyGet("registry", appName, "image-repo")
}