rename to usage

.github/CODEOWNERS

@@ -41,7 +41,7 @@
 /install/installer/pkg/components/public-api-server @gitpod-io/engineering-webapp
 /install/installer/pkg/components/server @gitpod-io/engineering-webapp
 /install/installer/pkg/components/server/ide @gitpod-io/engineering-ide
-/install/installer/pkg/components/usage-controller @gitpod-io/engineering-webapp
+/install/installer/pkg/components/usage @gitpod-io/engineering-webapp
 /install/installer/pkg/components/workspace @gitpod-io/engineering-workspace
 /install/installer/pkg/components/workspace/ide @gitpod-io/engineering-ide
 /install/installer/pkg/components/ws-daemon @gitpod-io/engineering-workspace

components/BUILD.yaml

@@ -54,7 +54,7 @@ packages:
       - components/image-builder-mk3:docker
       - components/local-app:docker
       - components/public-api-server:docker
-      - components/usage-controller:docker
+      - components/usage:docker
       - components/openvsx-proxy:docker
       - components/proxy:docker
       - components/registry-facade:docker

components/usage-controller/BUILD.yaml → components/usage/BUILD.yaml

@@ -12,7 +12,7 @@ packages:
       - GOOS=linux
     config:
       packaging: app
-      buildCommand: ["go", "build", "-trimpath", "-ldflags", "-buildid= -w -s -X 'github.com/gitpod-io/gitpod/usage-controller/cmd.Version=commit-${__git_commit}'"]
+      buildCommand: ["go", "build", "-trimpath", "-ldflags", "-buildid= -w -s -X 'github.com/gitpod-io/gitpod/usage/cmd.Version=commit-${__git_commit}'"]
   - name: docker
     type: docker
     deps:
@@ -24,7 +24,7 @@ packages:
         VERSION: ${version}
       dockerfile: leeway.Dockerfile
       metadata:
-        helm-component: usage-controller
+        helm-component: usage
       image:
-        - ${imageRepoBase}/usage-controller:${version}
-        - ${imageRepoBase}/usage-controller:commit-${__git_commit}
+        - ${imageRepoBase}/usage:${version}
+        - ${imageRepoBase}/usage:commit-${__git_commit}

components/usage-controller/cmd/root.go → components/usage/cmd/root.go

@@ -14,15 +14,15 @@ import (
 
 var (
 	// ServiceName is the name we use for tracing/logging
-	ServiceName = "usage-controller"
+	ServiceName = "usage"
 	// Version of this service - set during build
 	Version = ""
 )
 
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:   ServiceName,
-	Short: "Runs usage controller",
+	Short: "Usage service & controller",
 }
 
 func Execute() {

components/usage-controller/cmd/run.go → components/usage/cmd/run.go

@@ -28,7 +28,7 @@ func run() *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			log.Init(ServiceName, Version, true, verbose)
 
-			log.Info("Hello world usage-controller")
+			log.Info("Hello world usage server")
 
 			done := make(chan bool, 1)
 			sigs := make(chan os.Signal, 1)

components/usage-controller/go.mod → components/usage/go.mod

@@ -1,4 +1,4 @@
-module github.com/gitpod-io/gitpod/usage-controller
+module github.com/gitpod-io/gitpod/usage
 
 go 1.18
 

components/usage-controller/leeway.Dockerfile → components/usage/leeway.Dockerfile

@@ -9,7 +9,7 @@ RUN  apk upgrade --no-cache \
   && apk add --no-cache ca-certificates
 
 RUN adduser -S -D -H -h /app -u 1000 appuser
-COPY components-usage-controller--app/usage-controller /app/usage-controller
+COPY components-usage--app/usage /app/usage
 RUN chown -R appuser /app
 
 USER appuser
@@ -19,5 +19,5 @@ ARG VERSION
 
 ENV GITPOD_BUILD_GIT_COMMIT=${__GIT_COMMIT}
 ENV GITPOD_BUILD_VERSION=${VERSION}
-ENTRYPOINT [ "/app/usage-controller" ]
+ENTRYPOINT [ "/app/usage" ]
 CMD [ "-v", "help" ]

components/usage-controller/main.go → components/usage/main.go

@@ -4,7 +4,7 @@
 
 package main
 
-import "github.com/gitpod-io/gitpod/usage-controller/cmd"
+import "github.com/gitpod-io/gitpod/usage/cmd"
 
 func main() {
 	cmd.Execute()