Update application label to use shortened format and refactor environment retrieval logic

Author: chenzhiguo

pkg/config/config.go

@@ -28,7 +28,7 @@ const (
 	ServiceGroupLabel      = "jmsf.jd.com/group"
 	ServiceSpaceLabel      = "jmsf.jd.com/space"
 	JdapServiceSpaceLabel  = "jmsf.jd.com/service-space"
-	ApplicationLabel       = "jmsf.jd.com/application"
+	ApplicationLabel       = "jmsf.jd.com/app"
 	JdapApplicationLabel   = "app.jdap.io/name"
 	WebHookMatchKeyEnv     = "JOYLIVE_MATCH_KEY"
 	WebHookMatchValueEnv   = "JOYLIVE_MATCH_VALUE"

pkg/resource/control.go

@@ -19,9 +19,13 @@ type ApplicationEnvResponse struct {
 }
 
 func GetApplicationEnvironments(labels map[string]string) (map[string]string, error) {
-	serviceSpace, application := labels[config.ServiceSpaceLabel], labels[config.ApplicationLabel]
-	if len(serviceSpace) == 0 || len(application) == 0 {
-		serviceSpace, application = labels[config.JdapServiceSpaceLabel], labels[config.JdapApplicationLabel]
+	serviceSpace := labels[config.ServiceSpaceLabel]
+	application := labels[config.ApplicationLabel]
+	if len(serviceSpace) == 0 {
+		serviceSpace = labels[config.JdapServiceSpaceLabel]
+	}
+	if len(application) == 0 {
+		application = labels[config.JdapApplicationLabel]
 	}
 	envMaps := make(map[string]string)
 	if len(serviceSpace) != 0 && len(application) != 0 {