fix(openstack/clients): configure OpenStack in worker.go, validate in…

… configuration, not in worker.
gardener · Feb 6, 2025 · 2a32424 · 2a32424
1 parent 7fcb1bd
commit 2a32424
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/cmd/inventory/utils_openstack.go b/cmd/inventory/utils_openstack.go
@@ -90,7 +90,6 @@ func validateOpenStackConfig(conf *config.Config) error {
 				if creds.User.PasswordFile == "" {
 					return fmt.Errorf("OpenStack: %w: %s", errNoPasswordFile, name)
 				}
-				break
 			case config.OpenStackAuthenticationMethodAppCredentials:
 				if creds.AppCredentials.AppCredentialsIDFile == "" {
 					return fmt.Errorf("OpenStack: %w: %s", errNoAppCredentialsIDFile, name)
@@ -101,7 +100,6 @@ func validateOpenStackConfig(conf *config.Config) error {
 				if creds.AppCredentials.AppCredentialsNameFile == "" {
 					return fmt.Errorf("OpenStack: %w: %s", errNoAppCredentialsNameFile, name)
 				}
-				break
 			default:
 				return fmt.Errorf("OpenStack: %w: %s uses %s", errUnknownAuthenticationMethod, name, creds.Authentication)
 			}
@@ -120,6 +118,12 @@ func configureOpenStackClients(ctx context.Context, conf *config.Config) error {
 	}
 
 	slog.Info("configuring OpenStack clients")
+
+	err := validateOpenStackConfig(conf)
+	if err != nil {
+		return fmt.Errorf("invalid OpenStack configuration: %w", err)
+	}
+
 	configFuncs := map[string]func(ctx context.Context, conf *config.Config) error{
 		"compute":       configureOpenStackComputeClientsets,
 		"network":       configureOpenStackNetworkClientsets,
@@ -204,7 +208,7 @@ func configureOpenStackComputeClientsets(ctx context.Context, conf *config.Confi
 				ApplicationCredentialName:   appName,
 			}
 		default:
-			fmt.Errorf("unknown authentication method: %s", namedCreds.Authentication)
+			return fmt.Errorf("unknown authentication method: %s", namedCreds.Authentication)
 		}
 
 		providerClient, err := gophercloudconfig.NewProviderClient(ctx, authOpts)
@@ -216,6 +220,10 @@ func configureOpenStackComputeClientsets(ctx context.Context, conf *config.Confi
 			Region: region,
 		})
 
+		if err != nil {
+			return fmt.Errorf("unable to create client for compute service with credentials %s: %w", cred, err)
+		}
+
 		client := openstackclients.Client[*gophercloud.ServiceClient]{
 			NamedCredentials: cred,
 			ProjectID:        projectID,
@@ -305,7 +313,7 @@ func configureOpenStackNetworkClientsets(ctx context.Context, conf *config.Confi
 				ApplicationCredentialName:   appName,
 			}
 		default:
-			fmt.Errorf("unknown authentication method: %s", namedCreds.Authentication)
+			return fmt.Errorf("unknown authentication method: %s", namedCreds.Authentication)
 		}
 
 		providerClient, err := gophercloudconfig.NewProviderClient(ctx, authOpts)
@@ -317,6 +325,10 @@ func configureOpenStackNetworkClientsets(ctx context.Context, conf *config.Confi
 			Region: region,
 		})
 
+		if err != nil {
+			return fmt.Errorf("unable to create client for network service with credentials %s: %w", cred, err)
+		}
+
 		client := openstackclients.Client[*gophercloud.ServiceClient]{
 			NamedCredentials: cred,
 			ProjectID:        projectID,
@@ -406,7 +418,7 @@ func configureOpenStackBlockStorageClientsets(ctx context.Context, conf *config.
 				ApplicationCredentialName:   appName,
 			}
 		default:
-			fmt.Errorf("unknown authentication method: %s", namedCreds.Authentication)
+			return fmt.Errorf("unknown authentication method: %s", namedCreds.Authentication)
 		}
 
 		providerClient, err := gophercloudconfig.NewProviderClient(ctx, authOpts)
@@ -418,6 +430,10 @@ func configureOpenStackBlockStorageClientsets(ctx context.Context, conf *config.
 			Region: region,
 		})
 
+		if err != nil {
+			return fmt.Errorf("unable to create client for block storage service with credentials %s: %w", cred, err)
+		}
+
 		client := openstackclients.Client[*gophercloud.ServiceClient]{
 			NamedCredentials: cred,
 			ProjectID:        projectID,

diff --git a/cmd/inventory/worker.go b/cmd/inventory/worker.go
@@ -185,6 +185,10 @@ func NewWorkerCommand() *cli.Command {
 						return err
 					}
 
+					if err := configureOpenStackClients(ctx.Context, conf); err != nil {
+						return err
+					}
+
 					// Configure logging and middlewares
 					slog.Info("configuring logging and middlewares")
 					logger, err := newLogger(os.Stdout, conf)