Fixed minor bugs with environment parsing

backend/Dockerfile

@@ -13,10 +13,6 @@ ADD ./go-app/go.mod /app
 
 # Required files for code generation
 ADD ./app_sdk/app_base.py /app_sdk
-ADD ./app_sdk_kali/app_base.py /app_sdk_kali
-ADD ./app_sdk_kali/static_baseline.py /app_sdk_kali
-ADD ./app_sdk_blackarch/app_base.py /app_sdk_blackarch
-ADD ./app_sdk_blackarch/static_baseline.py /app_sdk_blackarch
 ADD ./app_gen /app_gen
 
 RUN go get -v
@@ -31,8 +27,6 @@ FROM alpine:3.12
 
 COPY --from=builder /app/ /app
 COPY --from=builder /app_sdk/ /app_sdk
-COPY --from=builder /app_sdk_kali/ /app_sdk_kali
-COPY --from=builder /app_sdk_blackarch/ /app_sdk_blackarch
 COPY --from=builder /app_gen/ /app_gen
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 

backend/go-app/docker.go

@@ -220,19 +220,18 @@ func buildImageMemory(fs billy.Filesystem, tags []string, dockerfileFolder strin
 	// docker build --build-arg http_proxy=http://my.proxy.url
 	// Attempt at setting name according to #359: https://github.com/frikky/Shuffle/issues/359
 	labels := map[string]string{}
-	target := ""
-	if len(tags) > 0 {
-		if strings.Contains(tags[0], ":") {
-			version := strings.Split(tags[0], ":")
-			if len(version) == 2 {
-				target = fmt.Sprintf("shuffle-build-%s", version[1])
-				tags = append(tags, target)
-				labels["name"] = target
-			}
-		}
-	}
+	//target := ""
+	//if len(tags) > 0 {
+	//	if strings.Contains(tags[0], ":") {
+	//		version := strings.Split(tags[0], ":")
+	//		if len(version) == 2 {
+	//			target = fmt.Sprintf("shuffle-build-%s", version[1])
+	//			tags = append(tags, target)
+	//			labels["name"] = target
+	//		}
+	//	}
+	//}
 
-	_ = labels
 	buildOptions := types.ImageBuildOptions{
 		Remove:    true,
 		Tags:      tags,

backend/go-app/go.mod

@@ -2,7 +2,7 @@ module shuffle
 
 go 1.13
 
-replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared
+//replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared
 
 //replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi
 
@@ -22,7 +22,7 @@ require (
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/elastic/go-elasticsearch/v7 v7.13.1 // indirect
 	github.com/frikky/kin-openapi v0.39.0
-	github.com/frikky/shuffle-shared v0.0.69
+	github.com/frikky/shuffle-shared v0.0.71
 	github.com/fsouza/go-dockerclient v1.7.2
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-git/go-billy/v5 v5.0.0

backend/go-app/main.go

@@ -5304,8 +5304,8 @@ func migrateDatabase(resp http.ResponseWriter, request *http.Request) {
 	}
 
 	ctx := context.Background()
-	es := shuffle.GetEsConfig()
-	_, err := shuffle.RunInit(*dbclient, *es, storage.Client{}, gceProject, "onprem", false, "")
+	//es := shuffle.GetEsConfig()
+	_, err := shuffle.RunInit(*dbclient, storage.Client{}, gceProject, "onprem", false, "")
 	if err != nil {
 		log.Printf("[WARNING] Failed to start migration because of init issues: %s", err)
 		resp.WriteHeader(401)
@@ -5387,7 +5387,7 @@ func migrateDatabase(resp http.ResponseWriter, request *http.Request) {
 	envSuccess := 0
 	hookSuccess := 0
 	scheduleSuccess := 0
-	_, err = shuffle.RunInit(*dbclient, *es, storage.Client{}, gceProject, "onprem", false, "elasticsearch")
+	_, err = shuffle.RunInit(*dbclient, storage.Client{}, gceProject, "onprem", false, "elasticsearch")
 
 	for _, item := range orgs {
 		err = shuffle.SetOrg(ctx, item, item.Id)
@@ -5668,14 +5668,14 @@ func initHandlers() {
 		log.Fatalf("[DEBUG] Database client error during init: %s", err)
 	}
 
-	es := shuffle.GetEsConfig()
+	//es := shuffle.GetEsConfig()
 	elasticConfig := "elasticsearch"
 	if strings.ToLower(os.Getenv("SHUFFLE_ELASTIC")) == "false" {
 		elasticConfig = ""
 	}
 
 	for {
-		_, err = shuffle.RunInit(*dbclient, *es, storage.Client{}, gceProject, "onprem", true, elasticConfig)
+		_, err = shuffle.RunInit(*dbclient, storage.Client{}, gceProject, "onprem", true, elasticConfig)
 		if err != nil {
 			log.Printf("[ERROR] Error in initial database connection. Retrying in 5 seconds. %s", err)
 			time.Sleep(5 * time.Second)