Skip to content

feat: pass through metadata generate requirements errors #3142

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
+6 −6
Open

feat: pass through metadata generate requirements errors #3142

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
2 changes: 1 addition & 1 deletion cli/bpmetadata/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ func CreateBlueprintMetadata(bpPath string, bpMetadataObj *BlueprintMetadata) (*
moduleName := parseBpModuleName(bpPath, repoDetails.Source.BlueprintRootPath)
requirements, err := getBlueprintRequirements(rolesCfgPath, svcsCfgPath, versionsCfgPath, mdFlags.perModuleRequirements, moduleName)
if err != nil {
Log.Info("skipping blueprint requirements since roles and/or services configurations were not found as per https://tinyurl.com/tf-iam and https://tinyurl.com/tf-services")
Log.Info("skipping blueprint requirements since roles and/or services configurations were not found as per https://tinyurl.com/tf-iam and https://tinyurl.com/tf-services", "error:", err)
} else {
bpMetadataObj.Spec.Requirements = requirements
}
Expand Down
10 changes: 5 additions & 5 deletions cli/bpmetadata/tfconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
)

const (
versionRegEx = "/v([0-9]+[.0-9]*)$"
modulePattern = `(?:^|/)modules/([^/]+)`
perModuleRoles = "per_module_roles"
versionRegEx = "/v([0-9]+[.0-9]*)$"
modulePattern = `(?:^|/)modules/([^/]+)`
perModuleRoles = "per_module_roles"
perModuleServices = "per_module_services"
rootModuleName = "root"
rootModuleName = "root"
)

type blueprintVersion struct {
Expand Down Expand Up @@ -528,7 +528,7 @@ func parseBlueprintServices(servicesFile *hcl.File, perModuleMode bool, moduleNa
diags = gohcl.DecodeExpression(apisAttr.Expr, nil, &s)
err = hasHclErrors(diags)
if err != nil {
return nil, err
return nil, fmt.Errorf("error decoding activate_apis: %w", err)
}

// because we're only interested in the top-level modules block
Expand Down
Loading