From dc8f27f3564a2883890ef87e85a120a3bd2e38fe Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Fri, 22 Aug 2025 20:27:52 -0500 Subject: [PATCH] Remove redundant type assertions --- upup/pkg/fi/cloudup/scalewaytasks/dns_record.go | 6 ++---- upup/pkg/fi/cloudup/scalewaytasks/instance.go | 9 ++++----- upup/pkg/fi/cloudup/scalewaytasks/sshkey.go | 4 +--- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/upup/pkg/fi/cloudup/scalewaytasks/dns_record.go b/upup/pkg/fi/cloudup/scalewaytasks/dns_record.go index 3a4543f958..a696cce17f 100644 --- a/upup/pkg/fi/cloudup/scalewaytasks/dns_record.go +++ b/upup/pkg/fi/cloudup/scalewaytasks/dns_record.go @@ -112,10 +112,8 @@ func (_ *DNSRecord) CheckChanges(actual, expected, changes *DNSRecord) error { } func (d *DNSRecord) RenderScw(t *scaleway.ScwAPITarget, actual, expected, changes *DNSRecord) error { - cloud := t.Cloud.(scaleway.ScwCloud) - if actual != nil { - recordUpdated, err := cloud.DomainService().UpdateDNSZoneRecords(&domain.UpdateDNSZoneRecordsRequest{ + recordUpdated, err := t.Cloud.DomainService().UpdateDNSZoneRecords(&domain.UpdateDNSZoneRecordsRequest{ DNSZone: fi.ValueOf(actual.DNSZone), Changes: []*domain.RecordChange{ { @@ -138,7 +136,7 @@ func (d *DNSRecord) RenderScw(t *scaleway.ScwAPITarget, actual, expected, change return nil } - recordCreated, err := cloud.DomainService().UpdateDNSZoneRecords(&domain.UpdateDNSZoneRecordsRequest{ + recordCreated, err := t.Cloud.DomainService().UpdateDNSZoneRecords(&domain.UpdateDNSZoneRecordsRequest{ DNSZone: fi.ValueOf(expected.DNSZone), Changes: []*domain.RecordChange{ { diff --git a/upup/pkg/fi/cloudup/scalewaytasks/instance.go b/upup/pkg/fi/cloudup/scalewaytasks/instance.go index a5d9c2695b..23080cc067 100644 --- a/upup/pkg/fi/cloudup/scalewaytasks/instance.go +++ b/upup/pkg/fi/cloudup/scalewaytasks/instance.go @@ -175,8 +175,7 @@ func (_ *Instance) CheckChanges(actual, expected, changes *Instance) error { } func (_ *Instance) RenderScw(t *scaleway.ScwAPITarget, actual, expected, changes *Instance) error { - cloud := t.Cloud.(scaleway.ScwCloud) - instanceService := cloud.InstanceService() + instanceService := t.Cloud.InstanceService() zone := scw.Zone(fi.ValueOf(expected.Zone)) userData, err := fi.ResourceAsBytes(*expected.UserData) @@ -216,7 +215,7 @@ func (_ *Instance) RenderScw(t *scaleway.ScwAPITarget, actual, expected, changes // If newInstanceCount > 0, we need to create new instances for this group for i := 0; i < newInstanceCount; i++ { // We create a unique name for each server - uniqueName, err := uniqueName(cloud, scaleway.ClusterNameFromTags(expected.Tags), fi.ValueOf(expected.Name)) + uniqueName, err := uniqueName(t.Cloud, scaleway.ClusterNameFromTags(expected.Tags), fi.ValueOf(expected.Name)) if err != nil { return fmt.Errorf("error rendering server group %s: computing unique name for server: %w", fi.ValueOf(expected.Name), err) } @@ -288,14 +287,14 @@ func (_ *Instance) RenderScw(t *scaleway.ScwAPITarget, actual, expected, changes // If newInstanceCount < 0, we need to delete instances of this group if newInstanceCount < 0 { - igInstances, err := cloud.GetClusterServers(cloud.ClusterName(actual.Tags), actual.Name) + igInstances, err := t.Cloud.GetClusterServers(t.Cloud.ClusterName(actual.Tags), actual.Name) if err != nil { return fmt.Errorf("error deleting instance: %w", err) } for i := 0; i > newInstanceCount; i-- { toDelete := igInstances[i*-1] - err = cloud.DeleteServer(toDelete) + err = t.Cloud.DeleteServer(toDelete) if err != nil { return fmt.Errorf("error deleting instance of group %s: %w", toDelete.Name, err) } diff --git a/upup/pkg/fi/cloudup/scalewaytasks/sshkey.go b/upup/pkg/fi/cloudup/scalewaytasks/sshkey.go index 78a82c7f75..e397b26090 100644 --- a/upup/pkg/fi/cloudup/scalewaytasks/sshkey.go +++ b/upup/pkg/fi/cloudup/scalewaytasks/sshkey.go @@ -114,8 +114,6 @@ func (*SSHKey) RenderScw(t *scaleway.ScwAPITarget, actual, expected, changes *SS return nil } - cloud := t.Cloud.(scaleway.ScwCloud) - name := fi.ValueOf(expected.Name) if name == "" { return fi.RequiredField("Name") @@ -133,7 +131,7 @@ func (*SSHKey) RenderScw(t *scaleway.ScwAPITarget, actual, expected, changes *SS keyArgs.PublicKey = d } - key, err := cloud.IamService().CreateSSHKey(keyArgs) + key, err := t.Cloud.IamService().CreateSSHKey(keyArgs) if err != nil { return fmt.Errorf("error creating SSH keypair: %w", err) }