Merge pull request #1871 from ywk253100/170330_remove_compressjs

Remove compress js flag

make/common/templates/adminserver/env

@@ -33,7 +33,6 @@ UI_SECRET=$ui_secret
 JOBSERVICE_SECRET=$jobservice_secret
 TOKEN_EXPIRATION=$token_expiration
 CFG_EXPIRATION=5
-USE_COMPRESSED_JS=$use_compressed_js
 GODEBUG=netdns=cgo
 ADMIRAL_URL=$admiral_url
 WITH_NOTARY=$with_notary

make/harbor.cfg

@@ -11,10 +11,6 @@ ui_url_protocol = http
 #The password for the root user of mysql db, change this before any production use.
 db_password = root123
 
-#Determine whether the UI should use compressed js files. 
-#For production, set it to on. For development, set it to off.
-use_compressed_js = on
-
 #Maximum number of job workers in job service  
 max_job_workers = 3 
 

make/prepare

@@ -138,7 +138,6 @@ ldap_scope = rcp.get("configuration", "ldap_scope")
 ldap_timeout = rcp.get("configuration", "ldap_timeout")
 db_password = rcp.get("configuration", "db_password")
 self_registration = rcp.get("configuration", "self_registration")
-use_compressed_js = rcp.get("configuration", "use_compressed_js")
 if protocol == "https":
     cert_path = rcp.get("configuration", "ssl_cert")
     cert_key_path = rcp.get("configuration", "ssl_cert_key")
@@ -223,8 +222,7 @@ render(os.path.join(templates_dir, "adminserver", "env"),
         jobservice_secret=jobservice_secret,
         token_expiration=token_expiration,
         admiral_url=admiral_url,
-        with_notary=args.notary_mode,
+        with_notary=args.notary_mode
-        use_compressed_js=use_compressed_js
 	)
 
 render(os.path.join(templates_dir, "ui", "env"), 

src/adminserver/systemcfg/systemcfg.go

@@ -98,10 +98,6 @@ var (
 			env:   "TOKEN_EXPIRATION",
 			parse: parseStringToInt,
 		},
-		common.UseCompressedJS: &parser{
-			env:   "USE_COMPRESSED_JS",
-			parse: parseStringToBool,
-		},
 		common.CfgExpiration: &parser{
 			env:   "CFG_EXPIRATION",
 			parse: parseStringToInt,
@@ -132,11 +128,6 @@ var (
 			env:   "MAX_JOB_WORKERS",
 			parse: parseStringToInt,
 		},
-		// TODO remove this config?
-		common.UseCompressedJS: &parser{
-			env:   "USE_COMPRESSED_JS",
-			parse: parseStringToBool,
-		},
 		common.CfgExpiration: &parser{
 			env:   "CFG_EXPIRATION",
 			parse: parseStringToInt,

src/common/const.go

@@ -58,7 +58,6 @@ const (
 	TokenExpiration            = "token_expiration"
 	CfgExpiration              = "cfg_expiration"
 	JobLogDir                  = "job_log_dir"
-	UseCompressedJS            = "use_compressed_js"
 	AdminInitialPassword       = "admin_initial_password"
 	AdmiralEndpoint            = "admiral_url"
 	WithNotary                 = "with_notary"

src/common/models/config.go

@@ -92,7 +92,6 @@ type SystemCfg struct {
 	MaxJobWorkers              int             `json:"max_job_workers"`
 	JobLogDir                  string          `json:"job_log_dir"`
 	InitialAdminPwd            string          `json:"initial_admin_pwd,omitempty"`
-	CompressJS                 bool            `json:"compress_js"`      //TODO remove
 	TokenExpiration            int             `json:"token_expiration"` // in minute
 	SecretKey                  string          `json:"secret_key,omitempty"`
 	CfgExpiration              int             `json:"cfg_expiration"`

src/common/utils/ldap/ldap_test.go

@@ -63,7 +63,6 @@ var adminServerLdapTestConfig = map[string]interface{}{
 	//	config.TokenExpiration:            30,
 	common.CfgExpiration: 5,
 	//	config.JobLogDir:                  "/var/log/jobs",
-	//	config.UseCompressedJS:            true,
 	common.AdminInitialPassword: "password",
 }
 

src/common/utils/test/adminserver.go

@@ -57,7 +57,6 @@ var adminServerDefaultConfig = map[string]interface{}{
 	common.MaxJobWorkers:              3,
 	common.TokenExpiration:            30,
 	common.CfgExpiration:              5,
-	common.UseCompressedJS:            true,
 	common.AdminInitialPassword:       "password",
 	common.AdmiralEndpoint:            "http://www.vmware.com",
 	common.WithNotary:                 false,

src/ui/api/config.go

@@ -63,7 +63,6 @@ var (
 		common.TokenExpiration,
 		common.CfgExpiration,
 		common.JobLogDir,
-		common.UseCompressedJS,
 		common.AdminInitialPassword,
 	}
 
@@ -81,7 +80,6 @@ var (
 		common.EmailSSL,
 		common.SelfRegistration,
 		common.VerifyRemoteCert,
-		common.UseCompressedJS,
 	}
 
 	passwordKeys = []string{

src/ui/auth/ldap/ldap_test.go

@@ -48,7 +48,6 @@ var adminServerLdapTestConfig = map[string]interface{}{
 	//	config.TokenExpiration:            30,
 	common.CfgExpiration: 5,
 	//	config.JobLogDir:                  "/var/log/jobs",
-	//	config.UseCompressedJS:            true,
 	common.AdminInitialPassword: "password",
 }