refactor: drop property

This commit is contained in:
Jose Diaz-Gonzalez committed 2021-08-04 21:49:14 -04:00
1 parent 1b325435b8
commit a6e4949264
2 files changed
+18 -44

No files matched your search

+7 -9
View File
@@ -3,18 +3,16 @@ package registry
var ( var (
// DefaultProperties is a map of all valid network properties with corresponding default property values // DefaultProperties is a map of all valid network properties with corresponding default property values
DefaultProperties = map[string]string{ DefaultProperties = map[string]string{
"create-repository": "false", "create-repository": "false",
"disable-delete-warning": "false", "image-repo": "",
"image-repo": "", "push-on-release": "false",
"push-on-release": "false", "server": "",
"server": "",
} }
// GlobalProperties is a map of all valid global network properties // GlobalProperties is a map of all valid global network properties
GlobalProperties = map[string]bool{ GlobalProperties = map[string]bool{
"create-repository": true, "create-repository": true,
"disable-delete-warning": true, "push-on-release": true,
"push-on-release": true, "server": true,
"server": true,
} }
) )
+11 -35
View File
@@ -11,20 +11,17 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {
} }
flags := map[string]common.ReportFunc{ flags := map[string]common.ReportFunc{
"--registry-computed-create-repository": reportComputedCreateRepository, "--registry-computed-create-repository": reportComputedCreateRepository,
"--registry-global-create-repository": reportGlobalCreateRepository, "--registry-global-create-repository": reportGlobalCreateRepository,
"--registry-create-repository": reportCreateRepository, "--registry-create-repository": reportCreateRepository,
"--registry-computed-disable-delete-warning": reportComputedDisableDeleteWarning, "--registry-image-repo": reportImageRepo,
"--registry-global-disable-delete-warning": reportGlobalDisableDeleteWarning, "--registry-computed-push-on-release": reportComputedPushOnRelease,
"--registry-disable-delete-warning": reportDisableDeleteWarning, "--registry-global-push-on-release": reportGlobalPushOnRelease,
"--registry-image-repo": reportImageRepo, "--registry-push-on-release": reportPushOnRelease,
"--registry-computed-push-on-release": reportComputedPushOnRelease, "--registry-computed-server": reportComputedServer,
"--registry-global-push-on-release": reportGlobalPushOnRelease, "--registry-global-server": reportGlobalServer,
"--registry-push-on-release": reportPushOnRelease, "--registry-server": reportServer,
"--registry-computed-server": reportComputedServer, "--registry-tag-version": reportTagVersion,
"--registry-global-server": reportGlobalServer,
"--registry-server": reportServer,
"--registry-tag-version": reportTagVersion,
} }
flagKeys := []string{} flagKeys := []string{}
@@ -59,27 +56,6 @@ func reportCreateRepository(appName string) string {
return common.PropertyGet("registry", appName, "create-repository") 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 { func reportImageRepo(appName string) string {
return common.PropertyGet("registry", appName, "image-repo") return common.PropertyGet("registry", appName, "image-repo")
} }