Skip to content

Commit e06a294

Browse files
Nabil-SalahNabil-Salah
committed
refactor: change workload function name from workload3 and workload4 to workload
Signed-off-by: nabil salah <nabil.salah203@gmail.com>
1 parent eddef4a commit e06a294

16 files changed

+24
-24
lines changed

‎grid-client/deployer/deployment_utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func CountDeploymentPublicIPs(dl zosTypes.Deployment) (uint32, error) {
1313
var res uint32
1414
for _, wl := range dl.Workloads {
1515
if wl.Type == zosTypes.PublicIPType {
16-
data, err := wl.Workload3().WorkloadData()
16+
data, err := wl.Workload().WorkloadData()
1717
if err != nil {
1818
return res, errors.Wrapf(err, "could not parse workload data for workload %s", wl.Name)
1919
}

‎grid-client/deployer/gateway_fqdn_deployer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ func (d *GatewayFQDNDeployer) Sync(ctx context.Context, gw *workloads.GatewayFQD
217217
gw.Network = gwWorkload.Network
218218

219219
if wl != nil && wl.Result.State.IsOkay() {
220-
gwWorkload, err := workloads.NewGatewayFQDNProxyFromZosWorkload(*wl.Workload.Workload3())
220+
gwWorkload, err := workloads.NewGatewayFQDNProxyFromZosWorkload(*wl.Workload.Workload())
221221
gw.Backends = gwWorkload.Backends
222222
gw.Name = gwWorkload.Name
223223
gw.FQDN = gwWorkload.FQDN

‎grid-client/deployer/gateway_name_deployer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ func (d *GatewayNameDeployer) Sync(ctx context.Context, gw *workloads.GatewayNam
252252

253253
// if the node acknowledges it, we are golden
254254
if wl != nil && wl.Result.State.IsOkay() {
255-
gwWorkload, err := workloads.NewGatewayNameProxyFromZosWorkload(*wl.Workload.Workload3())
255+
gwWorkload, err := workloads.NewGatewayNameProxyFromZosWorkload(*wl.Workload.Workload())
256256
gw.Backends = gwWorkload.Backends
257257
gw.Name = gwWorkload.Name
258258
gw.FQDN = gwWorkload.FQDN

‎grid-client/deployer/k8s_deployer.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ func (d *K8sDeployer) UpdateFromRemote(ctx context.Context, k8sCluster *workload
261261
for _, dl := range currentDeployments {
262262
for _, w := range dl.Workloads {
263263
if w.Type == zosTypes.ZMachineType {
264-
d, err := w.Workload3().WorkloadData()
264+
d, err := w.Workload().WorkloadData()
265265
if err != nil {
266266
zerolog.Error().Err(err).Msg("failed to get workload data")
267267
}
@@ -303,7 +303,7 @@ func (d *K8sDeployer) UpdateFromRemote(ctx context.Context, k8sCluster *workload
303303
for _, w := range dl.Workloads {
304304
if w.Type == zosTypes.ZMachineType {
305305
workloadNodeID[w.Name] = node
306-
workloadObj[w.Name] = *w.Workload3()
306+
workloadObj[w.Name] = *w.Workload()
307307

308308
} else if w.Type == zosTypes.PublicIPType {
309309
ipResult := zos.PublicIPResult{}
@@ -313,7 +313,7 @@ func (d *K8sDeployer) UpdateFromRemote(ctx context.Context, k8sCluster *workload
313313
publicIPs[w.Name] = ipResult.IP.String()
314314
publicIP6s[w.Name] = ipResult.IPv6.String()
315315
} else if w.Type == zosTypes.ZMountType {
316-
wl, err := w.Workload3().WorkloadData()
316+
wl, err := w.Workload().WorkloadData()
317317
if err != nil {
318318
return d.tfPluginClient.sentry.error(errors.Wrap(err, "failed to load disk data"))
319319
}

‎grid-client/state/state.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func (st *State) LoadGatewayFQDNFromGrid(ctx context.Context, nodeID uint32, nam
9191
if err != nil {
9292
return workloads.GatewayFQDNProxy{}, errors.Wrapf(err, "could not generate deployment metadata for %s", name)
9393
}
94-
gateway, err := workloads.NewGatewayFQDNProxyFromZosWorkload(*wl.Workload3())
94+
gateway, err := workloads.NewGatewayFQDNProxyFromZosWorkload(*wl.Workload())
9595
if err != nil {
9696
return workloads.GatewayFQDNProxy{}, err
9797
}
@@ -127,7 +127,7 @@ func (st *State) LoadGatewayNameFromGrid(ctx context.Context, nodeID uint32, nam
127127
if err != nil {
128128
return workloads.GatewayNameProxy{}, errors.Wrapf(err, "could not generate deployment metadata for %s", deploymentName)
129129
}
130-
gateway, err := workloads.NewGatewayNameProxyFromZosWorkload(*wl.Workload3())
130+
gateway, err := workloads.NewGatewayNameProxyFromZosWorkload(*wl.Workload())
131131
if err != nil {
132132
return workloads.GatewayNameProxy{}, err
133133
}
@@ -194,12 +194,12 @@ func (st *State) LoadK8sFromGrid(ctx context.Context, nodeIDs []uint32, deployme
194194
return workloads.K8sCluster{}, errors.Wrapf(err, "could not compute node %s, resources", workload.Name)
195195
}
196196

197-
node, err := workloads.NewK8sNodeFromWorkload(*workload.Workload3(), nodeID, workloadDiskSize[workload.Name], workloadComputedIP[workload.Name], workloadComputedIP6[workload.Name])
197+
node, err := workloads.NewK8sNodeFromWorkload(*workload.Workload(), nodeID, workloadDiskSize[workload.Name], workloadComputedIP[workload.Name], workloadComputedIP6[workload.Name])
198198
if err != nil {
199199
return workloads.K8sCluster{}, errors.Wrapf(err, "could not generate node data for %s", workload.Name)
200200
}
201201

202-
isMaster, err := isMasterNode(*workload.Workload3())
202+
isMaster, err := isMasterNode(*workload.Workload())
203203
if err != nil {
204204
return workloads.K8sCluster{}, err
205205
}
@@ -282,7 +282,7 @@ func (st *State) computeK8sDeploymentResources(dl zosTypes.Deployment) (
282282

283283
case zos.ZMountType.String():
284284

285-
d, err := w.Workload3().WorkloadData()
285+
d, err := w.Workload().WorkloadData()
286286
if err != nil {
287287
return workloadDiskSize, workloadComputedIP, workloadComputedIP6, errors.Wrap(err, "failed to load disk data")
288288
}

‎grid-client/workloads/disk.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type Disk struct {
1818
func NewDiskFromWorkload(wl *zosTypes.Workload) (Disk, error) {
1919
var dataI interface{}
2020

21-
dataI, err := wl.Workload3().WorkloadData()
21+
dataI, err := wl.Workload().WorkloadData()
2222
if err != nil {
2323
return Disk{}, errors.Wrap(err, "failed to get workload data")
2424
}

‎grid-client/workloads/qsfs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func GroupsFromZos(gs []zos.ZdbGroup) (groups Groups) {
113113
func NewQSFSFromWorkload(wl *zosTypes.Workload) (QSFS, error) {
114114
var dataI interface{}
115115

116-
dataI, err := wl.Workload3().WorkloadData()
116+
dataI, err := wl.Workload().WorkloadData()
117117
if err != nil {
118118
return QSFS{}, errors.Wrap(err, "failed to get workload data")
119119
}

‎grid-client/workloads/volume.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ type Volume struct {
1919
func NewVolumeFromWorkload(wl *zosTypes.Workload) (Volume, error) {
2020
var dataI interface{}
2121

22-
dataI, err := wl.Workload3().WorkloadData()
22+
dataI, err := wl.Workload().WorkloadData()
2323
if err != nil {
2424
return Volume{}, errors.Wrap(err, "failed to get workload data")
2525
}

‎grid-client/workloads/zdb.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ type ZDB struct {
3434
func NewZDBFromWorkload(wl *zosTypes.Workload) (ZDB, error) {
3535
var dataI interface{}
3636

37-
dataI, err := wl.Workload3().WorkloadData()
37+
dataI, err := wl.Workload().WorkloadData()
3838
if err != nil {
3939
return ZDB{}, errors.Wrap(err, "failed to get workload data")
4040
}

‎grid-client/workloads/zlog.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func zlogs(dl *zosTypes.Deployment, name string) []Zlog {
4141

4242
var dataI interface{}
4343

44-
dataI, err := wl.Workload3().WorkloadData()
44+
dataI, err := wl.Workload.Workload().WorkloadData()
4545
if err != nil {
4646
continue
4747
}

‎grid-client/zos/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ func (d *Deployment) zosDeployment() *gridtypes.Deployment {
163163
var workloads []gridtypes.Workload
164164

165165
for _, wl := range d.Workloads {
166-
workloads = append(workloads, *wl.Workload3())
166+
workloads = append(workloads, *wl.Workload())
167167
}
168168

169169
for _, req := range d.SignatureRequirement.Requests {

‎grid-client/zos/machine.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func (r *ZMachineResult) UnmarshalJSON(data []byte) error {
145145
}
146146

147147
func (wl *Workload) ZMachineWorkload() (*zos.ZMachine, error) {
148-
dataI, err := wl.Workload3().WorkloadData()
148+
dataI, err := wl.Workload().WorkloadData()
149149
if err != nil {
150150
return nil, errors.Wrap(err, "failed to get workload data")
151151
}

‎grid-client/zos/machine_light.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ type ZMachineLightResult struct {
5656
}
5757

5858
func (wl *Workload) ZMachineLightWorkload() (*zos.ZMachineLight, error) {
59-
dataI, err := wl.Workload3().WorkloadData()
59+
dataI, err := wl.Workload().WorkloadData()
6060
if err != nil {
6161
return nil, errors.Wrap(err, "failed to get workload data")
6262
}

‎grid-client/zos/network.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ type Peer struct {
6363
}
6464

6565
func (wl *Workload) NetworkWorkload() (*zos.Network, error) {
66-
dataI, err := wl.Workload3().WorkloadData()
66+
dataI, err := wl.Workload().WorkloadData()
6767
if err != nil {
6868
return nil, errors.Wrap(err, "failed to get workload data")
6969
}

‎grid-client/zos/network_light.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (h Bytes) MarshalText() (text []byte, err error) {
6060
}
6161

6262
func (wl *Workload) NetworkLightWorkload() (*zos.NetworkLight, error) {
63-
dataI, err := wl.Workload3().WorkloadData()
63+
dataI, err := wl.Workload().WorkloadData()
6464
if err != nil {
6565
return nil, errors.Wrap(err, "failed to get workload data")
6666
}

‎grid-client/zos/workload.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func NewWorkloadFromZosWorkload(wl gridtypes.Workload) Workload {
9090
}
9191
}
9292

93-
func (wl *Workload) Workload3() *gridtypes.Workload {
93+
func (wl *Workload) Workload() *gridtypes.Workload {
9494
return &gridtypes.Workload{
9595
Version: wl.Version,
9696
Name: gridtypes.Name(wl.Name),
@@ -109,13 +109,13 @@ func (wl *Workload) Workload3() *gridtypes.Workload {
109109

110110
func (wl *Workload) Challenge(w io.Writer) error {
111111

112-
return wl.Workload3().Challenge(w)
112+
return wl.Workload().Challenge(w)
113113
}
114114

115115
// Capacity returns the used capacity by this workload
116116
func (wl *Workload) Capacity() (Capacity, error) {
117117

118-
cap, err := wl.Workload3().Capacity()
118+
cap, err := wl.Workload().Capacity()
119119
return Capacity{
120120
CRU: cap.CRU,
121121
SRU: uint64(cap.SRU),

0 commit comments

Comments
 (0)