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

[code] desktop support with 1.59 upgrade #5107

Merged
merged 4 commits into from
Aug 19, 2021
Merged

[code] desktop support with 1.59 upgrade #5107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8155c10
[local-app-api] support Node.js
akosyakov Jul 26, 2021
b26d8a8
[local-app] control auto tunneling api
akosyakov Jul 26, 2021
07b141e
[supervisor] pass env vars to ssh sessions
akosyakov Aug 8, 2021
7a4aa18
[code] fix #4780: desktop support
akosyakov Aug 8, 2021
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
7 changes: 4 additions & 3 deletions components/ide/code/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh |
&& npm install -g yarn node-gyp
ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH

ENV GP_CODE_COMMIT 06711200f6a3a19af94f91102fd49d921b1145db
ENV GP_CODE_COMMIT 9bc86ad1d6f3f7116ef96003983738963fd70a6f
RUN mkdir gp-code \
&& cd gp-code \
&& git init \
Expand All @@ -51,6 +51,7 @@ RUN mkdir gp-code \
&& git reset --hard FETCH_HEAD
WORKDIR /gp-code
RUN yarn
RUN yarn gitpod:link
RUN yarn gulp gitpod-min

# grant write permissions for built-in extensions
Expand All @@ -77,5 +78,5 @@ ENV GITPOD_ENV_SET_EDITOR /ide/bin/code
ENV GITPOD_ENV_SET_VISUAL "$GITPOD_ENV_SET_EDITOR"
ENV GITPOD_ENV_SET_GP_OPEN_EDITOR "$GITPOD_ENV_SET_EDITOR"
ENV GITPOD_ENV_SET_GIT_EDITOR "$GITPOD_ENV_SET_EDITOR --wait"
ENV GITPOD_ENV_SET_GP_PREVIEW_BROWSER "/ide/bin/code --command gitpod.api.preview"
ENV GITPOD_ENV_SET_GP_EXTERNAL_BROWSER "/ide/bin/code --open-external"
ENV GITPOD_ENV_SET_GP_PREVIEW_BROWSER "/ide/bin/code --preview"
ENV GITPOD_ENV_SET_GP_EXTERNAL_BROWSER "/ide/bin/code --openExternal"
168 changes: 150 additions & 18 deletions components/local-app-api/go/localapp.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 38 additions & 1 deletion components/local-app-api/go/localapp_grpc.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion components/local-app-api/localapp.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import "supervisor-api/port.proto";

service LocalApp {
rpc TunnelStatus(TunnelStatusRequest) returns (stream TunnelStatusResponse) {}
rpc AutoTunnel(AutoTunnelRequest) returns (AutoTunnelResponse) {}
}
message TunnelStatusRequest {
string instance_id = 1;
Expand All @@ -23,4 +24,10 @@ message TunnelStatus {
uint32 remote_port = 1;
uint32 local_port = 2;
supervisor.TunnelVisiblity visibility = 3;
}
}

message AutoTunnelRequest {
string instance_id = 1;
bool enabled = 2;
}
message AutoTunnelResponse {}
3 changes: 2 additions & 1 deletion components/local-app-api/typescript-grpcweb/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ module.exports = {
output: {
filename: 'localapp.js',
path: path.resolve('./lib'),
libraryTarget: 'umd'
libraryTarget: 'umd',
globalObject: 'typeof self !== \'undefined\' ? self : this'
},
externals: {
'@improbable-eng/grpc-web': 'commonjs2 @improbable-eng/grpc-web',
Expand Down
1 change: 1 addition & 0 deletions components/local-app/pkg/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ func Login(ctx context.Context, opts LoginOpts) (token string, err error) {
ClientID: "gplctl-1.0",
ClientSecret: "gplctl-1.0-secret", // Required (even though it is marked as optional?!)
Scopes: []string{
"function:getWorkspace",
"function:getWorkspaces",
"function:listenForWorkspaceInstanceUpdates",
"resource:workspace::*::get",
Expand Down
Loading