Skip to content

Commit

Permalink
Merge pull request #27734 from quinton-hoole/2016-06-20-rename-dnspro…
Browse files Browse the repository at this point in the history
…vider-route53-testing-package

Automatic merge from submit-queue

Rename dnsprovider/providers/aws/route53/internal/testing to stubs.

Resolves #27586 (comment)

cc @colhom @goltermann
  • Loading branch information
k8s-merge-robot authored Jun 21, 2016
2 parents fae7285 + acaad60 commit 6f54637
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions federation/pkg/dnsprovider/providers/aws/route53/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ package route53

import (
"k8s.io/kubernetes/federation/pkg/dnsprovider"
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/aws/route53/testing"
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/aws/route53/stubs"
)

// Compile time check for interface adeherence
var _ dnsprovider.Interface = Interface{}

type Interface struct {
service testing.Route53API
service stubs.Route53API
}

// newInterfaceWithStub facilitates stubbing out the underlying AWS Route53
// library for testing purposes. It returns an provider-independent interface.
func newInterfaceWithStub(service testing.Route53API) *Interface {
func newInterfaceWithStub(service stubs.Route53API) *Interface {
return &Interface{service}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"testing"

"k8s.io/kubernetes/federation/pkg/dnsprovider"
route53testing "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/aws/route53/testing"
route53testing "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/aws/route53/stubs"
"k8s.io/kubernetes/federation/pkg/dnsprovider/rrstype"

"github.com/aws/aws-sdk-go/aws"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.
*/

/* internal implements a stub for the AWS Route53 API, used primarily for unit testing purposes */
package testing
package stubs

import (
"fmt"
Expand Down

0 comments on commit 6f54637

Please sign in to comment.