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

fix: p2p instance test connection #20968

Merged
merged 2 commits into from
Sep 27, 2024
Merged

fix: p2p instance test connection #20968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c09e45
fix: p2p instance test connection
chlins Sep 26, 2024
08f1254
Merge branch 'main' into fix/p2p-instance-test-connection
wy65701436 Sep 27, 2024
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 src/pkg/p2p/preheat/provider/client/http_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func NewHTTPClient(insecure bool) *HTTPClient {
// Get content from the url
func (hc *HTTPClient) Get(url string, cred *auth.Credential, parmas map[string]string, options map[string]string) ([]byte, error) {
bytes, err := hc.get(url, cred, parmas, options)
logMsg := fmt.Sprintf("Get %s with cred=%v, params=%v, options=%v", url, cred, parmas, options)
logMsg := fmt.Sprintf("Get %s with params=%v, options=%v", url, parmas, options)
if err != nil {
log.Errorf("%s: %s", logMsg, err)
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/p2p/preheat/provider/dragonfly.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func (dd *DragonflyDriver) Self() *Metadata {
ID: "dragonfly",
Name: "Dragonfly",
Icon: "https://raw.github.com/dragonflyoss/Dragonfly2/master/docs/images/logo/dragonfly-linear.png",
Version: "2.1.57",
Version: "2.1.59",
Source: "https://github.com/dragonflyoss/Dragonfly2",
Maintainers: []string{"chlins.zhang@gmail.com", "gaius.qi@gmail.com"},
}
Expand Down
5 changes: 5 additions & 0 deletions ...left-side-nav/distribution/distribution-setup-modal/distribution-setup-modal.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,11 @@ export class DistributionSetupModalComponent implements OnInit, OnDestroy {
this.checkBtnState = ClrLoadingState.LOADING;
const instance: Instance = clone(this.model);
instance.id = 0;
if (instance.auth_mode !== AuthMode.NONE) {
instance.auth_info = this.authData;
} else {
delete instance.auth_info;
}
this.distributionService
.PingInstances({
instance: this.handleInstance(instance),
Expand Down
1 change: 1 addition & 0 deletions src/server/v2.0/handler/preheat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@ func convertParamInstanceToModelInstance(model *models.Instance) (*instanceModel

return &instanceModel.Instance{
AuthData: string(authData),
AuthInfo: model.AuthInfo,
AuthMode: model.AuthMode,
Default: model.Default,
Description: model.Description,
Expand Down
3 changes: 2 additions & 1 deletion src/server/v2.0/handler/preheat_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func Test_convertProvidersToFrontend(t *testing.T) {
{"",
backend,
[]*models.Metadata{
{ID: "dragonfly", Icon: "https://raw.github.com/dragonflyoss/Dragonfly2/master/docs/images/logo/dragonfly-linear.png", Maintainers: []string{"chlins.zhang@gmail.com", "gaius.qi@gmail.com"}, Name: "Dragonfly", Source: "https://github.com/dragonflyoss/Dragonfly2", Version: "2.1.57"},
{ID: "dragonfly", Icon: "https://raw.github.com/dragonflyoss/Dragonfly2/master/docs/images/logo/dragonfly-linear.png", Maintainers: []string{"chlins.zhang@gmail.com", "gaius.qi@gmail.com"}, Name: "Dragonfly", Source: "https://github.com/dragonflyoss/Dragonfly2", Version: "2.1.59"},
{Icon: "https://github.com/uber/kraken/blob/master/assets/kraken-logo-color.svg", ID: "kraken", Maintainers: []string{"mmpei/peimingming@corp.netease.com"}, Name: "Kraken", Source: "https://github.com/uber/kraken", Version: "0.1.3"},
},
},
Expand Down Expand Up @@ -288,6 +288,7 @@ func Test_convertParamInstanceToModelInstance(t *testing.T) {
Endpoint: "https://example.com",
AuthMode: "none",
AuthData: `{"name":"harbor"}`,
AuthInfo: map[string]string{"name": "harbor"},
Status: "Unknown",
Default: true,
Insecure: true,
Expand Down
Loading