Skip to content

Commit

Permalink
upgrade: updated go packages and it's dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: azar-writes-code <[email protected]>
  • Loading branch information
azar-writes-code committed Dec 2, 2024
1 parent a853ade commit 8f89e72
Show file tree
Hide file tree
Showing 3,483 changed files with 277,409 additions and 131,075 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
24 changes: 12 additions & 12 deletions cmd/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ Change the file as per your needs and then run the compage generate command to g
Run: func(cmd *cobra.Command, args []string) {
wD, err := os.Getwd()
if err != nil {
log.Errorf("error while getting the current directory [" + err.Error() + "]")
log.Errorf("error while getting the current directory: %v", err)
return
}
// set the project directory environment variable, if this is set, then the project will be generated in this folder
err = os.Setenv("COMPAGE_GENERATED_PROJECT_DIRECTORY", wD)
if err != nil {
log.Errorf("error while setting the project directory [" + err.Error() + "]")
log.Errorf("error while setting the project directory: %v", err)
return
}

Expand Down Expand Up @@ -59,7 +59,7 @@ func GenerateCode() error {
// converts to core project
coreProject, err := cmd.GetProject(project)
if err != nil {
log.Errorf("error while converting request to project [" + err.Error() + "]")
log.Errorf("error while converting request to project: %v", err)
return err
}

Expand All @@ -70,21 +70,21 @@ func GenerateCode() error {
// convert the license data to byte array
licenseData, err1 := json.Marshal(l)
if err1 != nil {
log.Errorf("error while marshalling license data [" + err1.Error() + "]")
log.Errorf("error while marshalling license data: %v", err1)
return err1
}
// convert the license data to license struct
err1 = json.Unmarshal(licenseData, license)
if err1 != nil {
log.Errorf("error while unmarshalling license data [" + err1.Error() + "]")
log.Errorf("error while unmarshalling license data: %v", err1)
return err1
}
// assign absolute path to the license file Path if it's not set
if len(license.Path) > 0 {
// assign absolute path to the license file Path if it's not
absPath, err2 := filepath.Abs(license.Path)
if err2 != nil {
log.Errorf("error while getting absolute path [" + err2.Error() + "]")
log.Errorf("error while getting absolute path: %v", err2)
return err2
}
license.Path = absPath
Expand All @@ -103,21 +103,21 @@ func GenerateCode() error {
// convert the license data to byte array
licenseData, err1 := json.Marshal(l)
if err1 != nil {
log.Errorf("error while marshalling license data [" + err1.Error() + "]")
log.Errorf("error while marshalling license data: %v", err1)
return err1
}
// convert the license data to license struct
err1 = json.Unmarshal(licenseData, license)
if err1 != nil {
log.Errorf("error while unmarshalling license data [" + err1.Error() + "]")
log.Errorf("error while unmarshalling license data: %v", err1)
return err1
}
// assign absolute path to the license file Path if it's not set
if len(license.Path) > 0 {
// assign absolute path to the license file Path if it's not
absPath, err2 := filepath.Abs(license.Path)
if err2 != nil {
log.Errorf("error while getting absolute path [" + err2.Error() + "]")
log.Errorf("error while getting absolute path: %v", err2)
return err2
}
license.Path = absPath
Expand All @@ -130,14 +130,14 @@ func GenerateCode() error {
// pull the common templates
err = ociregistry.PullOCIArtifact("common", project.CompageCoreVersion)
if err != nil {
log.Errorf("error while pulling the common templates [" + err.Error() + "]")
log.Errorf("error while pulling the common templates: %v", err)
return err
}
for _, node := range coreProject.CompageJSON.Nodes {
// make sure that the latest template is pulled
err = ociregistry.PullOCIArtifact(node.Language, project.CompageCoreVersion)
if err != nil {
log.Errorf("error while pulling the template [" + err.Error() + "]")
log.Errorf("error while pulling the template: %v", err)
return err
}
log.Debugf("template pulled successfully for language %s", node.Language)
Expand All @@ -146,7 +146,7 @@ func GenerateCode() error {
// triggers project generation, process the request
err0 := handlers.Handle(coreProject)
if err0 != nil {
log.Errorf("error while generating the project [" + err0.Error() + "]")
log.Errorf("error while generating the project: %v", err0)
return err
}
log.Infof("project generated successfully at %s", utils.GetProjectDirectoryName(project.Name))
Expand Down
4 changes: 2 additions & 2 deletions cmd/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ func createOrUpdateDefaultConfigFile() error {

if language != "go" && language != "dotnet" {
message := fmt.Sprintf("language %s is not supported", language)
log.Errorf(message)
return fmt.Errorf(message)
log.Errorf("%s", message)
return fmt.Errorf("%s", message)
}

_, err = os.Create(configFilePath)
Expand Down
Loading

0 comments on commit 8f89e72

Please sign in to comment.