Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

fix(cert): remove hostnameOverride defaults being generated #1285

Merged
merged 2 commits into from
Jun 15, 2017
Merged

fix(cert): remove hostnameOverride defaults being generated #1285

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
31d30c4
fix(cert): remove hostnameOverride defaults being generated
davek-at-ibm Jun 15, 2017
4a39651
Merge branch 'master' into remove_hostnameOverride_defaults
davek-at-ibm Jun 15, 2017
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
4 changes: 2 additions & 2 deletions ...oser-playground/src/app/connection-profile-data/connection-profile-data.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,7 @@ describe('ConnectionProfileDataComponent', () => {
mockConnectionProfileService.setHostname.should.be.called;
mockNgbModal.open.should.have.been.called;

patchSpy.should.have.been.calledWith({cert: 'ordererCert_2', hostnameOverride: 'orderer0'});
patchSpy.should.have.been.calledWith({cert: 'ordererCert_2', hostnameOverride: ''});
}));

it('should open peers certificate modal if hostname set', fakeAsync(() => {
Expand Down Expand Up @@ -1006,7 +1006,7 @@ describe('ConnectionProfileDataComponent', () => {
mockConnectionProfileService.setHostname.should.be.called;
mockNgbModal.open.should.have.been.called;

patchSpy.should.have.been.calledWith({cert: 'peerCert_1', hostnameOverride: 'peer0'});
patchSpy.should.have.been.calledWith({cert: 'peerCert_1', hostnameOverride: ''});
}));

it('should error on unrecognized type', fakeAsync(() => {
Expand Down
6 changes: 0 additions & 6 deletions .../composer-playground/src/app/connection-profile-data/connection-profile-data.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,17 +531,11 @@ export class ConnectionProfileDataComponent {
return this.modalService.open(AddCertificateComponent).result
.then((result) => {
if (type === 'orderers') {
if (result.hostnameOverride === '') {
result.hostnameOverride = 'orderer' + index;
}
this.v1Form.controls['orderers']['controls'][index].patchValue({
cert: result.cert,
hostnameOverride: result.hostnameOverride
});
} else if (type === 'peers') {
if (result.hostnameOverride === '') {
result.hostnameOverride = 'peer' + index;
}
this.v1Form.controls['peers']['controls'][index].patchValue({
cert: result.cert,
hostnameOverride: result.hostnameOverride
Expand Down