From a6e4949264a97be29f16c469d282830678d68fc7 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Thu, 4 Mar 2021 22:16:21 -0500
Subject: [PATCH] refactor: drop property

---
 plugins/registry/registry.go | 16 ++++++-------
 plugins/registry/report.go   | 46 +++++++++---------------------------
 2 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/plugins/registry/registry.go b/plugins/registry/registry.go
index 32dcded7b..88cf04481 100644
--- a/plugins/registry/registry.go
+++ b/plugins/registry/registry.go
@@ -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,
 	}
 )
diff --git a/plugins/registry/report.go b/plugins/registry/report.go
index ad077cde8..61d4232cb 100644
--- a/plugins/registry/report.go
+++ b/plugins/registry/report.go
@@ -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")
 }