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.

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

feat(appstore): Handle Website Directory During Second Installation o… #7649

Merged
merged 1 commit into from
Jan 6, 2025

Conversation

zhengkunwang223
Copy link
Member

No description provided.

Copy link

f2c-ci-robot bot commented Jan 6, 2025

Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

// }
// return websiteDir
//}

func (i *AppInstall) GetComposePath() string {
return path.Join(i.GetAppPath(), i.Name, "docker-compose.yml")
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes made between the original code and mine are:

Original function to get the site directory is missing.

My suggestion is: Create function GetSiteDir with the below logic:

var data map[string]interface{}
if err := json.Unmarshal([]byte(i.Env), &data); err != nil {
  return path.Join(i.GetAppPath(), i Name, "www")
}

websiteDir, ok := data["WEBSITEDIOR"].(string)

If not OK or websitedir exists then use 'path.Join' and 'i.GetName()' instead of direct value

For optimization you can add docstrings at top and bottom of file if they're not present else remove unnecessary space in Go comments as it looks better.

return value
}
return ""
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code snippet is not formatted properly so it's difficult to review and determine if there are any irregularities, potential issues, or optimization suggestions. Please ensure that all lines in every file have been properly indented before reviewing them. For instance:

type IFileService interface {
    // methods
}

// Implementation of the FileInterface
...

Then run this through gopls with full scope enabled (for example, -scope=full).

}
resPath := fileService.GetPathByType(pathType)
helper.SuccessWithData(c, resPath)
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are no major code changes between the two provided versions. The only significant difference is the addition of error handling to both functions. If anything else needs an investigation, please let me know; I'm here to help.

Copy link

sonarqubecloud bot commented Jan 6, 2025

Quality Gate Failed Quality Gate failed

Failed conditions
B Maintainability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@wanghe-fit2cloud
Copy link
Member

/approve

Copy link

f2c-ci-robot bot commented Jan 6, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wanghe-fit2cloud

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved label Jan 6, 2025
@zhengkunwang223 zhengkunwang223 merged commit b1adafe into dev-v2 Jan 6, 2025
4 of 6 checks passed
@zhengkunwang223 zhengkunwang223 deleted the pr@dev-v2@common branch January 6, 2025 09:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants