Skip to content

Stop template resolving if not needed #1943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Stop template resolving if not needed #1943

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions pkg/cloudprovider/provider/anexia/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,33 @@ func ensureConditions(status *anxtypes.ProviderStatus) {
}
}

// getTokenFromSpec got extracted from getConfig in order to circumvent it.Add commentMore actions
//
// That allowed us to reduce [Cleanup] to the bare minimum and allowing tear
// downs if the template no longer exists.
func (p *provider) getTokenFromSpec(spec clusterv1alpha1.ProviderSpec) (string, error) {
if spec.Value == nil {
return "", fmt.Errorf("machine.spec.providerSpec.value is nil")
}

pconfig, err := providerconfigtypes.GetConfig(spec)
if err != nil {
return "", err
}

rawConfig, err := anxtypes.GetConfig(*pconfig)
if err != nil {
return "", fmt.Errorf("error parsing provider config: %w", err)
}

token, err := p.configVarResolver.GetConfigVarStringValueOrEnv(rawConfig.Token, anxtypes.AnxTokenEnv)
if err != nil {
return "", fmt.Errorf("failed to get 'token': %w", err)
}

return token, nil
}

func (p *provider) getConfig(ctx context.Context, log *zap.SugaredLogger, provSpec clusterv1alpha1.ProviderSpec) (*resolvedConfig, *providerconfig.Config, error) {
pconfig, err := providerconfig.GetConfig(provSpec)
if err != nil {
Expand Down Expand Up @@ -314,12 +341,12 @@ func (p *provider) Validate(ctx context.Context, log *zap.SugaredLogger, machine
}

func (p *provider) Get(ctx context.Context, log *zap.SugaredLogger, machine *clusterv1alpha1.Machine, pd *cloudprovidertypes.ProviderData) (instance.Instance, error) {
config, _, err := p.getConfig(ctx, log, machine.Spec.ProviderSpec)
token, err := p.getTokenFromSpec(machine.Spec.ProviderSpec)
if err != nil {
return nil, newError(common.InvalidConfigurationMachineError, "failed to retrieve config: %v", err)
return nil, newError(common.InvalidConfigurationMachineError, "querying token: %v", err)
}

_, cli, err := getClient(config.Token, &machine.Name)
_, cli, err := getClient(token, &machine.Name)
if err != nil {
return nil, newError(common.InvalidConfigurationMachineError, "failed to create Anexia client: %v", err)
}
Expand Down Expand Up @@ -390,12 +417,12 @@ func (p *provider) Cleanup(ctx context.Context, log *zap.SugaredLogger, machine
}()

ensureConditions(&status)
config, _, err := p.getConfig(ctx, log, machine.Spec.ProviderSpec)
token, err := p.getTokenFromSpec(machine.Spec.ProviderSpec)
if err != nil {
return false, newError(common.InvalidConfigurationMachineError, "failed to parse MachineSpec: %v", err)
return false, fmt.Errorf("querying token from MachineSpec failed: %w", err)
}

_, cli, err := getClient(config.Token, &machine.Name)
_, cli, err := getClient(token, &machine.Name)
if err != nil {
return false, newError(common.InvalidConfigurationMachineError, "failed to create Anexia client: %v", err)
}
Expand Down