Skip to content

[content-service] Remove UsageReport service #12932

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

Merged
roboquat merged 1 commit into from
Sep 16, 2022
Merged

[content-service] Remove UsageReport service #12932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/content-service-api/go/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ type UsageReportConfig struct {
}

type ServiceConfig struct {
Service baseserver.ServerConfiguration `json:"service"`
Storage StorageConfig `json:"storage"`
UsageReports UsageReportConfig `json:"usageReport"`
Service baseserver.ServerConfiguration `json:"service"`
Storage StorageConfig `json:"storage"`
// Deprecated
_ UsageReportConfig `json:"usageReport"`
}
6 changes: 0 additions & 6 deletions components/content-service/cmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,6 @@ var runCmd = &cobra.Command{
}
api.RegisterIDEPluginServiceServer(srv.GRPC(), idePluginService)

usageReportService, err := service.NewUsageReportService(cfg.Storage, cfg.UsageReports.BucketName)
if err != nil {
log.WithError(err).Fatalf("Cannot create usage report service")
}
api.RegisterUsageReportServiceServer(srv.GRPC(), usageReportService)

err = srv.ListenAndServe()
if err != nil {
log.WithError(err).Fatal("Cannot start server")
Expand Down
105 changes: 0 additions & 105 deletions components/content-service/pkg/service/usage-report-service.go
View file
Open in desktop

This file was deleted.

61 changes: 0 additions & 61 deletions components/content-service/pkg/service/usage-report-service_test.go
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions install/installer/cmd/testdata/render/aws-setup/output.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,9 +1240,6 @@ data:
"bucket": "s3-bucket"
},
"blobQuota": 5368709120
},
"usageReport": {
"bucketName": "gitpod-usage-reports"
}
}
kind: ConfigMap
Expand Down Expand Up @@ -7227,7 +7224,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 2e45691c9b7dbd15eefd950854dfc5d89500012dc70f6a624069a404c72f9010
gitpod.io/checksum_config: 8a160b6e8470e7a514961a4530576b4fa6bfb60eae6a275d05f2b488542a9e9b
creationTimestamp: null
labels:
app: gitpod
Expand Down
5 changes: 1 addition & 4 deletions install/installer/cmd/testdata/render/azure-setup/output.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1202,9 +1202,6 @@ data:
"parallelUpload": 6
},
"blobQuota": 5368709120
},
"usageReport": {
"bucketName": "gitpod-usage-reports"
}
}
kind: ConfigMap
Expand Down Expand Up @@ -7067,7 +7064,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 9f2fefeff4c2a12ff62db1ffafb3d9af6b91ba0b536b6e8664b55c43a1aec3c0
gitpod.io/checksum_config: 20782435cc6d6e080cf720b57dca8d4d5cfe40942fc71c4bfd54934fdc34c766
creationTimestamp: null
labels:
app: gitpod
Expand Down
5 changes: 1 addition & 4 deletions install/installer/cmd/testdata/render/customization/output.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,9 +1419,6 @@ data:
"parallelUpload": 6
},
"blobQuota": 5368709120
},
"usageReport": {
"bucketName": "gitpod-usage-reports"
}
}
kind: ConfigMap
Expand Down Expand Up @@ -8441,7 +8438,7 @@ spec:
metadata:
annotations:
gitpod.io: hello
gitpod.io/checksum_config: d72d95c5bd425eaabe281cea259139df35cc6343145eadac5f2e95aae30360ab
gitpod.io/checksum_config: efaa4ecb9c874bc91c8f6000604bbbc61f5294f388703b19ec5cdb58c303ea23
hello: world
creationTimestamp: null
labels:
Expand Down
5 changes: 1 addition & 4 deletions install/installer/cmd/testdata/render/external-registry/output.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,9 +1233,6 @@ data:
"parallelUpload": 6
},
"blobQuota": 5368709120
},
"usageReport": {
"bucketName": "gitpod-usage-reports"
}
}
kind: ConfigMap
Expand Down Expand Up @@ -7508,7 +7505,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 9f2fefeff4c2a12ff62db1ffafb3d9af6b91ba0b536b6e8664b55c43a1aec3c0
gitpod.io/checksum_config: 20782435cc6d6e080cf720b57dca8d4d5cfe40942fc71c4bfd54934fdc34c766
creationTimestamp: null
labels:
app: gitpod
Expand Down
5 changes: 1 addition & 4 deletions install/installer/cmd/testdata/render/gcp-setup/output.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,9 +1178,6 @@ data:
"region": ""
},
"blobQuota": 5368709120
},
"usageReport": {
"bucketName": "gitpod-usage-reports"
}
}
kind: ConfigMap
Expand Down Expand Up @@ -7116,7 +7113,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 161f3cb1cb0878446fc17e8b20667e54261e2ebe7ac8212e33a63e2674507435
gitpod.io/checksum_config: facd640dff87a0bd161053705fc8e34204a605c5eeaf445f6f5ef8e5329f486a
creationTimestamp: null
labels:
app: gitpod
Expand Down
5 changes: 1 addition & 4 deletions install/installer/cmd/testdata/render/http-proxy/output.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,9 +1304,6 @@ data:
"parallelUpload": 6
},
"blobQuota": 5368709120
},
"usageReport": {
"bucketName": "gitpod-usage-reports"
}
}
kind: ConfigMap
Expand Down Expand Up @@ -8353,7 +8350,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 9f2fefeff4c2a12ff62db1ffafb3d9af6b91ba0b536b6e8664b55c43a1aec3c0
gitpod.io/checksum_config: 20782435cc6d6e080cf720b57dca8d4d5cfe40942fc71c4bfd54934fdc34c766
creationTimestamp: null
labels:
app: gitpod
Expand Down
5 changes: 1 addition & 4 deletions install/installer/cmd/testdata/render/minimal/output.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,9 +1304,6 @@ data:
"parallelUpload": 6
},
"blobQuota": 5368709120
},
"usageReport": {
"bucketName": "gitpod-usage-reports"
}
}
kind: ConfigMap
Expand Down Expand Up @@ -7788,7 +7785,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 9f2fefeff4c2a12ff62db1ffafb3d9af6b91ba0b536b6e8664b55c43a1aec3c0
gitpod.io/checksum_config: 20782435cc6d6e080cf720b57dca8d4d5cfe40942fc71c4bfd54934fdc34c766
creationTimestamp: null
labels:
app: gitpod
Expand Down
5 changes: 1 addition & 4 deletions install/installer/cmd/testdata/render/statefulset-customization/output.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,9 +1304,6 @@ data:
"parallelUpload": 6
},
"blobQuota": 5368709120
},
"usageReport": {
"bucketName": "gitpod-usage-reports"
}
}
kind: ConfigMap
Expand Down Expand Up @@ -7800,7 +7797,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 9f2fefeff4c2a12ff62db1ffafb3d9af6b91ba0b536b6e8664b55c43a1aec3c0
gitpod.io/checksum_config: 20782435cc6d6e080cf720b57dca8d4d5cfe40942fc71c4bfd54934fdc34c766
creationTimestamp: null
labels:
app: gitpod
Expand Down
5 changes: 1 addition & 4 deletions install/installer/cmd/testdata/render/use-pod-security-policies/output.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,9 +1526,6 @@ data:
"parallelUpload": 6
},
"blobQuota": 5368709120
},
"usageReport": {
"bucketName": "gitpod-usage-reports"
}
}
kind: ConfigMap
Expand Down Expand Up @@ -8232,7 +8229,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 9f2fefeff4c2a12ff62db1ffafb3d9af6b91ba0b536b6e8664b55c43a1aec3c0
gitpod.io/checksum_config: 20782435cc6d6e080cf720b57dca8d4d5cfe40942fc71c4bfd54934fdc34c766
creationTimestamp: null
labels:
app: gitpod
Expand Down
5 changes: 1 addition & 4 deletions install/installer/cmd/testdata/render/workspace-requests-limits/output.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,9 +1304,6 @@ data:
"parallelUpload": 6
},
"blobQuota": 5368709120
},
"usageReport": {
"bucketName": "gitpod-usage-reports"
}
}
kind: ConfigMap
Expand Down Expand Up @@ -7791,7 +7788,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 9f2fefeff4c2a12ff62db1ffafb3d9af6b91ba0b536b6e8664b55c43a1aec3c0
gitpod.io/checksum_config: 20782435cc6d6e080cf720b57dca8d4d5cfe40942fc71c4bfd54934fdc34c766
creationTimestamp: null
labels:
app: gitpod
Expand Down
Loading