Skip to content

Commit 62044f5

Browse files
yamamoto-febcyamamoto-febc
committed
add: JSON tags to all exported struct fields in wrapper packages
Signed-off-by: Kazumichi Yamamoto <yamamoto.febc@gmail.com>
1 parent 8cadb15 commit 62044f5

8 files changed

Lines changed: 204 additions & 133 deletions

File tree

‎apis/application/application.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ func (op *ApplicationOp) Create(ctx context.Context, name string, clusterID v1.C
5858
}
5959

6060
type ApplicationDetail struct {
61-
ApplicationID v1.ApplicationID
62-
Name string
63-
ClusterID v1.ClusterID
64-
ClusterName string
65-
ActiveVersion *int32
66-
DesiredCount *int32
67-
ScalingCooldownSeconds int32
61+
ApplicationID v1.ApplicationID `json:"applicationID"`
62+
Name string `json:"name"`
63+
ClusterID v1.ClusterID `json:"clusterID"`
64+
ClusterName string `json:"clusterName"`
65+
ActiveVersion *int32 `json:"activeVersion"`
66+
DesiredCount *int32 `json:"desiredCount"`
67+
ScalingCooldownSeconds int32 `json:"scalingCooldownSeconds"`
6868
}
6969

7070
func (op *ApplicationOp) Read(ctx context.Context, id v1.ApplicationID) (app *ApplicationDetail, err error) {
@@ -108,9 +108,9 @@ func (op *ApplicationOp) Update(ctx context.Context, id v1.ApplicationID, toVers
108108
}
109109

110110
type Placement struct {
111-
NodeID string
112-
ContainersStats v1.ApplicationContainersStats
113-
Desired v1.ApplicationPeekDesiredContainersResponse
111+
NodeID string `json:"nodeID"`
112+
ContainersStats v1.ApplicationContainersStats `json:"containersStats"`
113+
Desired v1.ApplicationPeekDesiredContainersResponse `json:"desired"`
114114
}
115115

116116
func (op *ApplicationOp) Containers(ctx context.Context, id v1.ApplicationID) (list []Placement, err error) {

‎apis/autoscalinggroup/autoscalinggroup.go‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,13 @@ func (op *AutoScalingGroupOp) Delete(ctx context.Context, id v1.AutoScalingGroup
9393
var _ AutoScalingGroupAPI = (*AutoScalingGroupOp)(nil)
9494

9595
type NodeInterface struct {
96-
InterfaceIndex int16
97-
Upstream string
98-
IpPool []v1.IpRange
99-
NetmaskLen *int16
100-
DefaultGateway *string
101-
PacketFilterID *string
102-
ConnectsToLB bool
96+
InterfaceIndex int16 `json:"interfaceIndex"`
97+
Upstream string `json:"upstream"`
98+
IpPool []v1.IpRange `json:"ipPool"`
99+
NetmaskLen *int16 `json:"netmaskLen"`
100+
DefaultGateway *string `json:"defaultGateway"`
101+
PacketFilterID *string `json:"packetFilterID"`
102+
ConnectsToLB bool `json:"connectsToLB"`
103103
}
104104

105105
func (n NodeInterface) into() (ret v1.AutoScalingGroupNodeInterface) {
@@ -125,13 +125,13 @@ func (n *NodeInterface) From(res *v1.AutoScalingGroupNodeInterface) {
125125
}
126126

127127
type CreateParams struct {
128-
Name string
129-
Zone string
130-
NameServers []v1.IPv4
131-
WorkerServiceClassPath string
132-
MinNodes int32
133-
MaxNodes int32
134-
Interfaces []NodeInterface
128+
Name string `json:"name"`
129+
Zone string `json:"zone"`
130+
NameServers []v1.IPv4 `json:"nameServers"`
131+
WorkerServiceClassPath string `json:"workerServiceClassPath"`
132+
MinNodes int32 `json:"minNodes"`
133+
MaxNodes int32 `json:"maxNodes"`
134+
Interfaces []NodeInterface `json:"interfaces"`
135135
}
136136

137137
func (c CreateParams) into() (ret v1.CreateAutoScalingGroup) {
@@ -147,16 +147,16 @@ func (c CreateParams) into() (ret v1.CreateAutoScalingGroup) {
147147
}
148148

149149
type AutoScalingGroupDetail struct {
150-
AutoScalingGroupID v1.AutoScalingGroupID
151-
Name string
152-
Zone string
153-
NameServers []v1.IPv4
154-
WorkerServiceClassPath string
155-
MinNodes int32
156-
MaxNodes int32
157-
CurrentNodes int32
158-
Deleting bool
159-
Interfaces []NodeInterface
150+
AutoScalingGroupID v1.AutoScalingGroupID `json:"autoScalingGroupID"`
151+
Name string `json:"name"`
152+
Zone string `json:"zone"`
153+
NameServers []v1.IPv4 `json:"nameServers"`
154+
WorkerServiceClassPath string `json:"workerServiceClassPath"`
155+
MinNodes int32 `json:"minNodes"`
156+
MaxNodes int32 `json:"maxNodes"`
157+
CurrentNodes int32 `json:"currentNodes"`
158+
Deleting bool `json:"deleting"`
159+
Interfaces []NodeInterface `json:"interfaces"`
160160
}
161161

162162
func (a *AutoScalingGroupDetail) from(res *v1.ReadAutoScalingGroupDetail) {

‎apis/certificate/certificate.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ func (op *CertificateOp) List(ctx context.Context, maxItems int64, cursor *v1.Ce
5151
}
5252

5353
type CreateParams struct {
54-
Name string
55-
CertificatePEM string
56-
PrivateKeyPEM string
57-
IntermediateCertificatePEM *string
54+
Name string `json:"name"`
55+
CertificatePEM string `json:"certificatePem"`
56+
PrivateKeyPEM string `json:"privatekeyPem"`
57+
IntermediateCertificatePEM *string `json:"intermediateCertificatePem"`
5858
}
5959

6060
func (op *CertificateOp) Create(ctx context.Context, req CreateParams) (ret *v1.CreatedCertificate, err error) {

‎apis/cluster/cluster.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ func (op *ClusterOp) Delete(ctx context.Context, id v1.ClusterID) error {
8787
var _ ClusterAPI = (*ClusterOp)(nil)
8888

8989
type CreateParams struct {
90-
Name string
91-
LetsEncryptEmail *string
92-
Ports []v1.CreateLoadBalancerPort
93-
ServicePrincipalID string
90+
Name string `json:"name"`
91+
LetsEncryptEmail *string `json:"letsEncryptEmail"`
92+
Ports []v1.CreateLoadBalancerPort `json:"ports"`
93+
ServicePrincipalID string `json:"servicePrincipalID"`
9494
}
9595

9696
func (c CreateParams) into() (ret v1.CreateCluster) {
@@ -103,8 +103,8 @@ func (c CreateParams) into() (ret v1.CreateCluster) {
103103
}
104104

105105
type UpdateParams struct {
106-
LetsEncryptEmail *string
107-
ServicePrincipalID string
106+
LetsEncryptEmail *string `json:"letsEncryptEmail"`
107+
ServicePrincipalID string `json:"servicePrincipalID"`
108108
}
109109

110110
func (u UpdateParams) into() (ret v1.UpdateCluster) {
@@ -115,12 +115,12 @@ func (u UpdateParams) into() (ret v1.UpdateCluster) {
115115
}
116116

117117
type ClusterDetail struct {
118-
ClusterID v1.ClusterID
119-
Name string
120-
Ports []v1.ReadLoadBalancerPort
121-
ServicePrincipalID string
122-
HasLetsEncryptEmail bool
123-
Created int
118+
ClusterID v1.ClusterID `json:"clusterID"`
119+
Name string `json:"name"`
120+
Ports []v1.ReadLoadBalancerPort `json:"ports"`
121+
ServicePrincipalID string `json:"servicePrincipalID"`
122+
HasLetsEncryptEmail bool `json:"hasLetsEncryptEmail"`
123+
Created int `json:"created"`
124124
}
125125

126126
func (c *ClusterDetail) fromSummary(res *v1.ReadClusterSummary) {

‎apis/loadbalancer/loadbalancer.go‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,14 @@ func (op *LoadBalancerOp) ReadNode(ctx context.Context, lbID v1.LoadBalancerID,
141141
var _ LoadBalancerAPI = (*LoadBalancerOp)(nil)
142142

143143
type LoadBalancerInterface struct {
144-
InterfaceIndex int16
145-
Upstream string
146-
IpPool []v1.IpRange
147-
NetmaskLen *int16
148-
DefaultGateway *string
149-
Vip *string
150-
VirtualRouterID *int16
151-
PacketFilterID *string
144+
InterfaceIndex int16 `json:"interfaceIndex"`
145+
Upstream string `json:"upstream"`
146+
IpPool []v1.IpRange `json:"ipPool"`
147+
NetmaskLen *int16 `json:"netmaskLen"`
148+
DefaultGateway *string `json:"defaultGateway"`
149+
Vip *string `json:"vip"`
150+
VirtualRouterID *int16 `json:"virtualRouterID"`
151+
PacketFilterID *string `json:"packetFilterID"`
152152
}
153153

154154
func (l LoadBalancerInterface) into() (ret v1.LoadBalancerInterface) {
@@ -176,8 +176,8 @@ func (l *LoadBalancerInterface) From(res *v1.LoadBalancerInterface) {
176176
}
177177

178178
type NodeInterface struct {
179-
InterfaceIndex int16
180-
Addresses []NodeInterfaceAddress
179+
InterfaceIndex int16 `json:"interfaceIndex"`
180+
Addresses []NodeInterfaceAddress `json:"addresses"`
181181
}
182182

183183
func (n *NodeInterface) From(res *v1.ReadLoadBalancerNodeInterface) {
@@ -186,8 +186,8 @@ func (n *NodeInterface) From(res *v1.ReadLoadBalancerNodeInterface) {
186186
}
187187

188188
type NodeInterfaceAddress struct {
189-
Address string
190-
Vip bool
189+
Address string `json:"address"`
190+
Vip bool `json:"vip"`
191191
}
192192

193193
func (n *NodeInterfaceAddress) From(res *v1.ReadLoadBalancerNodeInterfaceAddress) {
@@ -196,10 +196,10 @@ func (n *NodeInterfaceAddress) From(res *v1.ReadLoadBalancerNodeInterfaceAddress
196196
}
197197

198198
type CreateParams struct {
199-
Name string
200-
ServiceClassPath string
201-
NameServers []v1.IPv4
202-
Interfaces []LoadBalancerInterface
199+
Name string `json:"name"`
200+
ServiceClassPath string `json:"serviceClassPath"`
201+
NameServers []v1.IPv4 `json:"nameServers"`
202+
Interfaces []LoadBalancerInterface `json:"interfaces"`
203203
}
204204

205205
func (c CreateParams) into() (ret v1.CreateLoadBalancer) {
@@ -212,13 +212,13 @@ func (c CreateParams) into() (ret v1.CreateLoadBalancer) {
212212
}
213213

214214
type LoadBalancerDetail struct {
215-
LoadBalancerID v1.LoadBalancerID
216-
Name string
217-
ServiceClassPath string
218-
NameServers []v1.IPv4
219-
Interfaces []LoadBalancerInterface
220-
Created int
221-
Deleting bool
215+
LoadBalancerID v1.LoadBalancerID `json:"loadBalancerID"`
216+
Name string `json:"name"`
217+
ServiceClassPath string `json:"serviceClassPath"`
218+
NameServers []v1.IPv4 `json:"nameServers"`
219+
Interfaces []LoadBalancerInterface `json:"interfaces"`
220+
Created int `json:"created"`
221+
Deleting bool `json:"deleting"`
222222
}
223223

224224
func (l *LoadBalancerDetail) from(res *v1.ReadLoadBalancerDetail) {
@@ -232,13 +232,13 @@ func (l *LoadBalancerDetail) from(res *v1.ReadLoadBalancerDetail) {
232232
}
233233

234234
type LoadBalancerNodeDetail struct {
235-
LoadBalancerNodeID v1.LoadBalancerNodeID
236-
ResourceID *string
237-
Interfaces []NodeInterface
238-
Status v1.LoadBalancerNodeStatus
239-
ArchiveVersion *string
240-
CreateErrorMessage *string
241-
Created int
235+
LoadBalancerNodeID v1.LoadBalancerNodeID `json:"loadBalancerNodeID"`
236+
ResourceID *string `json:"resourceID"`
237+
Interfaces []NodeInterface `json:"interfaces"`
238+
Status v1.LoadBalancerNodeStatus `json:"status"`
239+
ArchiveVersion *string `json:"archiveVersion"`
240+
CreateErrorMessage *string `json:"createErrorMessage"`
241+
Created int `json:"created"`
242242
}
243243

244244
func (l *LoadBalancerNodeDetail) from(res *v1.ReadLoadBalancerNode) {

‎apis/version/version.go‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ func (op *VersionOp) Delete(ctx context.Context, id v1.ApplicationVersionNumber)
9393
var _ VersionAPI = (*VersionOp)(nil)
9494

9595
type ExposedPort struct {
96-
TargetPort v1.Port
97-
LoadBalancerPort *v1.Port
98-
UseLetsEncrypt bool
99-
Host []string
100-
HealthCheck *v1.HealthCheck
96+
TargetPort v1.Port `json:"targetPort"`
97+
LoadBalancerPort *v1.Port `json:"loadBalancerPort"`
98+
UseLetsEncrypt bool `json:"useLetsEncrypt"`
99+
Host []string `json:"host"`
100+
HealthCheck *v1.HealthCheck `json:"healthCheck"`
101101
}
102102

103103
func (p ExposedPort) into() (ret v1.ExposedPort) {
@@ -119,9 +119,9 @@ func (p *ExposedPort) From(res *v1.ExposedPort) {
119119
}
120120

121121
type EnvironmentVariable struct {
122-
Key string
123-
Value *string
124-
Secret bool
122+
Key string `json:"key"`
123+
Value *string `json:"value"`
124+
Secret bool `json:"secret"`
125125
}
126126

127127
func (e EnvironmentVariable) into() (ret v1.CreateEnvironmentVariable) {
@@ -139,21 +139,21 @@ func (e *EnvironmentVariable) From(res *v1.ReadEnvironmentVariable) {
139139
}
140140

141141
type CreateParams struct {
142-
CPU int64
143-
Memory int64
144-
ScalingMode v1.ScalingMode
145-
FixedScale *int32
146-
MinScale *int32
147-
MaxScale *int32
148-
ScaleInThreshold *int32
149-
ScaleOutThreshold *int32
150-
Image string
151-
Cmd []string
152-
RegistryUsername *string
153-
RegistryPassword *string
154-
RegistryPasswordAction v1.RegistryPasswordAction
155-
ExposedPorts []ExposedPort
156-
EnvVars []EnvironmentVariable
142+
CPU int64 `json:"cpu"`
143+
Memory int64 `json:"memory"`
144+
ScalingMode v1.ScalingMode `json:"scalingMode"`
145+
FixedScale *int32 `json:"fixedScale"`
146+
MinScale *int32 `json:"minScale"`
147+
MaxScale *int32 `json:"maxScale"`
148+
ScaleInThreshold *int32 `json:"scaleInThreshold"`
149+
ScaleOutThreshold *int32 `json:"scaleOutThreshold"`
150+
Image string `json:"image"`
151+
Cmd []string `json:"cmd"`
152+
RegistryUsername *string `json:"registryUsername"`
153+
RegistryPassword *string `json:"registryPassword"`
154+
RegistryPasswordAction v1.RegistryPasswordAction `json:"registryPasswordAction"`
155+
ExposedPorts []ExposedPort `json:"exposedPorts"`
156+
EnvVars []EnvironmentVariable `json:"envVars"`
157157
}
158158

159159
func (c *CreateParams) into() (ret v1.CreateApplicationVersion) {
@@ -177,23 +177,23 @@ func (c *CreateParams) into() (ret v1.CreateApplicationVersion) {
177177
}
178178

179179
type VersionDetail struct {
180-
Version v1.ApplicationVersionNumber
181-
CPU int64
182-
Memory int64
183-
ScalingMode v1.ScalingMode
184-
FixedScale *int32
185-
MinScale *int32
186-
MaxScale *int32
187-
ScaleInThreshold *int32
188-
ScaleOutThreshold *int32
189-
Image string
190-
Cmd []string
191-
RegistryUsername *string
192-
RegistryPassword *string
193-
ActiveNodeCount int64
194-
Created int
195-
ExposedPorts []ExposedPort
196-
EnvVars []EnvironmentVariable
180+
Version v1.ApplicationVersionNumber `json:"version"`
181+
CPU int64 `json:"cpu"`
182+
Memory int64 `json:"memory"`
183+
ScalingMode v1.ScalingMode `json:"scalingMode"`
184+
FixedScale *int32 `json:"fixedScale"`
185+
MinScale *int32 `json:"minScale"`
186+
MaxScale *int32 `json:"maxScale"`
187+
ScaleInThreshold *int32 `json:"scaleInThreshold"`
188+
ScaleOutThreshold *int32 `json:"scaleOutThreshold"`
189+
Image string `json:"image"`
190+
Cmd []string `json:"cmd"`
191+
RegistryUsername *string `json:"registryUsername"`
192+
RegistryPassword *string `json:"registryPassword"`
193+
ActiveNodeCount int64 `json:"activeNodeCount"`
194+
Created int `json:"created"`
195+
ExposedPorts []ExposedPort `json:"exposedPorts"`
196+
EnvVars []EnvironmentVariable `json:"envVars"`
197197
}
198198

199199
func (v *VersionDetail) from(res *v1.ReadApplicationVersionDetail) {

0 commit comments

Comments
 (0)