summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--http.go24
-rw-r--r--init.go6
-rw-r--r--patchset.Get.go4
-rw-r--r--patchset.Send.go2
-rw-r--r--structs.go1
5 files changed, 29 insertions, 8 deletions
diff --git a/http.go b/http.go
index fb65080..9d5fff0 100644
--- a/http.go
+++ b/http.go
@@ -42,7 +42,7 @@ func (f *Forge) HttpPost(url string, data []byte) ([]byte, error) {
}
func (f *Forge) LookupPBorig(check *gitpb.Repos) (*gitpb.Repos, error) {
- url := forgeURL + "lookup"
+ url := f.forgeURL + "lookup"
for repo := range check.IterByFullPath() {
if repo.Namespace == "" {
@@ -54,7 +54,27 @@ func (f *Forge) LookupPBorig(check *gitpb.Repos) (*gitpb.Repos, error) {
}
func (f *Forge) LookupPB(check *gitpb.Repos) (*gitpb.Repos, error) {
- url := forgeURL + "lookup"
+ url := f.forgeURL + "lookup"
+
+ queryPB := gitpb.NewRepos()
+
+ for repo := range check.IterByFullPath() {
+ ns := repo.Namespace
+ if ns == "" {
+ ns = repo.GoInfo.GoPath
+ }
+
+ newr := new(gitpb.Repo)
+ newr.Namespace = ns
+
+ queryPB.AppendByNamespace(newr)
+ }
+
+ return queryPB.SubmitReposPB(url)
+}
+
+func (f *Forge) UpdatePB(check *gitpb.Repos) (*gitpb.Repos, error) {
+ url := f.forgeURL + "update"
queryPB := gitpb.NewRepos()
diff --git a/init.go b/init.go
index e91b9e9..220050b 100644
--- a/init.go
+++ b/init.go
@@ -139,9 +139,11 @@ func (f *Forge) InitPB() {
f.hasFullScan = true
}
+ f.forgeURL = "https://forge.wit.com/"
+
if os.Getenv("FORGE_URL") != "" {
- forgeURL = os.Getenv("FORGE_URL")
- log.Info("got forge url", forgeURL)
+ f.forgeURL = os.Getenv("FORGE_URL")
+ log.Info("got forge url", f.forgeURL)
}
}
diff --git a/patchset.Get.go b/patchset.Get.go
index b0daf29..4ad3c48 100644
--- a/patchset.Get.go
+++ b/patchset.Get.go
@@ -6,10 +6,8 @@ import (
"go.wit.com/log"
)
-var forgeURL string = "https://forge.wit.com/"
-
func (f *Forge) GetPatchesets() (*Patchsets, error) {
- url := forgeURL + "GetPatchsets"
+ url := f.forgeURL + "GetPatchsets"
log.Info("GetPatchsets() url", url)
body, err := f.HttpPost(url, nil)
if err != nil {
diff --git a/patchset.Send.go b/patchset.Send.go
index b3d4a96..489f095 100644
--- a/patchset.Send.go
+++ b/patchset.Send.go
@@ -40,7 +40,7 @@ func (f *Forge) SubmitDevelPatchSet(name string) (*Patchset, error) {
func (f *Forge) submitPatchset(pset *Patchset) error {
var url string
- url = forgeURL + "patchset"
+ url = f.forgeURL + "patchset"
msg, err := pset.Marshal()
if err != nil {
log.Info("proto.Marshal() failed:", err)
diff --git a/structs.go b/structs.go
index 1b540d3..3a6927e 100644
--- a/structs.go
+++ b/structs.go
@@ -21,6 +21,7 @@ type Forge struct {
hasFullScan bool // track last scan so it can be throttled
fullscan time.Time // time of the last scan so it can be throttled
hostname string // your hostname
+ forgeURL string // URL to use to forge.wit.com
// Machine *zoopb.Machine // things for virtigo to track vm's
}