Skip to content

K
k3s
Unverified Commit fa094e66 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #58435 from bowei/cp-gen-method-pages

Automatic merge from submit-queue (batch tested with PRs 58422, 58229, 58421, 58435, 58475). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add handling for method that use Pages() to retrieve results - Add handling for method that use Pages() to retrieve results - Make functions take in *Key rather than value type. ```release-note NONE ```
parents df76ee22 d3a1b4b2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 21 deletions
pkg/cloudprovider/providers/gce/cloud/gen.go
View file @ fa094e66
This source diff could not be displayed because it is too large. You can view the blob instead.
pkg/cloudprovider/providers/gce/cloud/meta/BUILD
View file @ fa094e66
...@@ -12,7 +12,6 @@ go_library( ...@@ -12,7 +12,6 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/meta", importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/meta",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/google.golang.org/api/compute/v0.alpha:go_default_library", "//vendor/google.golang.org/api/compute/v0.alpha:go_default_library",
"//vendor/google.golang.org/api/compute/v0.beta:go_default_library", "//vendor/google.golang.org/api/compute/v0.beta:go_default_library",
"//vendor/google.golang.org/api/compute/v1:go_default_library", "//vendor/google.golang.org/api/compute/v1:go_default_library",
......
pkg/cloudprovider/providers/gce/cloud/meta/meta.go
View file @ fa094e66
...@@ -119,6 +119,18 @@ var AllServices = []*ServiceInfo{ ...@@ -119,6 +119,18 @@ var AllServices = []*ServiceInfo{
Object: "BackendService", Object: "BackendService",
Service: "RegionBackendServices", Service: "RegionBackendServices",
Resource: "backendServices", Resource: "backendServices",
version: VersionGA,
keyType: Regional,
serviceType: reflect.TypeOf(&ga.RegionBackendServicesService{}),
additionalMethods: []string{
"GetHealth",
"Update",
},
},
{
Object: "BackendService",
Service: "RegionBackendServices",
Resource: "backendServices",
version: VersionAlpha, version: VersionAlpha,
keyType: Regional, keyType: Regional,
serviceType: reflect.TypeOf(&alpha.RegionBackendServicesService{}), serviceType: reflect.TypeOf(&alpha.RegionBackendServicesService{}),
...@@ -285,6 +297,7 @@ var AllServices = []*ServiceInfo{ ...@@ -285,6 +297,7 @@ var AllServices = []*ServiceInfo{
additionalMethods: []string{ additionalMethods: []string{
"AttachNetworkEndpoints", "AttachNetworkEndpoints",
"DetachNetworkEndpoints", "DetachNetworkEndpoints",
"ListNetworkEndpoints",
}, },
options: AggregatedList, options: AggregatedList,
}, },
......
pkg/cloudprovider/providers/gce/cloud/mock_test.go
View file @ fa094e66
...@@ -45,42 +45,42 @@ func TestMocks(t *testing.T) { ...@@ -45,42 +45,42 @@ func TestMocks(t *testing.T) {
key := keyAlpha key := keyAlpha
// Get not found. // Get not found.
if _, err := mock.AlphaAddresses().Get(ctx, *key); err == nil { if _, err := mock.AlphaAddresses().Get(ctx, key); err == nil {
t.Errorf("AlphaAddresses().Get(%v, %v) = _, nil; want error", ctx, key) t.Errorf("AlphaAddresses().Get(%v, %v) = _, nil; want error", ctx, key)
} }
if _, err := mock.BetaAddresses().Get(ctx, *key); err == nil { if _, err := mock.BetaAddresses().Get(ctx, key); err == nil {
t.Errorf("BetaAddresses().Get(%v, %v) = _, nil; want error", ctx, key) t.Errorf("BetaAddresses().Get(%v, %v) = _, nil; want error", ctx, key)
} }
if _, err := mock.Addresses().Get(ctx, *key); err == nil { if _, err := mock.Addresses().Get(ctx, key); err == nil {
t.Errorf("Addresses().Get(%v, %v) = _, nil; want error", ctx, key) t.Errorf("Addresses().Get(%v, %v) = _, nil; want error", ctx, key)
} }
// Insert. // Insert.
{ {
obj := &alpha.Address{} obj := &alpha.Address{}
if err := mock.AlphaAddresses().Insert(ctx, *keyAlpha, obj); err != nil { if err := mock.AlphaAddresses().Insert(ctx, keyAlpha, obj); err != nil {
t.Errorf("AlphaAddresses().Insert(%v, %v, %v) = %v; want nil", ctx, key, obj, err) t.Errorf("AlphaAddresses().Insert(%v, %v, %v) = %v; want nil", ctx, key, obj, err)
} }
} }
{ {
obj := &beta.Address{} obj := &beta.Address{}
if err := mock.BetaAddresses().Insert(ctx, *keyBeta, obj); err != nil { if err := mock.BetaAddresses().Insert(ctx, keyBeta, obj); err != nil {
t.Errorf("BetaAddresses().Insert(%v, %v, %v) = %v; want nil", ctx, key, obj, err) t.Errorf("BetaAddresses().Insert(%v, %v, %v) = %v; want nil", ctx, key, obj, err)
} }
} }
{ {
obj := &ga.Address{} obj := &ga.Address{}
if err := mock.Addresses().Insert(ctx, *keyGA, &ga.Address{Name: "ga"}); err != nil { if err := mock.Addresses().Insert(ctx, keyGA, &ga.Address{Name: "ga"}); err != nil {
t.Errorf("Addresses().Insert(%v, %v, %v) = %v; want nil", ctx, key, obj, err) t.Errorf("Addresses().Insert(%v, %v, %v) = %v; want nil", ctx, key, obj, err)
} }
} }
// Get across versions. // Get across versions.
if obj, err := mock.AlphaAddresses().Get(ctx, *key); err != nil { if obj, err := mock.AlphaAddresses().Get(ctx, key); err != nil {
t.Errorf("AlphaAddresses().Get(%v, %v) = %v, %v; want nil", ctx, key, obj, err) t.Errorf("AlphaAddresses().Get(%v, %v) = %v, %v; want nil", ctx, key, obj, err)
} }
if obj, err := mock.BetaAddresses().Get(ctx, *key); err != nil { if obj, err := mock.BetaAddresses().Get(ctx, key); err != nil {
t.Errorf("BetaAddresses().Get(%v, %v) = %v, %v; want nil", ctx, key, obj, err) t.Errorf("BetaAddresses().Get(%v, %v) = %v, %v; want nil", ctx, key, obj, err)
} }
if obj, err := mock.Addresses().Get(ctx, *key); err != nil { if obj, err := mock.Addresses().Get(ctx, key); err != nil {
t.Errorf("Addresses().Get(%v, %v) = %v, %v; want nil", ctx, key, obj, err) t.Errorf("Addresses().Get(%v, %v) = %v, %v; want nil", ctx, key, obj, err)
} }
// List across versions. // List across versions.
...@@ -128,23 +128,23 @@ func TestMocks(t *testing.T) { ...@@ -128,23 +128,23 @@ func TestMocks(t *testing.T) {
} }
} }
// Delete across versions. // Delete across versions.
if err := mock.AlphaAddresses().Delete(ctx, *keyAlpha); err != nil { if err := mock.AlphaAddresses().Delete(ctx, keyAlpha); err != nil {
t.Errorf("AlphaAddresses().Delete(%v, %v) = %v; want nil", ctx, key, err) t.Errorf("AlphaAddresses().Delete(%v, %v) = %v; want nil", ctx, key, err)
} }
if err := mock.BetaAddresses().Delete(ctx, *keyBeta); err != nil { if err := mock.BetaAddresses().Delete(ctx, keyBeta); err != nil {
t.Errorf("BetaAddresses().Delete(%v, %v) = %v; want nil", ctx, key, err) t.Errorf("BetaAddresses().Delete(%v, %v) = %v; want nil", ctx, key, err)
} }
if err := mock.Addresses().Delete(ctx, *keyGA); err != nil { if err := mock.Addresses().Delete(ctx, keyGA); err != nil {
t.Errorf("Addresses().Delete(%v, %v) = %v; want nil", ctx, key, err) t.Errorf("Addresses().Delete(%v, %v) = %v; want nil", ctx, key, err)
} }
// Delete not found. // Delete not found.
if err := mock.AlphaAddresses().Delete(ctx, *keyAlpha); err == nil { if err := mock.AlphaAddresses().Delete(ctx, keyAlpha); err == nil {
t.Errorf("AlphaAddresses().Delete(%v, %v) = nil; want error", ctx, key) t.Errorf("AlphaAddresses().Delete(%v, %v) = nil; want error", ctx, key)
} }
if err := mock.BetaAddresses().Delete(ctx, *keyBeta); err == nil { if err := mock.BetaAddresses().Delete(ctx, keyBeta); err == nil {
t.Errorf("BetaAddresses().Delete(%v, %v) = nil; want error", ctx, key) t.Errorf("BetaAddresses().Delete(%v, %v) = nil; want error", ctx, key)
} }
if err := mock.Addresses().Delete(ctx, *keyGA); err == nil { if err := mock.Addresses().Delete(ctx, keyGA); err == nil {
t.Errorf("Addresses().Delete(%v, %v) = nil; want error", ctx, key) t.Errorf("Addresses().Delete(%v, %v) = nil; want error", ctx, key)
} }
} }
pkg/cloudprovider/providers/gce/cloud/utils.go
View file @ fa094e66
...@@ -142,7 +142,7 @@ func copyViaJSON(dest, src interface{}) error { ...@@ -142,7 +142,7 @@ func copyViaJSON(dest, src interface{}) error {
} }
// SelfLink returns the self link URL for the given object. // SelfLink returns the self link URL for the given object.
func SelfLink(ver meta.Version, project, resource string, key meta.Key) string { func SelfLink(ver meta.Version, project, resource string, key *meta.Key) string {
var prefix string var prefix string
switch ver { switch ver {
case meta.VersionAlpha: case meta.VersionAlpha:
......
pkg/cloudprovider/providers/gce/cloud/utils_test.go
View file @ fa094e66
...@@ -165,28 +165,28 @@ func TestSelfLink(t *testing.T) { ...@@ -165,28 +165,28 @@ func TestSelfLink(t *testing.T) {
ver meta.Version ver meta.Version
project string project string
resource string resource string
key meta.Key key *meta.Key
want string want string
}{ }{
{ {
meta.VersionAlpha, meta.VersionAlpha,
"proj1", "proj1",
"addresses", "addresses",
*meta.RegionalKey("key1", "us-central1"), meta.RegionalKey("key1", "us-central1"),
"https://www.googleapis.com/compute/alpha/projects/proj1/regions/us-central1/addresses/key1", "https://www.googleapis.com/compute/alpha/projects/proj1/regions/us-central1/addresses/key1",
}, },
{ {
meta.VersionBeta, meta.VersionBeta,
"proj3", "proj3",
"disks", "disks",
*meta.ZonalKey("key2", "us-central1-b"), meta.ZonalKey("key2", "us-central1-b"),
"https://www.googleapis.com/compute/beta/projects/proj3/zones/us-central1-b/disks/key2", "https://www.googleapis.com/compute/beta/projects/proj3/zones/us-central1-b/disks/key2",
}, },
{ {
meta.VersionGA, meta.VersionGA,
"proj4", "proj4",
"urlMaps", "urlMaps",
*meta.GlobalKey("key3"), meta.GlobalKey("key3"),
"https://www.googleapis.com/compute/v1/projects/proj4/urlMaps/key3", "https://www.googleapis.com/compute/v1/projects/proj4/urlMaps/key3",
}, },
} { } {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment