Merge pull request #117 from uselagoon/fix/deal-with-slashes

bomoko · web-flow · commit e89698e80429 · 2025-05-22T13:34:08.000+12:00
Fix for slashes in environment names
diff --git a/go.mod b/go.mod
@@ -9,6 +9,7 @@ require (
 	github.com/joho/godotenv v1.5.1
 	github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2
 	github.com/stretchr/testify v1.10.0
+	github.com/uselagoon/machinery v0.0.34
 )
 
 require (
@@ -39,8 +40,8 @@ require (
 	github.com/streadway/amqp v1.1.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/vektah/gqlparser/v2 v2.5.21 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/crypto v0.32.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 )
diff --git a/go.sum b/go.sum
@@ -178,6 +178,8 @@ github.com/terminalstatic/go-xsd-validate v0.1.6/go.mod h1:18lsvYFofBflqCrvo1ump
 github.com/tiago4orion/conjure v0.0.0-20150908101743-93cb30b9d218 h1:tOESt7J50fPC9NqR0VdU1Zxk2zo5QYH70ap5TsU1bt4=
 github.com/tiago4orion/conjure v0.0.0-20150908101743-93cb30b9d218/go.mod h1:GQei++1WClbEC7AN1B9ipY1jCjzllM/7UNg0okAh/Z4=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/uselagoon/machinery v0.0.34 h1:5DsvXEyMeXmzQhjt11YH7+kZJueabovrwKTv0x7jQV8=
+github.com/uselagoon/machinery v0.0.34/go.mod h1:G0ujppuNR0BrtAnlmH8xDb9TDfayb4A36aeo0DYg7fQ=
 github.com/vektah/gqlparser/v2 v2.5.21 h1:Zw1rG2dr1pRR4wqwbVq4d6+xk2f4ut/yo+hwr4QjE08=
 github.com/vektah/gqlparser/v2 v2.5.21/go.mod h1:xMl+ta8a5M1Yo1A1Iwt/k7gSpscwSnHZdw7tfhEGfTM=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
@@ -194,8 +196,8 @@ go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -243,8 +245,8 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210216224549-f992740a1bac/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201113234701-d7a72108b828/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
diff --git a/internal/handler/insightsParserFilter.go b/internal/handler/insightsParserFilter.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	cdx "github.com/CycloneDX/cyclonedx-go"
 	"github.com/Khan/genqlient/graphql"
+	"github.com/uselagoon/machinery/utils/namespace"
 	"log/slog"
 )
 
@@ -21,8 +22,8 @@ func processSbomInsightsData(h *Messaging, insights InsightsData, v string, apiC
 		return []LagoonFact{}, "", err
 	}
 
-	// Determine lagoon resource destination
-	_, environment, apiErr := determineResourceFromLagoonAPI(apiClient, resource)
+	kubernetesNamespaceName := namespace.GenerateNamespaceName("", resource.Environment, resource.Project, "", "", false)
+	_, environment, apiErr := determineResourceFromLagoonAPIByKubernetesNamespace(apiClient, kubernetesNamespaceName)
 	if apiErr != nil {
 		return nil, "", apiErr
 	}
diff --git a/internal/handler/main.go b/internal/handler/main.go
@@ -8,6 +8,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"github.com/uselagoon/machinery/utils/namespace"
 	"io"
 	"io/ioutil"
 	"log"
@@ -428,24 +429,28 @@ func (h *Messaging) getApiClient() graphql.Client {
 	return apiClient
 }
 
-func determineResourceFromLagoonAPI(apiClient graphql.Client, resource ResourceDestination) (lagoonclient.Project, lagoonclient.Environment, error) {
-	// Get project data (we need the project ID to be able to utilise the environmentByName query)
-	project, err := lagoonclient.GetProjectByName(context.TODO(), apiClient, resource.Project)
+func determineResourceFromLagoonAPIByKubernetesNamespace(apiClient graphql.Client, k8sNamespaceName string) (lagoonclient.Project, lagoonclient.Environment, error) {
+	project, environment, err := lagoonclient.GetEnvironmentFromKubernetesNamespaceName(context.TODO(), apiClient, k8sNamespaceName)
 	if err != nil {
-		return lagoonclient.Project{}, lagoonclient.Environment{}, fmt.Errorf("error: unable to determine resource destination (does %s:%s exist?): %v", resource.Project, resource.Environment, err.Error())
+		return lagoonclient.Project{}, lagoonclient.Environment{}, fmt.Errorf("error: unable to determine resource destination (does %s exist?): %v", k8sNamespaceName, err.Error())
 	}
-
 	if project.Id == 0 || project.Name == "" {
-		return lagoonclient.Project{}, lagoonclient.Environment{}, fmt.Errorf("error: unable to determine resource destination (does %s:%s exist?): %v", resource.Project, resource.Environment, err.Error())
+		return lagoonclient.Project{}, lagoonclient.Environment{}, fmt.Errorf("error: unable to determine resource destination (does %s exist?): %v", k8sNamespaceName, err.Error())
 	}
-
-	environment, err := lagoonclient.GetEnvironmentFromName(context.TODO(), apiClient, resource.Environment, project.Id)
-	if err != nil {
-		return lagoonclient.Project{}, lagoonclient.Environment{}, err
+	if environment.Id == 0 || environment.Name == "" {
+		return lagoonclient.Project{}, lagoonclient.Environment{}, fmt.Errorf("error: unable to determine resource destination (does %s exist?): %v", k8sNamespaceName, err.Error())
 	}
+
 	return project, environment, nil
 }
 
+func determineResourceFromLagoonAPI(apiClient graphql.Client, resource ResourceDestination) (lagoonclient.Project, lagoonclient.Environment, error) {
+	// Determine lagoon resource destination
+	// let's grab the environment via the kubernetes namespace
+	kubernetesNamespaceName := namespace.GenerateNamespaceName("", resource.Environment, resource.Project, "", "", false)
+	return determineResourceFromLagoonAPIByKubernetesNamespace(apiClient, kubernetesNamespaceName)
+}
+
 func (h *Messaging) sendToLagoonS3(incoming *InsightsMessage, insights InsightsData, resource ResourceDestination) (err error) {
 	// strip http/s protocol from origin
 	u, _ := url.Parse(h.S3Config.S3Origin)
diff --git a/internal/lagoonclient/facts.go b/internal/lagoonclient/facts.go
@@ -59,6 +59,25 @@ func GetEnvironmentFromName(ctx context.Context, client graphql.Client, environm
 	}, nil
 }
 
+func GetEnvironmentFromKubernetesNamespaceName(ctx context.Context, client graphql.Client, kubernetesNamespaceName string) (Project, Environment, error) {
+	var ret Environment
+	var retProject Project
+
+	resp, err := getEnvironmentByNamespaceName(ctx, client, kubernetesNamespaceName)
+	if err != nil {
+		return retProject, ret, err
+	}
+
+	return Project{
+			Id:   resp.EnvironmentByKubernetesNamespaceName.Project.Id,
+			Name: resp.EnvironmentByKubernetesNamespaceName.Project.Name,
+		}, Environment{
+			Id:   resp.EnvironmentByKubernetesNamespaceName.Id,
+			Name: resp.EnvironmentByKubernetesNamespaceName.Name,
+		}, nil
+
+}
+
 func GetEnvironmentFromID(ctx context.Context, client graphql.Client, environmentID int) (Environment, error) {
 	var ret Environment
 
diff --git a/internal/lagoonclient/generated.go b/internal/lagoonclient/generated.go
diff --git a/internal/lagoonclient/genqlient.graphql b/internal/lagoonclient/genqlient.graphql

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`cdx "github.com/CycloneDX/cyclonedx-go"`
`6`	`6`	`"github.com/Khan/genqlient/graphql"`
	`7`	`+ "github.com/uselagoon/machinery/utils/namespace"`
`7`	`8`	`"log/slog"`
`8`	`9`	`)`
`9`	`10`
`@@ -21,8 +22,8 @@ func processSbomInsightsData(h *Messaging, insights InsightsData, v string, apiC`
`21`	`22`	`return []LagoonFact{}, "", err`
`22`	`23`	`}`
`23`	`24`
`24`		`- // Determine lagoon resource destination`
`25`		`- _, environment, apiErr := determineResourceFromLagoonAPI(apiClient, resource)`
	`25`	`+ kubernetesNamespaceName := namespace.GenerateNamespaceName("", resource.Environment, resource.Project, "", "", false)`
	`26`	`+ _, environment, apiErr := determineResourceFromLagoonAPIByKubernetesNamespace(apiClient, kubernetesNamespaceName)`
`26`	`27`	`if apiErr != nil {`
`27`	`28`	`return nil, "", apiErr`
`28`	`29`	`}`