Merge pull request #348 from jstrachan/gha

fix: upgrade deps

go.mod

@@ -8,8 +8,8 @@ require (
 	github.com/hashicorp/vault/api v1.0.5-0.20190909201928-35325e2c3262 // indirect
 	github.com/jenkins-x/go-scm v1.6.7
 	github.com/jenkins-x/jx-api/v4 v4.0.25
-	github.com/jenkins-x/jx-gitops v0.2.33
-	github.com/jenkins-x/jx-helpers/v3 v3.0.91
+	github.com/jenkins-x/jx-gitops v0.2.35
+	github.com/jenkins-x/jx-helpers/v3 v3.0.92
 	github.com/jenkins-x/jx-logging/v3 v3.0.3
 	github.com/mitchellh/mapstructure v1.3.1 // indirect
 	github.com/pkg/errors v0.9.1

go.sum

@@ -776,20 +776,19 @@ github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj
 github.com/jenkins-x/go-scm v1.5.117/go.mod h1:PCT338UhP/pQ0IeEeMEf/hoLTYKcH7qjGEKd7jPkeYg=
 github.com/jenkins-x/go-scm v1.6.2 h1:IHTL/Wrc559pB9QqMkJpfU/McE4x5rwqxyGwMhbtQwE=
 github.com/jenkins-x/go-scm v1.6.2/go.mod h1:yVqpMl3ZSkPWVcPi9EhcK3QtTM/anrtYqI//FqwrdxQ=
-github.com/jenkins-x/go-scm v1.6.6/go.mod h1:yVqpMl3ZSkPWVcPi9EhcK3QtTM/anrtYqI//FqwrdxQ=
 github.com/jenkins-x/go-scm v1.6.7 h1:Tc8yLV1B0OdKCbtQX76Bc5FfbsvShqa+HWrTky92vGY=
 github.com/jenkins-x/go-scm v1.6.7/go.mod h1:yVqpMl3ZSkPWVcPi9EhcK3QtTM/anrtYqI//FqwrdxQ=
 github.com/jenkins-x/jx-api/v4 v4.0.25 h1:G80im88KcIOH8smhzvK/6qOI76RB328dAX9Wneb+xyo=
 github.com/jenkins-x/jx-api/v4 v4.0.25/go.mod h1:IC88X+24Nmexuj7lRNRgzfrchzlo0qysfwkICpqDmMQ=
-github.com/jenkins-x/jx-gitops v0.2.33 h1:z5eDSeUh5CNxKJx1Zu1eB/uRrFxm+IAhC51Run9x5hQ=
-github.com/jenkins-x/jx-gitops v0.2.33/go.mod h1:pEOtos+lqhoXid+lNRIFS45NjXwrGUTZ2iaHm2qUCNw=
-github.com/jenkins-x/jx-helpers/v3 v3.0.91 h1:szB0LlOjThjur/sYlubXrFdGxhpp+YLnrnSvUf6pHns=
-github.com/jenkins-x/jx-helpers/v3 v3.0.91/go.mod h1:W/ZUs7eWMJ+n0qVjUH9TDCc01dBTD9ptnqtS5qehk2c=
+github.com/jenkins-x/jx-gitops v0.2.35 h1:fNFf7LqsHhOBOtOg33Q5RjBNR54T7lBXJccKmnINadU=
+github.com/jenkins-x/jx-gitops v0.2.35/go.mod h1:mlFIDKyPLuL7MotQyhM/zxO6SU7sjHYTmb28ogUInuY=
+github.com/jenkins-x/jx-helpers/v3 v3.0.92 h1:xg3DUt2531IHgeC6yNNnlZOnlmWOXm67YFo/ovz9PNI=
+github.com/jenkins-x/jx-helpers/v3 v3.0.92/go.mod h1:W/ZUs7eWMJ+n0qVjUH9TDCc01dBTD9ptnqtS5qehk2c=
 github.com/jenkins-x/jx-kube-client/v3 v3.0.2 h1:sJs6FaIwycDYwE4UsA7j9tpdXOxXEta9KNUJp6s45VI=
 github.com/jenkins-x/jx-kube-client/v3 v3.0.2/go.mod h1:C/mKnCT5wvolX61eLKJVBNev9sqnkGNpi4skTQ1Gr3Q=
 github.com/jenkins-x/jx-logging/v3 v3.0.3 h1:sVACbwiKuaDFYPfJeVAU10MJI4DA6LcH1RqJKwfNozc=
 github.com/jenkins-x/jx-logging/v3 v3.0.3/go.mod h1:Vp2ER2SYgGhAgEEHlLwfi2ZB54tz6ya1qExq0A4CKMI=
-github.com/jenkins-x/lighthouse-client v0.0.80/go.mod h1:zyq+yVOK8LsBr6TYUsnxtMueuG6CqqHjgVlf7QmktdA=
+github.com/jenkins-x/lighthouse-client v0.0.83/go.mod h1:f3bofZN335GxjnzLvaLFt+j9uDjIZTamyxVJ54cvOo8=
 github.com/jenkins-x/logrus-stackdriver-formatter v0.2.3 h1:NuRWKUPCEX1wKlXA8ZYSG28qGKd41R7BK11YDQkPwqo=
 github.com/jenkins-x/logrus-stackdriver-formatter v0.2.3/go.mod h1:litPp7VZWDRCl8LvXuqGngy+65kkg/+T23TgFnDmfTk=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
@@ -1873,6 +1872,7 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0=
 gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0=
+gopkg.in/validator.v2 v2.0.0-20200605151824-2b28d334fa05 h1:l9eKDCWy9n7C5NAiQAMvDePh0vyLAweR6LcSUVXFUGg=
 gopkg.in/validator.v2 v2.0.0-20200605151824-2b28d334fa05/go.mod h1:o4V0GXN9/CAmCsvJ0oXYZvrZOe7syiDZSN1GWGZTGzc=
 gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=

pkg/envctx/env_context.go

@@ -4,8 +4,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	v1 "github.com/jenkins-x/jx-api/v4/pkg/apis/jenkins.io/v1"
 	jxcore "github.com/jenkins-x/jx-api/v4/pkg/apis/core/v4beta1"
+	v1 "github.com/jenkins-x/jx-api/v4/pkg/apis/jenkins.io/v1"
 	"github.com/jenkins-x/jx-helpers/v3/pkg/kube"
 	"github.com/jenkins-x/jx-helpers/v3/pkg/versionstream"
 )
@@ -29,6 +29,12 @@ type EnvironmentContext struct {
 
 	// GitToken the git token used to clone the development git repository
 	GitToken string
+
+	// GitOwner the current owner of the current git repository we are in
+	GitOwner string
+
+	// GitRepository the current name  of the current git repository we are in
+	GitRepository string
 }
 
 // TeamSettings returns the team settings for the current environment

pkg/envctx/load.go

@@ -32,7 +32,7 @@ func (e *EnvironmentContext) LazyLoad(gclient gitclient.Interface, jxClient vers
 		return errors.Errorf("no dev environemnt in namespace %s", ns)
 	}
 	if e.Requirements == nil {
-		e.Requirements, err = variablefinders.FindRequirements(gclient, jxClient, ns, dir)
+		e.Requirements, err = variablefinders.FindRequirements(gclient, jxClient, ns, dir, e.GitOwner, e.GitRepository)
 		if err != nil {
 			return errors.Wrapf(err, "failed to load requirements from dev environment")
 		}