remove extra obj region validation that is incompatible with newer regions

Author: eljohnson92

internal/webhook/v1alpha2/linodeobjectstoragebucket_webhook.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"slices"
 
+	"github.com/linode/linodego"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -109,7 +110,7 @@ func (v *LinodeObjectStorageBucketCustomValidator) validateLinodeObjectStorageBu
 	if skipAPIValidation {
 		return errs
 	}
-	if err := validateObjectStorageRegion(ctx, linodeClient, bucket.Spec.Region, field.NewPath("spec").Child("region")); err != nil {
+	if err := validateRegion(ctx, linodeClient, bucket.Spec.Region, field.NewPath("spec").Child("region"), linodego.CapabilityObjectStorage); err != nil {
 		errs = append(errs, err)
 	}
 

internal/webhook/v1alpha2/linodeobjectstoragebucket_webhook_test.go

@@ -92,24 +92,6 @@ func TestValidateLinodeObjectStorageBucketSpec(t *testing.T) {
 			),
 		),
 		OneOf(
-			Path(
-				Call("invalid region format in spec", func(ctx context.Context, mck Mock) {
-				}),
-				Result("error", func(ctx context.Context, mck Mock) {
-					bucket := bucket
-					bucket.Spec.Region = "123invalid"
-					assert.NotNil(t, objvalidator.validateLinodeObjectStorageBucketSpec(ctx, &bucket, mck.LinodeClient, false))
-				}),
-			),
-			Path(
-				Call("invalid region format in spec", func(ctx context.Context, mck Mock) {
-				}),
-				Result("error", func(ctx context.Context, mck Mock) {
-					bucket := bucket
-					bucket.Spec.Region = "invalid-2-2"
-					assert.NotNil(t, objvalidator.validateLinodeObjectStorageBucketSpec(ctx, &bucket, mck.LinodeClient, false))
-				}),
-			),
 			Path(
 				Call("region ID not present", func(ctx context.Context, mck Mock) {
 					mck.LinodeClient.EXPECT().GetRegion(gomock.Any(), gomock.Any()).Return(nil, errors.New("invalid region")).AnyTimes()

internal/webhook/v1alpha2/webhook_helpers.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"regexp"
 	"slices"
 	"time"
 
@@ -80,34 +79,6 @@ func validateLinodeType(ctx context.Context, linodegoclient clients.LinodeClient
 	return plan, nil
 }
 
-// validateObjectStorageRegion validates an Object Storage deployment's region ID via the following rules:
-//   - The Region ID is in the form: REGION_ID.
-//   - The region has Object Storage support.
-//
-// NOTE: This implementation intended to bypass the authentication requirement for the [Clusters List] and [Cluster
-// View] endpoints in the Linode API, thereby reusing a [github.com/linode/linodego.Client] (and its caching if enabled)
-// across many admission requests.
-//
-// [Clusters List]: https://www.linode.com/docs/api/object-storage/#clusters-list
-// [Cluster View]: https://www.linode.com/docs/api/object-storage/#cluster-view
-
-func validateObjectStorageRegion(ctx context.Context, linodegoclient clients.LinodeClient, id string, path *field.Path) *field.Error {
-	// TODO: instrument with tracing, might need refactor to preserve readibility
-
-	cexp := regexp.MustCompile("^(([[:lower:]]+-)*[[:lower:]]+)$")
-	cexp1 := regexp.MustCompile(`^(([[:lower:]]+-)*[[:lower:]]+)-\d+$`)
-	if !cexp.MatchString(id) && !cexp1.MatchString(id) {
-		return field.Invalid(path, id, "must be in form: region_id or region_id-ordinal")
-	}
-	var region string
-	if cexp.FindStringSubmatch(id) != nil {
-		region = cexp.FindStringSubmatch(id)[0]
-	} else {
-		region = cexp1.FindStringSubmatch(id)[1]
-	}
-	return validateRegion(ctx, linodegoclient, region, path, linodego.CapabilityObjectStorage)
-}
-
 func getCredentialDataFromRef(ctx context.Context, crClient clients.K8sClient, credentialsRef corev1.SecretReference, defaultNamespace string) ([]byte, error) {
 	credSecret, err := getCredentials(ctx, crClient, credentialsRef, defaultNamespace)
 	if err != nil {