remove URLs from python build file

fengshunli · Jul 19, 2022 · 5bd532d · 5bd532d
1 parent aef74d6
commit 5bd532d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 32 deletions.
diff --git a/build.py b/build.py
@@ -5,10 +5,6 @@
 import subprocess
 
 BASE_GETTER_CONST = "github.com/armosec/kubescape/v2/core/cautils/getter"
-BE_SERVER_CONST   = BASE_GETTER_CONST + ".ArmoBEURL"
-ER_SERVER_CONST   = BASE_GETTER_CONST + ".ArmoERURL"
-WEBSITE_CONST     = BASE_GETTER_CONST + ".ArmoFEURL"
-AUTH_SERVER_CONST = BASE_GETTER_CONST + ".armoAUTHURL"
 
 def check_status(status, msg):
     if status != 0:
@@ -41,10 +37,6 @@ def main():
     package_name = get_package_name()
     build_url = "github.com/armosec/kubescape/v2/core/cautils.BuildNumber"
     release_version = os.getenv("RELEASE")
-    armo_be_server = os.getenv("ArmoBEServer")
-    armo_er_server = os.getenv("ArmoERServer")
-    armo_website = os.getenv("ArmoWebsite")
-    armo_auth_server = os.getenv("ArmoAuthServer")
 
     client_var = "github.com/armosec/kubescape/v2/core/cautils.Client"
     client_name = os.getenv("CLIENT")
@@ -64,14 +56,6 @@ def main():
         ldflags += " -X {}={}".format(build_url, release_version)
     if client_name:
         ldflags += " -X {}={}".format(client_var, client_name)
-    if armo_be_server:
-        ldflags += " -X {}={}".format(BE_SERVER_CONST, armo_be_server)
-    if armo_er_server:
-        ldflags += " -X {}={}".format(ER_SERVER_CONST, armo_er_server)
-    if armo_website:
-        ldflags += " -X {}={}".format(WEBSITE_CONST, armo_website)
-    if armo_auth_server:
-        ldflags += " -X {}={}".format(AUTH_SERVER_CONST, armo_auth_server)
 
     build_command = ["go", "build", "-tags=static", "-o", ks_file, "-ldflags" ,ldflags]
 

diff --git a/core/pkg/resourcehandler/registrydata.go b/core/pkg/resourcehandler/registrydata.go
@@ -62,6 +62,10 @@ func (registryAdaptors *RegistryAdaptors) collectImagesVulnerabilities(k8sResour
 	// convert result to IMetadata object
 	metaObjs := vulnerabilitiesToIMetadata(imagesVulnerability)
 
+	if len(metaObjs) == 0 {
+		return fmt.Errorf("no vulnerabilities found for any of the images")
+	}
+
 	// save in resources map
 	for i := range metaObjs {
 		allResources[metaObjs[i].GetID()] = metaObjs[i]

diff --git a/httphandler/build.py b/httphandler/build.py
@@ -5,10 +5,6 @@
 import subprocess
 
 BASE_GETTER_CONST = "github.com/armosec/kubescape/v2/core/cautils/getter"
-BE_SERVER_CONST   = BASE_GETTER_CONST + ".ArmoBEURL"
-ER_SERVER_CONST   = BASE_GETTER_CONST + ".ArmoERURL"
-WEBSITE_CONST     = BASE_GETTER_CONST + ".ArmoFEURL"
-AUTH_SERVER_CONST = BASE_GETTER_CONST + ".armoAUTHURL"
 
 def checkStatus(status, msg):
     if status != 0:
@@ -42,10 +38,6 @@ def main():
     packageName = getPackageName()
     buildUrl = "github.com/armosec/kubescape/v2/core/cautils.BuildNumber"
     releaseVersion = os.getenv("RELEASE")
-    ArmoBEServer = os.getenv("ArmoBEServer")
-    ArmoERServer = os.getenv("ArmoERServer")
-    ArmoWebsite = os.getenv("ArmoWebsite")
-    ArmoAuthServer = os.getenv("ArmoAuthServer")
 
     # Create build directory
     buildDir = getBuildDir()
@@ -60,14 +52,6 @@ def main():
     ldflags = "-w -s"
     if releaseVersion:
         ldflags += " -X {}={}".format(buildUrl, releaseVersion)
-    if ArmoBEServer:
-        ldflags += " -X {}={}".format(BE_SERVER_CONST, ArmoBEServer)
-    if ArmoERServer:
-        ldflags += " -X {}={}".format(ER_SERVER_CONST, ArmoERServer)
-    if ArmoWebsite:
-        ldflags += " -X {}={}".format(WEBSITE_CONST, ArmoWebsite)
-    if ArmoAuthServer:
-        ldflags += " -X {}={}".format(AUTH_SERVER_CONST, ArmoAuthServer)
 
     build_command = ["go", "build", "-tags=static", "-o", ks_file, "-ldflags" ,ldflags]