Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
c3e23b1b
Commit
c3e23b1b
authored
Jan 05, 2018
by
Bowei Du
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix gofmt
parent
adaaed10
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
34 deletions
+34
-34
meta.go
pkg/cloudprovider/providers/gce/cloud/meta/meta.go
+32
-32
utils_test.go
pkg/cloudprovider/providers/gce/cloud/utils_test.go
+2
-2
No files found.
pkg/cloudprovider/providers/gce/cloud/meta/meta.go
View file @
c3e23b1b
...
@@ -65,14 +65,14 @@ var AllVersions = []Version{
...
@@ -65,14 +65,14 @@ var AllVersions = []Version{
// AllServices are a list of all the services to generate code for. Keep
// AllServices are a list of all the services to generate code for. Keep
// this list in lexiographical order by object type.
// this list in lexiographical order by object type.
var
AllServices
=
[]
*
ServiceInfo
{
var
AllServices
=
[]
*
ServiceInfo
{
&
ServiceInfo
{
{
Object
:
"Address"
,
Object
:
"Address"
,
Service
:
"Addresses"
,
Service
:
"Addresses"
,
Resource
:
"addresses"
,
Resource
:
"addresses"
,
keyType
:
Regional
,
keyType
:
Regional
,
serviceType
:
reflect
.
TypeOf
(
&
ga
.
AddressesService
{}),
serviceType
:
reflect
.
TypeOf
(
&
ga
.
AddressesService
{}),
},
},
&
ServiceInfo
{
{
Object
:
"Address"
,
Object
:
"Address"
,
Service
:
"Addresses"
,
Service
:
"Addresses"
,
Resource
:
"addresses"
,
Resource
:
"addresses"
,
...
@@ -80,7 +80,7 @@ var AllServices = []*ServiceInfo{
...
@@ -80,7 +80,7 @@ var AllServices = []*ServiceInfo{
keyType
:
Regional
,
keyType
:
Regional
,
serviceType
:
reflect
.
TypeOf
(
&
alpha
.
AddressesService
{}),
serviceType
:
reflect
.
TypeOf
(
&
alpha
.
AddressesService
{}),
},
},
&
ServiceInfo
{
{
Object
:
"Address"
,
Object
:
"Address"
,
Service
:
"Addresses"
,
Service
:
"Addresses"
,
Resource
:
"addresses"
,
Resource
:
"addresses"
,
...
@@ -88,14 +88,14 @@ var AllServices = []*ServiceInfo{
...
@@ -88,14 +88,14 @@ var AllServices = []*ServiceInfo{
keyType
:
Regional
,
keyType
:
Regional
,
serviceType
:
reflect
.
TypeOf
(
&
beta
.
AddressesService
{}),
serviceType
:
reflect
.
TypeOf
(
&
beta
.
AddressesService
{}),
},
},
&
ServiceInfo
{
{
Object
:
"Address"
,
Object
:
"Address"
,
Service
:
"GlobalAddresses"
,
Service
:
"GlobalAddresses"
,
Resource
:
"addresses"
,
Resource
:
"addresses"
,
keyType
:
Global
,
keyType
:
Global
,
serviceType
:
reflect
.
TypeOf
(
&
ga
.
GlobalAddressesService
{}),
serviceType
:
reflect
.
TypeOf
(
&
ga
.
GlobalAddressesService
{}),
},
},
&
ServiceInfo
{
{
Object
:
"BackendService"
,
Object
:
"BackendService"
,
Service
:
"BackendServices"
,
Service
:
"BackendServices"
,
Resource
:
"backendServices"
,
Resource
:
"backendServices"
,
...
@@ -106,7 +106,7 @@ var AllServices = []*ServiceInfo{
...
@@ -106,7 +106,7 @@ var AllServices = []*ServiceInfo{
"Update"
,
"Update"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"BackendService"
,
Object
:
"BackendService"
,
Service
:
"BackendServices"
,
Service
:
"BackendServices"
,
Resource
:
"backendServices"
,
Resource
:
"backendServices"
,
...
@@ -115,7 +115,7 @@ var AllServices = []*ServiceInfo{
...
@@ -115,7 +115,7 @@ var AllServices = []*ServiceInfo{
serviceType
:
reflect
.
TypeOf
(
&
alpha
.
BackendServicesService
{}),
serviceType
:
reflect
.
TypeOf
(
&
alpha
.
BackendServicesService
{}),
additionalMethods
:
[]
string
{
"Update"
},
additionalMethods
:
[]
string
{
"Update"
},
},
},
&
ServiceInfo
{
{
Object
:
"BackendService"
,
Object
:
"BackendService"
,
Service
:
"RegionBackendServices"
,
Service
:
"RegionBackendServices"
,
Resource
:
"backendServices"
,
Resource
:
"backendServices"
,
...
@@ -127,14 +127,14 @@ var AllServices = []*ServiceInfo{
...
@@ -127,14 +127,14 @@ var AllServices = []*ServiceInfo{
"Update"
,
"Update"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"Disk"
,
Object
:
"Disk"
,
Service
:
"Disks"
,
Service
:
"Disks"
,
Resource
:
"disks"
,
Resource
:
"disks"
,
keyType
:
Zonal
,
keyType
:
Zonal
,
serviceType
:
reflect
.
TypeOf
(
&
ga
.
DisksService
{}),
serviceType
:
reflect
.
TypeOf
(
&
ga
.
DisksService
{}),
},
},
&
ServiceInfo
{
{
Object
:
"Disk"
,
Object
:
"Disk"
,
Service
:
"Disks"
,
Service
:
"Disks"
,
Resource
:
"disks"
,
Resource
:
"disks"
,
...
@@ -142,7 +142,7 @@ var AllServices = []*ServiceInfo{
...
@@ -142,7 +142,7 @@ var AllServices = []*ServiceInfo{
keyType
:
Zonal
,
keyType
:
Zonal
,
serviceType
:
reflect
.
TypeOf
(
&
alpha
.
DisksService
{}),
serviceType
:
reflect
.
TypeOf
(
&
alpha
.
DisksService
{}),
},
},
&
ServiceInfo
{
{
Object
:
"Disk"
,
Object
:
"Disk"
,
Service
:
"RegionDisks"
,
Service
:
"RegionDisks"
,
Resource
:
"disks"
,
Resource
:
"disks"
,
...
@@ -150,7 +150,7 @@ var AllServices = []*ServiceInfo{
...
@@ -150,7 +150,7 @@ var AllServices = []*ServiceInfo{
keyType
:
Regional
,
keyType
:
Regional
,
serviceType
:
reflect
.
TypeOf
(
&
alpha
.
DisksService
{}),
serviceType
:
reflect
.
TypeOf
(
&
alpha
.
DisksService
{}),
},
},
&
ServiceInfo
{
{
Object
:
"Firewall"
,
Object
:
"Firewall"
,
Service
:
"Firewalls"
,
Service
:
"Firewalls"
,
Resource
:
"firewalls"
,
Resource
:
"firewalls"
,
...
@@ -160,14 +160,14 @@ var AllServices = []*ServiceInfo{
...
@@ -160,14 +160,14 @@ var AllServices = []*ServiceInfo{
"Update"
,
"Update"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"ForwardingRule"
,
Object
:
"ForwardingRule"
,
Service
:
"ForwardingRules"
,
Service
:
"ForwardingRules"
,
Resource
:
"forwardingRules"
,
Resource
:
"forwardingRules"
,
keyType
:
Regional
,
keyType
:
Regional
,
serviceType
:
reflect
.
TypeOf
(
&
ga
.
ForwardingRulesService
{}),
serviceType
:
reflect
.
TypeOf
(
&
ga
.
ForwardingRulesService
{}),
},
},
&
ServiceInfo
{
{
Object
:
"ForwardingRule"
,
Object
:
"ForwardingRule"
,
Service
:
"ForwardingRules"
,
Service
:
"ForwardingRules"
,
Resource
:
"forwardingRules"
,
Resource
:
"forwardingRules"
,
...
@@ -175,7 +175,7 @@ var AllServices = []*ServiceInfo{
...
@@ -175,7 +175,7 @@ var AllServices = []*ServiceInfo{
keyType
:
Regional
,
keyType
:
Regional
,
serviceType
:
reflect
.
TypeOf
(
&
alpha
.
ForwardingRulesService
{}),
serviceType
:
reflect
.
TypeOf
(
&
alpha
.
ForwardingRulesService
{}),
},
},
&
ServiceInfo
{
{
Object
:
"ForwardingRule"
,
Object
:
"ForwardingRule"
,
Service
:
"GlobalForwardingRules"
,
Service
:
"GlobalForwardingRules"
,
Resource
:
"forwardingRules"
,
Resource
:
"forwardingRules"
,
...
@@ -185,7 +185,7 @@ var AllServices = []*ServiceInfo{
...
@@ -185,7 +185,7 @@ var AllServices = []*ServiceInfo{
"SetTarget"
,
"SetTarget"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"HealthCheck"
,
Object
:
"HealthCheck"
,
Service
:
"HealthChecks"
,
Service
:
"HealthChecks"
,
Resource
:
"healthChecks"
,
Resource
:
"healthChecks"
,
...
@@ -195,7 +195,7 @@ var AllServices = []*ServiceInfo{
...
@@ -195,7 +195,7 @@ var AllServices = []*ServiceInfo{
"Update"
,
"Update"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"HealthCheck"
,
Object
:
"HealthCheck"
,
Service
:
"HealthChecks"
,
Service
:
"HealthChecks"
,
Resource
:
"healthChecks"
,
Resource
:
"healthChecks"
,
...
@@ -206,7 +206,7 @@ var AllServices = []*ServiceInfo{
...
@@ -206,7 +206,7 @@ var AllServices = []*ServiceInfo{
"Update"
,
"Update"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"HttpHealthCheck"
,
Object
:
"HttpHealthCheck"
,
Service
:
"HttpHealthChecks"
,
Service
:
"HttpHealthChecks"
,
Resource
:
"httpHealthChecks"
,
Resource
:
"httpHealthChecks"
,
...
@@ -216,7 +216,7 @@ var AllServices = []*ServiceInfo{
...
@@ -216,7 +216,7 @@ var AllServices = []*ServiceInfo{
"Update"
,
"Update"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"HttpsHealthCheck"
,
Object
:
"HttpsHealthCheck"
,
Service
:
"HttpsHealthChecks"
,
Service
:
"HttpsHealthChecks"
,
Resource
:
"httpsHealthChecks"
,
Resource
:
"httpsHealthChecks"
,
...
@@ -226,7 +226,7 @@ var AllServices = []*ServiceInfo{
...
@@ -226,7 +226,7 @@ var AllServices = []*ServiceInfo{
"Update"
,
"Update"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"InstanceGroup"
,
Object
:
"InstanceGroup"
,
Service
:
"InstanceGroups"
,
Service
:
"InstanceGroups"
,
Resource
:
"instanceGroups"
,
Resource
:
"instanceGroups"
,
...
@@ -239,7 +239,7 @@ var AllServices = []*ServiceInfo{
...
@@ -239,7 +239,7 @@ var AllServices = []*ServiceInfo{
"SetNamedPorts"
,
"SetNamedPorts"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"Instance"
,
Object
:
"Instance"
,
Service
:
"Instances"
,
Service
:
"Instances"
,
Resource
:
"instances"
,
Resource
:
"instances"
,
...
@@ -250,7 +250,7 @@ var AllServices = []*ServiceInfo{
...
@@ -250,7 +250,7 @@ var AllServices = []*ServiceInfo{
"DetachDisk"
,
"DetachDisk"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"Instance"
,
Object
:
"Instance"
,
Service
:
"Instances"
,
Service
:
"Instances"
,
Resource
:
"instances"
,
Resource
:
"instances"
,
...
@@ -262,7 +262,7 @@ var AllServices = []*ServiceInfo{
...
@@ -262,7 +262,7 @@ var AllServices = []*ServiceInfo{
"DetachDisk"
,
"DetachDisk"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"Instance"
,
Object
:
"Instance"
,
Service
:
"Instances"
,
Service
:
"Instances"
,
Resource
:
"instances"
,
Resource
:
"instances"
,
...
@@ -275,7 +275,7 @@ var AllServices = []*ServiceInfo{
...
@@ -275,7 +275,7 @@ var AllServices = []*ServiceInfo{
"UpdateNetworkInterface"
,
"UpdateNetworkInterface"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"NetworkEndpointGroup"
,
Object
:
"NetworkEndpointGroup"
,
Service
:
"NetworkEndpointGroups"
,
Service
:
"NetworkEndpointGroups"
,
Resource
:
"networkEndpointGroups"
,
Resource
:
"networkEndpointGroups"
,
...
@@ -288,7 +288,7 @@ var AllServices = []*ServiceInfo{
...
@@ -288,7 +288,7 @@ var AllServices = []*ServiceInfo{
},
},
options
:
AggregatedList
,
options
:
AggregatedList
,
},
},
&
ServiceInfo
{
{
Object
:
"Project"
,
Object
:
"Project"
,
Service
:
"Projects"
,
Service
:
"Projects"
,
Resource
:
"projects"
,
Resource
:
"projects"
,
...
@@ -297,7 +297,7 @@ var AllServices = []*ServiceInfo{
...
@@ -297,7 +297,7 @@ var AllServices = []*ServiceInfo{
options
:
NoGet
|
NoList
|
NoInsert
|
NoDelete
|
CustomOps
,
options
:
NoGet
|
NoList
|
NoInsert
|
NoDelete
|
CustomOps
,
serviceType
:
reflect
.
TypeOf
(
&
ga
.
ProjectsService
{}),
serviceType
:
reflect
.
TypeOf
(
&
ga
.
ProjectsService
{}),
},
},
&
ServiceInfo
{
{
Object
:
"Region"
,
Object
:
"Region"
,
Service
:
"Regions"
,
Service
:
"Regions"
,
Resource
:
"regions"
,
Resource
:
"regions"
,
...
@@ -305,21 +305,21 @@ var AllServices = []*ServiceInfo{
...
@@ -305,21 +305,21 @@ var AllServices = []*ServiceInfo{
options
:
ReadOnly
,
options
:
ReadOnly
,
serviceType
:
reflect
.
TypeOf
(
&
ga
.
RegionsService
{}),
serviceType
:
reflect
.
TypeOf
(
&
ga
.
RegionsService
{}),
},
},
&
ServiceInfo
{
{
Object
:
"Route"
,
Object
:
"Route"
,
Service
:
"Routes"
,
Service
:
"Routes"
,
Resource
:
"routes"
,
Resource
:
"routes"
,
keyType
:
Global
,
keyType
:
Global
,
serviceType
:
reflect
.
TypeOf
(
&
ga
.
RoutesService
{}),
serviceType
:
reflect
.
TypeOf
(
&
ga
.
RoutesService
{}),
},
},
&
ServiceInfo
{
{
Object
:
"SslCertificate"
,
Object
:
"SslCertificate"
,
Service
:
"SslCertificates"
,
Service
:
"SslCertificates"
,
Resource
:
"sslCertificates"
,
Resource
:
"sslCertificates"
,
keyType
:
Global
,
keyType
:
Global
,
serviceType
:
reflect
.
TypeOf
(
&
ga
.
SslCertificatesService
{}),
serviceType
:
reflect
.
TypeOf
(
&
ga
.
SslCertificatesService
{}),
},
},
&
ServiceInfo
{
{
Object
:
"TargetHttpProxy"
,
Object
:
"TargetHttpProxy"
,
Service
:
"TargetHttpProxies"
,
Service
:
"TargetHttpProxies"
,
Resource
:
"targetHttpProxies"
,
Resource
:
"targetHttpProxies"
,
...
@@ -329,7 +329,7 @@ var AllServices = []*ServiceInfo{
...
@@ -329,7 +329,7 @@ var AllServices = []*ServiceInfo{
"SetUrlMap"
,
"SetUrlMap"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"TargetHttpsProxy"
,
Object
:
"TargetHttpsProxy"
,
Service
:
"TargetHttpsProxies"
,
Service
:
"TargetHttpsProxies"
,
Resource
:
"targetHttpsProxies"
,
Resource
:
"targetHttpsProxies"
,
...
@@ -340,7 +340,7 @@ var AllServices = []*ServiceInfo{
...
@@ -340,7 +340,7 @@ var AllServices = []*ServiceInfo{
"SetUrlMap"
,
"SetUrlMap"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"TargetPool"
,
Object
:
"TargetPool"
,
Service
:
"TargetPools"
,
Service
:
"TargetPools"
,
Resource
:
"targetPools"
,
Resource
:
"targetPools"
,
...
@@ -351,7 +351,7 @@ var AllServices = []*ServiceInfo{
...
@@ -351,7 +351,7 @@ var AllServices = []*ServiceInfo{
"RemoveInstance"
,
"RemoveInstance"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"UrlMap"
,
Object
:
"UrlMap"
,
Service
:
"UrlMaps"
,
Service
:
"UrlMaps"
,
Resource
:
"urlMaps"
,
Resource
:
"urlMaps"
,
...
@@ -361,7 +361,7 @@ var AllServices = []*ServiceInfo{
...
@@ -361,7 +361,7 @@ var AllServices = []*ServiceInfo{
"Update"
,
"Update"
,
},
},
},
},
&
ServiceInfo
{
{
Object
:
"Zone"
,
Object
:
"Zone"
,
Service
:
"Zones"
,
Service
:
"Zones"
,
Resource
:
"zones"
,
Resource
:
"zones"
,
...
...
pkg/cloudprovider/providers/gce/cloud/utils_test.go
View file @
c3e23b1b
...
@@ -161,7 +161,7 @@ func TestCopyVisJSON(t *testing.T) {
...
@@ -161,7 +161,7 @@ func TestCopyVisJSON(t *testing.T) {
func
TestSelfLink
(
t
*
testing
.
T
)
{
func
TestSelfLink
(
t
*
testing
.
T
)
{
t
.
Parallel
()
t
.
Parallel
()
for
_
,
tc
:=
range
[]
struct
{
for
_
,
tc
:=
range
[]
struct
{
ver
meta
.
Version
ver
meta
.
Version
project
string
project
string
resource
string
resource
string
...
@@ -189,7 +189,7 @@ func TestSelfLink(t *testing.T) {
...
@@ -189,7 +189,7 @@ func TestSelfLink(t *testing.T) {
*
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"
,
},
},
}{
}
{
if
link
:=
SelfLink
(
tc
.
ver
,
tc
.
project
,
tc
.
resource
,
tc
.
key
);
link
!=
tc
.
want
{
if
link
:=
SelfLink
(
tc
.
ver
,
tc
.
project
,
tc
.
resource
,
tc
.
key
);
link
!=
tc
.
want
{
t
.
Errorf
(
"SelfLink(%v, %q, %q, %v) = %v, want %q"
,
tc
.
ver
,
tc
.
project
,
tc
.
resource
,
tc
.
key
,
link
,
tc
.
want
)
t
.
Errorf
(
"SelfLink(%v, %q, %q, %v) = %v, want %q"
,
tc
.
ver
,
tc
.
project
,
tc
.
resource
,
tc
.
key
,
link
,
tc
.
want
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment