Skip to content
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

Jump to bottom

feat: start using the appconfig 'source' column #2597

Merged
merged 6 commits into from
Oct 17, 2023
Merged

feat: start using the appconfig 'source' column #2597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da7bc35
feat: start using the appconfig 'source' column
hspitzley-czi Oct 16, 2023
f61761d
feat: start using the appconfig 'source' column
hspitzley-czi Oct 16, 2023
27c38fe
Merge branch 'hspitzley/use_apconfig_source_column' of github.com:cha…
hspitzley-czi Oct 16, 2023
44e60fb
try again
hspitzley-czi Oct 16, 2023
429fcd7
fix
hspitzley-czi Oct 16, 2023
8a5ffce
Merge branch 'main' into hspitzley/use_apconfig_source_column
hspitzley-czi Oct 17, 2023
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
27 changes: 11 additions & 16 deletions api/pkg/cmd/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,11 @@ func (c *dbConfig) GetAllAppConfigs(payload *model.AppMetadata) ([]*model.AppCon
return nil, errors.Wrap(err, "[GetAllAppConfigs] unable to query app configs")
}

return entArrayToSharedModelArray(records), nil
results := make([]*model.AppConfig, len(records))
for idx, record := range records {
results[idx] = MakeAppConfigFromEnt(record)
}
return results, nil
}

// Returns only env-level configs for the given app and env
Expand All @@ -108,10 +112,9 @@ func (c *dbConfig) GetAppConfigsForEnv(payload *model.AppMetadata) ([]*model.Res
return nil, errors.Wrap(err, "[GetAppConfigsForEnv] unable to query app configs")
}

results := entArrayToSharedModelArray(records)
resolvedResults := []*model.ResolvedAppConfig{}
for _, result := range results {
resolvedResults = append(resolvedResults, model.NewResolvedAppConfig(result))
resolvedResults := make([]*model.ResolvedAppConfig, len(records))
for idx, record := range records {
resolvedResults[idx] = &model.ResolvedAppConfig{AppConfig: *MakeAppConfigFromEnt(record), Source: record.Source.String()}
}

return resolvedResults, nil
Expand Down Expand Up @@ -140,7 +143,7 @@ func (c *dbConfig) GetAppConfigsForStack(payload *model.AppMetadata) ([]*model.R

results := []*model.ResolvedAppConfig{}
for _, record := range resolvedMap {
results = append(results, model.NewResolvedAppConfig(MakeAppConfigFromEnt(record)))
results = append(results, &model.ResolvedAppConfig{AppConfig: *MakeAppConfigFromEnt(record), Source: record.Source.String()})
}

return results, nil
Expand All @@ -163,14 +166,6 @@ func rollback(tx *ent.Tx, err error) error {
return err
}

func entArrayToSharedModelArray(records []*ent.AppConfig) []*model.AppConfig {
results := make([]*model.AppConfig, len(records))
for idx, record := range records {
results[idx] = MakeAppConfigFromEnt(record)
}
return results
}

func (c *dbConfig) GetResolvedAppConfig(payload *model.AppConfigLookupPayload) (*model.ResolvedAppConfig, error) {
db := c.DB.GetDB()
records, err := appEnvScopedQuery(db.AppConfig, &payload.AppMetadata).
Expand All @@ -189,8 +184,8 @@ func (c *dbConfig) GetResolvedAppConfig(payload *model.AppConfigLookupPayload) (
}

// at most 2 records are defined and since we order by stack DESC, the first record is the stack-specific one if it exists
result := MakeAppConfigFromEnt(records[0])
return model.NewResolvedAppConfig(result), nil
record := records[0]
return &model.ResolvedAppConfig{AppConfig: *MakeAppConfigFromEnt(record), Source: record.Source.String()}, nil
}

func (c *dbConfig) DeleteAppConfig(payload *model.AppConfigLookupPayload) (*model.AppConfig, error) {
Expand Down
11 changes: 0 additions & 11 deletions shared/model/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,6 @@ func NewAppConfigDiffPayload(appName, srcEnv, srcStack, destEnv, destStack strin
}
}

func NewResolvedAppConfig(appConfig *AppConfig) *ResolvedAppConfig {
source := "stack"
if appConfig.Stack == "" {
source = "environment"
}
return &ResolvedAppConfig{
AppConfig: *appConfig,
Source: source,
}
}

// @Description App config key/value pair wrapped in "record" key
type WrappedResolvedAppConfig struct {
Record *ResolvedAppConfig `json:"record"`
Expand Down
Loading