Skip to content

Commit e08e4a7

Browse files
author
Andrea Falzetti
committed
Merge branch 'ide/supervisor-readable-logs' into ak/merge_run_tasks
2 parents 905ee6c + ed8f01c commit e08e4a7

File tree

76 files changed

+880
-67812
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+880
-67812
lines changed

‎.gitpod.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ tasks:
5252
(cd install/installer && make deps)
5353
exit 0
5454
- name: Java
55+
init: leeway run components/supervisor-api:generate-java
5556
command: |
5657
if [ -z "$RUN_GRADLE_TASK" ]; then
5758
read -r -p "Press enter to continue Java gradle task"

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Change Log
22

33
## December 2022
4+
- Update JetBrains IDE images to most recent stable version. ([#15462](https://github.com/gitpod-io/gitpod/pull/15462)) - [@roboquat](https://github.com/roboquat)
45
- The Admin Teams search will also search by team slug in addition to team name. ([#15338](https://github.com/gitpod-io/gitpod/pull/15338)) - [@selfcontained](https://github.com/selfcontained)
56
- [installer] Update third_party charts to use full index ([#15432](https://github.com/gitpod-io/gitpod/pull/15432)) - [@Pothulapati](https://github.com/Pothulapati)
67
- Update beta notice for the JetBrains integration ([#15371](https://github.com/gitpod-io/gitpod/pull/15371)) - [@gtsiolis](https://github.com/gtsiolis)

‎WORKSPACE.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ defaultArgs:
77
publishToNPM: true
88
publishToJBMarketplace: true
99
localAppVersion: unknown
10-
codeCommit: d98cbb1f6815c9dc45133d2f61d4bc257e73f9e8
11-
codeVersion: 1.74.2
10+
codeCommit: 05e928f3d900f8b27574d846d46d2ca4a10c2ffd
11+
codeVersion: 1.75.0
1212
codeQuality: stable
1313
noVerifyJBPlugin: false
1414
intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2022.3.1.tar.gz"

‎components/BUILD.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ packages:
6262
- components/ide/jetbrains/image:clion-latest
6363
- components/image-builder-bob:docker
6464
- components/image-builder-mk3:docker
65+
- components/ipfs/ipfs-cluster:docker
66+
- components/ipfs/kubo:docker
6567
- components/local-app:docker
6668
- components/public-api-server:docker
6769
- components/usage:docker

‎components/content-service/cmd/test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
22
// Licensed under the GNU Affero General Public License (AGPL).
3-
// See License-AGPL.txt in the project root for license information.
3+
// See License.AGPL.txt in the project root for license information.
44

55
package cmd
66

‎components/content-service/pkg/storage/s3.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
22
// Licensed under the GNU Affero General Public License (AGPL).
3-
// See License-AGPL.txt in the project root for license information.
3+
// See License.AGPL.txt in the project root for license information.
44

55
package storage
66

‎components/content-service/pkg/storage/s3_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
22
// Licensed under the GNU Affero General Public License (AGPL).
3-
// See License-AGPL.txt in the project root for license information.
3+
// See License.AGPL.txt in the project root for license information.
44

55
package storage_test
66

‎components/content-service/pkg/storage/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
22
// Licensed under the GNU Affero General Public License (AGPL).
3-
// See License-AGPL.txt in the project root for license information.
3+
// See License.AGPL.txt in the project root for license information.
44

55
package storage_test
66

‎components/dashboard/src/components/UsageLimitReachedModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2022 Gitpod GmbH. All rights reserved.
33
* Licensed under the GNU Affero General Public License (AGPL).
4-
* See License-AGPL.txt in the project root for license information.
4+
* See License.AGPL.txt in the project root for license information.
55
*/
66

77
import { Team } from "@gitpod/gitpod-protocol";

‎components/iam/pkg/oidc/demo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
22
// Licensed under the GNU Affero General Public License (AGPL).
3-
// See License-AGPL.txt in the project root for license information.
3+
// See License.AGPL.txt in the project root for license information.
44

55
package oidc
66

‎components/iam/pkg/oidc/oauth2.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
22
// Licensed under the GNU Affero General Public License (AGPL).
3-
// See License-AGPL.txt in the project root for license information.
3+
// See License.AGPL.txt in the project root for license information.
44

55
package oidc
66

‎components/iam/pkg/server/server.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ package server
66

77
import (
88
"fmt"
9-
db "github.com/gitpod-io/gitpod/components/gitpod-db/go"
109
"net"
1110
"os"
11+
"path/filepath"
12+
13+
db "github.com/gitpod-io/gitpod/components/gitpod-db/go"
1214

1315
goidc "github.com/coreos/go-oidc/v3/oidc"
1416
"github.com/gitpod-io/gitpod/common-go/baseserver"
@@ -34,6 +36,11 @@ func Start(logger *logrus.Entry, version string, cfg *config.ServiceConfig) erro
3436
return fmt.Errorf("failed to establish database connection: %w", err)
3537
}
3638

39+
_, err = db.NewCipherSetFromKeysInFile(filepath.Join(cfg.DatabaseConfigPath, "encryptionKeys"))
40+
if err != nil {
41+
return fmt.Errorf("failed to read cipherset from file: %w", err)
42+
}
43+
3744
srv, err := baseserver.New("iam",
3845
baseserver.WithLogger(logger),
3946
baseserver.WithConfig(cfg.Server),

‎components/ide/jetbrains/backend-plugin/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -e
88
if [ "${NO_VERIFY_JB_PLUGIN}" == "true" ]; then
99
echo "build.sh: skip verify plugin step"
1010
else
11-
./gradlew -PsupervisorApiProjectPath=components-supervisor-api-java--lib/ -PgitpodProtocolProjectPath=components-gitpod-protocol-java--lib/ -PenvironmentName="$JB_QUALIFIER" -Dgradle.user.home="/workspace/.gradle-$JB_QUALIFIER" -Pplugin.verifier.home.dir="$HOME/.cache/pluginVerifier-$JB_QUALIFIER" runPluginVerifier
11+
./gradlew -PsupervisorApiProjectPath=components-supervisor-api-java--lib/ -PgitpodProtocolProjectPath=components-gitpod-protocol-java--lib/ -PenvironmentName="$JB_QUALIFIER" -Dgradle.user.home="/workspace/.gradle-$JB_QUALIFIER" -Dplugin.verifier.home.dir="$HOME/.cache/pluginVerifier-$JB_QUALIFIER" runPluginVerifier
1212
fi
13-
./gradlew -PsupervisorApiProjectPath=components-supervisor-api-java--lib/ -PgitpodProtocolProjectPath=components-gitpod-protocol-java--lib/ -PenvironmentName="$JB_QUALIFIER" -Dgradle.user.home="/workspace/.gradle-$JB_QUALIFIER" buildPlugin
13+
./gradlew -PsupervisorApiProjectPath=components-supervisor-api-java--lib/ -PgitpodProtocolProjectPath=components-gitpod-protocol-java--lib/ -PenvironmentName="$JB_QUALIFIER" -Dgradle.user.home="/workspace/.gradle-$JB_QUALIFIER" -Dplugin.verifier.home.dir="$HOME/.cache/pluginVerifier-$JB_QUALIFIER" buildPlugin
1414
unzip ./build/distributions/gitpod-remote.zip -d ./build

‎components/ide/jetbrains/image/create-supervisor-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
22
// Licensed under the GNU Affero General Public License (AGPL).
3-
// See License-AGPL.txt in the project root for license information.
3+
// See License.AGPL.txt in the project root for license information.
44

55
// @ts-check
66
const fs = require("fs");

‎components/ide/jetbrains/image/resolve-latest-ide-version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
33
# Licensed under the GNU Affero General Public License (AGPL).
4-
# See License-AGPL.txt in the project root for license information.
4+
# See License.AGPL.txt in the project root for license information.
55

66
set -Eeuo pipefail
77

‎components/ide/jetbrains/launcher/leeway.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
22
# Licensed under the GNU Affero General Public License (AGPL).
3-
# See License-AGPL.txt in the project root for license information.
3+
# See License.AGPL.txt in the project root for license information.
44

55
FROM alpine:3.16 as base_builder
66
RUN mkdir /ide-desktop

‎components/ide/jetbrains/launcher/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
22
// Licensed under the GNU Affero General Public License (AGPL).
3-
// See License-AGPL.txt in the project root for license information.
3+
// See License.AGPL.txt in the project root for license information.
44

55
package main
66

‎components/ide/jetbrains/launcher/testdata/.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
22
# Licensed under the GNU Affero General Public License (AGPL).
3-
# See License-AGPL.txt in the project root for license information.
3+
# See License.AGPL.txt in the project root for license information.
44

55
# see https://github.com/gitpod-io/spring-petclinic/blob/master/.gitpod.yml
66
tasks:

‎components/ipfs/ipfs-cluster/BUILD.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
packages:
2+
- name: docker
3+
type: docker
4+
config:
5+
dockerfile: leeway.Dockerfile
6+
buildArgs:
7+
VERSION: 1.0.4
8+
image:
9+
- ${imageRepoBase}/ipfs/ipfs-cluster:v1.0.4

‎components/ipfs/ipfs-cluster/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# ipfs-cluster
2+
3+
[ipfs-cluster](https://github.com/ipfs-cluster/ipfs-cluster) is a pinset orchestration for IPFS.
4+
This component is for building the ipfs-cluster container image now.

‎components/ipfs/ipfs-cluster/leeway.Dockerfile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
2+
# Licensed under the GNU Affero General Public License (AGPL).
3+
# See License.AGPL.txt in the project root for license information.
4+
5+
ARG VERSION
6+
7+
FROM alpine as dependencies
8+
9+
RUN apk add -U wget
10+
11+
RUN wget -O /jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 \
12+
&& chmod +x /jq
13+
14+
RUN wget -O /kubectl https://dl.k8s.io/release/v1.24.3/bin/linux/amd64/kubectl \
15+
&& chmod +x /kubectl
16+
17+
FROM docker.io/ipfs/ipfs-cluster:${VERSION}
18+
19+
COPY --from=dependencies /jq /usr/bin/jq
20+
COPY --from=dependencies /kubectl /usr/bin/kubectl

‎components/ipfs/kubo/BUILD.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
packages:
2+
- name: docker
3+
type: docker
4+
config:
5+
dockerfile: leeway.Dockerfile
6+
buildArgs:
7+
VERSION: v0.16.0
8+
image:
9+
- ${imageRepoBase}/ipfs/kubo:v0.16.0

‎components/ipfs/kubo/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# kubo
2+
3+
[kubo](https://github.com/ipfs/kubo) is an An IPFS implementation in Go.
4+
This component is for building the kubo container image now.

‎components/ipfs/kubo/leeway.Dockerfile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
2+
# Licensed under the GNU Affero General Public License (AGPL).
3+
# See License.AGPL.txt in the project root for license information.
4+
5+
ARG VERSION
6+
7+
FROM alpine as dependencies
8+
9+
RUN apk add -U wget
10+
11+
RUN wget -O /jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 \
12+
&& chmod +x /jq
13+
14+
FROM docker.io/ipfs/kubo:${VERSION}
15+
16+
COPY --from=dependencies /jq /usr/bin/jq

‎components/refresh-credential/cmd/root.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
22
// Licensed under the GNU Affero General Public License (AGPL).
3-
// See License-AGPL.txt in the project root for license information.
3+
// See License.AGPL.txt in the project root for license information.
44

55
package cmd
66

‎components/refresh-credential/leeway.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
22
# Licensed under the GNU Affero General Public License (AGPL).
3-
# See License-AGPL.txt in the project root for license information.
3+
# See License.AGPL.txt in the project root for license information.
44

55
FROM alpine:3.16
66

‎components/refresh-credential/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
22
// Licensed under the GNU Affero General Public License (AGPL).
3-
// See License-AGPL.txt in the project root for license information.
3+
// See License.AGPL.txt in the project root for license information.
44

55
package main
66

‎components/refresh-credential/pkg/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
22
// Licensed under the GNU Affero General Public License (AGPL).
3-
// See License-AGPL.txt in the project root for license information.
3+
// See License.AGPL.txt in the project root for license information.
44

55
package config
66

‎components/refresh-credential/pkg/ecr/updater.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
22
// Licensed under the GNU Affero General Public License (AGPL).
3-
// See License-AGPL.txt in the project root for license information.
3+
// See License.AGPL.txt in the project root for license information.
44

55
package ecr
66

‎components/supervisor-api/BUILD.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,16 @@ packages:
77
config:
88
commands:
99
- ["echo"]
10+
- name: java
11+
type: generic
12+
srcs:
13+
- "*.proto"
14+
- "third_party/**/*.proto"
15+
- "generate-java.sh"
16+
config:
17+
commands:
18+
- ["./generate-java.sh"]
19+
scripts:
20+
- name: generate-java
21+
description: Generate Java files from Surpervisor API proto files
22+
script: ./generate-java.sh

‎components/supervisor-api/generate-java.sh

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/bash
2+
# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
3+
# Licensed under the GNU Affero General Public License (AGPL).
4+
# See License.AGPL.txt in the project root for license information.
5+
6+
# replace Java reserved keywords
7+
sed -i 's/private = 0;/private_visibility = 0;/g' status.proto
8+
sed -i 's/public = 1;/public_visibility = 1;/g' status.proto
9+
10+
PROTOC_GEN_GRPC_JAVA_PATH=/tmp/protoc-gen-grpc-java
11+
12+
if [ ! -f $PROTOC_GEN_GRPC_JAVA_PATH ]; then
13+
curl -sSo $PROTOC_GEN_GRPC_JAVA_PATH https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/1.49.0/protoc-gen-grpc-java-1.49.0-linux-x86_64.exe
14+
chmod +x $PROTOC_GEN_GRPC_JAVA_PATH
15+
fi
16+
17+
OUT_DIR=java/src/main/java/
18+
19+
mkdir -p $OUT_DIR
20+
21+
protoc \
22+
-I. -Ithird_party \
23+
--plugin=protoc-gen-grpc-java=$PROTOC_GEN_GRPC_JAVA_PATH \
24+
--grpc-java_out=$OUT_DIR \
25+
--java_out=$OUT_DIR \
26+
./*.proto
27+
28+
# revert Java reserved keywords
29+
sed -i 's/private_visibility = 0;/private = 0;/g' status.proto
30+
sed -i 's/public_visibility = 1;/public = 1;/g' status.proto

‎components/supervisor-api/generate.sh

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,8 @@ go_protoc_gateway() {
4242
*.proto
4343
}
4444

45-
local_java_protoc() {
46-
# replace Java reserved keywords
47-
sed -i 's/private = 0;/private_visibility = 0;/g' status.proto
48-
sed -i 's/public = 1;/public_visibility = 1;/g' status.proto
49-
protoc \
50-
-I /usr/lib/protoc/include -I"$COMPONENTS_DIR" -I. -I"$THIRD_PARTY_INCLUDES" \
51-
--plugin=protoc-gen-grpc-java=/tmp/protoc-gen-grpc-java \
52-
--grpc-java_out=java/src/main/java \
53-
--java_out=java/src/main/java \
54-
./*.proto
55-
# remove trailing spaces
56-
find "${COMPONENTS_DIR}"/supervisor-api/java/src/main/java/io/gitpod/supervisor/api -maxdepth 1 -name "*.java" -exec sed -i -e "s/[[:space:]]*$//" {} \;
57-
# revert Java reserved keywords
58-
sed -i 's/private_visibility = 0;/private = 0;/g' status.proto
59-
sed -i 's/public_visibility = 1;/public = 1;/g' status.proto
60-
}
61-
6245
install_dependencies
6346
local_go_protoc "$COMPONENTS_DIR"
6447
go_protoc_gateway "$COMPONENTS_DIR"
65-
local_java_protoc "$COMPONENTS_DIR"
48+
./generate-java.sh
6649
update_license

‎components/supervisor-api/java/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
.vscode
44
bin
55
build
6+
api

‎components/supervisor-api/java/BUILD.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
packages:
22
- name: lib
33
type: generic
4+
deps:
5+
- components/supervisor-api:java
46
srcs:
57
- "**/*.java"
68
- "build.gradle"
@@ -10,4 +12,5 @@ packages:
1012
- "settings.gradle"
1113
config:
1214
commands:
15+
- ["cp", "-r", "components-supervisor-api--java/java/src/main/java", "src/main"]
1316
- ["./gradlew", "build"]

0 commit comments

Comments
 (0)