diff --git a/go.mod b/go.mod index e3db14352..eb0b8f561 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( k8s.io/kubernetes v1.18.9 // indirect kmodules.xyz/client-go v0.0.0-20201007024140-3223988adf40 kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 - kmodules.xyz/custom-resources v0.0.0-20200922210108-70f2815a43bb + kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4 kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41 // indirect kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab kmodules.xyz/prober v0.0.0-20200922212142-743a6514664e // indirect diff --git a/go.sum b/go.sum index 79d5349c9..a38a7c718 100644 --- a/go.sum +++ b/go.sum @@ -983,8 +983,8 @@ kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 h1:NWWv+Qju8xzHZ kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4/go.mod h1:WrO3fryNyFCgqqyWnwI89lnzWA7kN072Ehya7ELGfzE= kmodules.xyz/custom-resources v0.0.0-20200604135349-9e9f5c4fdba9 h1:W+k1qhU0W1rptia2PWPOb7IWUvWnf31EMnatXt7MW6w= kmodules.xyz/custom-resources v0.0.0-20200604135349-9e9f5c4fdba9/go.mod h1:bu1V7HdnuHc1hgvbqAdcwTViQ0TfZwF3Nu/SjB4vai4= -kmodules.xyz/custom-resources v0.0.0-20200922210108-70f2815a43bb h1:SwMPMh6A196yoe8kAH+guTNS8rsTfB2dRbFNh6g0Znk= -kmodules.xyz/custom-resources v0.0.0-20200922210108-70f2815a43bb/go.mod h1:+YU32jSWaGGE4etTr/iCF88tLAeDNq1lhptVymjUbjg= +kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4 h1:eftT0CrrAYK1uniwsVhheYao4mwGk+eFT9eftRX9BMo= +kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4/go.mod h1:+YU32jSWaGGE4etTr/iCF88tLAeDNq1lhptVymjUbjg= kmodules.xyz/objectstore-api v0.0.0-20200521103120-92080446e04d h1:ud3XDScnBdD5q6nLQI/tHLSbuuSwIFaav6IhcQAz2qA= kmodules.xyz/objectstore-api v0.0.0-20200521103120-92080446e04d/go.mod h1:k6sbzLWYBLRGDNmCj/NwLgj1cniRXCl9ux/P6+7Xd+A= kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41 h1:BsCSSPoY0uRGylfPTUzzQ28h2axuXremPGPzwpmxvYI= diff --git a/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/appbinding_helpers.go b/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/appbinding_helpers.go index b6dbf848d..bc26ee570 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/appbinding_helpers.go +++ b/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/appbinding_helpers.go @@ -27,6 +27,7 @@ import ( "kmodules.xyz/client-go/apiextensions" "kmodules.xyz/custom-resources/crds" + core "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" ) @@ -51,17 +52,12 @@ func (a AppBinding) URL() (string, error) { return "", errors.New("connection url is missing") } -const ( - KeyUsername = "username" - KeyPassword = "password" -) - func (a AppBinding) URLTemplate() (string, error) { rawurl, err := a.URL() if err != nil { return "", err } - auth := fmt.Sprintf("{{%s}}:{{%s}}@", KeyUsername, KeyPassword) + auth := fmt.Sprintf("{{%s}}:{{%s}}@", core.BasicAuthUsernameKey, core.BasicAuthPasswordKey) i := strings.Index(rawurl, "://") if i < 0 { diff --git a/vendor/modules.txt b/vendor/modules.txt index d991e9ba7..49acc7ff2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -860,7 +860,7 @@ kmodules.xyz/client-go/tools/cli kmodules.xyz/client-go/tools/clusterid # kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 kmodules.xyz/crd-schema-fuzz -# kmodules.xyz/custom-resources v0.0.0-20200922210108-70f2815a43bb +# kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4 kmodules.xyz/custom-resources/apis/appcatalog kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1 kmodules.xyz/custom-resources/client/clientset/versioned