fix golangci-lint

Author: Laure-di

internal/services/baremetal/helper_test.go

@@ -12,8 +12,5 @@ func IsOfferAvailable(offerID string, zone scw.Zone, tt *acctest.TestTools) bool
 		Zone:    zone,
 		OfferID: offerID,
 	})
-	if offer.Stock == baremetal.OfferStockAvailable {
-		return true
-	}
-	return false
+	return offer.Stock == baremetal.OfferStockAvailable
 }

internal/services/baremetal/offer_data_source_test.go

@@ -16,13 +16,13 @@ import (
 const (
 	OfferName = "EM-B220E-NVME"
 	Region    = "fr-par-1"
-	OfferId   = "206ea234-9097-4ae1-af68-6d2be09f47ed"
+	OfferID   = "206ea234-9097-4ae1-af68-6d2be09f47ed"
 )
 
 func TestAccDataSourceOffer_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(OfferId, Region, tt) {
+	if !IsOfferAvailable(OfferID, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}
 	resource.ParallelTest(t, resource.TestCase{
@@ -47,7 +47,7 @@ func TestAccDataSourceOffer_Basic(t *testing.T) {
 					resource.TestCheckResourceAttrPair("data.scaleway_baremetal_offer.test2", "offer_id", "data.scaleway_baremetal_offer.test1", "offer_id"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "name", OfferName),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "beryllium"),
-					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "include_disabled", "false"), //what the hell
+					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "include_disabled", "false"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "bandwidth", "1000000000"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "beryllium"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "stock", "available"), // skipping this as stocks vary too much
@@ -72,7 +72,7 @@ func TestAccDataSourceOffer_Basic(t *testing.T) {
 func TestAccDataSourceOffer_SubscriptionPeriodHourly(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(OfferId, Region, tt) {
+	if !IsOfferAvailable(OfferID, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}
 	resource.ParallelTest(t, resource.TestCase{
@@ -126,7 +126,7 @@ func TestAccDataSourceOffer_SubscriptionPeriodHourly(t *testing.T) {
 func TestAccDataSourceOffer_SubscriptionPeriodMonthly(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(OfferId, Region, tt) {
+	if !IsOfferAvailable(OfferID, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}
 	resource.ParallelTest(t, resource.TestCase{

internal/services/baremetal/server_data_source_test.go

@@ -12,7 +12,7 @@ import (
 func TestAccDataSourceServer_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(OfferId, Region, tt) {
+	if !IsOfferAvailable(OfferID, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}
 

internal/services/baremetal/server_test.go

@@ -20,7 +20,7 @@ func TestAccServer_Basic(t *testing.T) {
 	// t.Skip("Skipping Baremetal Server test as no stock is available currently")
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(OfferId, Region, tt) {
+	if !IsOfferAvailable(OfferID, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}
 
@@ -114,7 +114,7 @@ func TestAccServer_Basic(t *testing.T) {
 func TestAccServer_RequiredInstallConfig(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(OfferId, Region, tt) {
+	if !IsOfferAvailable(OfferID, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}
 
@@ -175,7 +175,7 @@ func TestAccServer_WithoutInstallConfig(t *testing.T) {
 func TestAccServer_CreateServerWithOption(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(OfferId, Region, tt) {
+	if !IsOfferAvailable(OfferID, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}
 
@@ -240,7 +240,7 @@ func TestAccServer_CreateServerWithOption(t *testing.T) {
 func TestAccServer_AddOption(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(OfferId, Region, tt) {
+	if !IsOfferAvailable(OfferID, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}
 
@@ -331,7 +331,7 @@ func TestAccServer_AddOption(t *testing.T) {
 func TestAccServer_AddTwoOptionsThenDeleteOne(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(OfferId, Region, tt) {
+	if !IsOfferAvailable(OfferID, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}
 
@@ -485,7 +485,7 @@ func TestAccServer_AddTwoOptionsThenDeleteOne(t *testing.T) {
 func TestAccServer_CreateServerWithPrivateNetwork(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(OfferId, Region, tt) {
+	if !IsOfferAvailable(OfferID, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}
 
@@ -554,7 +554,7 @@ func TestAccServer_CreateServerWithPrivateNetwork(t *testing.T) {
 func TestAccServer_AddPrivateNetwork(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(OfferId, Region, tt) {
+	if !IsOfferAvailable(OfferID, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}
 
@@ -666,7 +666,7 @@ func TestAccServer_AddPrivateNetwork(t *testing.T) {
 func TestAccServer_AddAnotherPrivateNetwork(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(OfferId, Region, tt) {
+	if !IsOfferAvailable(OfferID, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}
 
@@ -791,7 +791,7 @@ func TestAccServer_AddAnotherPrivateNetwork(t *testing.T) {
 func TestAccServer_WithIPAMPrivateNetwork(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
-	if !IsOfferAvailable(OfferId, Region, tt) {
+	if !IsOfferAvailable(OfferID, Region, tt) {
 		t.Skip("Offer is out of stock")
 	}