From ec27e2dc0719d1a32142b4ffe9f7e116b4372dea Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Thu, 30 Mar 2017 12:59:47 +0800 Subject: [PATCH] remove compress js flag --- make/common/templates/adminserver/env | 1 - make/harbor.cfg | 4 ---- make/prepare | 4 +--- src/adminserver/systemcfg/systemcfg.go | 9 --------- src/common/const.go | 1 - src/common/models/config.go | 1 - src/common/utils/ldap/ldap_test.go | 1 - src/common/utils/test/adminserver.go | 1 - src/ui/api/config.go | 2 -- src/ui/auth/ldap/ldap_test.go | 1 - 10 files changed, 1 insertion(+), 24 deletions(-) diff --git a/make/common/templates/adminserver/env b/make/common/templates/adminserver/env index 9b268f189..190acac5a 100644 --- a/make/common/templates/adminserver/env +++ b/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 diff --git a/make/harbor.cfg b/make/harbor.cfg index 8c9575585..b476812e4 100644 --- a/make/harbor.cfg +++ b/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 diff --git a/make/prepare b/make/prepare index c298393d6..57da6cbbb 100755 --- a/make/prepare +++ b/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, - use_compressed_js=use_compressed_js + with_notary=args.notary_mode ) render(os.path.join(templates_dir, "ui", "env"), diff --git a/src/adminserver/systemcfg/systemcfg.go b/src/adminserver/systemcfg/systemcfg.go index 577221a81..1cef91005 100644 --- a/src/adminserver/systemcfg/systemcfg.go +++ b/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, diff --git a/src/common/const.go b/src/common/const.go index 6c18fc58d..204b4f398 100644 --- a/src/common/const.go +++ b/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" diff --git a/src/common/models/config.go b/src/common/models/config.go index 16f518d2b..491f1582f 100644 --- a/src/common/models/config.go +++ b/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"` diff --git a/src/common/utils/ldap/ldap_test.go b/src/common/utils/ldap/ldap_test.go index 60cf7c34a..a5767a005 100644 --- a/src/common/utils/ldap/ldap_test.go +++ b/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", } diff --git a/src/common/utils/test/adminserver.go b/src/common/utils/test/adminserver.go index 0a0741d1d..af2b96e70 100644 --- a/src/common/utils/test/adminserver.go +++ b/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, diff --git a/src/ui/api/config.go b/src/ui/api/config.go index 22ccea112..be9a8cb09 100644 --- a/src/ui/api/config.go +++ b/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{ diff --git a/src/ui/auth/ldap/ldap_test.go b/src/ui/auth/ldap/ldap_test.go index 9b001ae55..e14227819 100644 --- a/src/ui/auth/ldap/ldap_test.go +++ b/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", }