lint fixes

dmacvicar · Aug 16, 2024 · fb5ee4c · fb5ee4c
1 parent c7ea8a8
commit fb5ee4c
Show file tree

Hide file tree

Showing 28 changed files with 80 additions and 120 deletions.
diff --git a/libvirt/cloudinit_def.go b/libvirt/cloudinit_def.go
@@ -18,9 +18,11 @@ import (
  "github.com/hooklift/iso9660"
 )
 
-const userDataFileName string = "user-data"
-const metaDataFileName string = "meta-data"
-const networkConfigFileName string = "network-config"
+const (
+ userDataFileName string = "user-data"
+ metaDataFileName string = "meta-data"
+ networkConfigFileName string = "network-config"
+)
 
 type defCloudInit struct {
  Name string
@@ -46,12 +48,10 @@ func (ci *defCloudInit) CreateIso() (string, error) {
 }
 
 func removeTmpIsoDirectory(iso string) {
-
  err := os.RemoveAll(filepath.Dir(iso))
  if err != nil {
  log.Printf("error while removing tmp directory holding the ISO file: %s", err)
  }
-
 }
 
 func (ci *defCloudInit) UploadIso(client *Client, iso string) (string, error) {

diff --git a/libvirt/data_source_libvirt_network_test.go b/libvirt/data_source_libvirt_network_test.go
@@ -13,7 +13,6 @@ func TestAccLibvirtNetworkDataSource_DNSHostTemplate(t *testing.T) {
  PreCheck: func() { testAccPreCheck(t) },
  Providers: testAccProviders,
  Steps: []resource.TestStep{
-
  {
  Config: `data "libvirt_network_dns_host_template" "bootstrap" {
  count = 2
@@ -33,7 +32,6 @@ func TestAccLibvirtNetworkDataSource_DNSHostTemplate(t *testing.T) {
 
 func checkTemplate(id, name, value string) resource.TestCheckFunc {
  return func(state *terraform.State) error {
-
  rs, err := getResourceFromTerraformState(id, state)
  if err != nil {
  return err
@@ -54,7 +52,6 @@ func TestAccLibvirtNetworkDataSource_DNSSRVTemplate(t *testing.T) {
  PreCheck: func() { testAccPreCheck(t) },
  Providers: testAccProviders,
  Steps: []resource.TestStep{
-
  {
  Config: `data "libvirt_network_dns_srv_template" "etcd_cluster" {
  count = 2

diff --git a/libvirt/data_source_libvirt_node_info.go b/libvirt/data_source_libvirt_node_info.go
@@ -64,7 +64,6 @@ func resourceLibvirtNodeInfoRead(d *schema.ResourceData, meta interface{}) error
  }
 
  model, memory, cpus, _, nodes, sockets, cores, threads, err := virConn.NodeGetInfo()
-
  if err != nil {
  return fmt.Errorf("failed to retrieve domains: %w", err)
  }

diff --git a/libvirt/domain.go b/libvirt/domain.go
@@ -19,15 +19,17 @@ import (
  "libvirt.org/go/libvirtxml"
 )
 
-const domWaitLeaseStillWaiting = "waiting-addresses"
-const domWaitLeaseDone = "all-addresses-obtained"
+const (
+ domWaitLeaseStillWaiting = "waiting-addresses"
+ domWaitLeaseDone = "all-addresses-obtained"
+)
 
 var errDomainInvalidState = errors.New("invalid state for domain")
 
 func domainWaitForLeases(ctx context.Context, virConn *libvirt.Libvirt, domain libvirt.Domain, waitForLeases []*libvirtxml.DomainInterface,
- timeout time.Duration, rd *schema.ResourceData) error {
+ timeout time.Duration, rd *schema.ResourceData,
+) error {
  waitFunc := func() (interface{}, string, error) {
-
  state, err := domainGetState(virConn, domain)
  if err != nil {
  return false, "", err
@@ -82,8 +84,8 @@ func domainWaitForLeases(ctx context.Context, virConn *libvirt.Libvirt, domain l
 
 func domainIfaceHasAddress(virConn *libvirt.Libvirt, domain libvirt.Domain,
  iface libvirtxml.DomainInterface,
- rd *schema.ResourceData) (found bool, ignore bool, err error) {
-
+ rd *schema.ResourceData,
+) (found bool, ignore bool, err error) {
  mac := strings.ToUpper(iface.MAC.Address)
  if mac == "" {
  log.Printf("[DEBUG] Can't wait without a MAC address: ignoring interface %+v.\n", iface)
@@ -464,9 +466,9 @@ func setConsoles(d *schema.ResourceData, domainDef *libvirtxml.Domain) {
 }
 
 func setDisks(d *schema.ResourceData, domainDef *libvirtxml.Domain, virConn *libvirt.Libvirt) error {
- var scsiDisk = false
- var numOfISOs = 0
- var numOfSCSIs = 0
+ scsiDisk := false
+ numOfISOs := 0
+ numOfSCSIs := 0
 
  for i := 0; i < d.Get("disk.#").(int); i++ {
  disk := newDefDisk(i)
@@ -670,7 +672,8 @@ func setCloudinit(d *schema.ResourceData, domainDef *libvirtxml.Domain, virConn
 
 func setNetworkInterfaces(d *schema.ResourceData, domainDef *libvirtxml.Domain,
  virConn *libvirt.Libvirt, partialNetIfaces map[string]*pendingMapping,
- waitForLeases *[]*libvirtxml.DomainInterface) error {
+ waitForLeases *[]*libvirtxml.DomainInterface,
+) error {
  for i := 0; i < d.Get("network_interface.#").(int); i++ {
  prefix := fmt.Sprintf("network_interface.%d", i)
 
@@ -719,7 +722,6 @@ func setNetworkInterfaces(d *schema.ResourceData, domainDef *libvirtxml.Domain,
  if err != nil {
  return fmt.Errorf("can't retrieve network ID %s", networkUUID)
  }
-
  } else if bridgeNameI, ok := d.GetOk(prefix + ".bridge"); ok {
  netIface.Source = &libvirtxml.DomainInterfaceSource{
  Bridge: &libvirtxml.DomainInterfaceSourceBridge{

diff --git a/libvirt/domain_def.go b/libvirt/domain_def.go
@@ -16,7 +16,6 @@ const (
 
 // from existing domain return its XMLdefintion.
 func getXMLDomainDefFromLibvirt(virConn *libvirt.Libvirt, domain libvirt.Domain) (libvirtxml.Domain, error) {
-
  domainXMLDesc, err := virConn.DomainGetXMLDesc(domain, 0)
  if err != nil {
  return libvirtxml.Domain{}, fmt.Errorf("error retrieving libvirt domain XML description: %w", err)

diff --git a/libvirt/helper/suppress/strings.go b/libvirt/helper/suppress/strings.go
@@ -1,8 +1,9 @@
 package suppress
 
 import (
- "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
  "strings"
+
+ "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func CaseDifference(_, old, new string, _ *schema.ResourceData) bool {

diff --git a/libvirt/helpers_test.go b/libvirt/helpers_test.go
@@ -19,8 +19,10 @@ import (
 
 // This file contain function helpers used for testsuite/testacc
 
-var testAccProviders map[string]*schema.Provider
-var testAccProvider *schema.Provider
+var (
+ testAccProviders map[string]*schema.Provider
+ testAccProvider *schema.Provider
+)
 
 func init() {
  testAccProvider = Provider()
@@ -145,7 +147,6 @@ func getNetworkDef(state *terraform.State, name string, virConn *libvirt.Libvirt
 // testAccCheckNetworkExists checks that the network exists.
 func testAccCheckNetworkExists(name string, network *libvirt.Network) resource.TestCheckFunc {
  return func(state *terraform.State) error {
-
  rs, err := getResourceFromTerraformState(name, state)
  if err != nil {
  return err
@@ -191,7 +192,6 @@ func testAccCheckLibvirtNetworkDestroy(s *terraform.State) error {
 // testAccCheckDNSHosts checks the expected DNS hosts in a network.
 func testAccCheckDNSHosts(name string, expected []libvirtxml.NetworkDNSHost) resource.TestCheckFunc {
  return func(s *terraform.State) error {
-
  virConn := testAccProvider.Meta().(*Client).libvirt
  networkDef, err := getNetworkDef(s, name, virConn)
  if err != nil {
@@ -271,7 +271,6 @@ func testAccCheckLibvirtNetworkBridge(resourceName string, bridgeName string) re
 // testAccCheckLibvirtNetworkDNSForwarders checks the DNS forwarders in the libvirt network.
 func testAccCheckLibvirtNetworkDNSForwarders(name string, expected []libvirtxml.NetworkDNSForwarder) resource.TestCheckFunc {
  return func(s *terraform.State) error {
-
  virConn := testAccProvider.Meta().(*Client).libvirt
 
  networkDef, err := getNetworkDef(s, name, virConn)
@@ -304,7 +303,6 @@ func testAccCheckLibvirtNetworkDNSForwarders(name string, expected []libvirtxml.
 // testAccCheckLibvirtNetworkLocalOnly checks the local-only property of the Domain.
 func testAccCheckLibvirtNetworkLocalOnly(name string, expectLocalOnly bool) resource.TestCheckFunc {
  return func(s *terraform.State) error {
-
  virConn := testAccProvider.Meta().(*Client).libvirt
 
  networkDef, err := getNetworkDef(s, name, virConn)
@@ -327,7 +325,6 @@ func testAccCheckLibvirtNetworkLocalOnly(name string, expectLocalOnly bool) reso
 // testAccCheckLibvirtNetworkDNSEnable checks the dns-enable property of the Domain.
 func testAccCheckLibvirtNetworkDNSEnableOrDisable(name string, expectDNS bool) resource.TestCheckFunc {
  return func(s *terraform.State) error {
-
  virConn := testAccProvider.Meta().(*Client).libvirt
 
  networkDef, err := getNetworkDef(s, name, virConn)
@@ -351,7 +348,6 @@ func testAccCheckLibvirtNetworkDNSEnableOrDisable(name string, expectDNS bool) r
 // testAccCheckDnsmasqOptions checks the expected Dnsmasq options in a network.
 func testAccCheckDnsmasqOptions(name string, expected []libvirtxml.NetworkDnsmasqOption) resource.TestCheckFunc {
  return func(s *terraform.State) error {
-
  virConn := testAccProvider.Meta().(*Client).libvirt
  networkDef, err := getNetworkDef(s, name, virConn)
  if err != nil {

diff --git a/libvirt/network.go b/libvirt/network.go
@@ -84,7 +84,7 @@ func getIPsFromResource(d *schema.ResourceData) ([]libvirtxml.NetworkIP, error)
  // because it is computed but we need to know if the user has
  // explicitly set it to false
  //
- //nolint:staticcheck
+
  if dhcpEnabledByUser, dhcpSetByUser := d.GetOkExists("dhcp.0.enabled"); dhcpSetByUser {
  dhcpEnabled = dhcpEnabledByUser.(bool)
  }
@@ -213,9 +213,9 @@ func getDNSMasqOptionFromResource(d *schema.ResourceData) []libvirtxml.NetworkDn
  optionName := d.Get(dnsmasqOptionsPrefix + ".option_name").(string)
  optionValue, ok := d.GetOk(dnsmasqOptionsPrefix + ".option_value")
  if ok {
-  optionString = optionName + "=" + optionValue.(string)
+  optionString = optionName + "=" + optionValue.(string)
  } else {
-  optionString = optionName
+  optionString = optionName
  }
  dnsmasqOption = append(dnsmasqOption, libvirtxml.NetworkDnsmasqOption{
  Value: optionString,

diff --git a/libvirt/resource_libvirt_combustion_test.go b/libvirt/resource_libvirt_combustion_test.go
@@ -15,7 +15,7 @@ func TestAccLibvirtCombustion_Basic(t *testing.T) {
  randomCombustionName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
  randomPoolName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
  randomPoolPath := "/tmp/terraform-provider-libvirt-pool-" + randomPoolName
- var config = fmt.Sprintf(`
+ config := fmt.Sprintf(`
  resource "libvirt_pool" "%s" {
  name = "%s"
  type = "dir"

diff --git a/libvirt/resource_libvirt_coreos_ignition_test.go b/libvirt/resource_libvirt_coreos_ignition_test.go
@@ -16,7 +16,7 @@ func TestAccLibvirtIgnition_Basic(t *testing.T) {
  randomIgnitionName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
  randomPoolName := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
  randomPoolPath := "/tmp/terraform-provider-libvirt-pool-" + randomPoolName
- var config = fmt.Sprintf(`
+ config := fmt.Sprintf(`
  data "ignition_systemd_unit" "acceptance-test-systemd" {
  name = "%s"
  content = "[Service]\nType=oneshot\nExecStart=/usr/bin/echo Hello World\n\n[Install]\nWantedBy=multi-user.target"

diff --git a/libvirt/resource_libvirt_domain.go b/libvirt/resource_libvirt_domain.go
@@ -1130,7 +1130,6 @@ func resourceLibvirtDomainDelete(ctx context.Context, d *schema.ResourceData, me
  if err := virConn.DomainUndefineFlags(domain, libvirt.DomainUndefineNvram|
  libvirt.DomainUndefineSnapshotsMetadata|libvirt.DomainUndefineManagedSave|
  libvirt.DomainUndefineCheckpointsMetadata); err != nil {
-
  if isError(err, libvirt.ErrNoSupport) || isError(err, libvirt.ErrInvalidArg) {
  log.Printf("libvirt does not support undefine flags: will try again without flags")
  if err := virConn.DomainUndefine(domain); err != nil {