Skip to content
This repository has been archived by the owner on Jan 24, 2023. It is now read-only.

Commit

Permalink
Merge pull request #4182 from cloudfoundry/cf-cli-bump
Browse files Browse the repository at this point in the history 
Bump CF CLI to 6.49.0
  • Loading branch information
@richard-cox
richard-cox committed Apr 6, 2020
2 parents bb88fd7 + 1c3b916 commit 4fd4a83
Show file tree
Hide file tree
Showing 17 changed files with 752 additions and 463 deletions.
30 changes: 29 additions & 1 deletion ...es/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,32 @@
</mat-card>
</app-tile>
</app-tile-group>
</app-tile-grid>

<!-- Advanced info -->
<app-tile-group>
<app-tile>
<mat-card>
<mat-card-header>
<mat-card-title>Additional Application Info</mat-card-title>
</mat-card-header>
<mat-card-content>
<app-metadata-item icon="fingerprint" label="Application GUID" [clipboardValue]="appSvc.app.entity.guid">{{ appSvc.app.entity.guid }}</app-metadata-item>
<app-metadata-item icon="chevron_right" label="Command">{{ appSvc.app.entity.command || appSvc.app.entity.detected_start_command || '-' }}</app-metadata-item>
<app-metadata-item icon="power" label="Ports">{{ appSvc.app.entity.ports || '-' }}</app-metadata-item>
</mat-card-content>
</mat-card>
</app-tile>
<app-tile>
<mat-card>
<mat-card-header>
<mat-card-title>Health Check Configuration</mat-card-title>
</mat-card-header>
<mat-card-content>
<app-metadata-item icon="favorite_border" label="Health Check Type">{{ appSvc.app.entity.health_check_type }}</app-metadata-item>
<app-metadata-item icon="schedule" label="Health Check Timeout">{{ appSvc.app.entity.health_check_timeout | uptime }}</app-metadata-item>
<app-metadata-item *ngIf="appSvc.app.entity.health_check_type === 'http'" icon="http" label="Health Check HTTP Endpoint">{{ appSvc.app.entity.health_check_http_endpoint }}</app-metadata-item>
</mat-card-content>
</mat-card>
</app-tile>
</app-tile-group>
</app-tile-grid>
20 changes: 15 additions & 5 deletions ...cloud-foundry/src/features/applications/deploy-application/deploy-application-deployer.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Store } from '@ngrx/store';
import { BehaviorSubject, Observable, of as observableOf, Subject, Subscription } from 'rxjs';
import { BehaviorSubject, of as observableOf, Subject, Subscription } from 'rxjs';
import websocketConnect from 'rxjs-websockets';
import { catchError, combineLatest, filter, first, map, mergeMap, share, switchMap, tap } from 'rxjs/operators';

Expand Down Expand Up @@ -91,7 +91,7 @@ export class DeployApplicationDeployer {
// Status of file transfers
fileTransferStatus$ = new BehaviorSubject<FileTransferStatus>(undefined);

public messages: Observable<string>;
public messages = new BehaviorSubject<string>('');

// Are we deploying?
deploying = false;
Expand Down Expand Up @@ -165,13 +165,14 @@ export class DeployApplicationDeployer {
this.applicationSource = appDetail.applicationSource;
this.applicationOverrides = appDetail.applicationOverrides;
const host = window.location.host;
const appId = this.isRedeploy ? `&app=${this.isRedeploy}` : '';
const streamUrl = (
`wss://${host}/pp/${this.proxyAPIVersion}/${this.cfGuid}/${this.orgGuid}/${this.spaceGuid}/deploy` +
`?org=${org.entity.name}&space=${space.entity.name}`
`?org=${org.entity.name}&space=${space.entity.name}${appId}`
);

this.inputStream = new Subject<string>();
this.messages = websocketConnect(streamUrl)
const buffer = websocketConnect(streamUrl)
.pipe(
switchMap((get) => get(this.inputStream)),
catchError(e => {
Expand All @@ -189,7 +190,16 @@ export class DeployApplicationDeployer {
map((log) => log.message),
share(),
);
this.msgSub = this.messages.subscribe();

// Buffer messages until each newline character
let b = '';
this.msgSub = buffer.subscribe(m => {
b = b + m;
if (b.endsWith('\n')) {
this.messages.next(b);
b = '';
}
});
})
).subscribe();

Expand Down
16 changes: 9 additions & 7 deletions ...ed/components/list/list-types/github-commits/github-commits-list-config-deploy.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,15 @@ export class GithubCommitsListConfigServiceDeploy extends GithubCommitsListConfi
this.initialised.next(true);

// Auto-select first commit - wait for page to load, select first item if present
this.dataSource.page$.pipe(
first()
).subscribe(rs => {
if (rs && rs.length > 0) {
this.dataSource.selectedRowToggle(rs[0], false);
}
});
setTimeout(() => {
this.dataSource.page$.pipe(
first()
).subscribe(rs => {
if (rs && rs.length > 0) {
this.dataSource.selectedRowToggle(rs[0], false);
}
});
}, 0);
});
}
}
25 changes: 22 additions & 3 deletions src/jetstream/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,21 @@ go 1.12
require (
bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c
code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c // indirect
code.cloudfoundry.org/cli v6.43.0+incompatible
code.cloudfoundry.org/cfnetworking-cli-api v0.0.0-20190103195135-4b04f26287a6 // indirect
code.cloudfoundry.org/cli v6.49.0+incompatible
code.cloudfoundry.org/diego-ssh v0.0.0-20200312183824-517d22c5d890 // indirect
code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f // indirect
code.cloudfoundry.org/inigo v0.0.0-20200318144131-597cd5dbfe8b // indirect
code.cloudfoundry.org/lager v2.0.0+incompatible // indirect
code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d // indirect
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/SermoDigital/jose v0.9.1
github.com/SermoDigital/jose v0.9.1 // indirect
github.com/Sirupsen/logrus v0.0.0-00010101000000-000000000000 // indirect
github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0
github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/bmatcuk/doublestar v1.1.1 // indirect
github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 // indirect
github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13
github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1 // indirect
github.com/cloudfoundry-community/go-cfenv v1.17.0
Expand All @@ -24,13 +31,18 @@ require (
github.com/cppforlife/go-patch v0.2.0 // indirect
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v1.13.1 // indirect
github.com/domodwyer/mailyak v3.1.1+incompatible
github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect
github.com/elazarl/goproxy v0.0.0-20200315184450-1f3cb6622dad // indirect
github.com/elazarl/goproxy/ext v0.0.0-20200315184450-1f3cb6622dad // indirect
github.com/fatih/color v1.7.0 // indirect
github.com/go-sql-driver/mysql v1.4.1
github.com/gogo/protobuf v1.2.1 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/google/martian v2.1.0+incompatible // indirect
github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e // indirect
github.com/gorilla/context v1.1.1
github.com/gorilla/securecookie v1.1.1
Expand All @@ -40,7 +52,8 @@ require (
github.com/jessevdk/go-flags v1.4.0 // indirect
github.com/jtolds/gls v4.20.0+incompatible // indirect
github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12
github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4
github.com/kr/pty v1.1.8 // indirect
github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 // indirect
github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 // indirect
github.com/labstack/echo v3.3.10+incompatible
github.com/labstack/gommon v0.3.0 // indirect
Expand All @@ -59,12 +72,18 @@ require (
github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f
github.com/onsi/ginkgo v1.11.0 // indirect
github.com/onsi/gomega v1.8.1 // indirect
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
github.com/pierrec/lz4 v2.0.5+incompatible // indirect
github.com/pkg/errors v0.8.1 // indirect
github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 // indirect
github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 // indirect
github.com/sajari/fuzzy v1.0.0 // indirect
github.com/satori/go.uuid v1.2.0
github.com/sirupsen/logrus v1.3.0
github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect
github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa
github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
github.com/tedsuo/rata v1.0.0 // indirect
github.com/ulikunitz/xz v0.5.6 // indirect
github.com/valyala/fasttemplate v1.1.0 // indirect
github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec // indirect
Expand Down
Loading

0 comments on commit 4fd4a83

Please sign in to comment.