Finish native completion and retire legacy command machinery
This commit is contained in:
@@ -15,57 +15,8 @@ import (
|
||||
"gitea.maximumdirect.net/eric/narratio/internal/artifacts"
|
||||
"gitea.maximumdirect.net/eric/narratio/internal/config"
|
||||
"gitea.maximumdirect.net/eric/narratio/internal/fileops"
|
||||
"go.maximumdirect.net/commandkit"
|
||||
)
|
||||
|
||||
type pipelineCampaignConfig = config.LoadedPipelineCampaign
|
||||
|
||||
type commandConfig struct {
|
||||
Config *config.Config
|
||||
cleanup func() error
|
||||
}
|
||||
|
||||
func (c *commandConfig) Close() error {
|
||||
if c == nil || c.cleanup == nil {
|
||||
return nil
|
||||
}
|
||||
cleanup := c.cleanup
|
||||
c.cleanup = nil
|
||||
return cleanup()
|
||||
}
|
||||
|
||||
func retainedCommandConfig(cfg *config.Config) *commandConfig {
|
||||
return &commandConfig{Config: cfg}
|
||||
}
|
||||
|
||||
func loadCommandConfigWithDependencies(ctx context.Context, pipelineFlag, campaignFlag, campaignFileFlag, sessionFlag string, sessionOpts config.SessionLoadOptions, secretsDir *string, deps commandDependencies) (*commandConfig, error) {
|
||||
selection := configurationSelection{}
|
||||
for _, field := range []struct {
|
||||
value string
|
||||
target *commandkit.Supplied[string]
|
||||
}{
|
||||
{pipelineFlag, &selection.Config}, {campaignFlag, &selection.Campaign}, {campaignFileFlag, &selection.CampaignFile},
|
||||
{sessionFlag, &selection.SessionFile}, {sessionOpts.SessionID, &selection.Session},
|
||||
} {
|
||||
if field.value != "" {
|
||||
*field.target = commandkit.Supplied[string]{Value: field.value, Set: true}
|
||||
}
|
||||
}
|
||||
if secretsDir != nil {
|
||||
selection.SecretsDir = commandkit.Supplied[string]{Value: *secretsDir, Set: true}
|
||||
}
|
||||
if sessionOpts.Overlay != nil {
|
||||
selection.Overlay = commandkit.Supplied[string]{Value: *sessionOpts.Overlay, Set: true}
|
||||
}
|
||||
acquisition := newConfigurationAcquisition(selection, deps)
|
||||
acquisition.previousSessionID = sessionOpts.PreviousSessionID
|
||||
cfg, err := acquisition.Domain(ctx)
|
||||
if err != nil {
|
||||
return nil, errors.Join(err, acquisition.Close())
|
||||
}
|
||||
return &commandConfig{Config: cfg, cleanup: acquisition.Close}, nil
|
||||
}
|
||||
|
||||
type acquiredSession struct {
|
||||
Config *config.SessionConfig
|
||||
Path string
|
||||
@@ -94,7 +45,7 @@ func loadRemoteSessionConfig(ctx context.Context, base *config.LoadedPipelineCam
|
||||
sessionPrefix := artifacts.S3SessionPrefix(rootPrefix, config.CampaignID(base.Campaign), sessionID)
|
||||
remoteKey := artifacts.S3SessionConfigKey(sessionPrefix)
|
||||
partialCfg := &config.Config{Pipeline: base.Pipeline, PipelinePath: base.PipelinePath, Campaign: base.Campaign, CampaignPath: base.CampaignPath}
|
||||
store, err := newCommandObjectStoreWithDependencies(ctx, partialCfg, nil, deps)
|
||||
store, err := newCommandObjectStoreWithDependencies(ctx, partialCfg, deps)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("remote session %q unavailable: %w", remoteKey, err)
|
||||
}
|
||||
@@ -150,32 +101,6 @@ func loadRemoteSessionConfig(ctx context.Context, base *config.LoadedPipelineCam
|
||||
return loaded, nil
|
||||
}
|
||||
|
||||
func loadPipelineCampaignConfigWithDependencies(pipelineFlag, campaignFlag, campaignFileFlag string, pipelineOpts config.PipelineLoadOptions, secretsDir *string, deps commandDependencies) (*pipelineCampaignConfig, error) {
|
||||
deps = normalizeCommandDependencies(deps)
|
||||
loadedPipelinePath, pipelineCfg, err := loadPipelineConfigWithDependencies(pipelineFlag, pipelineOpts, secretsDir, deps)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
resolvedCampaignPath, err := resolveCampaignConfigPath(pipelineCfg, campaignFlag, campaignFileFlag)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
campaignCfg, err := config.LoadCampaign(resolvedCampaignPath)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if selectedID := strings.TrimSpace(campaignFlag); selectedID != "" {
|
||||
if got := config.CampaignID(campaignCfg); got != selectedID {
|
||||
return nil, &config.SessionIdentityError{Source: resolvedCampaignPath, Field: "campaign_id", Expected: selectedID, Actual: got}
|
||||
}
|
||||
}
|
||||
loaded, err := config.LoadPipelineCampaign(loadedPipelinePath, pipelineCfg, resolvedCampaignPath, campaignCfg)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &loaded, nil
|
||||
}
|
||||
|
||||
func loadPipelineConfigWithDependencies(pipelineFlag string, opts config.PipelineLoadOptions, secretsDir *string, deps commandDependencies) (string, *config.PipelineConfig, error) {
|
||||
deps = normalizeCommandDependencies(deps)
|
||||
if !deps.secretsBootstrap.selectionSet {
|
||||
|
||||
Reference in New Issue
Block a user