Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

go-open-service-broker-client move #51

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
version = "1.6.1"

[[constraint]]
name = "github.com/pmorie/go-open-service-broker-client"
name = "sigs.k8s.io/go-open-service-broker-client"
version = "0.0.5"

[[constraint]]
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ fmtcheck: ## Check go formatting
@gofmt -l $(SOURCES) | grep ".*\.go"; if [ "$$?" = "0" ]; then exit 1; fi

vet: ## Run go vet
@go tool vet ./pkg
@go vet ./pkg

test: ## Run unit tests
@go test -cover ./pkg/...
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

A go library for developing an [Open Service
Broker](https://github.com/openservicebrokerapi/servicebroker), using the
[`pmorie/go-open-service-broker-client`](https://github.com/pmorie/go-open-service-broker-client)
[`sigs.k8s.io/go-open-service-broker-client`](https://sigs.k8s.io/go-open-service-broker-client)
OSB client library types. This project was originally created as part of the
[OSB Starter Pack](https://github.com/pmorie/osb-starter-pack) project.

Expand All @@ -22,7 +22,7 @@ Pack](https://github.com/pmorie/osb-starter-pack).

```go
import (
osb "github.com/pmorie/go-open-service-broker-client/v2"
osb "sigs.k8s.io/go-open-service-broker-client/v2"
broker "github.com/pmorie/osb-broker-lib/pkg/"

"gopkg.in/yaml.v2"
Expand Down
2 changes: 1 addition & 1 deletion pkg/broker/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package broker
import (
"net/http"

osb "github.com/pmorie/go-open-service-broker-client/v2"
osb "sigs.k8s.io/go-open-service-broker-client/v2"
)

// Interface contains the business logic for the broker's operations.
Expand Down
4 changes: 2 additions & 2 deletions pkg/broker/types.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package broker

import osb "github.com/pmorie/go-open-service-broker-client/v2"
import osb "sigs.k8s.io/go-open-service-broker-client/v2"

// CatalogResponse is sent as the response to a catalog requests.
type CatalogResponse struct {
Expand Down Expand Up @@ -42,7 +42,7 @@ type BindResponse struct {
Exists bool `json:"-"`
}

// GetBinding is sent as the response to a get binding call.
// GetBindingResponse is sent as the response to a get binding call.
type GetBindingResponse struct {
osb.GetBindingResponse
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/broker/user_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"

osb "github.com/pmorie/go-open-service-broker-client/v2"
osb "sigs.k8s.io/go-open-service-broker-client/v2"
)

// parseKubernetesIdentity - creates a kubernetes identity from the
Expand Down
2 changes: 1 addition & 1 deletion pkg/broker/user_info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"testing"

osb "github.com/pmorie/go-open-service-broker-client/v2"
osb "sigs.k8s.io/go-open-service-broker-client/v2"
)

func TestParseIdentity(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/rest/apisurface.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/golang/glog"
"github.com/gorilla/mux"

osb "github.com/pmorie/go-open-service-broker-client/v2"
osb "sigs.k8s.io/go-open-service-broker-client/v2"

"github.com/pmorie/osb-broker-lib/pkg/broker"
"github.com/pmorie/osb-broker-lib/pkg/metrics"
Expand Down Expand Up @@ -385,7 +385,7 @@ func unpackGetBindingRequest(r *http.Request, vars map[string]string) (*osb.GetB
return request, nil
}

// GetBindingLastOperation is the mux handler that dispatches binding last
// BindingLastOperationHandler is the mux handler that dispatches binding last
// operation requests to the broker's Interface.
func (s *APISurface) BindingLastOperationHandler(w http.ResponseWriter, r *http.Request) {
s.Metrics.Actions.WithLabelValues("binding_last_operation").Inc()
Expand Down
2 changes: 1 addition & 1 deletion pkg/rest/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io/ioutil"
"net/http"

osb "github.com/pmorie/go-open-service-broker-client/v2"
osb "sigs.k8s.io/go-open-service-broker-client/v2"
)

func getBrokerAPIVersionFromRequest(r *http.Request) string {
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/bind_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/pmorie/osb-broker-lib/pkg/metrics"
"github.com/pmorie/osb-broker-lib/pkg/rest"

osb "github.com/pmorie/go-open-service-broker-client/v2"
prom "github.com/prometheus/client_golang/prometheus"
osb "sigs.k8s.io/go-open-service-broker-client/v2"
)

func TestBind(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/catalog_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/pmorie/osb-broker-lib/pkg/metrics"
"github.com/pmorie/osb-broker-lib/pkg/rest"

osb "github.com/pmorie/go-open-service-broker-client/v2"
prom "github.com/prometheus/client_golang/prometheus"
osb "sigs.k8s.io/go-open-service-broker-client/v2"
)

func TestGetCatalog(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/deprovision_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/pmorie/osb-broker-lib/pkg/metrics"
"github.com/pmorie/osb-broker-lib/pkg/rest"

osb "github.com/pmorie/go-open-service-broker-client/v2"
prom "github.com/prometheus/client_golang/prometheus"
osb "sigs.k8s.io/go-open-service-broker-client/v2"
)

func TestDeprovision(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/last_operation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/pmorie/osb-broker-lib/pkg/metrics"
"github.com/pmorie/osb-broker-lib/pkg/rest"

osb "github.com/pmorie/go-open-service-broker-client/v2"
prom "github.com/prometheus/client_golang/prometheus"
osb "sigs.k8s.io/go-open-service-broker-client/v2"
)

func TestLastOperation(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/provision_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/pmorie/osb-broker-lib/pkg/metrics"
"github.com/pmorie/osb-broker-lib/pkg/rest"

osb "github.com/pmorie/go-open-service-broker-client/v2"
prom "github.com/prometheus/client_golang/prometheus"
osb "sigs.k8s.io/go-open-service-broker-client/v2"
)

func TestProvision(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"path"
"testing"

osb "github.com/pmorie/go-open-service-broker-client/v2"
"github.com/pmorie/osb-broker-lib/pkg/broker"
"github.com/pmorie/osb-broker-lib/pkg/metrics"
"github.com/pmorie/osb-broker-lib/pkg/rest"
osb "sigs.k8s.io/go-open-service-broker-client/v2"
)

// TODO: is this more of an integration test?
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/unbind_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/pmorie/osb-broker-lib/pkg/metrics"
"github.com/pmorie/osb-broker-lib/pkg/rest"

osb "github.com/pmorie/go-open-service-broker-client/v2"
prom "github.com/prometheus/client_golang/prometheus"
osb "sigs.k8s.io/go-open-service-broker-client/v2"
)

func TestUnbind(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/update_instance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/pmorie/osb-broker-lib/pkg/metrics"
"github.com/pmorie/osb-broker-lib/pkg/rest"

osb "github.com/pmorie/go-open-service-broker-client/v2"
prom "github.com/prometheus/client_golang/prometheus"
osb "sigs.k8s.io/go-open-service-broker-client/v2"
)

func TestUpdateInstance(t *testing.T) {
Expand Down