Skip to content

Fix prefix and variable names for gitops layer integration #304

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

Merged
seansund merged 1 commit into from
Feb 21, 2023
Merged

Fix prefix and variable names for gitops layer integration #304

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions src/models/terragrunt.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ export class TerragruntLayer implements TerragruntLayerModel, OutputFile {

const needsPrefixes: string[] = layerNeed.aliases || ['gitops_repo']
needsPrefixes.forEach(needPrefix => {
addInput({name: `${needPrefix}_host`, dependency, output: `${providesPrefix}_host`})
addInput({name: `${needPrefix}_org`, dependency, output: `${providesPrefix}_org`})
addInput({name: `${needPrefix}_repo`, dependency, output: `${providesPrefix}_name`})
addInput({name: `${needPrefix}_project`, dependency, output: `${providesPrefix}_project`})
addInput({name: `${needPrefix}_username`, dependency, output: `${providesPrefix}_username`})
addInput({name: `${needPrefix}_token`, dependency, output: `${providesPrefix}_token`})
addInput({name: `${needPrefix}_host`, dependency, output: `${providesPrefix}_config_host`})
addInput({name: `${needPrefix}_org`, dependency, output: `${providesPrefix}_config_org`})
addInput({name: `${needPrefix}_repo`, dependency, output: `${providesPrefix}_config_name`})
addInput({name: `${needPrefix}_project`, dependency, output: `${providesPrefix}_config_project`})
addInput({name: `${needPrefix}_username`, dependency, output: `${providesPrefix}_config_username`})
addInput({name: `${needPrefix}_token`, dependency, output: `${providesPrefix}_config_token`})
})
} else if (need === 'storage') {
const providesPrefix: string = first(layerProvides.filter(val => val.name === need).map(val => val.alias))
Expand Down
38 changes: 22 additions & 16 deletions src/services/iascable/iascable.impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ const applyVersionsToBomModules = (billOfMaterial: BillOfMaterialModel, modules:
const applyAnnotationsToBom = (billOfMaterial: BillOfMaterialModel, modules: SingleModuleVersion[]): BillOfMaterialModel => {

const provides: LayerProvides[] = uniqBy(modules
.map(extractProvidedCapabilities)
.map(extractProvidedCapabilities(modules))
.reduce(
flattenReverse,
extractProvidedCapabilitiesFromBom(billOfMaterial)
Expand Down Expand Up @@ -342,26 +342,32 @@ export const extractNeededCapabilitiesFromBom = (bom: CustomResourceDefinition):
})
}

const extractProvidedCapabilities = (module: SingleModuleVersion): LayerProvides[] => {
const provides: LayerProvides[] = []
const extractProvidedCapabilities = (modules: SingleModuleVersion[]) => {
return (module: SingleModuleVersion): LayerProvides[] => {
const provides: LayerProvides[] = []

// TODO this should be completely based on interfaces
const interfaces: string[] = (module.interfaces || [])
.map(value => value.replace(/.*#/, ''))
// TODO this should be completely based on interfaces
const interfaces: string[] = (module.interfaces || [])
.map(value => value.replace(/.*#/, ''))

if (interfaces.includes('cluster') && module.name !== 'ocp-login') {
provides.push({name: 'cluster', alias: module.alias || module.name})
}
if (interfaces.includes('cluster') && module.name !== 'ocp-login') {
provides.push({name: 'cluster', alias: module.alias || module.name})
}

if (interfaces.includes('gitops-provider') || module.name === 'argocd-bootstrap') {
provides.push({name: 'gitops', alias: module.alias || module.name})
}
if (interfaces.includes('gitops-provider') || module.name === 'argocd-bootstrap') {
// TODO use an interface and better error handling
const aliasModule = first(modules.filter(m => m.name === 'gitops-repo'))
.orElse({alias: 'gitops_repo', name: 'gitops-repo'} as any)

if (interfaces.includes('cluster-storage')) {
provides.push({name: 'storage', alias: module.alias || module.name})
}
provides.push({name: 'gitops', alias: aliasModule.alias || aliasModule.name})
}

return provides
if (interfaces.includes('cluster-storage')) {
provides.push({name: 'storage', alias: module.alias || module.name})
}

return provides
}
}

const extractNeededCapabilities = (allProvides: LayerProvides[]) => {
Expand Down