Switch to new repository golib/pkg/auth/userinfo.

Cloud-Foundations · Dec 5, 2019 · 0091e83 · 0091e83
1 parent f68954f
commit 0091e83
Show file tree

Hide file tree

Showing 19 changed files with 8 additions and 599 deletions.
diff --git a/broker/aws/api.go b/broker/aws/api.go
@@ -8,7 +8,7 @@ import (
 	"github.com/Cloud-Foundations/Dominator/lib/log"
 	"github.com/Cloud-Foundations/cloud-gate/broker"
 	"github.com/Cloud-Foundations/cloud-gate/broker/configuration"
-	"github.com/Cloud-Foundations/cloud-gate/lib/userinfo"
+	"github.com/Cloud-Foundations/golib/pkg/auth/userinfo"
 )
 
 type userAllowedCredentialsCacheEntry struct {

diff --git a/broker/httpd/api.go b/broker/httpd/api.go
@@ -25,7 +25,7 @@ import (
 	"github.com/Cloud-Foundations/cloud-gate/broker/configuration"
 	"github.com/Cloud-Foundations/cloud-gate/broker/staticconfiguration"
 	"github.com/Cloud-Foundations/cloud-gate/lib/constants"
-	"github.com/Cloud-Foundations/cloud-gate/lib/userinfo"
+	"github.com/Cloud-Foundations/golib/pkg/auth/userinfo"
 	"github.com/Cloud-Foundations/keymaster/lib/instrumentedwriter"
 )
 

diff --git a/broker/staticconfiguration/api.go b/broker/staticconfiguration/api.go
@@ -21,6 +21,7 @@ type BaseConfig struct {
 }
 
 type GitDatabaseConfig struct {
+	Branch                   string        `yaml:"branch"`
 	CheckInterval            time.Duration `yaml:"check_interval"`
 	LocalRepositoryDirectory string        `yaml:"local_repository_directory"`
 	RepositoryURL            string        `yaml:"repository_url"`

diff --git a/cloud-gate.spec b/cloud-gate.spec
@@ -1,5 +1,5 @@
 Name:           cloud-gate
-Version:        0.7.7
+Version:        0.7.8
 Release:        1%{?dist}
 Summary:        Access broker for clouds
 

diff --git a/cmd/cloud-gate/main.go b/cmd/cloud-gate/main.go
@@ -21,9 +21,9 @@ import (
 	"github.com/Cloud-Foundations/cloud-gate/broker/configuration"
 	"github.com/Cloud-Foundations/cloud-gate/broker/httpd"
 	"github.com/Cloud-Foundations/cloud-gate/broker/staticconfiguration"
-	"github.com/Cloud-Foundations/cloud-gate/lib/userinfo"
-	"github.com/Cloud-Foundations/cloud-gate/lib/userinfo/gitdb"
-	"github.com/Cloud-Foundations/cloud-gate/lib/userinfo/ldap"
+	"github.com/Cloud-Foundations/golib/pkg/auth/userinfo"
+	"github.com/Cloud-Foundations/golib/pkg/auth/userinfo/gitdb"
+	"github.com/Cloud-Foundations/golib/pkg/auth/userinfo/ldap"
 	"github.com/Cloud-Foundations/tricorder/go/tricorder"
 )
 
@@ -50,6 +50,7 @@ func getUserInfo(config *staticconfiguration.StaticConfiguration,
 	}
 	if config.GitDB.LocalRepositoryDirectory != "" {
 		userInfo, err := gitdb.New(config.GitDB.RepositoryURL,
+			config.GitDB.Branch,
 			config.GitDB.LocalRepositoryDirectory,
 			config.GitDB.CheckInterval, logger)
 		if err != nil {

diff --git a/lib/userinfo/api.go b/lib/userinfo/api.go
diff --git a/lib/userinfo/gitdb/api.go b/lib/userinfo/gitdb/api.go
diff --git a/lib/userinfo/gitdb/impl.go b/lib/userinfo/gitdb/impl.go
diff --git a/lib/userinfo/gitdb/impl_test.go b/lib/userinfo/gitdb/impl_test.go