Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions v1/providers/shadeform/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func (c *ShadeformClient) GetInstance(ctx context.Context, instanceID v1.CloudPr
return nil, errors.WrapAndTrace(fmt.Errorf("no instance returned from get request"))
}

instance, err := c.convertInstanceInfoResponseToV1Instance(ctx, *resp)
instance, err := c.convertInstanceInfoResponseToV1Instance(*resp)
if err != nil {
return nil, errors.WrapAndTrace(err)
}
Expand Down Expand Up @@ -215,7 +215,7 @@ func (c *ShadeformClient) ListInstances(ctx context.Context, _ v1.ListInstancesA

var instances []v1.Instance
for _, instance := range resp.Instances {
singleInstance, err := c.convertShadeformInstanceToV1Instance(ctx, instance)
singleInstance, err := c.convertShadeformInstanceToV1Instance(instance)
if err != nil {
return nil, errors.WrapAndTrace(err)
}
Expand Down Expand Up @@ -257,8 +257,7 @@ func (c *ShadeformClient) getLifecycleStatus(status string) v1.LifecycleStatus {
}

// convertInstanceInfoResponseToV1Instance - converts Instance Info to v1 instance
func (c *ShadeformClient) convertInstanceInfoResponseToV1Instance(ctx context.Context, instanceInfo openapi.InstanceInfoResponse) (*v1.Instance, error) {
c.logger.Debug(ctx, "converting instance info response to v1 instance", v1.LogField("instanceInfo", instanceInfo))
func (c *ShadeformClient) convertInstanceInfoResponseToV1Instance(instanceInfo openapi.InstanceInfoResponse) (*v1.Instance, error) {
instanceType := c.getInstanceType(string(instanceInfo.Cloud), instanceInfo.ShadeInstanceType)
lifeCycleStatus := c.getLifecycleStatus(string(instanceInfo.Status))

Expand All @@ -271,18 +270,15 @@ func (c *ShadeformClient) convertInstanceInfoResponseToV1Instance(ctx context.Co
if !found {
return nil, errors.WrapAndTrace(errors.New("could not find refID tag"))
}
c.logger.Debug(ctx, "refID found, deleting from tags", v1.LogField("refID", refID))
delete(tags, refIDTagName)

cloudCredRefID, found := tags[cloudCredRefIDTagName]
if !found {
return nil, errors.WrapAndTrace(errors.New("could not find cloudCredRefID tag"))
}
c.logger.Debug(ctx, "cloudCredRefID found, deleting from tags", v1.LogField("cloudCredRefID", cloudCredRefID))
delete(tags, cloudCredRefIDTagName)

diskSize := units.Base2Bytes(instanceInfo.Configuration.StorageInGb) * units.GiB
c.logger.Debug(ctx, "calculated diskSize", v1.LogField("diskSize", diskSize), v1.LogField("storageInGb", instanceInfo.Configuration.StorageInGb))

instance := &v1.Instance{
Name: c.getProvidedInstanceName(instanceInfo.Name),
Expand Down Expand Up @@ -314,8 +310,7 @@ func (c *ShadeformClient) convertInstanceInfoResponseToV1Instance(ctx context.Co

// convertInstanceInfoResponseToV1Instance - converts /instances response to v1 instance; the api struct is slightly
// different from instance info response and expected to diverge so keeping it as a separate function for now
func (c *ShadeformClient) convertShadeformInstanceToV1Instance(ctx context.Context, shadeformInstance openapi.Instance) (*v1.Instance, error) {
c.logger.Debug(ctx, "converting shadeform instance to v1 instance", v1.LogField("shadeformInstance", shadeformInstance))
func (c *ShadeformClient) convertShadeformInstanceToV1Instance(shadeformInstance openapi.Instance) (*v1.Instance, error) {
instanceType := c.getInstanceType(string(shadeformInstance.Cloud), shadeformInstance.ShadeInstanceType)
lifeCycleStatus := c.getLifecycleStatus(string(shadeformInstance.Status))

Expand All @@ -328,18 +323,15 @@ func (c *ShadeformClient) convertShadeformInstanceToV1Instance(ctx context.Conte
if !found {
return nil, errors.WrapAndTrace(errors.New("could not find refID tag"))
}
c.logger.Debug(ctx, "refID found, deleting from tags", v1.LogField("refID", refID))
delete(tags, refIDTagName)

cloudCredRefID, found := tags[cloudCredRefIDTagName]
if !found {
return nil, errors.WrapAndTrace(errors.New("could not find cloudCredRefID tag"))
}
c.logger.Debug(ctx, "cloudCredRefID found, deleting from tags", v1.LogField("cloudCredRefID", cloudCredRefID))
delete(tags, cloudCredRefIDTagName)

diskSize := units.Base2Bytes(shadeformInstance.Configuration.StorageInGb) * units.GiB
c.logger.Debug(ctx, "calculated diskSize", v1.LogField("diskSize", diskSize), v1.LogField("storageInGb", shadeformInstance.Configuration.StorageInGb))

instance := &v1.Instance{
Name: shadeformInstance.Name,
Expand Down
Loading