fix json unmarshal bug (#747)

Signed-off-by: cndoit18 <cndoit18@outlook.com>
goharbor · Aug 16, 2021 · f80845d · f80845d
1 parent c6e2642
commit f80845d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/apis/goharbor.io/v1beta1/harbor_configuration.go b/apis/goharbor.io/v1beta1/harbor_configuration.go
@@ -94,8 +94,12 @@ func (h HarborConfigurationSpec) ToJSON() ([]byte, error) {
 		return nil, err
 	}
 
-	extension := make(map[string]interface{})
-	if json.Unmarshal(h.Extension.Raw, &extension) != nil {
+	if len(h.Extension.Raw) > 0 {
+		extension := make(map[string]interface{})
+		if err = json.Unmarshal(h.Extension.Raw, &extension); err != nil {
+			return nil, err
+		}
+
 		delete(data, "extension")
 
 		for k, v := range extension {