fix region parameter in PROD API (#44)

* fix region parameter in PROD API

Signed-off-by: Felix Breuer <f.breuer94@gmail.com>

* fix tests for optional configuration options

Signed-off-by: Felix Breuer <f.breuer94@gmail.com>

---------

Signed-off-by: Felix Breuer <f.breuer94@gmail.com>

Author: breuerfelix

pkg/apis/stackit/validation/cloudprofile.go

@@ -26,10 +26,6 @@ func ValidateCloudProfileConfig(cloudProfile *stackitv1alpha1.CloudProfileConfig
 	allErrs := field.ErrorList{}
 
 	floatingPoolPath := fldPath.Child("constraints", "floatingPools")
-	if len(cloudProfile.Constraints.FloatingPools) == 0 {
-		allErrs = append(allErrs, field.Required(floatingPoolPath, "must provide at least one floating pool"))
-	}
-
 	combinationFound := sets.NewString()
 	for i, pool := range cloudProfile.Constraints.FloatingPools {
 		idxPath := floatingPoolPath.Index(i)
@@ -70,10 +66,6 @@ func ValidateCloudProfileConfig(cloudProfile *stackitv1alpha1.CloudProfileConfig
 		allErrs = append(allErrs, ValidateProviderMachineImage(idxPath, machineImage)...)
 	}
 	allErrs = append(allErrs, validateMachineImageMapping(machineImages, cloudProfile, field.NewPath("spec").Child("machineImages"))...)
-
-	if len(cloudProfile.KeyStoneURL) == 0 && len(cloudProfile.KeyStoneURLs) == 0 {
-		allErrs = append(allErrs, field.Required(fldPath.Child("keyStoneURL"), "must provide the URL to KeyStone"))
-	}
 	if ca := cloudProfile.KeyStoneCACert; ca != nil && len(*ca) > 0 {
 		_, err := utils.DecodeCertificate([]byte(*ca))
 		if err != nil {

pkg/apis/stackit/validation/cloudprofile_test.go

@@ -73,17 +73,6 @@ var _ = Describe("CloudProfileConfig validation", func() {
 		})
 
 		Context("floating pools constraints", func() {
-			It("should enforce that at least one pool has been defined", func() {
-				cloudProfileConfig.Constraints.FloatingPools = []stackitv1alpha1.FloatingPool{}
-
-				errorList := ValidateCloudProfileConfig(cloudProfileConfig, machineImages, fldPath)
-
-				Expect(errorList).To(ConsistOf(PointTo(MatchFields(IgnoreExtras, Fields{
-					"Type":  Equal(field.ErrorTypeRequired),
-					"Field": Equal("root.constraints.floatingPools"),
-				}))))
-			})
-
 			It("should forbid unsupported pools", func() {
 				cloudProfileConfig.Constraints.FloatingPools = []stackitv1alpha1.FloatingPool{
 					{
@@ -159,18 +148,6 @@ var _ = Describe("CloudProfileConfig validation", func() {
 		})
 
 		Context("keystone url validation", func() {
-			It("should forbid keystone urls with unsupported format", func() {
-				cloudProfileConfig.KeyStoneURL = ""
-				cloudProfileConfig.KeyStoneURLs = nil
-
-				errorList := ValidateCloudProfileConfig(cloudProfileConfig, machineImages, fldPath)
-
-				Expect(errorList).To(ConsistOf(PointTo(MatchFields(IgnoreExtras, Fields{
-					"Type":  Equal(field.ErrorTypeRequired),
-					"Field": Equal("root.keyStoneURL"),
-				}))))
-			})
-
 			It("should forbid keystone urls with missing keys", func() {
 				cloudProfileConfig.KeyStoneURL = ""
 				cloudProfileConfig.KeyStoneURLs = []stackitv1alpha1.KeyStoneURL{{}}

pkg/stackit/client/dns.go

@@ -15,7 +15,7 @@ import (
 )
 
 func NewDNSClient(ctx context.Context, endpoints stackitv1alpha1.APIEndpoints, credentials *stackit.Credentials) (DNSClient, error) {
-	options := clientOptions(nil, endpoints, credentials)
+	options := clientOptions(endpoints, credentials)
 
 	if endpoints.DNS != nil {
 		options = append(options, sdkconfig.WithEndpoint(*endpoints.DNS))

pkg/stackit/client/factory.go

@@ -75,14 +75,11 @@ func (f factory) DNS(ctx context.Context, c client.Client, secretRef corev1.Secr
 	return NewDNSClient(ctx, f.StackitAPIEndpoints, credentials)
 }
 
-func clientOptions(region *string, endpoints stackitv1alpha1.APIEndpoints, credentials *stackit.Credentials) []sdkconfig.ConfigurationOption {
+func clientOptions(endpoints stackitv1alpha1.APIEndpoints, credentials *stackit.Credentials) []sdkconfig.ConfigurationOption {
 	result := []sdkconfig.ConfigurationOption{
 		sdkconfig.WithUserAgent(UserAgent),
 		sdkconfig.WithServiceAccountKey(credentials.SaKeyJSON),
 	}
-	if region != nil {
-		result = append(result, sdkconfig.WithRegion(*region))
-	}
 
 	if endpoints.TokenEndpoint != nil {
 		result = append(result, sdkconfig.WithTokenEndpoint(*endpoints.TokenEndpoint))

pkg/stackit/client/iaas.go

@@ -128,7 +128,7 @@ func (c iaasClient) GetNetworkByName(ctx context.Context, name string) ([]iaas.N
 }
 
 func NewIaaSClient(region string, endpoints stackitv1alpha1.APIEndpoints, credentials *stackit.Credentials) (IaaSClient, error) {
-	options := clientOptions(&region, endpoints, credentials)
+	options := clientOptions(endpoints, credentials)
 
 	if endpoints.IaaS != nil {
 		options = append(options, sdkconfig.WithEndpoint(*endpoints.IaaS))

pkg/stackit/client/loadbalancing.go

@@ -23,7 +23,7 @@ type loadBalancingClient struct {
 }
 
 func NewLoadBalancingClient(ctx context.Context, region string, endpoints stackitv1alpha1.APIEndpoints, credentials *stackit.Credentials) (LoadBalancingClient, error) {
-	options := clientOptions(&region, endpoints, credentials)
+	options := clientOptions(endpoints, credentials)
 
 	if endpoints.LoadBalancer != nil {
 		options = append(options, sdkconfig.WithEndpoint(*endpoints.LoadBalancer))

pkg/webhook/seedprovider/add.go

@@ -27,7 +27,7 @@ type AddOptions struct {
 	ETCDStorage config.ETCDStorage
 }
 
-var logger = log.Log.WithName("openstack-seedprovider-webhook")
+var logger = log.Log.WithName("stackit-seedprovider-webhook")
 
 // AddToManagerWithOptions creates a webhook with the given options and adds it to the manager.
 func AddToManagerWithOptions(mgr manager.Manager, opts AddOptions) (*extensionswebhook.Webhook, error) {

pkg/webhook/seedprovider/ensurer.go

@@ -21,7 +21,7 @@ import (
 func NewEnsurer(etcdStorage *config.ETCDStorage, logger logr.Logger) genericmutator.Ensurer {
 	return &ensurer{
 		etcdStorage: etcdStorage,
-		logger:      logger.WithName("openstack-seedprovider-ensurer"),
+		logger:      logger.WithName("stackit-seedprovider-ensurer"),
 	}
 }